From f0943995c62b117e9139a0a61f979e6e0cd6f81f Mon Sep 17 00:00:00 2001 From: luisangelsm Date: Fri, 13 Mar 2026 11:06:25 +0100 Subject: [PATCH] Include sanitation --- YACReader/goto_flow_toolbar.cpp | 9 ++++++- YACReader/magnifying_glass.h | 1 - YACReader/main.cpp | 3 +-- YACReader/main_window_viewer.cpp | 9 ++++--- YACReader/mouse_handler.cpp | 2 +- YACReader/notifications_label_widget.cpp | 9 ++++++- YACReader/page_label_widget.cpp | 7 ++++- YACReader/render.cpp | 2 -- YACReader/themes/theme.h | 2 +- YACReader/viewer.cpp | 7 +++-- YACReader/width_slider.cpp | 8 +++--- YACReaderLibrary/add_label_dialog.cpp | 3 +++ YACReaderLibrary/add_label_dialog.h | 5 +++- YACReaderLibrary/bundle_creator.h | 2 +- YACReaderLibrary/classic_comics_view.cpp | 10 ++++++- YACReaderLibrary/classic_comics_view.h | 2 ++ .../comic_vine/comic_vine_dialog.cpp | 3 ++- .../comic_vine/search_single_comic.h | 2 -- YACReaderLibrary/comic_vine/search_volume.h | 4 ++- YACReaderLibrary/comic_vine/select_comic.h | 2 -- YACReaderLibrary/comic_vine/select_volume.cpp | 1 - YACReaderLibrary/comic_vine/select_volume.h | 2 -- .../comic_vine/sort_volume_comics.h | 1 - YACReaderLibrary/comics_remover.h | 1 - YACReaderLibrary/comics_view.cpp | 2 +- YACReaderLibrary/comics_view.h | 4 ++- YACReaderLibrary/db/comic_model.cpp | 3 ++- YACReaderLibrary/db/comic_model.h | 2 +- .../db/comic_query_result_processor.cpp | 2 ++ .../db/comic_query_result_processor.h | 1 - YACReaderLibrary/db/data_base_management.cpp | 6 +++-- YACReaderLibrary/db/data_base_management.h | 1 - YACReaderLibrary/db/folder_model.cpp | 4 +-- .../db/folder_query_result_processor.cpp | 3 ++- YACReaderLibrary/db/query_parser.cpp | 4 +-- YACReaderLibrary/db/reading_list_item.h | 1 - YACReaderLibrary/db/reading_list_model.cpp | 4 ++- YACReaderLibrary/db_helper.cpp | 2 +- YACReaderLibrary/empty_container_info.cpp | 2 +- YACReaderLibrary/empty_container_info.h | 7 ++++- YACReaderLibrary/empty_folder_widget.h | 1 - YACReaderLibrary/empty_label_widget.h | 3 +-- YACReaderLibrary/empty_reading_list_widget.h | 1 - YACReaderLibrary/empty_special_list.h | 1 - YACReaderLibrary/folder_content_view.cpp | 6 +++-- YACReaderLibrary/folder_content_view.h | 5 +++- YACReaderLibrary/grid_comics_view.cpp | 14 ++++++---- YACReaderLibrary/grid_comics_view.h | 1 + YACReaderLibrary/import_widget.h | 10 ++++++- YACReaderLibrary/info_comics_view.cpp | 9 +++---- .../initial_comic_info_extractor.h | 6 ++++- YACReaderLibrary/library_comic_opener.cpp | 1 - YACReaderLibrary/library_creator.cpp | 1 + YACReaderLibrary/library_creator.h | 1 - YACReaderLibrary/library_window.cpp | 26 +++++++++++++------ YACReaderLibrary/library_window.h | 1 - YACReaderLibrary/library_window_actions.cpp | 1 - YACReaderLibrary/options_dialog.cpp | 13 +++++++--- YACReaderLibrary/options_dialog.h | 12 ++++++--- YACReaderLibrary/properties_dialog.cpp | 1 + .../recent_visibility_coordinator.h | 2 -- .../controllers/v2/comiccontroller_v2.cpp | 3 --- .../v2/comiccontrollerinreadinglist_v2.cpp | 5 ---- .../v2/comicdownloadinfocontroller_v2.cpp | 3 ++- .../v2/comicfullinfocontroller_v2.cpp | 2 -- .../controllers/v2/errorcontroller_v2.cpp | 3 --- .../v2/foldercontentcontroller_v2.cpp | 1 - .../v2/folderinfocontroller_v2.cpp | 6 ++--- .../v2/readinglistinfocontroller_v2.cpp | 6 ++--- .../controllers/v2/taginfocontroller_v2.cpp | 6 ++--- .../v2/updatecomiccontroller_v2.cpp | 7 ++--- .../server/yacreader_http_session_store.cpp | 2 ++ .../server/yacreader_http_session_store.h | 3 ++- YACReaderLibrary/server_config_dialog.cpp | 1 - YACReaderLibrary/themes/theme.h | 1 - YACReaderLibrary/themes/theme_factory.cpp | 3 +++ YACReaderLibrary/trayicon_controller.cpp | 2 +- YACReaderLibrary/trayicon_controller.h | 4 ++- YACReaderLibrary/xml_info_library_scanner.cpp | 2 ++ .../yacreader_comics_selection_helper.h | 4 ++- .../yacreader_content_views_manager.cpp | 11 ++++---- .../yacreader_content_views_manager.h | 3 ++- YACReaderLibrary/yacreader_folders_view.cpp | 2 -- YACReaderLibrary/yacreader_folders_view.h | 6 +++-- .../yacreader_navigation_controller.cpp | 5 ++-- .../yacreader_reading_lists_view.cpp | 1 - .../yacreader_reading_lists_view.h | 6 +++-- YACReaderLibraryServer/main.cpp | 2 -- common/check_new_version.h | 1 - common/comic.cpp | 1 + common/comic.h | 1 - common/custom_widgets.cpp | 1 - common/rhi/yacreader_comic_flow_rhi.h | 3 +++ common/rhi/yacreader_flow_rhi.cpp | 1 + common/rhi/yacreader_flow_rhi.h | 2 -- common/rhi/yacreader_page_flow_rhi.h | 3 +++ common/scroll_management.cpp | 1 - common/themes/icon_utils.cpp | 1 + common/themes/icon_utils.h | 4 ++- compressed_archive/compressed_archive.cpp | 3 --- custom_widgets/rounded_corners_dialog.cpp | 2 +- custom_widgets/whats_new_controller.cpp | 2 -- custom_widgets/whats_new_dialog.cpp | 11 ++++++-- .../yacreader_library_item_widget.cpp | 5 ++-- custom_widgets/yacreader_search_line_edit.h | 1 - custom_widgets/yacreader_sidebar.cpp | 1 - custom_widgets/yacreader_sidebar.h | 8 +++++- custom_widgets/yacreader_table_view.cpp | 2 -- custom_widgets/yacreader_titled_toolbar.cpp | 1 - custom_widgets/yacreader_treeview.cpp | 2 +- custom_widgets/yacreader_treeview.h | 9 ++++++- .../edit_shortcuts_dialog.cpp | 4 --- 112 files changed, 252 insertions(+), 179 deletions(-) diff --git a/YACReader/goto_flow_toolbar.cpp b/YACReader/goto_flow_toolbar.cpp index 2f45af1d..f3428eca 100644 --- a/YACReader/goto_flow_toolbar.cpp +++ b/YACReader/goto_flow_toolbar.cpp @@ -1,6 +1,13 @@ #include "goto_flow_toolbar.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "configuration.h" diff --git a/YACReader/magnifying_glass.h b/YACReader/magnifying_glass.h index 33137de0..d174c93f 100644 --- a/YACReader/magnifying_glass.h +++ b/YACReader/magnifying_glass.h @@ -2,7 +2,6 @@ #define __MAGNIFYING_GLASS #include -#include #include #include diff --git a/YACReader/main.cpp b/YACReader/main.cpp index 5d1e9e77..27d0d08c 100644 --- a/YACReader/main.cpp +++ b/YACReader/main.cpp @@ -4,7 +4,6 @@ #include #include "main_window_viewer.h" -#include "configuration.h" #include "exit_check.h" #include "appearance_configuration.h" #include "theme_manager.h" @@ -16,10 +15,10 @@ #include "QsLogDest.h" using namespace QsLogging; +using namespace YACReader; #if defined(WIN32) && defined(_DEBUG) #define _CRTDBG_MAP_ALLOC -#include #include #define DEBUG_NEW new (_NORMAL_BLOCK, __FILE__, __LINE__) #define new DEBUG_NEW diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp index 35a27009..bb210bc6 100644 --- a/YACReader/main_window_viewer.cpp +++ b/YACReader/main_window_viewer.cpp @@ -1,12 +1,10 @@ #include "main_window_viewer.h" +#include "bookmarks_dialog.h" #include "configuration.h" #include "viewer.h" -#include "goto_dialog.h" -#include "custom_widgets.h" #include "options_dialog.h" #include "check_new_version.h" #include "comic.h" -#include "bookmarks_dialog.h" #include "width_slider.h" #include "qnaturalsorting.h" #include "help_about_dialog.h" @@ -22,12 +20,14 @@ #include "whats_new_controller.h" -#include #include #include +#include #include #include +#include +#include #include #include #include @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef use_unarr #include "unarr.h" diff --git a/YACReader/mouse_handler.cpp b/YACReader/mouse_handler.cpp index 9ab6055e..4ac97da7 100644 --- a/YACReader/mouse_handler.cpp +++ b/YACReader/mouse_handler.cpp @@ -1,6 +1,6 @@ #include "mouse_handler.h" -#include +#include #include "configuration.h" #include "goto_flow_widget.h" diff --git a/YACReader/notifications_label_widget.cpp b/YACReader/notifications_label_widget.cpp index 2d5ff56f..480025fb 100644 --- a/YACReader/notifications_label_widget.cpp +++ b/YACReader/notifications_label_widget.cpp @@ -1,6 +1,13 @@ #include "notifications_label_widget.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include NotificationsLabelWidget::NotificationsLabelWidget(QWidget *parent) : QWidget(parent) diff --git a/YACReader/page_label_widget.cpp b/YACReader/page_label_widget.cpp index 4a1e7cad..93ddf4ae 100644 --- a/YACReader/page_label_widget.cpp +++ b/YACReader/page_label_widget.cpp @@ -1,6 +1,11 @@ #include "page_label_widget.h" -#include +#include +#include +#include +#include +#include +#include PageLabelWidget::PageLabelWidget(QWidget *parent) : QWidget(parent) diff --git a/YACReader/render.cpp b/YACReader/render.cpp index 59996fea..9ad49ec4 100644 --- a/YACReader/render.cpp +++ b/YACReader/render.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include "comic_db.h" #include "yacreader_global_gui.h" #include "configuration.h" diff --git a/YACReader/themes/theme.h b/YACReader/themes/theme.h index 99715f64..658fe8a6 100644 --- a/YACReader/themes/theme.h +++ b/YACReader/themes/theme.h @@ -1,7 +1,7 @@ #ifndef THEME_H #define THEME_H -#include +#include #include #include "help_about_dialog_theme.h" diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp index 3eb44db4..ba08498d 100644 --- a/YACReader/viewer.cpp +++ b/YACReader/viewer.cpp @@ -12,14 +12,13 @@ #include "page_label_widget.h" #include "notifications_label_widget.h" #include "comic_db.h" -#include "shortcuts_manager.h" -#include "theme_manager.h" #include #include +#include #include - -#include +#include +#include Viewer::Viewer(QWidget *parent) : QScrollArea(parent), diff --git a/YACReader/width_slider.cpp b/YACReader/width_slider.cpp index 70912043..162610d8 100644 --- a/YACReader/width_slider.cpp +++ b/YACReader/width_slider.cpp @@ -1,8 +1,10 @@ #include "width_slider.h" -#include - -#include "configuration.h" +#include +#include +#include +#include +#include YACReaderSliderAction::YACReaderSliderAction(QWidget *parent) : QWidgetAction(parent) diff --git a/YACReaderLibrary/add_label_dialog.cpp b/YACReaderLibrary/add_label_dialog.cpp index c1cc0c79..b8399a84 100644 --- a/YACReaderLibrary/add_label_dialog.cpp +++ b/YACReaderLibrary/add_label_dialog.cpp @@ -1,5 +1,8 @@ #include "add_label_dialog.h" +#include +#include + namespace { const char *labelColorNames[] = { QT_TR_NOOP("red"), diff --git a/YACReaderLibrary/add_label_dialog.h b/YACReaderLibrary/add_label_dialog.h index e16216d6..fd943119 100644 --- a/YACReaderLibrary/add_label_dialog.h +++ b/YACReaderLibrary/add_label_dialog.h @@ -1,7 +1,10 @@ #ifndef ADD_LABEL_DIALOG_H #define ADD_LABEL_DIALOG_H -#include +#include +#include +#include +#include #include "yacreader_global.h" #include "themable.h" diff --git a/YACReaderLibrary/bundle_creator.h b/YACReaderLibrary/bundle_creator.h index a5ed56f6..7fb05e71 100644 --- a/YACReaderLibrary/bundle_creator.h +++ b/YACReaderLibrary/bundle_creator.h @@ -1,7 +1,7 @@ #ifndef __BUNDLE_CREATOR_H #define __BUNDLE_CREATOR_H -#include +#include class BundleCreator : public QObject { diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index e3eccd48..6c5d883f 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -2,7 +2,15 @@ #include "yacreader_global.h" -#include "QStackedWidget" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "comic_flow_widget.h" #include "shortcuts_manager.h" diff --git a/YACReaderLibrary/classic_comics_view.h b/YACReaderLibrary/classic_comics_view.h index af67ee67..836dce9c 100644 --- a/YACReaderLibrary/classic_comics_view.h +++ b/YACReaderLibrary/classic_comics_view.h @@ -4,8 +4,10 @@ #include "comics_view.h" #include "themable.h" +#include #include #include +#include class QSplitter; class QStackedWidget; diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp index 5efab527..acdc37ac 100644 --- a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp +++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp @@ -1,5 +1,7 @@ #include "comic_vine_dialog.h" +#include #include +#include #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include #include #include "data_base_management.h" #include diff --git a/YACReaderLibrary/comic_vine/search_single_comic.h b/YACReaderLibrary/comic_vine/search_single_comic.h index e3a1bd16..7fa7151e 100644 --- a/YACReaderLibrary/comic_vine/search_single_comic.h +++ b/YACReaderLibrary/comic_vine/search_single_comic.h @@ -1,8 +1,6 @@ #ifndef SEARCH_SINGLE_COMIC_H #define SEARCH_SINGLE_COMIC_H -#include - #include "scraper_checkbox.h" #include "themable.h" diff --git a/YACReaderLibrary/comic_vine/search_volume.h b/YACReaderLibrary/comic_vine/search_volume.h index 9d874273..2fa38608 100644 --- a/YACReaderLibrary/comic_vine/search_volume.h +++ b/YACReaderLibrary/comic_vine/search_volume.h @@ -1,7 +1,9 @@ #ifndef SEARCH_VOLUME_H #define SEARCH_VOLUME_H -#include +#include +#include + #include "scraper_checkbox.h" #include "themable.h" diff --git a/YACReaderLibrary/comic_vine/select_comic.h b/YACReaderLibrary/comic_vine/select_comic.h index e6c7f3c8..cf2b290c 100644 --- a/YACReaderLibrary/comic_vine/select_comic.h +++ b/YACReaderLibrary/comic_vine/select_comic.h @@ -1,8 +1,6 @@ #ifndef SELECT_COMIC_H #define SELECT_COMIC_H -#include - #include "scraper_results_paginator.h" #include "themable.h" diff --git a/YACReaderLibrary/comic_vine/select_volume.cpp b/YACReaderLibrary/comic_vine/select_volume.cpp index 66e6c5ee..924c6358 100644 --- a/YACReaderLibrary/comic_vine/select_volume.cpp +++ b/YACReaderLibrary/comic_vine/select_volume.cpp @@ -21,7 +21,6 @@ #include "comic_vine_client.h" #include "scraper_scroll_label.h" -#include "response_parser.h" #include "scraper_results_paginator.h" #include "selected_volume_info.h" diff --git a/YACReaderLibrary/comic_vine/select_volume.h b/YACReaderLibrary/comic_vine/select_volume.h index be50d2bb..07793787 100644 --- a/YACReaderLibrary/comic_vine/select_volume.h +++ b/YACReaderLibrary/comic_vine/select_volume.h @@ -1,8 +1,6 @@ #ifndef SELECT_VOLUME_H #define SELECT_VOLUME_H -#include - #include "scraper_results_paginator.h" #include "selected_volume_info.h" #include "volume_search_query.h" diff --git a/YACReaderLibrary/comic_vine/sort_volume_comics.h b/YACReaderLibrary/comic_vine/sort_volume_comics.h index c3a1a160..b516f7c5 100644 --- a/YACReaderLibrary/comic_vine/sort_volume_comics.h +++ b/YACReaderLibrary/comic_vine/sort_volume_comics.h @@ -1,7 +1,6 @@ #ifndef SORT_VOLUME_COMICS_H #define SORT_VOLUME_COMICS_H -#include #include #include #include diff --git a/YACReaderLibrary/comics_remover.h b/YACReaderLibrary/comics_remover.h index c46a4cbe..f153af6e 100644 --- a/YACReaderLibrary/comics_remover.h +++ b/YACReaderLibrary/comics_remover.h @@ -4,7 +4,6 @@ #include #include -#include class ComicsRemover : public QObject { diff --git a/YACReaderLibrary/comics_view.cpp b/YACReaderLibrary/comics_view.cpp index f3e705f1..5e537837 100644 --- a/YACReaderLibrary/comics_view.cpp +++ b/YACReaderLibrary/comics_view.cpp @@ -5,7 +5,7 @@ #include "QsLog.h" -#include +#include #include ComicsView::ComicsView(QWidget *parent) diff --git a/YACReaderLibrary/comics_view.h b/YACReaderLibrary/comics_view.h index 484c7354..f516d2d4 100644 --- a/YACReaderLibrary/comics_view.h +++ b/YACReaderLibrary/comics_view.h @@ -1,7 +1,9 @@ #ifndef COMICS_VIEW_H #define COMICS_VIEW_H -#include +#include +#include +#include #include "comic_model.h" diff --git a/YACReaderLibrary/db/comic_model.cpp b/YACReaderLibrary/db/comic_model.cpp index d85339b0..8701aca5 100644 --- a/YACReaderLibrary/db/comic_model.cpp +++ b/YACReaderLibrary/db/comic_model.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "comic_item.h" #include "comic_model.h" @@ -11,6 +11,7 @@ #include "comic_db.h" #include "db_helper.h" #include "reading_list_model.h" +#include "yacreader_global_gui.h" #ifdef use_unarr #include diff --git a/YACReaderLibrary/db/comic_model.h b/YACReaderLibrary/db/comic_model.h index d82b8369..484a69f6 100644 --- a/YACReaderLibrary/db/comic_model.h +++ b/YACReaderLibrary/db/comic_model.h @@ -8,7 +8,7 @@ #include #include -#include "yacreader_global_gui.h" +#include "yacreader_global.h" class ComicDB; diff --git a/YACReaderLibrary/db/comic_query_result_processor.cpp b/YACReaderLibrary/db/comic_query_result_processor.cpp index e1cf5e52..da0c9c5d 100644 --- a/YACReaderLibrary/db/comic_query_result_processor.cpp +++ b/YACReaderLibrary/db/comic_query_result_processor.cpp @@ -1,5 +1,7 @@ #include "comic_query_result_processor.h" +#include + #include "comic_item.h" #include "comic_model.h" #include "data_base_management.h" diff --git a/YACReaderLibrary/db/comic_query_result_processor.h b/YACReaderLibrary/db/comic_query_result_processor.h index 1a7359ee..a99623ad 100644 --- a/YACReaderLibrary/db/comic_query_result_processor.h +++ b/YACReaderLibrary/db/comic_query_result_processor.h @@ -4,7 +4,6 @@ #include #include -#include "yacreader_global.h" #include "concurrent_queue.h" class ComicItem; diff --git a/YACReaderLibrary/db/data_base_management.cpp b/YACReaderLibrary/db/data_base_management.cpp index 2a3ad18b..0a1bc656 100644 --- a/YACReaderLibrary/db/data_base_management.cpp +++ b/YACReaderLibrary/db/data_base_management.cpp @@ -1,10 +1,12 @@ #include "data_base_management.h" #include +#include +#include +#include +#include #include "initial_comic_info_extractor.h" -#include "check_new_version.h" #include "db_helper.h" -#include "yacreader_libraries.h" #include "QsLog.h" diff --git a/YACReaderLibrary/db/data_base_management.h b/YACReaderLibrary/db/data_base_management.h index 3bb844e8..c1d4aa7d 100644 --- a/YACReaderLibrary/db/data_base_management.h +++ b/YACReaderLibrary/db/data_base_management.h @@ -2,7 +2,6 @@ #define __DATA_BASE_MANAGEMENT_H #include -#include #include class ComicsInfoExporter : public QThread diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp index 17b70cf6..5d36f447 100644 --- a/YACReaderLibrary/db/folder_model.cpp +++ b/YACReaderLibrary/db/folder_model.cpp @@ -7,10 +7,10 @@ #include "qnaturalsorting.h" #include "yacreader_global.h" -#include "yacreader_global_gui.h" -#include #include +#include +#include #include diff --git a/YACReaderLibrary/db/folder_query_result_processor.cpp b/YACReaderLibrary/db/folder_query_result_processor.cpp index ec276a59..c936c509 100644 --- a/YACReaderLibrary/db/folder_query_result_processor.cpp +++ b/YACReaderLibrary/db/folder_query_result_processor.cpp @@ -5,8 +5,9 @@ #include "data_base_management.h" #include "search_query.h" -#include #include +#include +#include // Copy/pasted from "folder_model.cpp" #define ROOT 1 diff --git a/YACReaderLibrary/db/query_parser.cpp b/YACReaderLibrary/db/query_parser.cpp index d6691930..81a7df16 100644 --- a/YACReaderLibrary/db/query_parser.cpp +++ b/YACReaderLibrary/db/query_parser.cpp @@ -1,12 +1,10 @@ #include "query_parser.h" +#include #include -#include #include #include -#include - const std::map> QueryParser::fieldNames { { FieldType::numeric, { "numpages", "count", "arccount", "alternateCount", "rating" } }, { FieldType::text, { "date", "number", "arcnumber", "title", "volume", "storyarc", "genere", "writer", "penciller", "inker", "colorist", "letterer", "coverartist", "publisher", "format", "agerating", "synopsis", "characters", "notes", "editor", "imprint", "teams", "locations", "series", "alternateSeries", "alternateNumber", "languageISO", "seriesGroup", "mainCharacterOrTeam", "review", "tags" } }, diff --git a/YACReaderLibrary/db/reading_list_item.h b/YACReaderLibrary/db/reading_list_item.h index 58af7483..81876887 100644 --- a/YACReaderLibrary/db/reading_list_item.h +++ b/YACReaderLibrary/db/reading_list_item.h @@ -4,7 +4,6 @@ #include #include -#include "yacreader_global_gui.h" #include "reading_list_model.h" // TODO add propper constructors, using QList is not safe diff --git a/YACReaderLibrary/db/reading_list_model.cpp b/YACReaderLibrary/db/reading_list_model.cpp index 55aa626e..ca19bc55 100644 --- a/YACReaderLibrary/db/reading_list_model.cpp +++ b/YACReaderLibrary/db/reading_list_model.cpp @@ -8,7 +8,9 @@ #include "QsLog.h" -#include +#include + +#include "yacreader_global_gui.h" ReadingListModel::ReadingListModel(QObject *parent) : QAbstractItemModel(parent), rootItem(0) diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index 42d1bf82..ea08ce1b 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/YACReaderLibrary/db_helper.cpp @@ -9,11 +9,11 @@ #include #include #include +#include #include #include #include -#include #include "reading_list.h" #include "library_item.h" diff --git a/YACReaderLibrary/empty_container_info.cpp b/YACReaderLibrary/empty_container_info.cpp index e06eabfe..b6ee15db 100644 --- a/YACReaderLibrary/empty_container_info.cpp +++ b/YACReaderLibrary/empty_container_info.cpp @@ -1,6 +1,6 @@ #include "empty_container_info.h" -#include "yacreader_global.h" +#include EmptyContainerInfo::EmptyContainerInfo(QWidget *parent) : QWidget(parent), iconLabel(new QLabel()), titleLabel(new QLabel()) diff --git a/YACReaderLibrary/empty_container_info.h b/YACReaderLibrary/empty_container_info.h index ac61a3ec..9adbfa9d 100644 --- a/YACReaderLibrary/empty_container_info.h +++ b/YACReaderLibrary/empty_container_info.h @@ -1,7 +1,12 @@ #ifndef EMPTY_CONTAINER_INFO_H #define EMPTY_CONTAINER_INFO_H -#include +#include +#include +#include +#include +#include +#include #include "themable.h" diff --git a/YACReaderLibrary/empty_folder_widget.h b/YACReaderLibrary/empty_folder_widget.h index 02803925..1b8fdf69 100644 --- a/YACReaderLibrary/empty_folder_widget.h +++ b/YACReaderLibrary/empty_folder_widget.h @@ -1,7 +1,6 @@ #ifndef EMPTY_FOLDER_WIDGET_H #define EMPTY_FOLDER_WIDGET_H -#include #include "empty_container_info.h" class EmptyFolderWidget : public EmptyContainerInfo diff --git a/YACReaderLibrary/empty_label_widget.h b/YACReaderLibrary/empty_label_widget.h index a9ac9826..c17dfd55 100644 --- a/YACReaderLibrary/empty_label_widget.h +++ b/YACReaderLibrary/empty_label_widget.h @@ -1,9 +1,8 @@ #ifndef EMPTY_LABEL_WIDGET_H #define EMPTY_LABEL_WIDGET_H -#include #include "empty_container_info.h" -#include "yacreader_global_gui.h" +#include "yacreader_global.h" class EmptyLabelWidget : public EmptyContainerInfo { diff --git a/YACReaderLibrary/empty_reading_list_widget.h b/YACReaderLibrary/empty_reading_list_widget.h index 70ef65eb..7abd2760 100644 --- a/YACReaderLibrary/empty_reading_list_widget.h +++ b/YACReaderLibrary/empty_reading_list_widget.h @@ -1,7 +1,6 @@ #ifndef EMPTY_READING_LIST_WIDGET_H #define EMPTY_READING_LIST_WIDGET_H -#include #include "empty_container_info.h" class EmptyReadingListWidget : public EmptyContainerInfo diff --git a/YACReaderLibrary/empty_special_list.h b/YACReaderLibrary/empty_special_list.h index 0c926144..87967c9c 100644 --- a/YACReaderLibrary/empty_special_list.h +++ b/YACReaderLibrary/empty_special_list.h @@ -1,7 +1,6 @@ #ifndef EMPTY_SPECIAL_LIST_H #define EMPTY_SPECIAL_LIST_H -#include #include "empty_container_info.h" class EmptySpecialListWidget : public EmptyContainerInfo diff --git a/YACReaderLibrary/folder_content_view.cpp b/YACReaderLibrary/folder_content_view.cpp index 77106bc7..ec01ab00 100644 --- a/YACReaderLibrary/folder_content_view.cpp +++ b/YACReaderLibrary/folder_content_view.cpp @@ -2,18 +2,20 @@ #include "folder_model.h" #include "grid_comics_view.h" -#include "yacreader_global.h" #include "yacreader_global_gui.h" #include "yacreader_tool_bar_stretch.h" #include "comic.h" #include "comic_files_manager.h" -#include "theme_manager.h" #include "QsLog.h" +#include +#include #include #include #include +#include +#include using namespace YACReader; diff --git a/YACReaderLibrary/folder_content_view.h b/YACReaderLibrary/folder_content_view.h index cd0187f7..3e15797a 100644 --- a/YACReaderLibrary/folder_content_view.h +++ b/YACReaderLibrary/folder_content_view.h @@ -1,7 +1,10 @@ #ifndef FOLDERCONTENTVIEW_H #define FOLDERCONTENTVIEW_H -#include +#include +#include +#include +#include #include "comic_model.h" #include "themable.h" diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index c93ffcd2..601d9df5 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -1,15 +1,19 @@ #include "grid_comics_view.h" -#include +#include +#include +#include +#include +#include +#include #include -#include +#include +#include +#include "yacreader_global_gui.h" #include "comic.h" -#include "theme_manager.h" #include "comic_files_manager.h" #include "QsLog.h" -#include "yacreader_global.h" -#include "yacreader_tool_bar_stretch.h" #include "comic_db.h" #include "yacreader_comics_selection_helper.h" #include "yacreader_comic_info_helper.h" diff --git a/YACReaderLibrary/grid_comics_view.h b/YACReaderLibrary/grid_comics_view.h index 6ba587fd..9f60201d 100644 --- a/YACReaderLibrary/grid_comics_view.h +++ b/YACReaderLibrary/grid_comics_view.h @@ -4,6 +4,7 @@ #include "comics_view.h" #include "themable.h" +#include #include #include "comic_db.h" diff --git a/YACReaderLibrary/import_widget.h b/YACReaderLibrary/import_widget.h index 83366062..9e54ba5e 100644 --- a/YACReaderLibrary/import_widget.h +++ b/YACReaderLibrary/import_widget.h @@ -1,7 +1,15 @@ #ifndef IMPORT_WIDGET_H #define IMPORT_WIDGET_H -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "themable.h" diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp index 5e506d5c..b801b6d5 100644 --- a/YACReaderLibrary/info_comics_view.cpp +++ b/YACReaderLibrary/info_comics_view.cpp @@ -1,15 +1,14 @@ #include "info_comics_view.h" -#include "yacreader_global.h" -#include "theme_manager.h" - -#include +#include +#include #include +#include +#include #include "comic.h" #include "comic_files_manager.h" #include "comic_model.h" -#include "comic_db.h" #include "yacreader_comic_info_helper.h" #include "yacreader_comics_selection_helper.h" diff --git a/YACReaderLibrary/initial_comic_info_extractor.h b/YACReaderLibrary/initial_comic_info_extractor.h index 5382d81f..3e8f99ce 100644 --- a/YACReaderLibrary/initial_comic_info_extractor.h +++ b/YACReaderLibrary/initial_comic_info_extractor.h @@ -1,7 +1,11 @@ #ifndef INITIALCOMICINFOEXTRACTOR_H #define INITIALCOMICINFOEXTRACTOR_H -#include +#include +#include +#include +#include +#include namespace YACReader { class InitialComicInfoExtractor : public QObject diff --git a/YACReaderLibrary/library_comic_opener.cpp b/YACReaderLibrary/library_comic_opener.cpp index ede63f33..026d677c 100644 --- a/YACReaderLibrary/library_comic_opener.cpp +++ b/YACReaderLibrary/library_comic_opener.cpp @@ -3,7 +3,6 @@ #include "comic_db.h" #include -#include bool YACReader::openComic(const ComicDB &comic, unsigned long long libraryId, diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp index 877a96bb..139dea24 100644 --- a/YACReaderLibrary/library_creator.cpp +++ b/YACReaderLibrary/library_creator.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include diff --git a/YACReaderLibrary/library_creator.h b/YACReaderLibrary/library_creator.h index 0c13f344..401e08cd 100644 --- a/YACReaderLibrary/library_creator.h +++ b/YACReaderLibrary/library_creator.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index e7e9551e..d1689ede 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -3,11 +3,23 @@ #include "yacreader_global.h" #include "yacreader_global_gui.h" +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include #include +#include +#include #include #include +#include #include #include #include @@ -19,6 +31,11 @@ #include #include +#ifdef Q_OS_WIN +#include +#include +#endif + #include "folder_item.h" #include "data_base_management.h" #include "no_libraries_widget.h" @@ -51,6 +68,7 @@ #include "comics_remover.h" #include "yacreader_library_list_widget.h" #include "yacreader_folders_view.h" +#include "yacreader_reading_lists_view.h" #include "comic_vine_dialog.h" #include "api_key_dialog.h" @@ -63,7 +81,6 @@ #include "comic_files_manager.h" #include "reading_list_model.h" -#include "yacreader_reading_lists_view.h" #include "add_label_dialog.h" #include "yacreader_history_controller.h" @@ -84,18 +101,11 @@ #include "cover_utils.h" -#include "theme_manager.h" - #include "QsLog.h" #include "yacreader_http_server.h" extern YACReaderHttpServer *httpServer; -#ifdef Q_OS_WIN -#include -#include -#endif - #include namespace { diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h index 091ef275..4e5e0a88 100644 --- a/YACReaderLibrary/library_window.h +++ b/YACReaderLibrary/library_window.h @@ -8,7 +8,6 @@ #include "library_window_actions.h" #include "yacreader_global.h" -#include "yacreader_global_gui.h" #include "yacreader_libraries.h" #include "libraries_update_coordinator.h" diff --git a/YACReaderLibrary/library_window_actions.cpp b/YACReaderLibrary/library_window_actions.cpp index ce6e9f0f..4c6edbde 100644 --- a/YACReaderLibrary/library_window_actions.cpp +++ b/YACReaderLibrary/library_window_actions.cpp @@ -15,7 +15,6 @@ #include "theme_manager.h" #include -#include LibraryWindowActions::LibraryWindowActions() { diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp index aa00080c..288b162b 100644 --- a/YACReaderLibrary/options_dialog.cpp +++ b/YACReaderLibrary/options_dialog.cpp @@ -2,14 +2,21 @@ #include "yacreader_3d_flow_config_widget.h" #include "api_key_dialog.h" +#include "appearance_tab_widget.h" +#include "theme_factory.h" +#include "theme_manager.h" #include "yacreader_global_gui.h" -#include "theme_manager.h" -#include "theme_factory.h" -#include "appearance_tab_widget.h" #include "app_language_utils.h" +#include +#include +#include +#include #include +#include +#include +#include FlowType flowType = Strip; diff --git a/YACReaderLibrary/options_dialog.h b/YACReaderLibrary/options_dialog.h index 68faa16b..af878bfa 100644 --- a/YACReaderLibrary/options_dialog.h +++ b/YACReaderLibrary/options_dialog.h @@ -1,11 +1,17 @@ #ifndef __OPTIONS_DIALOG_H #define __OPTIONS_DIALOG_H -#include - -#include "yacreader_options_dialog.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "yacreader_global.h" +#include "yacreader_options_dialog.h" using namespace YACReader; diff --git a/YACReaderLibrary/properties_dialog.cpp b/YACReaderLibrary/properties_dialog.cpp index 435e0d6d..b23d5dd8 100644 --- a/YACReaderLibrary/properties_dialog.cpp +++ b/YACReaderLibrary/properties_dialog.cpp @@ -10,6 +10,7 @@ #include "db_helper.h" #include "yacreader_cover_label.h" +#include #include #include #include diff --git a/YACReaderLibrary/recent_visibility_coordinator.h b/YACReaderLibrary/recent_visibility_coordinator.h index 22fb1db4..518c9c17 100644 --- a/YACReaderLibrary/recent_visibility_coordinator.h +++ b/YACReaderLibrary/recent_visibility_coordinator.h @@ -2,8 +2,6 @@ #ifndef RECENT_VISIBILITY_COORDINATOR_H #define RECENT_VISIBILITY_COORDINATOR_H -#include - #include "folder_model.h" #include "comic_model.h" #include "folder_content_view.h" diff --git a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp index c2d457be..816ac19e 100644 --- a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp @@ -4,7 +4,6 @@ #include "yacreader_libraries.h" #include "yacreader_http_session.h" -#include "template.h" #include "../static.h" #include "comic_db.h" @@ -14,8 +13,6 @@ #include "QsLog.h" -#include - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp index 96113d2e..82b54030 100644 --- a/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp @@ -4,18 +4,13 @@ #include "yacreader_libraries.h" #include "yacreader_http_session.h" -#include "template.h" #include "../static.h" #include "comic_db.h" #include "comic.h" -#include "qnaturalsorting.h" - #include "QsLog.h" -#include - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp index c9a97a0b..903fa9ae 100644 --- a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp @@ -1,7 +1,8 @@ #include "comicdownloadinfocontroller_v2.h" +#include + #include "db_helper.h" -#include "yacreader_libraries.h" #include "comic_db.h" diff --git a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp index 8f06c83b..2f5af2fe 100644 --- a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp @@ -8,8 +8,6 @@ #include "yacreader_libraries.h" #include "yacreader_server_data_helper.h" -#include - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; using namespace std; diff --git a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp index cedbbc30..e0f6c618 100644 --- a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp @@ -1,8 +1,5 @@ #include "errorcontroller_v2.h" -#include "template.h" -#include "../static.h" - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp index 6f99993e..0ecc765d 100644 --- a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp @@ -14,7 +14,6 @@ #include "QsLog.h" #include -#include using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp index c6988435..5b5c1e3d 100644 --- a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp @@ -1,12 +1,12 @@ #include "folderinfocontroller_v2.h" + +#include + #include "db_helper.h" //get libraries #include "folder.h" #include "comic_db.h" -#include "template.h" -#include "../static.h" - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp index 6145cf63..7468bb40 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp @@ -1,13 +1,11 @@ #include "readinglistinfocontroller_v2.h" +#include + #include "db_helper.h" -#include "folder.h" #include "comic_db.h" -#include "template.h" -#include "../static.h" - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp index 29dad28c..21593067 100644 --- a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp @@ -1,13 +1,11 @@ #include "taginfocontroller_v2.h" +#include + #include "db_helper.h" -#include "folder.h" #include "comic_db.h" -#include "template.h" -#include "../static.h" - using stefanfrings::HttpRequest; using stefanfrings::HttpResponse; diff --git a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp index 94324838..03401063 100644 --- a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp @@ -1,13 +1,10 @@ #include "updatecomiccontroller_v2.h" -#include "db_helper.h" -#include "yacreader_libraries.h" +#include -#include "template.h" -#include "../static.h" +#include "db_helper.h" #include "comic_db.h" -#include "comic.h" #include "QsLog.h" diff --git a/YACReaderLibrary/server/yacreader_http_session_store.cpp b/YACReaderLibrary/server/yacreader_http_session_store.cpp index aadb6a31..b8fa889a 100644 --- a/YACReaderLibrary/server/yacreader_http_session_store.cpp +++ b/YACReaderLibrary/server/yacreader_http_session_store.cpp @@ -1,5 +1,7 @@ #include "yacreader_http_session_store.h" +#include + #include "yacreader_http_session.h" YACReaderHttpSessionStore::YACReaderHttpSessionStore(QObject *parent) diff --git a/YACReaderLibrary/server/yacreader_http_session_store.h b/YACReaderLibrary/server/yacreader_http_session_store.h index c3a6caa2..6771c999 100644 --- a/YACReaderLibrary/server/yacreader_http_session_store.h +++ b/YACReaderLibrary/server/yacreader_http_session_store.h @@ -1,8 +1,9 @@ #ifndef YACREADERHTTPSESSIONSTORE_H #define YACREADERHTTPSESSIONSTORE_H +#include +#include #include -#include class YACReaderHttpSession; diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp index 9352db74..924349d2 100644 --- a/YACReaderLibrary/server_config_dialog.cpp +++ b/YACReaderLibrary/server_config_dialog.cpp @@ -11,7 +11,6 @@ #include "ip_config_helper.h" #include "qrcodegen.hpp" -#include "theme_manager.h" extern YACReaderHttpServer *httpServer; diff --git a/YACReaderLibrary/themes/theme.h b/YACReaderLibrary/themes/theme.h index bc0ca8cc..6c208d69 100644 --- a/YACReaderLibrary/themes/theme.h +++ b/YACReaderLibrary/themes/theme.h @@ -1,7 +1,6 @@ #ifndef THEME_H #define THEME_H -#include #include #include "yacreader_icon.h" diff --git a/YACReaderLibrary/themes/theme_factory.cpp b/YACReaderLibrary/themes/theme_factory.cpp index 550611d8..e7bcc688 100644 --- a/YACReaderLibrary/themes/theme_factory.cpp +++ b/YACReaderLibrary/themes/theme_factory.cpp @@ -1,6 +1,9 @@ #include "theme_factory.h" #include +#include +#include +#include #include "icon_utils.h" #include "yacreader_global.h" diff --git a/YACReaderLibrary/trayicon_controller.cpp b/YACReaderLibrary/trayicon_controller.cpp index de7902ee..2fbda2e0 100644 --- a/YACReaderLibrary/trayicon_controller.cpp +++ b/YACReaderLibrary/trayicon_controller.cpp @@ -4,7 +4,7 @@ #include "library_window.h" -#include +#include #include #ifdef Q_OS_MACOS diff --git a/YACReaderLibrary/trayicon_controller.h b/YACReaderLibrary/trayicon_controller.h index 1ff9d407..5d8687b9 100644 --- a/YACReaderLibrary/trayicon_controller.h +++ b/YACReaderLibrary/trayicon_controller.h @@ -1,7 +1,9 @@ #ifndef TRAYICON_CONTROLLER_H #define TRAYICON_CONTROLLER_H -#include +#include +#include +#include #include class LibraryWindow; diff --git a/YACReaderLibrary/xml_info_library_scanner.cpp b/YACReaderLibrary/xml_info_library_scanner.cpp index 2740e416..20cadfbd 100644 --- a/YACReaderLibrary/xml_info_library_scanner.cpp +++ b/YACReaderLibrary/xml_info_library_scanner.cpp @@ -1,5 +1,7 @@ #include "xml_info_library_scanner.h" +#include + #include "comic_db.h" #include "data_base_management.h" #include "db_helper.h" diff --git a/YACReaderLibrary/yacreader_comics_selection_helper.h b/YACReaderLibrary/yacreader_comics_selection_helper.h index aad8d799..05566d89 100644 --- a/YACReaderLibrary/yacreader_comics_selection_helper.h +++ b/YACReaderLibrary/yacreader_comics_selection_helper.h @@ -1,8 +1,10 @@ #ifndef YACREADERCOMICSSELECTIONHELPER_H #define YACREADERCOMICSSELECTIONHELPER_H +#include +#include +#include #include -#include class ComicModel; diff --git a/YACReaderLibrary/yacreader_content_views_manager.cpp b/YACReaderLibrary/yacreader_content_views_manager.cpp index b36f33d6..8d56c1ea 100644 --- a/YACReaderLibrary/yacreader_content_views_manager.cpp +++ b/YACReaderLibrary/yacreader_content_views_manager.cpp @@ -4,21 +4,22 @@ #include "classic_comics_view.h" #include "grid_comics_view.h" +#include "folder_content_view.h" + +#include "yacreader_sidebar.h" + #include "info_comics_view.h" #include "comics_view_transition.h" -#include "folder_content_view.h" #include "empty_label_widget.h" #include "empty_special_list.h" #include "empty_reading_list_widget.h" #include "empty_folder_widget.h" #include "no_search_results_widget.h" - -#include "yacreader_sidebar.h" +#include "yacreader_options_dialog.h" +#include "options_dialog.h" //-- #include "yacreader_search_line_edit.h" -#include "options_dialog.h" -#include "theme_manager.h" YACReaderContentViewsManager::YACReaderContentViewsManager(QSettings *settings, LibraryWindow *parent) : QObject(parent), libraryWindow(parent), classicComicsView(nullptr), gridComicsView(nullptr), infoComicsView(nullptr) diff --git a/YACReaderLibrary/yacreader_content_views_manager.h b/YACReaderLibrary/yacreader_content_views_manager.h index 8ef45fd1..ed03b2d8 100644 --- a/YACReaderLibrary/yacreader_content_views_manager.h +++ b/YACReaderLibrary/yacreader_content_views_manager.h @@ -1,7 +1,8 @@ #ifndef YACREADERCONTENTVIEWSMANAGER_H #define YACREADERCONTENTVIEWSMANAGER_H -#include +#include +#include #include "yacreader_global_gui.h" #include "themable.h" diff --git a/YACReaderLibrary/yacreader_folders_view.cpp b/YACReaderLibrary/yacreader_folders_view.cpp index 27346279..546a0695 100644 --- a/YACReaderLibrary/yacreader_folders_view.cpp +++ b/YACReaderLibrary/yacreader_folders_view.cpp @@ -1,9 +1,7 @@ #include "yacreader_folders_view.h" -#include "yacreader_global.h" #include "yacreader_treeview.h" -#include "folder_item.h" #include "folder_model.h" #include "comic.h" diff --git a/YACReaderLibrary/yacreader_folders_view.h b/YACReaderLibrary/yacreader_folders_view.h index efb8d3c7..534859db 100644 --- a/YACReaderLibrary/yacreader_folders_view.h +++ b/YACReaderLibrary/yacreader_folders_view.h @@ -1,11 +1,13 @@ #ifndef YACREADER_FOLDERS_VIEW_H #define YACREADER_FOLDERS_VIEW_H +#include +#include +#include + #include "yacreader_treeview.h" #include "theme.h" -#include - class YACReaderFoldersView : public YACReaderTreeView { Q_OBJECT diff --git a/YACReaderLibrary/yacreader_navigation_controller.cpp b/YACReaderLibrary/yacreader_navigation_controller.cpp index 43ab4bee..0fb74f3c 100644 --- a/YACReaderLibrary/yacreader_navigation_controller.cpp +++ b/YACReaderLibrary/yacreader_navigation_controller.cpp @@ -3,8 +3,6 @@ #include #include "library_window.h" -#include "yacreader_folders_view.h" -#include "yacreader_reading_lists_view.h" #include "folder_item.h" #include "yacreader_history_controller.h" #include "comic_model.h" @@ -12,11 +10,12 @@ #include "reading_list_model.h" #include "comics_view.h" #include "folder_content_view.h" -#include "yacreader_search_line_edit.h" #include "yacreader_global.h" #include "empty_label_widget.h" #include "empty_special_list.h" #include "yacreader_content_views_manager.h" +#include "yacreader_folders_view.h" +#include "yacreader_reading_lists_view.h" #include "QsLog.h" diff --git a/YACReaderLibrary/yacreader_reading_lists_view.cpp b/YACReaderLibrary/yacreader_reading_lists_view.cpp index 62b4aea2..08084556 100644 --- a/YACReaderLibrary/yacreader_reading_lists_view.cpp +++ b/YACReaderLibrary/yacreader_reading_lists_view.cpp @@ -1,6 +1,5 @@ #include "yacreader_reading_lists_view.h" -#include "reading_list_item.h" #include "reading_list_model.h" YACReaderReadingListsView::YACReaderReadingListsView(QWidget *parent) diff --git a/YACReaderLibrary/yacreader_reading_lists_view.h b/YACReaderLibrary/yacreader_reading_lists_view.h index 12965afe..566ab45e 100644 --- a/YACReaderLibrary/yacreader_reading_lists_view.h +++ b/YACReaderLibrary/yacreader_reading_lists_view.h @@ -1,9 +1,11 @@ #ifndef YACREADER_READING_LISTS_VIEW_H #define YACREADER_READING_LISTS_VIEW_H -#include "yacreader_treeview.h" +#include +#include +#include -#include +#include "yacreader_treeview.h" class YACReaderReadingListsView : public YACReaderTreeView { diff --git a/YACReaderLibraryServer/main.cpp b/YACReaderLibraryServer/main.cpp index ac6fb435..acd064e4 100644 --- a/YACReaderLibraryServer/main.cpp +++ b/YACReaderLibraryServer/main.cpp @@ -19,8 +19,6 @@ #include "console_ui_library_creator.h" -#include - #include "QsLog.h" #include "QsLogDest.h" #include "qrcodegen.hpp" diff --git a/common/check_new_version.h b/common/check_new_version.h index 260ab426..37cae056 100644 --- a/common/check_new_version.h +++ b/common/check_new_version.h @@ -2,7 +2,6 @@ #define __CHECKUPDATE_H #include "http_worker.h" -#include "yacreader_global.h" #include #include diff --git a/common/comic.cpp b/common/comic.cpp index 04ea4886..0be6a3a0 100644 --- a/common/comic.cpp +++ b/common/comic.cpp @@ -1,5 +1,6 @@ #include "comic.h" +#include #include #include #include diff --git a/common/comic.h b/common/comic.h index 2241eb78..91952e6f 100644 --- a/common/comic.h +++ b/common/comic.h @@ -2,7 +2,6 @@ #define __COMIC_H #include #include -#include #include #include diff --git a/common/custom_widgets.cpp b/common/custom_widgets.cpp index be765393..e69de29b 100644 --- a/common/custom_widgets.cpp +++ b/common/custom_widgets.cpp @@ -1 +0,0 @@ -#include "custom_widgets.h" diff --git a/common/rhi/yacreader_comic_flow_rhi.h b/common/rhi/yacreader_comic_flow_rhi.h index c64db0e8..61d65300 100644 --- a/common/rhi/yacreader_comic_flow_rhi.h +++ b/common/rhi/yacreader_comic_flow_rhi.h @@ -3,6 +3,9 @@ #include "yacreader_flow_rhi.h" +#include +#include + class ImageLoader3D; class YACReaderComicFlow3D : public YACReaderFlow3D diff --git a/common/rhi/yacreader_flow_rhi.cpp b/common/rhi/yacreader_flow_rhi.cpp index 93bd88a7..3cf29c0d 100644 --- a/common/rhi/yacreader_flow_rhi.cpp +++ b/common/rhi/yacreader_flow_rhi.cpp @@ -1,5 +1,6 @@ #include "yacreader_flow_rhi.h" #include +#include #if defined(YACREADER_RHI_PERF) #include #endif diff --git a/common/rhi/yacreader_flow_rhi.h b/common/rhi/yacreader_flow_rhi.h index b7b31fe4..89a479c7 100644 --- a/common/rhi/yacreader_flow_rhi.h +++ b/common/rhi/yacreader_flow_rhi.h @@ -8,8 +8,6 @@ #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) #include -#include -#include #include #include "flow_types.h" diff --git a/common/rhi/yacreader_page_flow_rhi.h b/common/rhi/yacreader_page_flow_rhi.h index b188b6ff..6ec70f9a 100644 --- a/common/rhi/yacreader_page_flow_rhi.h +++ b/common/rhi/yacreader_page_flow_rhi.h @@ -3,6 +3,9 @@ #include "yacreader_flow_rhi.h" +#include +#include + class ImageLoaderByteArray3D; class YACReaderPageFlow3D : public YACReaderFlow3D diff --git a/common/scroll_management.cpp b/common/scroll_management.cpp index 6bdef5cd..ddef42dc 100644 --- a/common/scroll_management.cpp +++ b/common/scroll_management.cpp @@ -1,5 +1,4 @@ #include "scroll_management.h" -#include #include ScrollManagement::ScrollManagement() diff --git a/common/themes/icon_utils.cpp b/common/themes/icon_utils.cpp index 395347dd..9430dae9 100644 --- a/common/themes/icon_utils.cpp +++ b/common/themes/icon_utils.cpp @@ -1,5 +1,6 @@ #include "icon_utils.h" +#include #include #include "yacreader_global.h" diff --git a/common/themes/icon_utils.h b/common/themes/icon_utils.h index aef05bd7..952cf19e 100644 --- a/common/themes/icon_utils.h +++ b/common/themes/icon_utils.h @@ -1,7 +1,9 @@ #ifndef ICON_UTILS_H #define ICON_UTILS_H -#include +#include +#include +#include // Render an SVG file to a QPixmap at a specific logical size with HiDPI support. // Uses QSvgRenderer to rasterize directly at the target resolution (no upscaling). diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp index 2962eba7..0926e14e 100644 --- a/compressed_archive/compressed_archive.cpp +++ b/compressed_archive/compressed_archive.cpp @@ -12,9 +12,6 @@ #include "open_callbacks.h" #include "extract_callbacks.h" -#include "7z_includes.h" -#include "lib7zip/CPP/Common/MyInitGuid.h" - #include "QsLog.h" #define _MY_WINAPI WINAPI diff --git a/custom_widgets/rounded_corners_dialog.cpp b/custom_widgets/rounded_corners_dialog.cpp index 2529b6d7..f4e32e5e 100644 --- a/custom_widgets/rounded_corners_dialog.cpp +++ b/custom_widgets/rounded_corners_dialog.cpp @@ -1,6 +1,6 @@ #include "rounded_corners_dialog.h" -#include +#include YACReader::RoundedCornersDialog::RoundedCornersDialog(QWidget *parent) : QDialog(parent) diff --git a/custom_widgets/whats_new_controller.cpp b/custom_widgets/whats_new_controller.cpp index df550ab7..8e4b3804 100644 --- a/custom_widgets/whats_new_controller.cpp +++ b/custom_widgets/whats_new_controller.cpp @@ -3,8 +3,6 @@ #include "whats_new_dialog.h" #include "yacreader_global.h" -#include - YACReader::WhatsNewController::WhatsNewController() { } void YACReader::WhatsNewController::showWhatsNewIfNeeded(QWidget *fromParent) diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp index 5718ee7b..8f6aa98f 100644 --- a/custom_widgets/whats_new_dialog.cpp +++ b/custom_widgets/whats_new_dialog.cpp @@ -1,7 +1,14 @@ #include "whats_new_dialog.h" -#include "yacreader_global.h" -#include +#include +#include +#include +#include +#include +#include +#include + +#include "yacreader_global.h" YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent) : RoundedCornersDialog(parent) diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp index 295714f9..0bd5d2c5 100644 --- a/custom_widgets/yacreader_library_item_widget.cpp +++ b/custom_widgets/yacreader_library_item_widget.cpp @@ -1,9 +1,8 @@ #include "yacreader_library_item_widget.h" -#include "yacreader_global.h" -#include "yacreader_global_gui.h" - #include + +#include "yacreader_global.h" #include #include #include diff --git a/custom_widgets/yacreader_search_line_edit.h b/custom_widgets/yacreader_search_line_edit.h index 3f901dc6..dbaeebd2 100644 --- a/custom_widgets/yacreader_search_line_edit.h +++ b/custom_widgets/yacreader_search_line_edit.h @@ -4,7 +4,6 @@ #include #include -#include "yacreader_global.h" #include "themable.h" class QToolButton; diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp index bac2364c..ade0550e 100644 --- a/custom_widgets/yacreader_sidebar.cpp +++ b/custom_widgets/yacreader_sidebar.cpp @@ -6,7 +6,6 @@ #include "yacreader_folders_view.h" #include "yacreader_reading_lists_view.h" #include "yacreader_library_list_widget.h" -#include "yacreader_search_line_edit.h" #include "yacreader_titled_toolbar.h" #include "yacreader_global.h" diff --git a/custom_widgets/yacreader_sidebar.h b/custom_widgets/yacreader_sidebar.h index ca511b78..0d05c5a3 100644 --- a/custom_widgets/yacreader_sidebar.h +++ b/custom_widgets/yacreader_sidebar.h @@ -1,7 +1,13 @@ #ifndef YACREADER_SIDEBAR_H #define YACREADER_SIDEBAR_H -#include +#include +#include +#include +#include +#include +#include +#include #include "themable.h" diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp index 1075f9dd..08b67156 100644 --- a/custom_widgets/yacreader_table_view.cpp +++ b/custom_widgets/yacreader_table_view.cpp @@ -1,6 +1,5 @@ #include "yacreader_table_view.h" -#include "yacreader_global.h" #include "yacreader_global_gui.h" #include @@ -10,7 +9,6 @@ #include #include #include -#include #include "QsLog.h" diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp index 0265bc46..ab8e0436 100644 --- a/custom_widgets/yacreader_titled_toolbar.cpp +++ b/custom_widgets/yacreader_titled_toolbar.cpp @@ -1,6 +1,5 @@ #include "yacreader_titled_toolbar.h" -#include "yacreader_global.h" #include "yacreader_busy_widget.h" #include diff --git a/custom_widgets/yacreader_treeview.cpp b/custom_widgets/yacreader_treeview.cpp index c2699bd4..5ddaadcf 100644 --- a/custom_widgets/yacreader_treeview.cpp +++ b/custom_widgets/yacreader_treeview.cpp @@ -1,6 +1,6 @@ #include "yacreader_treeview.h" -#include "yacreader_global.h" +#include YACReaderTreeView::YACReaderTreeView(QWidget *parent) : QTreeView(parent), clicking(false) diff --git a/custom_widgets/yacreader_treeview.h b/custom_widgets/yacreader_treeview.h index 4a4d6730..a2d76daa 100644 --- a/custom_widgets/yacreader_treeview.h +++ b/custom_widgets/yacreader_treeview.h @@ -1,7 +1,14 @@ #ifndef YACREADER_TREEVIEW_H #define YACREADER_TREEVIEW_H -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "themable.h" diff --git a/shortcuts_management/edit_shortcuts_dialog.cpp b/shortcuts_management/edit_shortcuts_dialog.cpp index 8face33d..50d7f5ef 100644 --- a/shortcuts_management/edit_shortcuts_dialog.cpp +++ b/shortcuts_management/edit_shortcuts_dialog.cpp @@ -1,7 +1,5 @@ #include "edit_shortcuts_dialog.h" -#include "yacreader_global.h" - #include "actions_groups_model.h" #include "actions_shortcuts_model.h" #include "edit_shortcut_item_delegate.h" @@ -15,8 +13,6 @@ #include #include -#include "QsLog.h" - EditShortcutsDialog::EditShortcutsDialog(QWidget *parent) : QDialog(parent) {