From: Arkadiy Illarionov Date: Sat, 22 Jul 2023 22:26:31 +0000 (+0300) Subject: Fix include-what-you-use warnings X-Git-Tag: v2.3~30 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=c351a3a4fc698924a49dca09991aa0c5192ec345 Fix include-what-you-use warnings Use #if to check 0/1 config value --- diff --git a/geeqie.imp b/geeqie.imp new file mode 100644 index 00000000..08f494b1 --- /dev/null +++ b/geeqie.imp @@ -0,0 +1,32 @@ +[ + { include: [ "", private, "", public ] }, + + { include: [ "\"cairo.h\"", private, "", public ] }, + + { include: [ "@\"champlain/champlain-[a-z-]+.h\"", private, "", public ] }, + + { include: [ "@", private, "", public ] }, + { include: [ "", private, "", public ] }, + { include: [ "", private, "", public ] }, + + { include: [ "\"gdk/gdkkeysyms.h\"", private, "", public ] }, + + { include: [ "@\"gobject/.*\"", private, "", public ] }, + + { include: [ "", private, "", public ] }, + + { include: [ "\"gtk/gtkcssprovider.h\"", private, "", public ] }, + + { include: [ "", private, "", public ] }, + + { include: [ "\"libraw_types.h\"", private, "", public ] }, + + { include: [ "", private, "", public ] }, + { include: [ "", private, "", public ] }, + { include: [ "", private, "", public ] }, + + { include: [ "@\"pango/pango-[a-z]+.h\"", private, "", public ] }, + { include: [ "\"pango/pangocairo.h\"", private, "", public ] }, + + { include: [ "@\"poppler-[a-z]+.h\"", private, "", public ] }, +] diff --git a/meson.build b/meson.build index b942823f..b0d21389 100644 --- a/meson.build +++ b/meson.build @@ -147,9 +147,9 @@ summary({'gq_appdir': gq_appdir, # Create the define constants used in the sources. Set via config.h.in conf_data = configuration_data() -conf_data.set_quoted('VERSION', meson.project_version()) conf_data.set('DEBUG', debug) +conf_data.set('HAVE_GTK4', 0) option = get_option('gtk4') if option.enabled() gtk_dep = dependency('gtk4', required: true) @@ -160,6 +160,7 @@ endif glib_dep = dependency('glib-2.0', version : '>=2.52', required: true) # Required only when backward-cpp is used +conf_data.set('HAVE_DEVELOPER', 0) libdw_dep = [] libunwind_dep = [] option = get_option('devel') @@ -181,6 +182,7 @@ else endif # Required only for seg. fault stacktrace and backtrace debugging +conf_data.set('HAVE_EXECINFO_H', 0) option = get_option('execinfo') libexecinfo_dep = [] if not option.disabled() @@ -197,6 +199,7 @@ else summary({'execinfo' : ['stacktrace supported:', false]}, section : 'Debugging', bool_yn : true) endif +conf_data.set('HAVE_ARCHIVE', 0) libarchive_dep = [] req_version = '>=3.4.0' option = get_option('archive') @@ -212,6 +215,8 @@ else summary({'archive' : ['disabled - archive files e.g. .zip supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_LCMS', 0) +conf_data.set('HAVE_LCMS2', 0) lcms_dep = [] req_version = '>=2.0' option = get_option('cms') @@ -233,6 +238,7 @@ else summary({'cms' : ['disabled - color management supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_DJVU', 0) ddjvuapi_dep = [] req_version = '>=2.5.27' option = get_option('djvu') @@ -261,6 +267,7 @@ else endif # Required only for seg. fault stacktrace and backtrace debugging +conf_data.set('HAVE_EXECINFO_H', 0) option = get_option('execinfo') if not option.disabled() result = cc.check_header('execinfo.h') @@ -274,6 +281,7 @@ else summary({'execinfo' : ['stacktrace supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_EXIV2', 0) exiv2_dep = [] req_version = '>=0.18' option = get_option('exiv2') @@ -289,6 +297,9 @@ else summary({'exiv2' : ['disabled - image data processed by exiv2:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_CLUTTER', 0) +conf_data.set('HAVE_LIBCHAMPLAIN', 0) +conf_data.set('HAVE_LIBCHAMPLAIN_GTK', 0) champlain_dep = [] champlain_gtk_dep = [] clutter_dep = [] @@ -329,6 +340,7 @@ else summary({'gps-map' : ['disabled - GPS map displayed:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_HEIF', 0) libheif_dep = [] req_version = '>=1.3.2' option = get_option('heif') @@ -344,6 +356,7 @@ else summary({'heif' : ['disabled - heif files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_J2K', 0) libopenjp2_dep = [] req_version = '>=2.3.0' option = get_option('j2k') @@ -359,10 +372,11 @@ else summary({'j2k' : ['disabled - j2k files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_JPEG', 0) libjpeg_dep = [] option = get_option('jpeg') if not option.disabled() -libjpeg_dep = dependency('libjpeg', required : get_option('jpeg')) + libjpeg_dep = dependency('libjpeg', required : get_option('jpeg')) if libjpeg_dep.found() if cc.has_function('jpeg_destroy_decompress', dependencies : libjpeg_dep) conf_data.set('HAVE_JPEG', 1) @@ -377,6 +391,7 @@ else summary({'jpeg' : ['disabled - jpeg files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_JPEGXL', 0) libjxl_dep = [] req_version = '>=0.3.7' option = get_option('jpegxl') @@ -392,6 +407,7 @@ else summary({'jpegxl' : ['disabled - jpegxl files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_RAW', 0) libraw_dep = [] req_version = '>=0.20' option = get_option('libraw') @@ -407,6 +423,7 @@ else summary({'libraw' : ['disabled - .cr3 files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_LUA', 0) lua_dep = [] req_version = '>=5.3' option = get_option('lua') @@ -444,6 +461,7 @@ else endif install_data('README.md', 'COPYING', 'TODO', install_dir : helpdir) +conf_data.set('HAVE_PDF', 0) poppler_glib_dep = [] req_version = '>=0.62' option = get_option('pdf') @@ -459,6 +477,7 @@ else summary({'pdf' : ['disabled - pdf files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_SPELL', 0) gspell_dep = [] req_version = '>=1.6' option = get_option('spell') @@ -474,6 +493,7 @@ else summary({'spell' : ['disabled - spelling checks enabled', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_TIFF', 0) tiff_dep = [] option = get_option('tiff') if not option.disabled() @@ -492,6 +512,10 @@ else summary({'tiff' : ['disabled - tiff files supported:', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_FFMPEGTHUMBNAILER', 0) +conf_data.set('HAVE_FFMPEGTHUMBNAILER_METADATA', 0) +conf_data.set('HAVE_FFMPEGTHUMBNAILER_RGB', 0) +conf_data.set('HAVE_FFMPEGTHUMBNAILER_WH', 0) libffmpegthumbnailer_dep = [] req_version = '>=2.1.0' option = get_option('videothumbnailer') @@ -528,6 +552,7 @@ else summary({'videothumbnailer' : ['disabled -thumbnails of video files supported', false]}, section : 'Configuration', bool_yn : true) endif +conf_data.set('HAVE_WEBP', 0) libwebp_dep = [] req_version = '>=0.6.1' option = get_option('webp') @@ -544,6 +569,7 @@ else endif # Check for nl_langinfo and _NL_TIME_FIRST_WEEKDAY +conf_data.set('HAVE__NL_TIME_FIRST_WEEKDAY', 0) code = '''#include #include int main (int argc, char ** argv) { diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc index 099c5c5f..e271c42a 100644 --- a/src/advanced-exif.cc +++ b/src/advanced-exif.cc @@ -21,6 +21,13 @@ #include "advanced-exif.h" +#include + +#include +#include +#include +#include + #include #include "compat.h" @@ -31,10 +38,15 @@ #include "history-list.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "misc.h" +#include "options.h" #include "ui-misc.h" #include "window.h" +struct ExifData; +struct ExifItem; + enum { ADVANCED_EXIF_DATA_COLUMN_WIDTH = 200 }; @@ -337,7 +349,7 @@ static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIt return ret; } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static gboolean advanced_exif_mouseclick(GtkWidget *, GdkEventButton *, gpointer data) { /* @FIXME GTK4 stub */ diff --git a/src/bar-comment.cc b/src/bar-comment.cc index 28c9a549..ca724a98 100644 --- a/src/bar-comment.cc +++ b/src/bar-comment.cc @@ -21,8 +21,16 @@ #include "bar-comment.h" +#include + #include +#include +#include +#if HAVE_SPELL +# include +#endif + #include "bar.h" #include "compat.h" #include "debug.h" @@ -31,14 +39,12 @@ #include "layout.h" #include "main-defines.h" #include "metadata.h" +#include "options.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-menu.h" #include "ui-misc.h" -#ifdef HAVE_SPELL -#include -#endif - static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data); /* @@ -57,7 +63,7 @@ struct PaneCommentData FileData *fd; gchar *key; gint height; -#ifdef HAVE_SPELL +#if HAVE_SPELL GspellTextView *gspell_view; #endif }; @@ -250,7 +256,7 @@ static void bar_pane_comment_destroy(GtkWidget *, gpointer data) auto pcd = static_cast(data); file_data_unregister_notify_func(bar_pane_comment_notify_cb, pcd); -#ifdef HAVE_SPELL +#if HAVE_SPELL g_object_unref(pcd->gspell_view); #endif file_data_unref(pcd->fd); @@ -276,7 +282,7 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons pcd->pane.title = bar_pane_expander_title(title); pcd->pane.id = g_strdup(id); pcd->pane.type = PANE_COMMENT; -#ifdef HAVE_SPELL +#if HAVE_SPELL pcd->gspell_view = nullptr; #endif pcd->pane.expanded = expanded; @@ -305,7 +311,7 @@ static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, cons G_CALLBACK(bar_pane_comment_populate_popup), pcd); gtk_widget_show(pcd->comment_view); -#ifdef HAVE_SPELL +#if HAVE_SPELL if (g_strcmp0(key, "Xmp.xmp.Rating") != 0) { if (options->metadata.check_spelling) diff --git a/src/bar-comment.h b/src/bar-comment.h index 9ce1932b..64fe840a 100644 --- a/src/bar-comment.h +++ b/src/bar-comment.h @@ -22,6 +22,7 @@ #ifndef BAR_COMMENT_H #define BAR_COMMENT_H +#include #include GtkWidget *bar_pane_comment_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-exif.cc b/src/bar-exif.cc index dca90da3..795d6bf5 100644 --- a/src/bar-exif.cc +++ b/src/bar-exif.cc @@ -21,6 +21,12 @@ #include "bar-exif.h" +#include + +#include +#include +#include + #include #include "bar.h" @@ -35,6 +41,7 @@ #include "metadata.h" #include "misc.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-menu.h" #include "ui-misc.h" #include "ui-utildlg.h" @@ -614,7 +621,7 @@ static void bar_pane_exif_delete_entry_cb(GtkWidget *, gpointer data) g_object_unref(entry); } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static void bar_pane_exif_copy_entry_cb(GtkWidget *, gpointer data) { /* @FIXME GTK4 stub */ @@ -684,7 +691,7 @@ static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, return FALSE; } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer) { /* @FIXME GTK4 stub */ diff --git a/src/bar-exif.h b/src/bar-exif.h index 3bacd8ed..6efb987f 100644 --- a/src/bar-exif.h +++ b/src/bar-exif.h @@ -22,6 +22,7 @@ #ifndef BAR_EXIF_H #define BAR_EXIF_H +#include #include GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-gps.cc b/src/bar-gps.cc index b17e0069..dc6781a3 100644 --- a/src/bar-gps.cc +++ b/src/bar-gps.cc @@ -21,11 +21,23 @@ #include -#ifdef HAVE_LIBCHAMPLAIN -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN +#if HAVE_LIBCHAMPLAIN_GTK #include "bar-gps.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "bar.h" #include "compat.h" #include "debug.h" @@ -33,19 +45,15 @@ #include "intl.h" #include "layout.h" #include "main-defines.h" -#include "menu.h" #include "metadata.h" #include "misc.h" #include "rcfile.h" #include "thumb.h" +#include "typedefs.h" #include "ui-menu.h" #include "ui-utildlg.h" #include "uri-utils.h" -#include -#include -#include - #define MARKER_COLOUR 0x00, 0x00, 0xff, 0xff #define TEXT_COLOUR 0x00, 0x00, 0x00, 0xff #define THUMB_COLOUR 0xff, 0xff, 0xff, 0xff @@ -866,7 +874,7 @@ static void bar_pane_gps_map_centreing(PaneGPSData *pgd) g_string_free(message, TRUE); } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *, GdkEventButton *bevent, gpointer data) { /* @FIXME GTK4 stub */ @@ -971,7 +979,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma gtk_container_add(GTK_CONTAINER(frame), vbox); status = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 slider = gtk_scale_button_new(1, 17, 1, slider_icons); #else slider = gtk_scale_button_new(GTK_ICON_SIZE_SMALL_TOOLBAR, 1, 17, 1, slider_icons); @@ -1152,7 +1160,7 @@ void bar_pane_gps_update_from_config(GtkWidget *pane, const gchar **attribute_na bar_update_expander(pane); } -#endif -#endif +#endif // HAVE_LIBCHAMPLAIN_GTK +#endif // HAVE_LIBCHAMPLAIN /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/bar-gps.h b/src/bar-gps.h index 65ab94e3..033dff2e 100644 --- a/src/bar-gps.h +++ b/src/bar-gps.h @@ -22,6 +22,7 @@ #ifndef BAR_GPS_H #define BAR_GPS_H +#include #include GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *map_id, gint zoom, diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc index 4193443d..703c1e42 100644 --- a/src/bar-histogram.cc +++ b/src/bar-histogram.cc @@ -21,6 +21,11 @@ #include "bar-histogram.h" +#include +#include +#include +#include + #include #include "bar.h" @@ -30,9 +35,12 @@ #include "histogram.h" #include "intl.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-menu.h" #include "ui-misc.h" +struct HistMap; + /* *------------------------------------------------------------------- * keyword / comment utils @@ -299,7 +307,7 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi gtk_widget_add_events(phd->drawing_area, GDK_BUTTON_PRESS_MASK); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 gesture = gtk_gesture_click_new(); gtk_widget_add_controller(phd->drawing_area, GTK_EVENT_CONTROLLER(gesture)); #else diff --git a/src/bar-histogram.h b/src/bar-histogram.h index dd500a44..dd896a34 100644 --- a/src/bar-histogram.h +++ b/src/bar-histogram.h @@ -22,6 +22,7 @@ #ifndef BAR_HISTOGRAM_H #define BAR_HISTOGRAM_H +#include #include GtkWidget *bar_pane_histogram_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc index 47191103..2262b20f 100644 --- a/src/bar-keywords.cc +++ b/src/bar-keywords.cc @@ -21,7 +21,11 @@ #include "bar-keywords.h" -#include +#include +#include + +#include +#include #include "bar.h" #include "compat.h" @@ -33,8 +37,10 @@ #include "main-defines.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "rcfile.h" #include "secure-save.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" diff --git a/src/bar-keywords.h b/src/bar-keywords.h index a445b71a..d9fc7c6a 100644 --- a/src/bar-keywords.h +++ b/src/bar-keywords.h @@ -22,6 +22,7 @@ #ifndef BAR_KEYWORDS_H #define BAR_KEYWORDS_H +#include #include struct LayoutWindow; diff --git a/src/bar-rating.cc b/src/bar-rating.cc index 558f121e..e42791ac 100644 --- a/src/bar-rating.cc +++ b/src/bar-rating.cc @@ -21,6 +21,8 @@ #include "bar-rating.h" +#include + #include #include "bar.h" @@ -30,6 +32,7 @@ #include "intl.h" #include "metadata.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-misc.h" /** @@ -113,7 +116,7 @@ static void bar_pane_rating_selected_cb(GtkCheckButton *checkbutton, gpointer da auto prd = static_cast(data); gchar *rating; -#ifdef HAVE_GTK4 +#if HAVE_GTK4 const gchar *rating_label; rating_label = gtk_check_button_get_label(checkbutton); @@ -185,7 +188,7 @@ static GtkWidget *bar_pane_rating_new(const gchar *id, const gchar *title, gbool row_1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); gq_gtk_box_pack_start(GTK_BOX(prd->widget), row_1, FALSE, FALSE, 0); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 radio_rejected = gtk_check_button_new_with_label(_("Rejected")); #else radio_rejected = gtk_radio_button_new_with_label(nullptr, _("Rejected")); @@ -194,7 +197,7 @@ static GtkWidget *bar_pane_rating_new(const gchar *id, const gchar *title, gbool g_signal_connect(radio_rejected, "released", G_CALLBACK(bar_pane_rating_selected_cb), prd); prd->rating_buttons[0] = GTK_CHECK_BUTTON(radio_rejected); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 radio_unrated = gtk_check_button_new_with_label(_("Unrated")); gtk_check_button_set_group(GTK_CHECK_BUTTON(radio_unrated), GTK_CHECK_BUTTON(radio_rejected)); #else @@ -212,7 +215,7 @@ static GtkWidget *bar_pane_rating_new(const gchar *id, const gchar *title, gbool { i_str = g_strdup_printf("%d", i - 1); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 radio_rating = gtk_check_button_new_with_label(i_str); gtk_check_button_set_group(GTK_CHECK_BUTTON(radio_rating), GTK_CHECK_BUTTON(radio_rejected)); #else diff --git a/src/bar-rating.h b/src/bar-rating.h index 2eda1cdf..f58a1996 100644 --- a/src/bar-rating.h +++ b/src/bar-rating.h @@ -22,6 +22,7 @@ #ifndef BAR_RATING_H #define BAR_RATING_H +#include #include GtkWidget *bar_pane_rating_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-sort.cc b/src/bar-sort.cc index 730f3827..50790717 100644 --- a/src/bar-sort.cc +++ b/src/bar-sort.cc @@ -21,7 +21,10 @@ #include "bar-sort.h" -#include +#include + +#include +#include #include "collect-io.h" #include "collect.h" @@ -35,10 +38,13 @@ #include "layout.h" #include "main-defines.h" #include "misc.h" +#include "options.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-misc.h" +#include "ui-utildlg.h" #include "utilops.h" #include "window.h" diff --git a/src/bar-sort.h b/src/bar-sort.h index 0b75e6ed..beb58872 100644 --- a/src/bar-sort.h +++ b/src/bar-sort.h @@ -22,6 +22,7 @@ #ifndef BAR_SORT_H #define BAR_SORT_H +#include #include struct LayoutWindow; diff --git a/src/bar.cc b/src/bar.cc index d21c8e92..a44bc78f 100644 --- a/src/bar.cc +++ b/src/bar.cc @@ -21,9 +21,13 @@ #include "bar.h" +#include + +#include +#include + #include -#include "bar-histogram.h" #include "compat.h" #include "debug.h" #include "filedata.h" @@ -32,6 +36,7 @@ #include "main-defines.h" #include "metadata.h" #include "rcfile.h" +#include "typedefs.h" #include "ui-menu.h" #include "ui-misc.h" @@ -172,8 +177,8 @@ static const gchar default_config_copyright[] = " " ""; -#ifdef HAVE_LIBCHAMPLAIN -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN +#if HAVE_LIBCHAMPLAIN_GTK static const gchar default_config_gps[] = "" " " @@ -202,8 +207,8 @@ static const KnownPanes known_panes[] = { {PANE_EXIF, "file_info", N_("File info"), default_config_file_info}, {PANE_EXIF, "location", N_("Location and GPS"), default_config_location}, {PANE_EXIF, "copyright", N_("Copyright"), default_config_copyright}, -#ifdef HAVE_LIBCHAMPLAIN -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN +#if HAVE_LIBCHAMPLAIN_GTK {PANE_GPS, "gps", N_("GPS Map"), default_config_gps}, #endif #endif @@ -313,7 +318,7 @@ static void bar_expander_height_cb(GtkWidget *, gpointer data) list = gtk_container_get_children(GTK_CONTAINER(expander)); data_box = static_cast(list->data); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 window = gtk_window_new(); #else window = gtk_window_new(GTK_WINDOW_TOPLEVEL); @@ -735,7 +740,7 @@ static void bar_destroy(GtkWidget *, gpointer data) g_free(bd); } -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN_GTK /** @FIXME this is an ugly hack that works around this bug: https://bugzilla.gnome.org/show_bug.cgi?id=590692 @@ -810,7 +815,7 @@ GtkWidget *bar_new(LayoutWindow *lw) _("Add Pane"), G_CALLBACK(bar_menu_add_cb), bd); gtk_widget_show(add_box); -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN_GTK g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL); #endif diff --git a/src/bar.h b/src/bar.h index 5cd84668..bfa6350a 100644 --- a/src/bar.h +++ b/src/bar.h @@ -22,6 +22,8 @@ #ifndef BAR_H #define BAR_H +#include +#include #include struct FileData; diff --git a/src/cache-loader.cc b/src/cache-loader.cc index 30f58d84..d6800dc8 100644 --- a/src/cache-loader.cc +++ b/src/cache-loader.cc @@ -21,11 +21,22 @@ #include "cache-loader.h" -#include +#include +#include +#include +#include + +#include +#include + +#include "cache.h" #include "filedata.h" +#include "image-load.h" #include "metadata.h" #include "options.h" +#include "similar.h" +#include "typedefs.h" #include "ui-fileops.h" diff --git a/src/cache-loader.h b/src/cache-loader.h index 949d3a11..1db8b740 100644 --- a/src/cache-loader.h +++ b/src/cache-loader.h @@ -22,11 +22,11 @@ #ifndef CACHE_LOADER_H #define CACHE_LOADER_H +#include -#include "cache.h" -#include "image-load.h" - +struct CacheData; struct FileData; +struct ImageLoader; enum CacheDataType { CACHE_LOADER_NONE = 0, diff --git a/src/cache-maint.cc b/src/cache-maint.cc index 642bae5d..227fae13 100644 --- a/src/cache-maint.cc +++ b/src/cache-maint.cc @@ -21,9 +21,16 @@ #include "cache-maint.h" -#include +#include +#include + +#include +#include + +#include #include "cache-loader.h" +#include "cache.h" #include "compat.h" #include "debug.h" #include "filedata.h" @@ -32,6 +39,7 @@ #include "main-defines.h" #include "main.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "thumb-standard.h" #include "thumb.h" diff --git a/src/cache-maint.h b/src/cache-maint.h index 760864d5..84f0586c 100644 --- a/src/cache-maint.h +++ b/src/cache-maint.h @@ -22,6 +22,7 @@ #ifndef CACHE_MAINT_H #define CACHE_MAINT_H +#include #include #include "typedefs.h" diff --git a/src/cache.cc b/src/cache.cc index 97964614..22b89497 100644 --- a/src/cache.cc +++ b/src/cache.cc @@ -21,6 +21,15 @@ #include "cache.h" +#include +#include +#include + +#include +#include +#include +#include + #include #include "debug.h" @@ -29,11 +38,10 @@ #include "md5-util.h" #include "options.h" #include "secure-save.h" +#include "similar.h" #include "thumb-standard.h" #include "ui-fileops.h" -#include - /** * @file diff --git a/src/cache.h b/src/cache.h index 27de211e..94f7148f 100644 --- a/src/cache.h +++ b/src/cache.h @@ -22,9 +22,11 @@ #ifndef CACHE_H #define CACHE_H +#include -#include "similar.h" +#include +struct ImageSimilarityData; #define GQ_CACHE_THUMB "thumbnails" #define GQ_CACHE_METADATA "metadata" diff --git a/src/cellrenderericon.cc b/src/cellrenderericon.cc index 399b0333..6064e115 100644 --- a/src/cellrenderericon.cc +++ b/src/cellrenderericon.cc @@ -19,7 +19,10 @@ #include "cellrenderericon.h" -#include +#include + +#include +#include enum { FIXED_ICON_SIZE_MAX = 512 diff --git a/src/cellrenderericon.h b/src/cellrenderericon.h index cb949527..4ed83789 100644 --- a/src/cellrenderericon.h +++ b/src/cellrenderericon.h @@ -20,7 +20,13 @@ #ifndef __GQV_CELL_RENDERER_ICON_H__ #define __GQV_CELL_RENDERER_ICON_H__ +#include +#include +#include #include +#include + +struct GQvCellRendererIcon; #define TOGGLE_WIDTH 13 #define TOGGLE_SPACING 16 diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc index ba492e3f..d1ed42d2 100644 --- a/src/collect-dlg.cc +++ b/src/collect-dlg.cc @@ -21,9 +21,9 @@ #include "collect-dlg.h" -#include - -#include +#include +#include +#include #include "collect-io.h" #include "collect.h" @@ -32,6 +32,7 @@ #include "main-defines.h" #include "misc.h" #include "ui-fileops.h" +#include "ui-utildlg.h" #include "utilops.h" enum { diff --git a/src/collect-io.cc b/src/collect-io.cc index 4532642d..31d4496f 100644 --- a/src/collect-io.cc +++ b/src/collect-io.cc @@ -21,6 +21,13 @@ #include "collect-io.h" +#include +#include + +#include +#include +#include + #include #include "collect.h" @@ -29,6 +36,7 @@ #include "intl.h" #include "layout-util.h" #include "main-defines.h" +#include "options.h" #include "secure-save.h" #include "thumb.h" #include "ui-fileops.h" diff --git a/src/collect-io.h b/src/collect-io.h index 80dd94f4..6021fbf2 100644 --- a/src/collect-io.h +++ b/src/collect-io.h @@ -22,6 +22,8 @@ #ifndef COLLECT_IO_H #define COLLECT_IO_H +#include + #include "typedefs.h" struct CollectionData; diff --git a/src/collect-table.cc b/src/collect-table.cc index dda4dc76..81766292 100644 --- a/src/collect-table.cc +++ b/src/collect-table.cc @@ -21,11 +21,17 @@ #include "collect-table.h" -#include +#include + +#include +#include +#include +#include #include "cellrenderericon.h" #include "collect-dlg.h" #include "collect-io.h" +#include "collect.h" #include "compat.h" #include "debug.h" #include "dnd.h" @@ -39,8 +45,9 @@ #include "menu.h" #include "metadata.h" #include "misc.h" -#include "pixbuf-util.h" +#include "options.h" #include "print.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-tree-edit.h" diff --git a/src/collect-table.h b/src/collect-table.h index 14c77f5d..627768ba 100644 --- a/src/collect-table.h +++ b/src/collect-table.h @@ -22,7 +22,12 @@ #ifndef COLLECT_TABLE_H #define COLLECT_TABLE_H -#include "collect.h" +#include +#include +#include + +struct CollectInfo; +struct CollectionData; struct CollectTable { diff --git a/src/collect.cc b/src/collect.cc index ba00f885..2f7ca476 100644 --- a/src/collect.cc +++ b/src/collect.cc @@ -21,7 +21,13 @@ #include "collect.h" -#include +#include + +#include +#include +#include + +#include #include "collect-dlg.h" #include "collect-io.h" @@ -33,12 +39,15 @@ #include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "print.h" #include "ui-fileops.h" #include "ui-tree-edit.h" +#include "ui-utildlg.h" #include "utilops.h" #include "window.h" diff --git a/src/collect.h b/src/collect.h index 44c7bb47..b55bed04 100644 --- a/src/collect.h +++ b/src/collect.h @@ -22,6 +22,9 @@ #ifndef COLLECT_H #define COLLECT_H +#include +#include +#include #include #include "typedefs.h" diff --git a/src/color-man.cc b/src/color-man.cc index dd949777..f73080c2 100644 --- a/src/color-man.cc +++ b/src/color-man.cc @@ -23,15 +23,19 @@ #include -#ifdef HAVE_LCMS +#if HAVE_LCMS /*** color support enabled ***/ +#include +#include #include -#ifdef HAVE_LCMS2 -#include +#include + +#if HAVE_LCMS2 +# include #else -#include +# include #endif #include "debug.h" @@ -68,7 +72,7 @@ static void color_man_lib_init() if (init_done) return; init_done = TRUE; -#ifndef HAVE_LCMS2 +#if !HAVE_LCMS2 cmsErrorAction(LCMS_ERROR_IGNORE); #endif } @@ -76,7 +80,7 @@ static void color_man_lib_init() static cmsHPROFILE color_man_create_adobe_comp() { /* ClayRGB1998 is AdobeRGB compatible */ -#include "ClayRGB1998_icc.h" +#include "ClayRGB1998_icc.h" // IWYU pragma: keep return cmsOpenProfileFromMem(ClayRGB1998_icc, ClayRGB1998_icc_len); } @@ -458,7 +462,7 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p case COLOR_PROFILE_FILE: if (profile) { -#ifdef HAVE_LCMS2 +#if HAVE_LCMS2 char buffer[20]; buffer[0] = '\0'; cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", buffer, 20); @@ -505,7 +509,7 @@ void color_man_update() color_man_cache_reset(); } -#ifdef HAVE_HEIF +#if HAVE_HEIF #include #include diff --git a/src/color-man.h b/src/color-man.h index d023a070..55ff0860 100644 --- a/src/color-man.h +++ b/src/color-man.h @@ -23,6 +23,7 @@ #define COLOR_MAN_H #include +#include struct FileData; struct ImageWindow; diff --git a/src/compat.cc b/src/compat.cc index 4fa51b19..4d3789ea 100644 --- a/src/compat.cc +++ b/src/compat.cc @@ -22,7 +22,7 @@ #include -#ifdef HAVE_GTK4 +#if HAVE_GTK4 void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget) { if (GTK_IS_BUTTON(container)) diff --git a/src/compat.h b/src/compat.h index f413e737..11471337 100644 --- a/src/compat.h +++ b/src/compat.h @@ -32,7 +32,7 @@ #define MAP_ANON MAP_ANONYMOUS #endif -#ifdef HAVE_GTK4 +#if HAVE_GTK4 #define gq_gtk_box_pack_end(box, child, expand, fill, padding) gtk_box_append(box, child) #define gq_gtk_box_pack_start(box, child, expand, fill, padding) gtk_box_prepend(box, child) #define gq_gtk_frame_set_shadow_type(frame, type) ; diff --git a/src/debug.cc b/src/debug.cc index 3e4fe558..1e7c1105 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -20,8 +20,20 @@ #include "debug.h" +#include +#include + +#include +#include +#include +#include + #include +#if HAVE_EXECINFO_H +# include +#endif + #include "filedata.h" #include "intl.h" #include "logwindow.h" @@ -31,12 +43,6 @@ #include "options.h" #include "ui-fileops.h" -#ifdef HAVE_EXECINFO_H -#include -#endif - -#include - /* * Logging functions */ @@ -260,7 +266,7 @@ gchar *get_regexp() return g_strdup(regexp); } -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H /** * @brief Backtrace of geeqie files * @param file diff --git a/src/desktop-file.cc b/src/desktop-file.cc index 911428d2..a84efa17 100644 --- a/src/desktop-file.cc +++ b/src/desktop-file.cc @@ -21,7 +21,14 @@ #include "desktop-file.h" -#include +#include + +#include + +#include +#include +#include +#include #include "compat.h" #include "debug.h" @@ -31,9 +38,11 @@ #include "main-defines.h" #include "main.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-misc.h" +#include "ui-utildlg.h" #include "utilops.h" #include "window.h" diff --git a/src/dnd.cc b/src/dnd.cc index f2b318e3..600745e5 100644 --- a/src/dnd.cc +++ b/src/dnd.cc @@ -21,10 +21,10 @@ #include "dnd.h" -#include +#include +#include #include "compat.h" -#include "main-defines.h" #include "options.h" #include "pixbuf-util.h" diff --git a/src/dnd.h b/src/dnd.h index 703acb6a..1c2a1010 100644 --- a/src/dnd.h +++ b/src/dnd.h @@ -22,8 +22,13 @@ #ifndef DND_H #define DND_H +#include +#include +#include #include +#include "main-defines.h" + #define TARGET_APP_COLLECTION_MEMBER_STRING "application/x-" GQ_APPNAME_LC "-collection-member" #define TARGET_APP_EXIF_ENTRY_STRING "application/x-" GQ_APPNAME_LC "-exif-entry" #define TARGET_APP_KEYWORD_PATH_STRING "application/x-" GQ_APPNAME_LC "-keyword-path" diff --git a/src/dupe.cc b/src/dupe.cc index 4eb5b664..e84ca942 100644 --- a/src/dupe.cc +++ b/src/dupe.cc @@ -21,13 +21,21 @@ #include "dupe.h" +#include +#include + #include #include +#include +#include -#include +#include +#include +#include #include "cache.h" #include "collect-table.h" +#include "collect.h" #include "compat.h" #include "debug.h" #include "dnd.h" @@ -38,17 +46,21 @@ #include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "md5-util.h" #include "menu.h" #include "misc.h" -#include "pixbuf-util.h" +#include "options.h" #include "print.h" +#include "similar.h" #include "thumb.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" #include "ui-tree-edit.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" #include "window.h" diff --git a/src/dupe.h b/src/dupe.h index 5f3b26e5..791e66c5 100644 --- a/src/dupe.h +++ b/src/dupe.h @@ -22,14 +22,15 @@ #ifndef DUPE_H #define DUPE_H +#include +#include #include -#include "similar.h" - struct CollectInfo; struct CollectionData; struct FileData; struct ImageLoader; +struct ImageSimilarityData; struct ThumbLoader; /** @enum DupeMatchType diff --git a/src/editors.cc b/src/editors.cc index a074d560..9daeaa37 100644 --- a/src/editors.cc +++ b/src/editors.cc @@ -21,7 +21,13 @@ #include "editors.h" -#include +#include +#include + +#include +#include + +#include #include "compat.h" #include "debug.h" @@ -32,7 +38,9 @@ #include "main.h" #include "options.h" #include "pixbuf-util.h" +#include "typedefs.h" #include "ui-fileops.h" +#include "ui-utildlg.h" #include "utilops.h" enum { diff --git a/src/editors.h b/src/editors.h index 40df1478..2418de30 100644 --- a/src/editors.h +++ b/src/editors.h @@ -22,6 +22,7 @@ #ifndef EDITORS_H #define EDITORS_H +#include #include struct FileData; diff --git a/src/exif-common.cc b/src/exif-common.cc index edb7a473..7155d128 100644 --- a/src/exif-common.cc +++ b/src/exif-common.cc @@ -23,32 +23,43 @@ #define _XOPEN_SOURCE #endif +#include + #include #include #include +#include -#ifdef HAVE_LCMS -/*** color support enabled ***/ +#include -#ifdef HAVE_LCMS2 -#include -#else -#include -#endif +#if HAVE_LCMS +/*** color support enabled ***/ +# if HAVE_LCMS2 +# include +# else +# include +# endif #endif #include "cache.h" #include "debug.h" #include "exif.h" #include "filecache.h" +#include "filedata.h" #include "glua.h" #include "intl.h" #include "jpeg-parser.h" #include "main-defines.h" #include "misc.h" +#include "typedefs.h" #include "ui-fileops.h" #include "zonedetect.h" +struct ExifData; +struct ExifItem; +struct FileCacheData; +struct ZoneDetect; + static gdouble exif_rational_to_double(ExifRational *r, gint sign) { @@ -473,7 +484,7 @@ static gchar *exif_build_formatted_Resolution(ExifData *exif) static gchar *exif_build_formatted_ColorProfile(ExifData *exif) { -#ifdef HAVE_LCMS2 +#if HAVE_LCMS2 cmsUInt8Number profileID[17]; #endif const gchar *name = ""; @@ -507,7 +518,7 @@ static gchar *exif_build_formatted_ColorProfile(ExifData *exif) else { source = _("embedded"); -#ifdef HAVE_LCMS +#if HAVE_LCMS { cmsHPROFILE profile; @@ -515,7 +526,7 @@ static gchar *exif_build_formatted_ColorProfile(ExifData *exif) profile = cmsOpenProfileFromMem(profile_data, profile_len); if (profile) { -#ifdef HAVE_LCMS2 +#if HAVE_LCMS2 profileID[16] = '\0'; cmsGetHeaderProfileID(profile, profileID); name = reinterpret_cast(profileID); @@ -1035,7 +1046,7 @@ ExifData *exif_read_fd(FileData *fd) * not writable directly, thus it should contain the most up-to-date version */ sidecar_path = nullptr; -#ifdef HAVE_EXIV2 +#if HAVE_EXIV2 /* we are not able to handle XMP sidecars without exiv2 */ sidecar_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); @@ -1232,7 +1243,7 @@ gchar *metadata_file_info(FileData *fd, const gchar *key, MetadataFormat) return g_strdup(""); } -#ifdef HAVE_LUA +#if HAVE_LUA gchar *metadata_lua_info(FileData *fd, const gchar *key, MetadataFormat) { gchar *script_name; diff --git a/src/exif.cc b/src/exif.cc index e1ace2ca..cf476225 100644 --- a/src/exif.cc +++ b/src/exif.cc @@ -47,7 +47,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include #include diff --git a/src/exiv2.cc b/src/exiv2.cc index 42ce72df..49e95d08 100644 --- a/src/exiv2.cc +++ b/src/exiv2.cc @@ -20,39 +20,44 @@ #include -#ifdef HAVE_EXIV2 +#if HAVE_EXIV2 -// Don't include the file directly -// Early Exiv2 versions didn't have version.hpp and the macros. -#include -#include -#include - -#if EXIV2_TEST_VERSION(0,27,0) -#define HAVE_EXIV2_ERROR_CODE -#endif - -#include -#include -#include -#include -#include +#include "exif.h" -#if EXIV2_TEST_VERSION(0,27,0) -#define EXV_PACKAGE "exiv2" -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include - -#include "exif.h" +#ifdef ENABLE_NLS +# include +#endif #include "debug.h" #include "filedata.h" #include "filefilter.h" #include "misc.h" #include "options.h" +#include "typedefs.h" #include "ui-fileops.h" +struct ExifItem; + +#if EXIV2_TEST_VERSION(0,27,0) +#define HAVE_EXIV2_ERROR_CODE +#endif + +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" +#endif + #if EXIV2_TEST_VERSION(0,28,0) #define AnyError Error #define AutoPtr UniquePtr diff --git a/src/filecache.cc b/src/filecache.cc index eb815383..3b958411 100644 --- a/src/filecache.cc +++ b/src/filecache.cc @@ -20,9 +20,9 @@ #include "filecache.h" -#include - #include "debug.h" +#include "filedata.h" +#include "typedefs.h" /* Set to TRUE to add file cache dumps to the debug output */ const gboolean debug_file_cache = FALSE; diff --git a/src/filecache.h b/src/filecache.h index 7c975c04..fe76c7d3 100644 --- a/src/filecache.h +++ b/src/filecache.h @@ -21,11 +21,12 @@ #ifndef FILECACHE_H #define FILECACHE_H -#include "filedata.h" +#include struct FileCacheData; -using FileCacheReleaseFunc = void (*)(FileData *); +struct FileData; +using FileCacheReleaseFunc = void (*)(FileData *); FileCacheData *file_cache_new(FileCacheReleaseFunc release, gulong max_size); gboolean file_cache_get(FileCacheData *fc, FileData *fd); diff --git a/src/filedata.cc b/src/filedata.cc index 14e7d345..d66e80b1 100644 --- a/src/filedata.cc +++ b/src/filedata.cc @@ -21,28 +21,38 @@ #include "filedata.h" +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + #include #include "cache.h" #include "debug.h" +#include "exif.h" #include "filefilter.h" #include "histogram.h" #include "intl.h" #include "main-defines.h" #include "main.h" #include "metadata.h" +#include "misc.h" #include "options.h" #include "secure-save.h" #include "thumb-standard.h" #include "trash.h" #include "ui-fileops.h" -#include "exif.h" -#include "misc.h" - -#include -#include - #ifdef DEBUG_FILEDATA gint global_file_data_count = 0; #endif @@ -2653,7 +2663,7 @@ gint file_data_verify_ci(FileData *fd, GList *list) * it's location regardless of the user's preference. */ gchar *metadata_path = nullptr; -#ifdef HAVE_EXIV2 +#if HAVE_EXIV2 /* but ignore XMP if we are not able to write it */ metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); #endif diff --git a/src/filedata.h b/src/filedata.h index 31cb1d19..d3af8ed7 100644 --- a/src/filedata.h +++ b/src/filedata.h @@ -22,7 +22,10 @@ #ifndef FILEDATA_H #define FILEDATA_H +#include + #include +#include #include diff --git a/src/filefilter.cc b/src/filefilter.cc index 8c5448a4..650abb78 100644 --- a/src/filefilter.cc +++ b/src/filefilter.cc @@ -21,11 +21,16 @@ #include "filefilter.h" +#include + +#include + #include #include "cache.h" #include "debug.h" #include "main-defines.h" +#include "options.h" #include "rcfile.h" #include "ui-fileops.h" @@ -171,25 +176,25 @@ void filter_add_defaults() { /* formats supported by custom loaders */ filter_add_if_missing("dds", "DirectDraw Surface", ".dds", FORMAT_CLASS_IMAGE, FALSE, FALSE, TRUE); -#ifdef HAVE_PDF +#if HAVE_PDF filter_add_if_missing("pdf", "Portable Document Format", ".pdf", FORMAT_CLASS_DOCUMENT, FALSE, FALSE, TRUE); #endif -#ifdef HAVE_HEIF +#if HAVE_HEIF filter_add_if_missing("heif/avif", "HEIF/AVIF Image", ".heif;.heic;.avif", FORMAT_CLASS_IMAGE, FALSE, TRUE, TRUE); #endif -#ifdef HAVE_WEBP +#if HAVE_WEBP filter_add_if_missing("webp", "WebP Format", ".webp", FORMAT_CLASS_IMAGE, TRUE, FALSE, TRUE); #endif -#ifdef HAVE_DJVU +#if HAVE_DJVU filter_add_if_missing("djvu", "DjVu Format", ".djvu;.djv", FORMAT_CLASS_DOCUMENT, FALSE, FALSE, TRUE); #endif -#ifdef HAVE_JPEGXL +#if HAVE_JPEGXL filter_add_if_missing("jxl", "JXL", ".jxl", FORMAT_CLASS_IMAGE, FALSE, TRUE, TRUE); #endif -#ifdef HAVE_J2K +#if HAVE_J2K filter_add_if_missing("jp2", "JPEG 2000", ".jp2", FORMAT_CLASS_IMAGE, FALSE, FALSE, TRUE); #endif -#ifdef HAVE_ARCHIVE +#if HAVE_ARCHIVE filter_add_if_missing("zip", "Archive files", ".zip;.rar;.tar;.tar.gz;.tar.bz2;.tar.xz;.tgz;.tbz;.txz;.cbr;.cbz;.gz;.bz2;.xz;.lzh;.lza;.7z", FORMAT_CLASS_ARCHIVE, FALSE, FALSE, TRUE); #endif filter_add_if_missing("scr", "ZX Spectrum screen Format", ".scr", FORMAT_CLASS_IMAGE, FALSE, FALSE, TRUE); diff --git a/src/filefilter.h b/src/filefilter.h index 73cb104c..200a47b1 100644 --- a/src/filefilter.h +++ b/src/filefilter.h @@ -22,6 +22,8 @@ #ifndef FILEFILTER_H #define FILEFILTER_H +#include + #include "typedefs.h" struct FilterEntry { diff --git a/src/format-canon.cc b/src/format-canon.cc index 9eb0d55a..805e47c3 100644 --- a/src/format-canon.cc +++ b/src/format-canon.cc @@ -21,7 +21,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include "format-canon.h" diff --git a/src/format-fuji.cc b/src/format-fuji.cc index 3d41f08b..d6a2495b 100644 --- a/src/format-fuji.cc +++ b/src/format-fuji.cc @@ -22,7 +22,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include "format-fuji.h" diff --git a/src/format-nikon.cc b/src/format-nikon.cc index 26cdb35a..fbb81c30 100644 --- a/src/format-nikon.cc +++ b/src/format-nikon.cc @@ -21,7 +21,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include "format-nikon.h" diff --git a/src/format-olympus.cc b/src/format-olympus.cc index f33497f7..00a2aac0 100644 --- a/src/format-olympus.cc +++ b/src/format-olympus.cc @@ -19,7 +19,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include "format-olympus.h" diff --git a/src/format-raw.cc b/src/format-raw.cc index 70c6ba33..8c6a7f2b 100644 --- a/src/format-raw.cc +++ b/src/format-raw.cc @@ -21,7 +21,7 @@ #include -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 #include "format-raw.h" diff --git a/src/fullscreen.cc b/src/fullscreen.cc index 5caed5a7..9f35af30 100644 --- a/src/fullscreen.cc +++ b/src/fullscreen.cc @@ -22,10 +22,12 @@ #include "fullscreen.h" #include +#include #include #include -#include +#include +#include #include "compat.h" #include "debug.h" diff --git a/src/fullscreen.h b/src/fullscreen.h index 53ab0ea0..32b0b917 100644 --- a/src/fullscreen.h +++ b/src/fullscreen.h @@ -22,6 +22,7 @@ #ifndef FULLSCREEN_H #define FULLSCREEN_H +#include #include struct ImageWindow; diff --git a/src/glua.h b/src/glua.h index 1c5600ae..4be0f06a 100644 --- a/src/glua.h +++ b/src/glua.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_LUA +#if HAVE_LUA #include diff --git a/src/histogram.cc b/src/histogram.cc index 013deb46..e8aa2937 100644 --- a/src/histogram.cc +++ b/src/histogram.cc @@ -20,15 +20,15 @@ #include "histogram.h" -#include +#include + +#include #include "debug.h" #include "filedata.h" #include "intl.h" #include "pixbuf-util.h" -#include - /* *---------------------------------------------------------------------------- * image histogram diff --git a/src/histogram.h b/src/histogram.h index 774556db..66167371 100644 --- a/src/histogram.h +++ b/src/histogram.h @@ -22,6 +22,7 @@ #define HISTOGRAM_H #include +#include #include "typedefs.h" diff --git a/src/history-list.cc b/src/history-list.cc index f7519927..d65a70e6 100644 --- a/src/history-list.cc +++ b/src/history-list.cc @@ -20,7 +20,8 @@ #include "history-list.h" -#include +#include +#include #include "debug.h" #include "intl.h" diff --git a/src/image-load-collection.cc b/src/image-load-collection.cc index 0c69b097..88da33e7 100644 --- a/src/image-load-collection.cc +++ b/src/image-load-collection.cc @@ -20,7 +20,13 @@ #include "image-load-collection.h" -#include +#include + +#include + +#include +#include +#include #include "cache.h" #include "filedata.h" diff --git a/src/image-load-cr3.cc b/src/image-load-cr3.cc index 1f386e05..59e2f1dd 100644 --- a/src/image-load-cr3.cc +++ b/src/image-load-cr3.cc @@ -24,9 +24,19 @@ /** @FIXME This is just a copy of image-load-jpeg.cc, with an adjusted * start address for a .cr3 file */ +#include + +#if HAVE_JPEG #include "image-load-cr3.h" -#include +#include +#include + +#include +#include +#include +#include +#include #include "debug.h" #include "image-load.h" @@ -34,12 +44,6 @@ #include "jpeg-parser.h" #include "typedefs.h" -#ifdef HAVE_JPEG - -#include -#include -#include - struct ImageLoaderJpeg { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; diff --git a/src/image-load-cr3.h b/src/image-load-cr3.h index 08173105..468a994f 100644 --- a/src/image-load-cr3.h +++ b/src/image-load-cr3.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_JPEG +#if HAVE_JPEG struct ImageLoaderBackend; void image_loader_backend_set_cr3(ImageLoaderBackend *funcs); diff --git a/src/image-load-dds.cc b/src/image-load-dds.cc index 5267397e..1ed14a71 100644 --- a/src/image-load-dds.cc +++ b/src/image-load-dds.cc @@ -26,7 +26,11 @@ #include "image-load-dds.h" -#include +#include + +#include +#include +#include #include "image-load.h" diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc index 5f678261..b15391e4 100644 --- a/src/image-load-djvu.cc +++ b/src/image-load-djvu.cc @@ -22,11 +22,13 @@ #include -#ifdef HAVE_DJVU +#if HAVE_DJVU #include +#include +#include +#include #include -#include #include "image-load.h" diff --git a/src/image-load-djvu.h b/src/image-load-djvu.h index b071e10c..0f125d43 100644 --- a/src/image-load-djvu.h +++ b/src/image-load-djvu.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_DJVU +#if HAVE_DJVU struct ImageLoaderBackend; void image_loader_backend_set_djvu(ImageLoaderBackend *funcs); diff --git a/src/image-load-external.cc b/src/image-load-external.cc index 6a3bda4e..6118e6eb 100644 --- a/src/image-load-external.cc +++ b/src/image-load-external.cc @@ -20,7 +20,9 @@ #include "image-load-external.h" -#include +#include +#include +#include #include "filedata.h" #include "image-load.h" diff --git a/src/image-load-ffmpegthumbnailer.cc b/src/image-load-ffmpegthumbnailer.cc index 62500319..446ec804 100644 --- a/src/image-load-ffmpegthumbnailer.cc +++ b/src/image-load-ffmpegthumbnailer.cc @@ -23,8 +23,13 @@ #include -#ifdef HAVE_FFMPEGTHUMBNAILER -#include +#if HAVE_FFMPEGTHUMBNAILER +#include +#include +#include +#include +#include +#include //TODO Use videothumbnailer.h? #include "debug.h" #include "filedata.h" @@ -108,13 +113,13 @@ static gboolean image_loader_ft_load (gpointer loader, const guchar *, gsize, GE image_data *image = video_thumbnailer_create_image_data(); -#ifdef HAVE_FFMPEGTHUMBNAILER_WH +#if HAVE_FFMPEGTHUMBNAILER_WH video_thumbnailer_set_size(lft->vt, lft->requested_width, lft->requested_height); #else lft->vt->thumbnail_size = MAX(lft->requested_width,lft->requested_height); #endif -#ifdef HAVE_FFMPEGTHUMBNAILER_METADATA +#if HAVE_FFMPEGTHUMBNAILER_METADATA lft->vt->prefer_embedded_metadata = options->thumbnails.use_ft_metadata ? 1 : 0; #endif diff --git a/src/image-load-ffmpegthumbnailer.h b/src/image-load-ffmpegthumbnailer.h index b26ece39..43251af0 100644 --- a/src/image-load-ffmpegthumbnailer.h +++ b/src/image-load-ffmpegthumbnailer.h @@ -24,7 +24,7 @@ #include -#ifdef HAVE_FFMPEGTHUMBNAILER +#if HAVE_FFMPEGTHUMBNAILER struct ImageLoaderBackend; void image_loader_backend_set_ft(ImageLoaderBackend *funcs); diff --git a/src/image-load-gdk.cc b/src/image-load-gdk.cc index ff32b87b..802cd1cf 100644 --- a/src/image-load-gdk.cc +++ b/src/image-load-gdk.cc @@ -21,7 +21,9 @@ #include "image-load-gdk.h" -#include +#include +#include +#include #include "filedata.h" #include "image-load.h" diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc index 6b3f27d1..296a5b8d 100644 --- a/src/image-load-heif.cc +++ b/src/image-load-heif.cc @@ -22,9 +22,12 @@ #include -#ifdef HAVE_HEIF +#if HAVE_HEIF #include +#include +#include +#include #include #include "debug.h" diff --git a/src/image-load-heif.h b/src/image-load-heif.h index 4495d6c2..e1e56ba1 100644 --- a/src/image-load-heif.h +++ b/src/image-load-heif.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_HEIF +#if HAVE_HEIF struct ImageLoaderBackend; void image_loader_backend_set_heif(ImageLoaderBackend *funcs); diff --git a/src/image-load-j2k.cc b/src/image-load-j2k.cc index 72e2518c..66892015 100644 --- a/src/image-load-j2k.cc +++ b/src/image-load-j2k.cc @@ -20,10 +20,16 @@ #include -#ifdef HAVE_J2K +#if HAVE_J2K #include "image-load-j2k.h" +#include +#include + +#include +#include +#include #include #include "debug.h" diff --git a/src/image-load-j2k.h b/src/image-load-j2k.h index 025a9188..454eaa2e 100644 --- a/src/image-load-j2k.h +++ b/src/image-load-j2k.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_J2K +#if HAVE_J2K struct ImageLoaderBackend; void image_loader_backend_set_j2k(ImageLoaderBackend *funcs); diff --git a/src/image-load-jpeg.cc b/src/image-load-jpeg.cc index ea763e40..7adff05f 100644 --- a/src/image-load-jpeg.cc +++ b/src/image-load-jpeg.cc @@ -29,13 +29,16 @@ #include -#ifdef HAVE_JPEG +#if HAVE_JPEG #include "image-load-jpeg.h" #include #include // for FILE and size_t in jpeglib.h +#include +#include +#include #include #include diff --git a/src/image-load-jpeg.h b/src/image-load-jpeg.h index 5921a863..aac4f7b1 100644 --- a/src/image-load-jpeg.h +++ b/src/image-load-jpeg.h @@ -24,7 +24,7 @@ #include -#ifdef HAVE_JPEG +#if HAVE_JPEG struct ImageLoaderBackend; void image_loader_backend_set_jpeg(ImageLoaderBackend *funcs); diff --git a/src/image-load-jpegxl.cc b/src/image-load-jpegxl.cc index e1a4c10d..e64f9390 100644 --- a/src/image-load-jpegxl.cc +++ b/src/image-load-jpegxl.cc @@ -52,13 +52,20 @@ #include -#ifdef HAVE_JPEGXL +#if HAVE_JPEGXL #include "image-load-jpegxl.h" +#include +#include #include -#include +#include +#include +#include +#include +#include //TODO Use decode_cxx.h? +#include #include "debug.h" #include "image-load.h" diff --git a/src/image-load-jpegxl.h b/src/image-load-jpegxl.h index 3a939c39..b406f5fd 100644 --- a/src/image-load-jpegxl.h +++ b/src/image-load-jpegxl.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_JPEGXL +#if HAVE_JPEGXL struct ImageLoaderBackend; void image_loader_backend_set_jpegxl(ImageLoaderBackend *funcs); diff --git a/src/image-load-libraw.cc b/src/image-load-libraw.cc index d144e618..08f69d18 100644 --- a/src/image-load-libraw.cc +++ b/src/image-load-libraw.cc @@ -31,17 +31,19 @@ #include "image-load.h" -#ifdef HAVE_RAW +#if HAVE_RAW #include #include #include +#include #include #include "debug.h" #include "filedata.h" #include "filefilter.h" +#include "typedefs.h" struct UnmapData { diff --git a/src/image-load-pdf.cc b/src/image-load-pdf.cc index df8e8539..0345f0dc 100644 --- a/src/image-load-pdf.cc +++ b/src/image-load-pdf.cc @@ -20,11 +20,15 @@ #include -#ifdef HAVE_PDF +#if HAVE_PDF #include "image-load-pdf.h" +#include +#include #include -#include +#include +#include +#include #include "debug.h" #include "image-load.h" diff --git a/src/image-load-pdf.h b/src/image-load-pdf.h index 5aa86291..86f11fac 100644 --- a/src/image-load-pdf.h +++ b/src/image-load-pdf.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_PDF +#if HAVE_PDF struct ImageLoaderBackend; void image_loader_backend_set_pdf(ImageLoaderBackend *funcs); diff --git a/src/image-load-psd.cc b/src/image-load-psd.cc index 5582c024..62dfdc97 100644 --- a/src/image-load-psd.cc +++ b/src/image-load-psd.cc @@ -50,7 +50,11 @@ #include "image-load-psd.h" -#include +#include + +#include +#include +#include #include "debug.h" #include "image-load.h" diff --git a/src/image-load-svgz.cc b/src/image-load-svgz.cc index ef3ba157..534eddf8 100644 --- a/src/image-load-svgz.cc +++ b/src/image-load-svgz.cc @@ -20,7 +20,9 @@ #include "image-load-svgz.h" -#include +#include +#include +#include #include "image-load.h" diff --git a/src/image-load-tiff.cc b/src/image-load-tiff.cc index 2e5e2d9b..287c5a2d 100644 --- a/src/image-load-tiff.cc +++ b/src/image-load-tiff.cc @@ -27,10 +27,18 @@ #include -#ifdef HAVE_TIFF +#if HAVE_TIFF #include "image-load-tiff.h" +#include +#include +#include + +#include +#include +#include +#include #include #include "debug.h" diff --git a/src/image-load-tiff.h b/src/image-load-tiff.h index d91505ae..a2d8b08e 100644 --- a/src/image-load-tiff.h +++ b/src/image-load-tiff.h @@ -24,7 +24,7 @@ #include -#ifdef HAVE_TIFF +#if HAVE_TIFF struct ImageLoaderBackend; void image_loader_backend_set_tiff(ImageLoaderBackend *funcs); diff --git a/src/image-load-webp.cc b/src/image-load-webp.cc index d2fabe51..99511423 100644 --- a/src/image-load-webp.cc +++ b/src/image-load-webp.cc @@ -20,9 +20,12 @@ #include -#ifdef HAVE_WEBP +#if HAVE_WEBP #include "image-load-webp.h" +#include +#include +#include #include #include "debug.h" diff --git a/src/image-load-webp.h b/src/image-load-webp.h index 038e7e6a..19b5e0fb 100644 --- a/src/image-load-webp.h +++ b/src/image-load-webp.h @@ -23,7 +23,7 @@ #include -#ifdef HAVE_WEBP +#if HAVE_WEBP struct ImageLoaderBackend; void image_loader_backend_set_webp(ImageLoaderBackend *funcs); diff --git a/src/image-load-zxscr.cc b/src/image-load-zxscr.cc index e1c50260..c3651e66 100644 --- a/src/image-load-zxscr.cc +++ b/src/image-load-zxscr.cc @@ -20,7 +20,9 @@ #include "image-load-zxscr.h" -#include +#include +#include +#include #include "debug.h" #include "image-load.h" diff --git a/src/image-load.cc b/src/image-load.cc index 1182a64f..e06adfea 100644 --- a/src/image-load.cc +++ b/src/image-load.cc @@ -21,6 +21,13 @@ #include "image-load.h" +#include +#include +#include +#include + +#include + #include #include "debug.h" @@ -29,45 +36,46 @@ #include "gq-marshal.h" #include "image-load-collection.h" #include "image-load-dds.h" +#if HAVE_DJVU +# include "image-load-djvu.h" +#endif #include "image-load-external.h" +#if HAVE_FFMPEGTHUMBNAILER +# include "image-load-ffmpegthumbnailer.h" +#endif #include "image-load-gdk.h" +#if HAVE_HEIF +# include "image-load-heif.h" +#endif +#if HAVE_J2K +# include "image-load-j2k.h" +#endif +#if HAVE_JPEG +# if !HAVE_RAW +# include "image-load-cr3.h" +# endif +# include "image-load-jpeg.h" +#endif +#if HAVE_JPEGXL +# include "image-load-jpegxl.h" +#endif #include "image-load-libraw.h" +#if HAVE_PDF +# include "image-load-pdf.h" +#endif #include "image-load-psd.h" #include "image-load-svgz.h" +#if HAVE_TIFF +# include "image-load-tiff.h" +#endif #include "image-load-webp.h" #include "image-load-zxscr.h" #include "misc.h" #include "options.h" +#include "typedefs.h" #include "ui-fileops.h" -#ifdef HAVE_DJVU - #include "image-load-djvu.h" -#endif -#ifdef HAVE_FFMPEGTHUMBNAILER - #include "image-load-ffmpegthumbnailer.h" -#endif -#ifdef HAVE_HEIF - #include "image-load-heif.h" -#endif -#ifdef HAVE_J2K - #include "image-load-j2k.h" -#endif -#ifdef HAVE_JPEG - #include "image-load-cr3.h" - #include "image-load-jpeg.h" -#endif -#ifdef HAVE_JPEGXL - #include "image-load-jpegxl.h" -#endif -#ifdef HAVE_PDF - #include "image-load-pdf.h" -#endif -#ifdef HAVE_TIFF - #include "image-load-tiff.h" -#endif - -#include -#include +struct ExifData; enum { IMAGE_LOADER_READ_BUFFER_SIZE_DEFAULT = 4096, @@ -571,7 +579,7 @@ static void image_loader_size_cb(gpointer loader, } g_mutex_unlock(il->data_mutex); -#ifdef HAVE_FFMPEGTHUMBNAILER +#if HAVE_FFMPEGTHUMBNAILER if (il->fd->format_class == FORMAT_CLASS_VIDEO) scale = TRUE; #endif @@ -668,7 +676,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else { -#ifdef HAVE_FFMPEGTHUMBNAILER +#if HAVE_FFMPEGTHUMBNAILER if (il->fd->format_class == FORMAT_CLASS_VIDEO) { DEBUG_1("Using custom ffmpegthumbnailer loader"); @@ -676,7 +684,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif -#ifdef HAVE_PDF +#if HAVE_PDF if (il->bytes_total >= 4 && (memcmp(il->mapped_file + 0, "%PDF", 4) == 0)) { @@ -685,7 +693,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif -#ifdef HAVE_HEIF +#if HAVE_HEIF if (il->bytes_total >= 12 && ((memcmp(il->mapped_file + 4, "ftypheic", 8) == 0) || (memcmp(il->mapped_file + 4, "ftypheix", 8) == 0) || @@ -698,7 +706,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif - #ifdef HAVE_WEBP + #if HAVE_WEBP if (il->bytes_total >= 12 && (memcmp(il->mapped_file, "RIFF", 4) == 0) && (memcmp(il->mapped_file + 8, "WEBP", 4) == 0)) @@ -708,7 +716,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif -#ifdef HAVE_DJVU +#if HAVE_DJVU if (il->bytes_total >= 16 && (memcmp(il->mapped_file, "AT&TFORM", 8) == 0) && (memcmp(il->mapped_file + 12, "DJV", 3) == 0)) @@ -718,13 +726,13 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif -#ifdef HAVE_JPEG +#if HAVE_JPEG if (il->bytes_total >= 2 && il->mapped_file[0] == 0xff && il->mapped_file[1] == 0xd8) { DEBUG_1("Using custom jpeg loader"); image_loader_backend_set_jpeg(&il->backend); } -#ifndef HAVE_RAW +#if !HAVE_RAW else if (il->bytes_total >= 11 && (memcmp(il->mapped_file + 4, "ftypcrx", 7) == 0) && @@ -736,7 +744,7 @@ static void image_loader_setup_loader(ImageLoader *il) #endif else #endif -#ifdef HAVE_TIFF +#if HAVE_TIFF if (il->bytes_total >= 10 && (memcmp(il->mapped_file, "MM\0*", 4) == 0 || memcmp(il->mapped_file, "MM\0+\0\x08\0\0", 8) == 0 || @@ -761,7 +769,7 @@ static void image_loader_setup_loader(ImageLoader *il) image_loader_backend_set_psd(&il->backend); } else -#ifdef HAVE_J2K +#if HAVE_J2K if (il->bytes_total >= 12 && (memcmp(il->mapped_file, "\0\0\0\x0CjP\x20\x20\x0D\x0A\x87\x0A", 12) == 0)) { @@ -770,7 +778,7 @@ static void image_loader_setup_loader(ImageLoader *il) } else #endif -#ifdef HAVE_JPEGXL +#if HAVE_JPEGXL if (il->bytes_total >= 12 && (memcmp(il->mapped_file, "\0\0\0\x0C\x4A\x58\x4C\x20\x0D\x0A\x87\x0A", 12) == 0)) { @@ -810,7 +818,7 @@ static void image_loader_setup_loader(ImageLoader *il) il->loader = static_cast(il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il)); -#ifdef HAVE_TIFF +#if HAVE_TIFF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "tiff") == 0) { @@ -819,7 +827,7 @@ static void image_loader_setup_loader(ImageLoader *il) g_free(format); #endif -#ifdef HAVE_PDF +#if HAVE_PDF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "pdf") == 0) { @@ -828,7 +836,7 @@ static void image_loader_setup_loader(ImageLoader *il) g_free(format); #endif -#ifdef HAVE_HEIF +#if HAVE_HEIF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "heif") == 0) { @@ -837,7 +845,7 @@ static void image_loader_setup_loader(ImageLoader *il) g_free(format); #endif -#ifdef HAVE_DJVU +#if HAVE_DJVU format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "djvu") == 0) { @@ -934,7 +942,7 @@ static gboolean image_loader_begin(ImageLoader *il) return FALSE; } -#ifdef HAVE_PDF +#if HAVE_PDF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "pdf") == 0) { @@ -943,7 +951,7 @@ static gboolean image_loader_begin(ImageLoader *il) } g_free(format); #endif -#ifdef HAVE_HEIF +#if HAVE_HEIF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "heif") == 0) { @@ -952,7 +960,7 @@ static gboolean image_loader_begin(ImageLoader *il) } g_free(format); #endif -#ifdef HAVE_DJVU +#if HAVE_DJVU format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "djvu") == 0) { @@ -961,7 +969,7 @@ static gboolean image_loader_begin(ImageLoader *il) } g_free(format); #endif -#ifdef HAVE_TIFF +#if HAVE_TIFF format = il->backend.get_format_name(il->loader); if (g_strcmp0(format, "tiff") == 0) { diff --git a/src/image-load.h b/src/image-load.h index d24902dd..b59c4e17 100644 --- a/src/image-load.h +++ b/src/image-load.h @@ -23,6 +23,8 @@ #define IMAGE_LOAD_H #include +#include +#include struct FileData; diff --git a/src/image-overlay.cc b/src/image-overlay.cc index 7dfd5a73..2dec6382 100644 --- a/src/image-overlay.cc +++ b/src/image-overlay.cc @@ -21,7 +21,12 @@ #include "image-overlay.h" -#include +#include + +#include +#include +#include +#include #include "collect.h" #include "debug.h" @@ -33,12 +38,16 @@ #include "intl.h" #include "layout.h" #include "main-defines.h" +#include "options.h" #include "osd.h" #include "pixbuf-renderer.h" #include "pixbuf-util.h" #include "slideshow.h" +#include "typedefs.h" #include "ui-fileops.h" +struct HistMap; + /* *---------------------------------------------------------------------------- * image overlay diff --git a/src/image.cc b/src/image.cc index 5cd517b3..b2a45da2 100644 --- a/src/image.cc +++ b/src/image.cc @@ -21,26 +21,34 @@ #include "image.h" -#include +#include +#include + +#include +#include #include "collect-table.h" +#include "collect.h" #include "color-man.h" #include "compat.h" #include "debug.h" #include "exif.h" #include "filecache.h" +#include "filedata.h" #include "history-list.h" #include "image-load.h" #include "intl.h" #include "layout-image.h" #include "layout.h" #include "metadata.h" +#include "options.h" #include "pixbuf-renderer.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-misc.h" -#include +struct ExifData; +struct FileCacheData; static GList *image_list = nullptr; diff --git a/src/image.h b/src/image.h index 6f92c603..eed97a5e 100644 --- a/src/image.h +++ b/src/image.h @@ -22,6 +22,9 @@ #ifndef IMAGE_H #define IMAGE_H +#include +#include +#include #include #include "typedefs.h" diff --git a/src/img-view.cc b/src/img-view.cc index 9a00b945..dc3fb9bb 100644 --- a/src/img-view.cc +++ b/src/img-view.cc @@ -21,7 +21,9 @@ #include "img-view.h" -#include +#include +#include +#include #include "collect-io.h" #include "collect.h" @@ -36,15 +38,19 @@ #include "image.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "main.h" #include "menu.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "print.h" #include "slideshow.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-menu.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" #include "window.h" diff --git a/src/jpeg-parser.cc b/src/jpeg-parser.cc index b979e65a..ebde0f0c 100644 --- a/src/jpeg-parser.cc +++ b/src/jpeg-parser.cc @@ -21,7 +21,7 @@ #include "jpeg-parser.h" -#include +#include #include "debug.h" diff --git a/src/keymap-template.cc b/src/keymap-template.cc index 91962960..ebd248fa 100644 --- a/src/keymap-template.cc +++ b/src/keymap-template.cc @@ -19,8 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include - const char *keymap_template [] = { "", "", diff --git a/src/layout-config.cc b/src/layout-config.cc index 409a1b2b..46da2f38 100644 --- a/src/layout-config.cc +++ b/src/layout-config.cc @@ -21,6 +21,10 @@ #include "layout-config.h" +#include + +#include + #include #include "compat.h" @@ -253,7 +257,7 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st if (group) { -#ifdef HAVE_GTK4 +#if HAVE_GTK4 group = gtk_toggle_button_new(); gtk_toggle_button_set_group(button, group); #else @@ -262,7 +266,7 @@ static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint st } else { -#ifdef HAVE_GTK4 +#if HAVE_GTK4 group = gtk_toggle_button_new(); #else group = gtk_radio_button_new(nullptr); diff --git a/src/layout-config.h b/src/layout-config.h index 752822d6..512ce8e4 100644 --- a/src/layout-config.h +++ b/src/layout-config.h @@ -22,7 +22,7 @@ #ifndef LAYOUT_CONFIG_H #define LAYOUT_CONFIG_H - +#include #include #include "layout.h" diff --git a/src/layout-image.cc b/src/layout-image.cc index 228fff0f..0d4042b2 100644 --- a/src/layout-image.cc +++ b/src/layout-image.cc @@ -21,6 +21,14 @@ #include "layout-image.h" +#include + +#include +#include +#include +#include +#include + #include #include "collect.h" @@ -36,15 +44,17 @@ #include "img-view.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "pixbuf-renderer.h" -#include "pixbuf-util.h" #include "slideshow.h" #include "ui-fileops.h" #include "ui-menu.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" #include "view-file.h" @@ -601,7 +611,7 @@ static void li_pop_menu_copy_path_unquoted_cb(GtkWidget *, gpointer data) file_util_copy_path_to_clipboard(layout_image_get_fd(lw), FALSE); } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static void li_pop_menu_copy_image_cb(GtkWidget *, gpointer data) { /* @FIXME GTK4 stub */ diff --git a/src/layout-image.h b/src/layout-image.h index 817b7468..2c3b59c7 100644 --- a/src/layout-image.h +++ b/src/layout-image.h @@ -22,6 +22,7 @@ #ifndef LAYOUT_IMAGE_H #define LAYOUT_IMAGE_H +#include #include #include "typedefs.h" diff --git a/src/layout-util.cc b/src/layout-util.cc index ee9f68f8..b9edc6fb 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -21,7 +21,15 @@ #include "layout-util.h" -#include +#include +#include + +#include +#include +#include + +#include +#include #include @@ -30,7 +38,6 @@ #include "bar-sort.h" #include "bar.h" #include "cache-maint.h" -#include "collect-dlg.h" #include "collect-io.h" #include "collect.h" #include "color-man.h" @@ -49,11 +56,13 @@ #include "intl.h" #include "keymap-template.h" #include "layout-image.h" +#include "layout.h" #include "logwindow.h" #include "main-defines.h" #include "main.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "pan-view.h" #include "pixbuf-util.h" #include "preferences.h" @@ -65,6 +74,7 @@ #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" +#include "ui-utildlg.h" #include "utilops.h" #include "view-dir.h" #include "view-file.h" @@ -1924,7 +1934,7 @@ static void layout_menu_keyword_autocomplete_cb(GtkAction *, gpointer data) * color profile button (and menu) *----------------------------------------------------------------------------- */ -#ifdef HAVE_LCMS +#if HAVE_LCMS static void layout_color_menu_enable_cb(GtkToggleAction *action, gpointer data) { auto lw = static_cast(data); @@ -1941,7 +1951,7 @@ static void layout_color_menu_enable_cb() } #endif -#ifdef HAVE_LCMS +#if HAVE_LCMS static void layout_color_menu_use_image_cb(GtkToggleAction *action, gpointer data) { auto lw = static_cast(data); @@ -1960,7 +1970,7 @@ static void layout_color_menu_use_image_cb() } #endif -#ifdef HAVE_LCMS +#if HAVE_LCMS static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *, gpointer data) { auto lw = static_cast(data); @@ -3699,7 +3709,7 @@ void layout_util_sync_color(LayoutWindow *lw) gboolean use_image = FALSE; gint i; gchar action_name[15]; -#ifdef HAVE_LCMS +#if HAVE_LCMS gchar *image_profile; gchar *screen_profile; #endif @@ -3710,7 +3720,7 @@ void layout_util_sync_color(LayoutWindow *lw) use_color = layout_image_color_profile_get_use(lw); action = gtk_action_group_get_action(lw->action_group, "UseColorProfiles"); -#ifdef HAVE_LCMS +#if HAVE_LCMS gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), use_color); if (layout_image_color_profile_get_status(lw, &image_profile, &screen_profile)) { diff --git a/src/layout-util.h b/src/layout-util.h index faa7b155..2c7ea04e 100644 --- a/src/layout-util.h +++ b/src/layout-util.h @@ -22,8 +22,13 @@ #ifndef LAYOUT_UTIL_H #define LAYOUT_UTIL_H +#include +#include +#include -#include "layout.h" +#include "typedefs.h" + +struct LayoutWindow; gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data); diff --git a/src/layout.cc b/src/layout.cc index bcf828f3..98776dbd 100644 --- a/src/layout.cc +++ b/src/layout.cc @@ -21,7 +21,14 @@ #include "layout.h" -#include +#include + +#include + +#include +#include +#include +#include #include "bar-sort.h" #include "bar.h" diff --git a/src/layout.h b/src/layout.h index 8f3455a1..711c1474 100644 --- a/src/layout.h +++ b/src/layout.h @@ -22,9 +22,11 @@ #ifndef LAYOUT_H #define LAYOUT_H +#include #include #include "options.h" +#include "typedefs.h" struct AnimationData; struct FileData; diff --git a/src/logwindow.cc b/src/logwindow.cc index dbd1ec49..8ce6f867 100644 --- a/src/logwindow.cc +++ b/src/logwindow.cc @@ -21,9 +21,15 @@ #include "logwindow.h" #include +#include #include #include +#include +#include +#include +#include + #include #include "compat.h" @@ -32,6 +38,7 @@ #include "layout.h" #include "main-defines.h" #include "misc.h" +#include "options.h" #include "ui-misc.h" #include "window.h" diff --git a/src/lua.cc b/src/lua.cc index 83191474..51b6f39b 100644 --- a/src/lua.cc +++ b/src/lua.cc @@ -20,16 +20,18 @@ #include -#ifdef HAVE_LUA +#if HAVE_LUA #define _XOPEN_SOURCE #include "glua.h" -#include +#include + #include #include #include +#include #include #include @@ -37,10 +39,11 @@ #include "debug.h" #include "exif.h" #include "filedata.h" -#include "main-defines.h" #include "main.h" #include "ui-fileops.h" +struct ExifData; + /** * @file * User API consists of the following namespaces: diff --git a/src/main.cc b/src/main.cc index 89328fcf..4431dc89 100644 --- a/src/main.cc +++ b/src/main.cc @@ -21,26 +21,33 @@ #include "main.h" -#include +#include #include #include +#include +#include +#include #include -#ifdef HAVE_CLUTTER -#include +#if HAVE_CLUTTER +# include +# include #endif -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H #include #endif -#ifdef G_OS_UNIX -#include +#include +#include + +#ifdef ENABLE_NLS +# include #endif -#ifdef HAVE_DEVELOPER +#if HAVE_DEVELOPER #include "backward.h" #endif @@ -61,9 +68,11 @@ #include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "rcfile.h" #include "remote.h" @@ -95,7 +104,7 @@ void sig_handler_cb(int signo, siginfo_t *info, void *) guint64 addr; guint64 char_index; ssize_t len; -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H gint bt_size; void *bt[1024]; #endif @@ -181,7 +190,7 @@ void sig_handler_cb(int signo, siginfo_t *info, void *) len = write(STDERR_FILENO, "\n", 1); } -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H bt_size = backtrace(bt, 1024); backtrace_symbols_fd(bt, bt_size, STDERR_FILENO); #endif @@ -194,7 +203,7 @@ void sig_handler_cb(int signo, siginfo_t *info, void *) #else /* defined(SA_SIGINFO) */ void sig_handler_cb(int) { -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H gint bt_size; void *bt[1024]; #endif @@ -202,7 +211,7 @@ void sig_handler_cb(int) write(STDERR_FILENO, "Geeqie fatal error\n", 19); write(STDERR_FILENO, "Signal: Segmentation fault\n", 27); -#ifdef HAVE_EXECINFO_H +#if HAVE_EXECINFO_H bt_size = backtrace(bt, 1024); backtrace_symbols_fd(bt, bt_size, STDERR_FILENO); #endif @@ -707,7 +716,7 @@ static void parse_command_line_for_debug_option(gint argc, gchar *argv[]) #endif } -#ifdef HAVE_CLUTTER +#if HAVE_CLUTTER static gboolean parse_command_line_for_clutter_option(gint argc, gchar *argv[]) { const gchar *clutter_option = "--disable-clutter"; @@ -1199,7 +1208,7 @@ static void setup_sigbus_handler_unused() } #pragma GCC diagnostic pop -#ifndef HAVE_DEVELOPER +#if !HAVE_DEVELOPER static void setup_sig_handler() { struct sigaction sigsegv_action; @@ -1307,7 +1316,7 @@ gint main(gint argc, gchar *argv[]) gdk_threads_enter(); /* seg. fault handler */ -#ifdef HAVE_DEVELOPER +#if HAVE_DEVELOPER backward::SignalHandling sh{}; #else setup_sig_handler(); @@ -1329,7 +1338,7 @@ gint main(gint argc, gchar *argv[]) exif_init(); -#ifdef HAVE_LUA +#if HAVE_LUA lua_init(); #endif @@ -1353,7 +1362,7 @@ gint main(gint argc, gchar *argv[]) parse_command_line_for_debug_option(argc, argv); DEBUG_1("%s main: gtk_init", get_exec_time()); -#ifdef HAVE_CLUTTER +#if HAVE_CLUTTER if (parse_command_line_for_clutter_option(argc, argv)) { disable_clutter = TRUE; @@ -1435,7 +1444,7 @@ gint main(gint argc, gchar *argv[]) filter_rebuild(); } - #ifdef HAVE_CLUTTER + #if HAVE_CLUTTER /** @FIXME For the background of this see: * https://github.com/BestImageViewer/geeqie/issues/397 * The feature CLUTTER_FEATURE_SWAP_EVENTS indictates if the diff --git a/src/main.h b/src/main.h index 006414d9..78941b74 100644 --- a/src/main.h +++ b/src/main.h @@ -23,6 +23,7 @@ #define MAIN_H #include +#include #include extern gboolean thumb_format_changed; diff --git a/src/md5-util.cc b/src/md5-util.cc index 5d089f72..496d7dc7 100644 --- a/src/md5-util.cc +++ b/src/md5-util.cc @@ -33,7 +33,6 @@ #include "md5-util.h" #include -#include #include using GQChecksumPtr = std::unique_ptr; diff --git a/src/menu.cc b/src/menu.cc index 72724e04..9ac99948 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -21,15 +21,15 @@ #include "menu.h" -#include +#include #include "collect-io.h" #include "collect-table.h" +#include "collect.h" #include "editors.h" #include "intl.h" #include "main-defines.h" #include "pixbuf-util.h" -#include "ui-fileops.h" #include "ui-menu.h" static GtkWidget *real_submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data, diff --git a/src/menu.h b/src/menu.h index 1622970b..ed991efa 100644 --- a/src/menu.h +++ b/src/menu.h @@ -22,6 +22,8 @@ #ifndef MENU_H #define MENU_H +#include +#include #include #include "typedefs.h" diff --git a/src/meson.build b/src/meson.build index 94589c44..d1a00f2b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -256,7 +256,7 @@ gq_marshal_pragma = custom_target('gq-marshal-pragma', project_sources += gq_marshal_pragma -if conf_data.has('HAVE_LCMS') +if conf_data.get('HAVE_LCMS', 0) == 1 xxd_sh = find_program('generate-ClayRGB1998-icc-h.sh', dirs : join_paths(meson.project_source_root(), 'scripts')) ClayRGB1998_icc_h = custom_target('ClayRGB1998', diff --git a/src/metadata.cc b/src/metadata.cc index 4bb67315..85b6995d 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -21,7 +21,14 @@ #include "metadata.h" +#include + #include +#include +#include +#include + +#include #include @@ -33,11 +40,14 @@ #include "layout-util.h" #include "main-defines.h" #include "misc.h" +#include "options.h" #include "rcfile.h" #include "secure-save.h" #include "ui-fileops.h" #include "utilops.h" +struct ExifData; + enum MetadataKey { MK_NONE, MK_KEYWORDS, @@ -610,7 +620,7 @@ static void metadata_legacy_delete(FileData *fd, const gchar *except) g_free(metadata_path); } -#ifdef HAVE_EXIV2 +#if HAVE_EXIV2 /* without exiv2: do not delete xmp metadata because we are not able to convert it, just ignore it */ metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); @@ -717,7 +727,7 @@ GList *metadata_read_list(FileData *fd, const gchar *key, MetadataFormat format) { return g_list_append(nullptr, metadata_file_info(fd, key, format)); } -#ifdef HAVE_LUA +#if HAVE_LUA else if (strncmp(key, "lua.", 4) == 0) { return g_list_append(nullptr, metadata_lua_info(fd, key, format)); diff --git a/src/metadata.h b/src/metadata.h index 2740edbb..c51823b1 100644 --- a/src/metadata.h +++ b/src/metadata.h @@ -22,6 +22,7 @@ #ifndef METADATA_H #define METADATA_H +#include #include #include "typedefs.h" diff --git a/src/misc.cc b/src/misc.cc index 3d808919..9767e016 100644 --- a/src/misc.cc +++ b/src/misc.cc @@ -20,9 +20,19 @@ #include "misc.h" -#include +#include +#include + +#include +#include +#include +#include +#include #include +#include +#include + #include #include "debug.h" @@ -33,9 +43,6 @@ #include "options.h" #include "ui-fileops.h" -#include -#include - gdouble get_zoom_increment() { return ((options->image.zoom_increment != 0) ? static_cast(options->image.zoom_increment) / 100.0 : 1.0); @@ -268,7 +275,7 @@ int runcmd(const gchar *cmd) */ gint date_get_first_day_of_week() { -#ifdef HAVE__NL_TIME_FIRST_WEEKDAY +#if HAVE__NL_TIME_FIRST_WEEKDAY return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0]; #else gchar *dot; @@ -389,7 +396,7 @@ gint get_cpu_cores() return sysconf(_SC_NPROCESSORS_ONLN); } -#ifdef HAVE_GTK4 +#if HAVE_GTK4 void convert_gdkcolor_to_gdkrgba(gpointer data, GdkRGBA *gdk_rgba) { /* @FIXME GTK4 stub */ @@ -434,7 +441,7 @@ void gq_gtk_grid_attach_default(GtkGrid *grid, GtkWidget *child, guint left_atta /* Copied from the libarchive .repo. examples */ -#ifndef HAVE_ARCHIVE +#if !HAVE_ARCHIVE gchar *open_archive(FileData *) { log_printf("%s", _("Warning: libarchive not installed")); diff --git a/src/misc.h b/src/misc.h index 37f95953..4223bb13 100644 --- a/src/misc.h +++ b/src/misc.h @@ -21,6 +21,8 @@ #ifndef MISC_H #define MISC_H +#include +#include #include #include @@ -43,7 +45,7 @@ void gq_gtk_entry_set_text(GtkEntry *entry, const gchar *text); void gq_gtk_grid_attach_default(GtkGrid *grid, GtkWidget *child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach); void gq_gtk_grid_attach(GtkGrid *grid, GtkWidget *child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, GtkAttachOptions, GtkAttachOptions, guint, guint); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 void convert_gdkcolor_to_gdkrgba(gpointer data, GdkRGBA *gdk_rgba); #else void convert_gdkcolor_to_gdkrgba(gpointer data, GdkRGBA *gdk_rgba); diff --git a/src/options.cc b/src/options.cc index 8e641459..6171ed70 100644 --- a/src/options.cc +++ b/src/options.cc @@ -19,7 +19,9 @@ #include "options.h" -#include +#include + +#include #include "debug.h" #include "histogram.h" /* HCHAN_RGB */ diff --git a/src/options.h b/src/options.h index c980b21b..894f25e2 100644 --- a/src/options.h +++ b/src/options.h @@ -21,7 +21,9 @@ #ifndef OPTIONS_H #define OPTIONS_H +#include #include +#include #include "typedefs.h" diff --git a/src/osd.cc b/src/osd.cc index 57c68cde..6801e5fa 100644 --- a/src/osd.cc +++ b/src/osd.cc @@ -24,6 +24,13 @@ #include "osd.h" +#include +#include +#include + +#include +#include + #include #include "compat.h" @@ -32,11 +39,9 @@ #include "glua.h" #include "intl.h" #include "metadata.h" -#include "ui-fileops.h" +#include "typedefs.h" #include "ui-misc.h" -#include - static const gchar *predefined_tags[][2] = { {"%name%", N_("Name")}, {"%path:60%", N_("Path")}, @@ -321,7 +326,7 @@ gchar *image_osd_mkinfo(const gchar *str, FileData *fd, GHashTable *vars) { data = metadata_read_string(fd, RATING_KEY, METADATA_PLAIN); } -#ifdef HAVE_LUA +#if HAVE_LUA else if (strncmp(name, "lua/", 4) == 0) { gchar *tmp; diff --git a/src/osd.h b/src/osd.h index 97ac4575..4552c326 100644 --- a/src/osd.h +++ b/src/osd.h @@ -21,6 +21,7 @@ #ifndef OSD_H #define OSD_H +#include #include struct FileData; diff --git a/src/pan-view/pan-calendar.cc b/src/pan-view/pan-calendar.cc index 1b209ece..be9f74eb 100644 --- a/src/pan-view/pan-calendar.cc +++ b/src/pan-view/pan-calendar.cc @@ -22,14 +22,19 @@ #include "pan-calendar.h" #include +#include +#include #include "debug.h" +#include "filedata.h" #include "misc.h" #include "pan-item.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view-filter.h" #include "pan-view.h" #include "pixbuf-util.h" +#include "typedefs.h" #define PAN_CAL_POPUP_COLOR 220, 220, 220 enum { diff --git a/src/pan-view/pan-calendar.h b/src/pan-view/pan-calendar.h index 91fd8f36..32793031 100644 --- a/src/pan-view/pan-calendar.h +++ b/src/pan-view/pan-calendar.h @@ -22,7 +22,11 @@ #ifndef PAN_VIEW_PAN_CALENDAR_H #define PAN_VIEW_PAN_CALENDAR_H -#include "pan-types.h" +#include + +struct FileData; +struct PanItem; +struct PanWindow; void pan_calendar_update(PanWindow *pw, PanItem *pi_day); void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height); diff --git a/src/pan-view/pan-folder.cc b/src/pan-view/pan-folder.cc index 7c4e7404..31b27fdb 100644 --- a/src/pan-view/pan-folder.cc +++ b/src/pan-view/pan-folder.cc @@ -23,9 +23,12 @@ #include +#include "filedata.h" #include "pan-item.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view-filter.h" +#include "typedefs.h" static void pan_flower_size(PanWindow *pw, gint *width, gint *height) { diff --git a/src/pan-view/pan-folder.h b/src/pan-view/pan-folder.h index 1d074c26..525ab668 100644 --- a/src/pan-view/pan-folder.h +++ b/src/pan-view/pan-folder.h @@ -22,7 +22,10 @@ #ifndef PAN_VIEW_PAN_FOLDER_H #define PAN_VIEW_PAN_FOLDER_H -#include "pan-types.h" +#include + +struct FileData; +struct PanWindow; void pan_flower_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height, diff --git a/src/pan-view/pan-grid.cc b/src/pan-view/pan-grid.cc index 2839a5de..4d6583d7 100644 --- a/src/pan-view/pan-grid.cc +++ b/src/pan-view/pan-grid.cc @@ -24,8 +24,10 @@ #include #include "pan-item.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view-filter.h" +#include "typedefs.h" void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height) { diff --git a/src/pan-view/pan-grid.h b/src/pan-view/pan-grid.h index 359c8526..b3671bd2 100644 --- a/src/pan-view/pan-grid.h +++ b/src/pan-view/pan-grid.h @@ -22,7 +22,10 @@ #ifndef PAN_VIEW_PAN_GRID_H #define PAN_VIEW_PAN_GRID_H -#include "pan-types.h" +#include + +struct FileData; +struct PanWindow; void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height); diff --git a/src/pan-view/pan-item.cc b/src/pan-view/pan-item.cc index a303b135..eda674d6 100644 --- a/src/pan-view/pan-item.cc +++ b/src/pan-view/pan-item.cc @@ -21,7 +21,16 @@ #include "pan-item.h" +#include + +#include +#include +#include + +#include "cache.h" +#include "filedata.h" #include "image.h" +#include "pan-types.h" #include "pixbuf-util.h" #include "ui-misc.h" diff --git a/src/pan-view/pan-item.h b/src/pan-view/pan-item.h index aa4f291f..6fb5b67d 100644 --- a/src/pan-view/pan-item.h +++ b/src/pan-view/pan-item.h @@ -22,8 +22,13 @@ #ifndef PAN_VIEW_PAN_ITEM_H #define PAN_VIEW_PAN_ITEM_H +#include +#include + #include "pan-types.h" -#include "pixbuf-renderer.h" + +struct FileData; +struct PixbufRenderer; void pan_item_free(PanItem *pi); diff --git a/src/pan-view/pan-timeline.cc b/src/pan-view/pan-timeline.cc index 8d9540e5..ee93ae96 100644 --- a/src/pan-view/pan-timeline.cc +++ b/src/pan-view/pan-timeline.cc @@ -21,10 +21,15 @@ #include "pan-timeline.h" +#include + +#include "filedata.h" #include "pan-item.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view-filter.h" #include "pan-view.h" +#include "typedefs.h" void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height) { diff --git a/src/pan-view/pan-timeline.h b/src/pan-view/pan-timeline.h index 596721ce..f8afd9de 100644 --- a/src/pan-view/pan-timeline.h +++ b/src/pan-view/pan-timeline.h @@ -22,7 +22,10 @@ #ifndef PAN_VIEW_PAN_TIMELINE_H #define PAN_VIEW_PAN_TIMELINE_H -#include "pan-types.h" +#include + +struct FileData; +struct PanWindow; void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height); diff --git a/src/pan-view/pan-util.cc b/src/pan-view/pan-util.cc index c24fa71a..ed604a1d 100644 --- a/src/pan-view/pan-util.cc +++ b/src/pan-view/pan-util.cc @@ -21,8 +21,13 @@ #include "pan-util.h" -#include +#include +#include +#include +#include + +#include "filedata.h" #include "main-defines.h" #include "ui-fileops.h" diff --git a/src/pan-view/pan-util.h b/src/pan-view/pan-util.h index 49ea863e..64bd514f 100644 --- a/src/pan-view/pan-util.h +++ b/src/pan-view/pan-util.h @@ -22,7 +22,13 @@ #ifndef PAN_VIEW_PAN_UTIL_H #define PAN_VIEW_PAN_UTIL_H -#include "pan-types.h" +#include + +#include + +#include "typedefs.h" + +struct FileData; enum PanDateLengthType { PAN_DATE_LENGTH_EXACT, diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc index 15b7353f..b21954b0 100644 --- a/src/pan-view/pan-view-filter.cc +++ b/src/pan-view/pan-view-filter.cc @@ -21,16 +21,19 @@ #include "pan-view-filter.h" -#include +#include + +#include #include "compat.h" +#include "filedata.h" #include "image.h" #include "intl.h" #include "main-defines.h" #include "metadata.h" #include "misc.h" +#include "pan-types.h" #include "pan-view.h" -#include "ui-fileops.h" #include "ui-misc.h" #include "ui-tabcomp.h" diff --git a/src/pan-view/pan-view-filter.h b/src/pan-view/pan-view-filter.h index 40dbcba7..40060183 100644 --- a/src/pan-view/pan-view-filter.h +++ b/src/pan-view/pan-view-filter.h @@ -22,7 +22,12 @@ #ifndef PAN_VIEW_PAN_VIEW_FILTER_H #define PAN_VIEW_PAN_VIEW_FILTER_H -#include "pan-types.h" +#include +#include + +#include "typedefs.h" + +struct PanWindow; enum PanViewFilterMode { PAN_VIEW_FILTER_REQUIRE, diff --git a/src/pan-view/pan-view-search.cc b/src/pan-view/pan-view-search.cc index 8546150e..f4f17bdd 100644 --- a/src/pan-view/pan-view-search.cc +++ b/src/pan-view/pan-view-search.cc @@ -21,15 +21,21 @@ #include "pan-view-search.h" -#include +#include +#include +#include + +#include #include "compat.h" +#include "filedata.h" #include "image.h" #include "intl.h" #include "main-defines.h" #include "misc.h" #include "pan-calendar.h" #include "pan-item.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view.h" #include "ui-misc.h" diff --git a/src/pan-view/pan-view-search.h b/src/pan-view/pan-view-search.h index 83c10aab..6adc890f 100644 --- a/src/pan-view/pan-view-search.h +++ b/src/pan-view/pan-view-search.h @@ -22,7 +22,11 @@ #ifndef PAN_VIEW_PAN_VIEW_SEARCH_H #define PAN_VIEW_PAN_VIEW_SEARCH_H -#include "pan-types.h" +#include +#include + +struct PanViewSearchUi; +struct PanWindow; void pan_search_toggle_visible(PanWindow *pw, gboolean enable); void pan_search_activate(PanWindow *pw); diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc index 8db42c27..55359472 100644 --- a/src/pan-view/pan-view.cc +++ b/src/pan-view/pan-view.cc @@ -21,29 +21,42 @@ #include "pan-view.h" -#include +#include +#include + +#include +#include +#include +#include #include "bar-exif.h" +#include "cache-loader.h" +#include "cache.h" #include "compat.h" #include "debug.h" #include "dnd.h" #include "editors.h" #include "exif.h" +#include "filedata.h" #include "fullscreen.h" +#include "image-load.h" #include "image.h" #include "img-view.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "main.h" #include "menu.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "pan-calendar.h" #include "pan-folder.h" #include "pan-grid.h" #include "pan-item.h" #include "pan-timeline.h" +#include "pan-types.h" #include "pan-util.h" #include "pan-view-filter.h" #include "pan-view-search.h" @@ -54,12 +67,11 @@ #include "ui-menu.h" #include "ui-misc.h" #include "ui-tabcomp.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" #include "window.h" -#include - enum { PAN_WINDOW_DEFAULT_WIDTH = 720, diff --git a/src/pan-view/pan-view.h b/src/pan-view/pan-view.h index 27bf693b..552ab41a 100644 --- a/src/pan-view/pan-view.h +++ b/src/pan-view/pan-view.h @@ -22,7 +22,12 @@ #ifndef PAN_VIEW_PAN_VIEW_H #define PAN_VIEW_PAN_VIEW_H -#include "pan-types.h" +#include + +#include "typedefs.h" + +struct PanItem; +struct PanWindow; void pan_layout_update(PanWindow *pw); GList *pan_layout_intersect(PanWindow *pw, gint x, gint y, gint width, gint height); diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc index d0a9440c..c3f87864 100644 --- a/src/pixbuf-renderer.cc +++ b/src/pixbuf-renderer.cc @@ -25,8 +25,6 @@ #include #include -#include - #include "debug.h" #include "main-defines.h" #include "options.h" diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h index af0d67f2..b2d3452e 100644 --- a/src/pixbuf-renderer.h +++ b/src/pixbuf-renderer.h @@ -22,10 +22,16 @@ #ifndef PIXBUF_RENDERER_H #define PIXBUF_RENDERER_H +#include +#include +#include +#include #include #include "typedefs.h" +struct PixbufRenderer; + #define TYPE_PIXBUF_RENDERER (pixbuf_renderer_get_type()) #define PIXBUF_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_PIXBUF_RENDERER, PixbufRenderer)) #define PIXBUF_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_PIXBUF_RENDERER, PixbufRendererClass)) @@ -65,12 +71,6 @@ #define ROUND_DOWN(A,B) ((gint)(((A))/(B))*(B)) -struct RendererFuncs; - -struct PixbufRenderer; -struct PixbufRendererClass; - - using PixbufRendererTileRequestFunc = gint (*)(PixbufRenderer *, gint, gint, gint, gint, GdkPixbuf *, gpointer); using PixbufRendererTileDisposeFunc = void (*)(PixbufRenderer *, gint, gint, gint, gint, GdkPixbuf *, gpointer); diff --git a/src/pixbuf-util.cc b/src/pixbuf-util.cc index bd55b290..1171568d 100644 --- a/src/pixbuf-util.cc +++ b/src/pixbuf-util.cc @@ -21,16 +21,24 @@ #include "pixbuf-util.h" +#include +#include +#include + +#include +#include +#include +#include + #include #include "debug.h" #include "exif.h" #include "filedata.h" #include "main-defines.h" +#include "typedefs.h" #include "ui-fileops.h" -#include - /* *----------------------------------------------------------------------------- diff --git a/src/pixbuf-util.h b/src/pixbuf-util.h index 4df9558f..325a840b 100644 --- a/src/pixbuf-util.h +++ b/src/pixbuf-util.h @@ -22,7 +22,10 @@ #ifndef PIXBUF_UTIL_H #define PIXBUF_UTIL_H +#include +#include #include +#include struct FileData; diff --git a/src/preferences.cc b/src/preferences.cc index 8b73b6c5..96d3c788 100644 --- a/src/preferences.cc +++ b/src/preferences.cc @@ -23,6 +23,28 @@ #include +#include +#include + +#include +#include +#include +#include + +#if HAVE_SPELL +#include +#endif + +#if HAVE_LCMS +#if HAVE_LCMS2 +#include +#else +#include +#endif +#endif + +#include + #include "bar-keywords.h" #include "cache.h" #include "color-man.h" @@ -37,34 +59,28 @@ #include "img-view.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "main.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "osd.h" #include "pixbuf-util.h" #include "rcfile.h" #include "slideshow.h" #include "toolbar.h" #include "trash.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-misc.h" #include "ui-tabcomp.h" +#include "ui-utildlg.h" #include "utilops.h" #include "window.h" #include "zonedetect.h" -#ifdef HAVE_LCMS -#ifdef HAVE_LCMS2 -#include -#else -#include -#endif -#endif - -#ifdef HAVE_SPELL -#include -#endif +struct ZoneDetect; enum { EDITOR_NAME_MAX_LENGTH = 32, @@ -274,7 +290,7 @@ static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *, GtkTreeIter * static void config_window_apply() { gboolean refresh = FALSE; -#ifdef HAVE_LCMS2 +#if HAVE_LCMS2 int i = 0; #endif @@ -491,7 +507,7 @@ static void config_window_apply() config_entry_to_option(log_window_f1_entry, &options->log_window.action, nullptr); #endif -#ifdef HAVE_LCMS +#if HAVE_LCMS for (i = 0; i < COLOR_PROFILE_INPUTS; i++) { config_entry_to_option(color_profile_input_name_entry[i], &options->color_profile.input_name[i], nullptr); @@ -2045,7 +2061,7 @@ static void config_tab_general(GtkWidget *notebook) options->thumbnails.collection_preview, &c_options->thumbnails.collection_preview); gtk_widget_set_tooltip_text(spin, _("The maximum number of thumbnails shown in a Collection preview montage")); -#ifdef HAVE_FFMPEGTHUMBNAILER_METADATA +#if HAVE_FFMPEGTHUMBNAILER_METADATA pref_checkbox_new_int(group, _("Use embedded metadata in video files as thumbnails when available"), options->thumbnails.use_ft_metadata, &c_options->thumbnails.use_ft_metadata); #endif @@ -2884,7 +2900,7 @@ static void config_tab_metadata(GtkWidget *notebook) group = pref_group_new(vbox, FALSE, _("Metadata writing sequence"), GTK_ORIENTATION_VERTICAL); -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 label = pref_label_new(group, _("Warning: Geeqie is built without Exiv2. Some options are disabled.")); #endif label = pref_label_new(group, _("When writing metadata, Geeqie will follow these steps, if selected. This process will stop when the first successful write occurs.")); @@ -2902,7 +2918,7 @@ static void config_tab_metadata(GtkWidget *notebook) gtk_widget_set_tooltip_markup(ct_button, markup); g_free(markup); -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 gtk_widget_set_sensitive(ct_button, FALSE); #endif @@ -2923,7 +2939,7 @@ static void config_tab_metadata(GtkWidget *notebook) pref_spacer(group, PREF_PAD_GROUP); group = pref_group_new(vbox, FALSE, _("Step 1 Options:"), GTK_ORIENTATION_VERTICAL); -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 gtk_widget_set_sensitive(group, FALSE); #endif @@ -2947,7 +2963,7 @@ static void config_tab_metadata(GtkWidget *notebook) pref_spacer(group, PREF_PAD_GROUP); group = pref_group_new(vbox, FALSE, _("Steps 2 and 3 Option:"), GTK_ORIENTATION_VERTICAL); -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 gtk_widget_set_sensitive(group, FALSE); #endif @@ -2965,7 +2981,7 @@ static void config_tab_metadata(GtkWidget *notebook) ct_button = pref_checkbox_new_int(group, _("Write altered image orientation to the metadata"), options->metadata.write_orientation, &c_options->metadata.write_orientation); gtk_widget_set_tooltip_text(ct_button, _("If checked, the results of orientation commands (Rotate, Mirror and Flip) issued on an image will be written to metadata\nNote: If this option is not checked, the results of orientation commands will be lost when Geeqie closes")); -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 gtk_widget_set_sensitive(ct_button, FALSE); #endif @@ -2986,7 +3002,7 @@ static void config_tab_metadata(GtkWidget *notebook) pref_spacer(group, PREF_PAD_GROUP); -#ifdef HAVE_SPELL +#if HAVE_SPELL group = pref_group_new(vbox, FALSE, _("Spelling checks"), GTK_ORIENTATION_VERTICAL); ct_button = pref_checkbox_new_int(group, _("Check spelling - Requires restart"), options->metadata.check_spelling, &c_options->metadata.check_spelling); @@ -3297,7 +3313,7 @@ static void config_tab_keywords(GtkWidget *notebook) GtkTextIter iter; GtkTextBuffer *buffer; gchar *tmp; -#ifdef HAVE_SPELL +#if HAVE_SPELL GspellTextView *gspell_view; #endif @@ -3318,7 +3334,7 @@ static void config_tab_keywords(GtkWidget *notebook) gq_gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 0); gtk_widget_show(scrolled); -#ifdef HAVE_SPELL +#if HAVE_SPELL if (options->metadata.check_spelling) { gspell_view = gspell_text_view_get_from_gtk_text_view(GTK_TEXT_VIEW(keyword_text)); @@ -3359,7 +3375,7 @@ static void config_tab_keywords(GtkWidget *notebook) } /* metadata tab */ -#ifdef HAVE_LCMS +#if HAVE_LCMS static void intent_menu_cb(GtkWidget *combo, gpointer data) { auto option = static_cast(data); @@ -3427,7 +3443,7 @@ static void config_tab_color(GtkWidget *notebook) vbox = scrolled_notebook_page(notebook, _("Color management")); group = pref_group_new(vbox, FALSE, _("Input profiles"), GTK_ORIENTATION_VERTICAL); -#ifndef HAVE_LCMS +#if !HAVE_LCMS gtk_widget_set_sensitive(pref_group_parent(group), FALSE); #endif @@ -3471,7 +3487,7 @@ static void config_tab_color(GtkWidget *notebook) } group = pref_group_new(vbox, FALSE, _("Screen profile"), GTK_ORIENTATION_VERTICAL); -#ifndef HAVE_LCMS +#if !HAVE_LCMS gtk_widget_set_sensitive(pref_group_parent(group), FALSE); #endif pref_checkbox_new_int(group, _("Use system screen profile if available"), @@ -3484,7 +3500,7 @@ static void config_tab_color(GtkWidget *notebook) options->color_profile.screen_file, nullptr, ".icc", "ICC Files", nullptr); tab_completion_add_select_button(color_profile_screen_file_entry, _("Select color profile"), FALSE); gtk_widget_set_size_request(color_profile_screen_file_entry, 160, -1); -#ifdef HAVE_LCMS +#if HAVE_LCMS add_intent_menu(table, 0, 1, _("Render Intent:"), options->color_profile.render_intent, &c_options->color_profile.render_intent); #endif gq_gtk_grid_attach(GTK_GRID(table), tabcomp, 1, 2, 0, 1, static_cast(GTK_FILL | GTK_EXPAND), static_cast(0), 0, 0); diff --git a/src/preferences.h b/src/preferences.h index 17fbadd4..345854b3 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -22,6 +22,7 @@ #ifndef PREFERENCES_H #define PREFERENCES_H +#include #include struct LayoutWindow; diff --git a/src/print.cc b/src/print.cc index 75d284d7..2a3b8ebd 100644 --- a/src/print.cc +++ b/src/print.cc @@ -20,7 +20,14 @@ #include "print.h" -#include +#include + +#include +#include +#include +#include +#include +#include #include "compat.h" #include "debug.h" diff --git a/src/print.h b/src/print.h index d61028fd..63a6ecd3 100644 --- a/src/print.h +++ b/src/print.h @@ -22,6 +22,7 @@ #ifndef PRINT_H #define PRINT_H +#include #include struct FileData; diff --git a/src/rcfile.cc b/src/rcfile.cc index b507877e..934094d0 100644 --- a/src/rcfile.cc +++ b/src/rcfile.cc @@ -21,6 +21,12 @@ #include "rcfile.h" +#include +#include + +#include +#include + #include #include "bar-comment.h" @@ -37,11 +43,14 @@ #include "filefilter.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "metadata.h" +#include "options.h" #include "pixbuf-renderer.h" #include "secure-save.h" #include "slideshow.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-utildlg.h" @@ -576,7 +585,7 @@ static void write_global_attributes(GString *outstr, gint indent) static void write_color_profile(GString *outstr, gint indent) { gint i; -#ifndef HAVE_LCMS +#if !HAVE_LCMS g_string_append_printf(outstr, "\n", GQ_APPNAME); #endif @@ -1403,7 +1412,7 @@ static void options_parse_global(GQParserData *parser_data, GMarkupParseContext static void options_parse_global_end(GQParserData *, GMarkupParseContext *, const gchar *, gpointer, GError **) { -#ifndef HAVE_EXIV2 +#if !HAVE_EXIV2 /* some options do not work without exiv2 */ options->metadata.save_in_image_file = FALSE; options->metadata.save_legacy_format = TRUE; @@ -1460,8 +1469,8 @@ static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *, } options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr); } -#ifdef HAVE_LIBCHAMPLAIN -#ifdef HAVE_LIBCHAMPLAIN_GTK +#if HAVE_LIBCHAMPLAIN +#if HAVE_LIBCHAMPLAIN_GTK else if (g_ascii_strcasecmp(element_name, "pane_gps") == 0) { /* Use this flag to determine if --disable-clutter has been issued */ diff --git a/src/rcfile.h b/src/rcfile.h index 16a7d642..d3d93a5f 100644 --- a/src/rcfile.h +++ b/src/rcfile.h @@ -22,8 +22,11 @@ #ifndef RCFILE_H #define RCFILE_H -#include "options.h" +#include +#include +struct ConfOptions; +struct GQParserData; struct LayoutWindow; void write_indent(GString *str, gint indent); @@ -77,8 +80,6 @@ gboolean read_bool_option(const gchar *option, const gchar *label, const gchar * #define READ_DUMMY(_target_, _name_, _msg_) read_dummy_option(option, #_name_, _msg_) -struct GQParserFuncData; -struct GQParserData; using GQParserStartFunc = void (*)(GQParserData *, GMarkupParseContext *, const gchar *, const gchar **, const gchar **, gpointer, GError **); using GQParserEndFunc = void (*)(GQParserData *, GMarkupParseContext *, const gchar *, gpointer, GError **); diff --git a/src/remote.cc b/src/remote.cc index 4ece932f..c7ce7522 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -21,8 +21,21 @@ #include "remote.h" +#include +#include +#include +#include + +#include +#include +#include +#include +#include + #include +#include + #include "cache-maint.h" #include "collect-io.h" #include "collect.h" @@ -31,28 +44,26 @@ #include "exif.h" #include "filedata.h" #include "filefilter.h" +#include "glua.h" #include "image.h" #include "img-view.h" #include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "main.h" #include "misc.h" +#include "options.h" #include "pixbuf-renderer.h" #include "rcfile.h" #include "slideshow.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-misc.h" #include "utilops.h" #include "view-file.h" -#include -#include -#include - -#include "glua.h" - enum { SERVER_MAX_CLIENTS = 8 }; @@ -1653,7 +1664,7 @@ static void gr_print0(const gchar *, GIOChannel *channel, gpointer) g_io_channel_write_chars(channel, "", -1, nullptr, nullptr); } -#ifdef HAVE_LUA +#if HAVE_LUA static void gr_lua(const gchar *text, GIOChannel *channel, gpointer) { gchar *result = nullptr; @@ -1734,7 +1745,7 @@ static RemoteCommandEntry remote_commands[] = { { nullptr, "--last", gr_image_last, FALSE, FALSE, nullptr, N_("last image") }, { nullptr, "--list-add:", gr_list_add, TRUE, FALSE, N_(""), N_("add FILE to command line collection list") }, { nullptr, "--list-clear", gr_list_clear, FALSE, FALSE, nullptr, N_("clear command line collection list") }, -#ifdef HAVE_LUA +#if HAVE_LUA { nullptr, "--lua:", gr_lua, TRUE, FALSE, N_(","), N_("run lua script on FILE") }, #endif { nullptr, "--new-window", gr_new_window, FALSE, FALSE, nullptr, N_("new window") }, diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc index 404d1ce7..aa364c01 100644 --- a/src/renderer-tiles.cc +++ b/src/renderer-tiles.cc @@ -25,10 +25,17 @@ #include #include -#include +#include +#include +#include +#include +#include +#include #include "debug.h" #include "options.h" +#include "pixbuf-renderer.h" +#include "typedefs.h" /* comment this out if not using this from within Geeqie * defining GQ_BUILD does these things: diff --git a/src/renderer-tiles.h b/src/renderer-tiles.h index f35cac6d..de195b83 100644 --- a/src/renderer-tiles.h +++ b/src/renderer-tiles.h @@ -22,8 +22,8 @@ #ifndef RENDERER_TILES_H #define RENDERER_TILES_H -#include - +struct PixbufRenderer; +struct RendererFuncs; RendererFuncs *renderer_tiles_new(PixbufRenderer *pr); diff --git a/src/search-and-run.cc b/src/search-and-run.cc index bb6a1c4d..c23da619 100644 --- a/src/search-and-run.cc +++ b/src/search-and-run.cc @@ -20,14 +20,17 @@ #include "search-and-run.h" -#include +#include + +#include +#include +#include +#include #include "compat.h" #include "debug.h" #include "layout.h" #include "main-defines.h" -#include "ui-misc.h" -#include "window.h" enum { SAR_LABEL, diff --git a/src/search.cc b/src/search.cc index ea0d194c..dd49fc93 100644 --- a/src/search.cc +++ b/src/search.cc @@ -21,11 +21,23 @@ #include "search.h" -#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include "bar-keywords.h" #include "cache.h" #include "collect-table.h" +#include "collect.h" #include "compat.h" #include "debug.h" #include "dnd.h" @@ -36,25 +48,27 @@ #include "img-view.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" -#include "pixbuf-util.h" +#include "options.h" #include "print.h" +#include "similar.h" #include "thumb.h" +#include "typedefs.h" #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" #include "ui-tabcomp.h" #include "ui-tree-edit.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" #include "window.h" -#include - enum { DEF_SEARCH_WIDTH = 700, DEF_SEARCH_HEIGHT = 650 diff --git a/src/secure-save.cc b/src/secure-save.cc index 348c6801..55a27b73 100644 --- a/src/secure-save.cc +++ b/src/secure-save.cc @@ -20,12 +20,16 @@ #include "secure-save.h" +#include +#include #include -#include #include +#include #include +#include + #include #include "debug.h" @@ -126,7 +130,7 @@ secure_open_umask(const gchar *file_name) /* Not a regular file, secure_save is disabled. */ ssi->secure_save = FALSE; } else { -#ifdef HAVE_ACCESS +#if HAVE_ACCESS /* XXX: access() do not work with setuid programs. */ if (access(ssi->file_name, R_OK | W_OK) < 0) { ssi->err = errno; @@ -250,11 +254,11 @@ secure_close(SecureSaveInfo *ssi) if (ssi->secure_save) { gboolean fail = FALSE; -#ifdef HAVE_FFLUSH +#if HAVE_FFLUSH fail = (fflush(ssi->fp) == EOF); #endif -#ifdef HAVE_FSYNC +#if HAVE_FSYNC if (!fail) fail = fsync(fileno(ssi->fp)); #endif diff --git a/src/shortcuts.cc b/src/shortcuts.cc index 35c635bd..e713a563 100644 --- a/src/shortcuts.cc +++ b/src/shortcuts.cc @@ -21,7 +21,8 @@ #include "shortcuts.h" -#include +#include +#include #include "collect.h" #include "compat.h" @@ -31,6 +32,7 @@ #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-misc.h" +#include "ui-utildlg.h" #include "utilops.h" struct ShortcutsData diff --git a/src/similar.cc b/src/similar.cc index 67c54681..6b9a641a 100644 --- a/src/similar.cc +++ b/src/similar.cc @@ -21,7 +21,7 @@ #include "similar.h" -#include +#include #include "options.h" diff --git a/src/similar.h b/src/similar.h index 528c8f8b..2fee1f20 100644 --- a/src/similar.h +++ b/src/similar.h @@ -23,6 +23,7 @@ #define SIMILAR_H #include +#include struct ImageSimilarityData { diff --git a/src/slideshow.cc b/src/slideshow.cc index ba29f278..65e48f19 100644 --- a/src/slideshow.cc +++ b/src/slideshow.cc @@ -21,13 +21,14 @@ #include "slideshow.h" -#include +#include #include "collect.h" #include "filedata.h" #include "image.h" #include "layout-image.h" #include "layout.h" +#include "options.h" static void slideshow_timer_stop(SlideShowData *ss); diff --git a/src/thumb-standard.cc b/src/thumb-standard.cc index 1ac949bb..cc9b97bd 100644 --- a/src/thumb-standard.cc +++ b/src/thumb-standard.cc @@ -21,6 +21,14 @@ #include "thumb-standard.h" +#include + +#include +#include +#include + +#include + #include #include "cache.h" @@ -33,8 +41,10 @@ #include "metadata.h" #include "options.h" #include "pixbuf-util.h" +#include "typedefs.h" #include "ui-fileops.h" +struct ExifData; /** * @file diff --git a/src/thumb-standard.h b/src/thumb-standard.h index 6752f5f3..ccf2d482 100644 --- a/src/thumb-standard.h +++ b/src/thumb-standard.h @@ -22,7 +22,12 @@ #ifndef THUMB_STANDARD_H #define THUMB_STANDARD_H +#include + #include +#include + +#include #include "main-defines.h" diff --git a/src/thumb.cc b/src/thumb.cc index 674e241d..b7605ea1 100644 --- a/src/thumb.cc +++ b/src/thumb.cc @@ -21,7 +21,13 @@ #include "thumb.h" -#include +#include +#include + +#include +#include + +#include #include "cache.h" #include "debug.h" @@ -35,8 +41,6 @@ #include "thumb-standard.h" #include "ui-fileops.h" -#include - static void thumb_loader_error_cb(ImageLoader *il, gpointer data); static void thumb_loader_setup(ThumbLoader *tl, FileData *fd); diff --git a/src/thumb.h b/src/thumb.h index 29f1c610..ad8fb802 100644 --- a/src/thumb.h +++ b/src/thumb.h @@ -23,6 +23,7 @@ #define THUMB_H #include +#include #include "typedefs.h" diff --git a/src/toolbar.cc b/src/toolbar.cc index df4a4e5f..417cf84c 100644 --- a/src/toolbar.cc +++ b/src/toolbar.cc @@ -21,14 +21,20 @@ #include "toolbar.h" +#include + +#include +#include +#include + #include #include "compat.h" #include "editors.h" #include "intl.h" #include "layout-util.h" +#include "layout.h" #include "main-defines.h" -#include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" @@ -219,7 +225,7 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label, toolbar_entry->name = g_strdup(name); toolbar_entry->stock_id = g_strdup(stock_id); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 gesture = gtk_gesture_click_new(); gtk_widget_add_controller(toolbar_entry->button, GTK_EVENT_CONTROLLER(gesture)); #else diff --git a/src/trash.cc b/src/trash.cc index 8e2d60d2..7daa6562 100644 --- a/src/trash.cc +++ b/src/trash.cc @@ -21,10 +21,11 @@ #include "trash.h" -#include +#include -#include "utilops.h" -#include "window.h" +#include + +#include #include "debug.h" #include "editors.h" @@ -32,7 +33,11 @@ #include "intl.h" #include "main-defines.h" #include "options.h" +#include "typedefs.h" #include "ui-fileops.h" +#include "ui-utildlg.h" +#include "utilops.h" +#include "window.h" /* *-------------------------------------------------------------------------- diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc index e0a620b1..ed4fb82e 100644 --- a/src/ui-bookmark.cc +++ b/src/ui-bookmark.cc @@ -21,10 +21,14 @@ #include "ui-bookmark.h" +#include #include #include -#include +#include +#include +#include +#include #include "compat.h" #include "debug.h" diff --git a/src/ui-bookmark.h b/src/ui-bookmark.h index 8e2f1f04..5d971e78 100644 --- a/src/ui-bookmark.h +++ b/src/ui-bookmark.h @@ -22,6 +22,7 @@ #ifndef UI_BOOKMARK_H #define UI_BOOKMARK_H +#include #include /* bookmarks */ diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc index 4ddfcad3..b5aa87f1 100644 --- a/src/ui-fileops.cc +++ b/src/ui-fileops.cc @@ -21,13 +21,17 @@ #include "ui-fileops.h" +#include +#include +#include + #include #include #include #include -#include -#include +#include +#include #include @@ -38,7 +42,10 @@ #include "layout.h" #include "main-defines.h" #include "md5-util.h" +#include "options.h" #include "secure-save.h" +#include "typedefs.h" +#include "ui-utildlg.h" #include "utilops.h" /* diff --git a/src/ui-fileops.h b/src/ui-fileops.h index 40269206..a1300306 100644 --- a/src/ui-fileops.h +++ b/src/ui-fileops.h @@ -22,15 +22,19 @@ #ifndef UI_FILEOPS_H #define UI_FILEOPS_H -#include -#include #include -#include + +#include #include +#include #include +#ifdef DEBUG +#define GQ_DEBUG_PATH_UTF8 1 +#endif + void print_term(gboolean err, const gchar *text_utf8); #define printf_term(err, ...) \ diff --git a/src/ui-help.cc b/src/ui-help.cc index 3bd3d08e..89cdef05 100644 --- a/src/ui-help.cc +++ b/src/ui-help.cc @@ -24,7 +24,8 @@ #include #include -#include +#include +#include #include "compat.h" #include "debug.h" diff --git a/src/ui-help.h b/src/ui-help.h index f04d2a2d..a85c94a2 100644 --- a/src/ui-help.h +++ b/src/ui-help.h @@ -22,6 +22,7 @@ #ifndef UI_HELP_H #define UI_HELP_H +#include #include GtkWidget *help_window_new(const gchar *title, diff --git a/src/ui-menu.cc b/src/ui-menu.cc index 66dd93bd..7ec7e997 100644 --- a/src/ui-menu.cc +++ b/src/ui-menu.cc @@ -21,7 +21,9 @@ #include "ui-menu.h" -#include +#include + +#include #include "layout.h" diff --git a/src/ui-menu.h b/src/ui-menu.h index 879aae3b..b8ee5727 100644 --- a/src/ui-menu.h +++ b/src/ui-menu.h @@ -22,7 +22,9 @@ #ifndef UI_MENU_H #define UI_MENU_H - +#include +#include +#include #include /** diff --git a/src/ui-misc.cc b/src/ui-misc.cc index 8d56e75a..6d673437 100644 --- a/src/ui-misc.cc +++ b/src/ui-misc.cc @@ -21,9 +21,13 @@ #include "ui-misc.h" +#include + #include #include +#include + #include #include "compat.h" @@ -32,10 +36,10 @@ #include "layout.h" #include "main-defines.h" #include "misc.h" +#include "options.h" +#include "typedefs.h" #include "utilops.h" -#include - /* *----------------------------------------------------------------------------- * widget and layout utilities @@ -360,7 +364,7 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si GCallback func, gpointer data) { GtkWidget *button; -#ifdef HAVE_GTK4 +#if HAVE_GTK4 GtkToggleButton *group;; #else GSList *group; @@ -368,7 +372,7 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si if (sibling) { -#ifdef HAVE_GTK4 +#if HAVE_GTK4 group = sibling; #else group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(sibling)); @@ -381,7 +385,7 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si if (mnemonic_text) { -#ifdef HAVE_GTK4 +#if HAVE_GTK4 button = gtk_toggle_button_new_with_mnemonic(text); gtk_toggle_button_set_group(button, group); #else @@ -390,7 +394,7 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si } else { -#ifdef HAVE_GTK4 +#if HAVE_GTK4 button = gtk_toggle_button_new_with_label(text); gtk_toggle_button_set_group(button, group); #else @@ -936,7 +940,7 @@ static void date_selection_popup(DateSelection *ds) gtk_widget_show(ds->calendar); date = date_selection_get(ds->box); -#ifdef HAVE_GTK4 +#if HAVE_GTK4 gtk_calendar_select_day(GTK_CALENDAR(ds->calendar), date); #else gtk_calendar_select_month(GTK_CALENDAR(ds->calendar), g_date_time_get_month(date), g_date_time_get_year(date)); diff --git a/src/ui-misc.h b/src/ui-misc.h index b385cc96..881585cf 100644 --- a/src/ui-misc.h +++ b/src/ui-misc.h @@ -22,11 +22,12 @@ #ifndef UI_MISC_H #define UI_MISC_H +#include -#include -#include -#include - +#include +#include +#include +#include #include /* these values are per GNOME HIG */ diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc index a0c4ffbc..85849591 100644 --- a/src/ui-pathsel.cc +++ b/src/ui-pathsel.cc @@ -25,9 +25,9 @@ #include #include -#include -#include +#include +#include #include "compat.h" #include "debug.h" @@ -35,12 +35,14 @@ #include "main-defines.h" #include "misc.h" #include "options.h" +#include "typedefs.h" #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" #include "ui-tabcomp.h" #include "ui-tree-edit.h" +#include "ui-utildlg.h" #include "uri-utils.h" #include "utilops.h" diff --git a/src/ui-pathsel.h b/src/ui-pathsel.h index 1dff0c7b..9ca9c1be 100644 --- a/src/ui-pathsel.h +++ b/src/ui-pathsel.h @@ -22,7 +22,7 @@ #ifndef UI_PATHSEL_H #define UI_PATHSEL_H - +#include #include GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path, diff --git a/src/ui-tabcomp.cc b/src/ui-tabcomp.cc index 07797e2c..1716e2a5 100644 --- a/src/ui-tabcomp.cc +++ b/src/ui-tabcomp.cc @@ -21,11 +21,12 @@ #include "ui-tabcomp.h" -#include #include -#include -#include +#include + +#include +#include #include "compat.h" #include "debug.h" diff --git a/src/ui-tabcomp.h b/src/ui-tabcomp.h index 3d665aa7..86504e8d 100644 --- a/src/ui-tabcomp.h +++ b/src/ui-tabcomp.h @@ -22,6 +22,7 @@ #ifndef UI_TABCOMP_H #define UI_TABCOMP_H +#include #include GtkWidget *tab_completion_new_with_history(GtkWidget **entry, const gchar *text, diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc index 8da8cb3e..b2add4ae 100644 --- a/src/ui-tree-edit.cc +++ b/src/ui-tree-edit.cc @@ -23,7 +23,7 @@ #include -#include +#include #include "compat.h" #include "misc.h" diff --git a/src/ui-tree-edit.h b/src/ui-tree-edit.h index 9d080fdb..41ab50ce 100644 --- a/src/ui-tree-edit.h +++ b/src/ui-tree-edit.h @@ -22,6 +22,8 @@ #ifndef UI_TREE_EDIT_H #define UI_TREE_EDIT_H +#include +#include #include struct TreeEditData diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc index 212bac8b..80edddc4 100644 --- a/src/ui-utildlg.cc +++ b/src/ui-utildlg.cc @@ -21,7 +21,14 @@ #include "ui-utildlg.h" +#include +#include #include +#include + +#include +#include +#include #include @@ -31,6 +38,7 @@ #include "intl.h" #include "main-defines.h" #include "misc.h" +#include "options.h" #include "rcfile.h" #include "ui-fileops.h" #include "ui-misc.h" diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h index f9ea4d61..41dd40ff 100644 --- a/src/ui-utildlg.h +++ b/src/ui-utildlg.h @@ -22,12 +22,11 @@ #ifndef UI_UTILDLG_H #define UI_UTILDLG_H +#include #include struct FileData; -#define GENERIC_DIALOG(gd) ((GenericDialog *)gd) - struct GenericDialog { GtkWidget *dialog; /**< window */ @@ -45,6 +44,8 @@ struct GenericDialog }; +#define GENERIC_DIALOG(gd) ((GenericDialog *)gd) + struct FileDialog { GenericDialog gd; diff --git a/src/uri-utils.cc b/src/uri-utils.cc index 924970ad..ef2e26be 100644 --- a/src/uri-utils.cc +++ b/src/uri-utils.cc @@ -20,8 +20,6 @@ #include "uri-utils.h" -#include - #include "debug.h" #include "filedata.h" #include "intl.h" diff --git a/src/uri-utils.h b/src/uri-utils.h index b85a8d67..1cda9dc2 100644 --- a/src/uri-utils.h +++ b/src/uri-utils.h @@ -21,6 +21,7 @@ #ifndef URI_UTILS_H #define URI_UTILS_H +#include #include void warning_dialog_dnd_uri_error(GList *uri_error_list); diff --git a/src/utilops.cc b/src/utilops.cc index 1703dbab..66081f1b 100644 --- a/src/utilops.cc +++ b/src/utilops.cc @@ -21,6 +21,14 @@ #include "utilops.h" +#include + +#include + +#include +#include +#include + #include #include "cache.h" @@ -32,6 +40,7 @@ #include "filefilter.h" #include "image.h" #include "intl.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "options.h" @@ -40,6 +49,7 @@ #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-misc.h" +#include "ui-utildlg.h" namespace { @@ -51,9 +61,9 @@ struct PixmapErrors GdkPixbuf *apply; }; -GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *widget) +GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget *) { - static PixmapErrors pe = [widget]() -> PixmapErrors + static PixmapErrors pe = []() -> PixmapErrors { GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); @@ -3167,7 +3177,7 @@ void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget * * */ -#ifdef HAVE_GTK4 +#if HAVE_GTK4 static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer data) { /* @FIXME GTK4 stub */ diff --git a/src/utilops.h b/src/utilops.h index d9096ce8..0a0ec6e8 100644 --- a/src/utilops.h +++ b/src/utilops.h @@ -22,10 +22,14 @@ #ifndef UTILOPS_H #define UTILOPS_H +#include +#include + #include "typedefs.h" -#include "ui-utildlg.h" struct FileData; +struct FileDialog; +struct GenericDialog; void file_maint_renamed(FileData *fd); void file_maint_moved(FileData *fd, GList *ignore_list); diff --git a/src/view-dir-list.cc b/src/view-dir-list.cc index 170dbe07..5cf69f76 100644 --- a/src/view-dir-list.cc +++ b/src/view-dir-list.cc @@ -21,10 +21,18 @@ #include "view-dir-list.h" -#include +#include + +#include +#include + +#include +#include #include "filedata.h" #include "layout.h" +#include "options.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-tree-edit.h" #include "view-dir.h" diff --git a/src/view-dir-list.h b/src/view-dir-list.h index 03ae9efc..19ae58ec 100644 --- a/src/view-dir-list.h +++ b/src/view-dir-list.h @@ -22,6 +22,8 @@ #ifndef VIEW_DIR_LIST_H #define VIEW_DIR_LIST_H +#include +#include #include struct FileData; diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc index 9bb762b4..de7b1338 100644 --- a/src/view-dir-tree.cc +++ b/src/view-dir-tree.cc @@ -21,11 +21,19 @@ #include "view-dir-tree.h" -#include +#include + +#include +#include + +#include +#include #include "debug.h" #include "filedata.h" #include "layout.h" +#include "options.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-tree-edit.h" #include "view-dir.h" diff --git a/src/view-dir-tree.h b/src/view-dir-tree.h index 755f9bd1..f0bb1497 100644 --- a/src/view-dir-tree.h +++ b/src/view-dir-tree.h @@ -22,6 +22,10 @@ #ifndef VIEW_DIR_TREE_H #define VIEW_DIR_TREE_H +#include + +#include +#include #include struct FileData; diff --git a/src/view-dir.cc b/src/view-dir.cc index afdd1b61..8d281268 100644 --- a/src/view-dir.cc +++ b/src/view-dir.cc @@ -20,6 +20,13 @@ #include "view-dir.h" +#include +#include + +#include + +#include + #include #include "compat.h" @@ -33,6 +40,7 @@ #include "layout.h" #include "main-defines.h" #include "menu.h" +#include "options.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" @@ -1178,7 +1186,7 @@ static GdkRGBA *vd_color_shifted(GtkWidget *widget) static GdkRGBA color; static GtkWidget *done = nullptr; -#ifdef HAVE_GTK4 +#if HAVE_GTK4 /* @FIXME GTK4 no background color */ #else if (done != widget) diff --git a/src/view-dir.h b/src/view-dir.h index f6be5e53..f55dd3d2 100644 --- a/src/view-dir.h +++ b/src/view-dir.h @@ -21,6 +21,9 @@ #ifndef VIEW_DIR_H #define VIEW_DIR_H +#include +#include +#include #include #include "typedefs.h" diff --git a/src/view-file.h b/src/view-file.h index 48fe5b4b..40394340 100644 --- a/src/view-file.h +++ b/src/view-file.h @@ -21,6 +21,9 @@ #ifndef VIEW_FILE_H #define VIEW_FILE_H +#include + +#include #include #include "typedefs.h" diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc index b22a6463..b24b3834 100644 --- a/src/view-file/view-file-icon.cc +++ b/src/view-file/view-file-icon.cc @@ -21,13 +21,16 @@ #include "view-file-icon.h" -#include +#include + +#include #include "cellrenderericon.h" #include "collect.h" #include "compat.h" #include "debug.h" #include "dnd.h" +#include "filedata.h" #include "img-view.h" #include "intl.h" #include "layout-image.h" diff --git a/src/view-file/view-file-icon.h b/src/view-file/view-file-icon.h index 96840cd6..73d0615b 100644 --- a/src/view-file/view-file-icon.h +++ b/src/view-file/view-file-icon.h @@ -22,10 +22,13 @@ #ifndef VIEW_FILE_VIEW_FILE_ICON_H #define VIEW_FILE_VIEW_FILE_ICON_H +#include +#include #include -#include "filedata.h" +#include "typedefs.h" +struct FileData; struct ViewFile; gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data); diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc index b802a3b2..02b4ce4c 100644 --- a/src/view-file/view-file-list.cc +++ b/src/view-file/view-file-list.cc @@ -21,11 +21,16 @@ #include "view-file-list.h" -#include +#include +#include + +#include +#include #include "collect.h" #include "debug.h" #include "dnd.h" +#include "filedata.h" #include "img-view.h" #include "intl.h" #include "layout-image.h" @@ -33,6 +38,7 @@ #include "main-defines.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" #include "ui-misc.h" #include "ui-tree-edit.h" @@ -40,8 +46,6 @@ #include "utilops.h" #include "view-file.h" -#include - /* Index to tree store */ enum { FILE_COLUMN_POINTER = 0, diff --git a/src/view-file/view-file-list.h b/src/view-file/view-file-list.h index 990cce0e..7039cfdd 100644 --- a/src/view-file/view-file-list.h +++ b/src/view-file/view-file-list.h @@ -22,10 +22,13 @@ #ifndef VIEW_FILE_VIEW_FILE_LIST_H #define VIEW_FILE_VIEW_FILE_LIST_H +#include +#include #include -#include "filedata.h" +#include "typedefs.h" +struct FileData; struct ViewFile; gboolean vflist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data); diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc index 89b712cb..9639c4dc 100644 --- a/src/view-file/view-file.cc +++ b/src/view-file/view-file.cc @@ -20,11 +20,13 @@ #include "view-file.h" -#include +#include +#include #include "compat.h" #include "debug.h" #include "dupe.h" +#include "filedata.h" #include "history-list.h" #include "intl.h" #include "layout.h" @@ -32,11 +34,12 @@ #include "main.h" #include "menu.h" #include "misc.h" -#include "pixbuf-util.h" +#include "options.h" #include "thumb.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" +#include "ui-utildlg.h" #include "utilops.h" #include "view-file/view-file-icon.h" #include "view-file/view-file-list.h" diff --git a/src/window.cc b/src/window.cc index 62bc2eee..d248302d 100644 --- a/src/window.cc +++ b/src/window.cc @@ -20,6 +20,13 @@ #include "window.h" +#include +#include + +#include +#include +#include + #include #include "debug.h" @@ -39,7 +46,7 @@ GtkWidget *window_new(const gchar *role, const gchar *icon, const gchar *icon_fi gchar *title; GtkWidget *window; -#ifdef HAVE_GTK4 +#if HAVE_GTK4 window = gtk_window_new(); #else window = gtk_window_new(GTK_WINDOW_TOPLEVEL); diff --git a/src/window.h b/src/window.h index d8ca5e9f..5657c3dd 100644 --- a/src/window.h +++ b/src/window.h @@ -21,6 +21,7 @@ #ifndef WINDOW_H #define WINDOW_H +#include #include GtkWidget *window_new(const gchar *role, const gchar *icon,