From ca2b7be34cbe17ded5ba444a6808dbe834a77d6c Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Thu, 8 Feb 2024 21:56:40 +0300 Subject: [PATCH] Cleanup main.h header * Include compat.h, config.h, debug.h, intl.h, options.h, typedefs.h where they are actually used. * Remove standard library includes. * Remove unused gdk-pixbuf includes. * Make other headers self-contained. * Move defines not related to main.cc from main.h to main-defines.h. --- src/advanced-exif.cc | 8 +- src/advanced-exif.h | 2 + src/bar-comment.cc | 7 +- src/bar-comment.h | 2 + src/bar-exif.cc | 7 +- src/bar-exif.h | 2 + src/bar-gps.cc | 7 +- src/bar-gps.h | 2 + src/bar-histogram.cc | 10 +- src/bar-histogram.h | 2 + src/bar-keywords.cc | 7 +- src/bar-keywords.h | 2 + src/bar-rating.cc | 6 +- src/bar-rating.h | 2 + src/bar-sort.cc | 7 +- src/bar-sort.h | 2 + src/bar.cc | 7 +- src/bar.h | 2 + src/cache-loader.cc | 4 +- src/cache-maint.cc | 8 +- src/cache-maint.h | 4 + src/cache.cc | 7 +- src/cellrenderericon.cc | 3 +- src/cellrenderericon.h | 2 + src/collect-dlg.cc | 10 +- src/collect-dlg.h | 1 + src/collect-io.cc | 6 +- src/collect-io.h | 2 + src/collect-table.cc | 7 +- src/collect.cc | 7 +- src/collect.h | 4 + src/color-man.cc | 15 +- src/color-man.h | 2 + src/compat.cc | 3 +- src/compat.h | 3 + src/debug.cc | 7 +- src/debug.h | 2 + src/desktop-file.cc | 8 +- src/dnd.cc | 6 +- src/dnd.h | 2 + src/dupe.cc | 13 +- src/dupe.h | 2 + src/editors.cc | 9 +- src/editors.h | 2 + src/exif-common.cc | 5 +- src/exif-int.h | 2 + src/exif.cc | 5 +- src/exif.h | 2 + src/exiv2.cc | 3 +- src/filecache.cc | 5 +- src/filecache.h | 1 - src/filedata.cc | 9 +- src/filedata.h | 6 + src/filefilter.cc | 5 +- src/filefilter.h | 1 + src/format-canon.cc | 8 +- src/format-fuji.cc | 8 +- src/format-nikon.cc | 7 +- src/format-olympus.cc | 8 +- src/format-raw.cc | 8 +- src/fullscreen.cc | 7 +- src/fullscreen.h | 2 + src/glua.h | 3 +- src/histogram.cc | 7 +- src/histogram.h | 4 + src/history-list.cc | 6 +- src/history-list.h | 2 + src/image-load-collection.cc | 6 +- src/image-load-collection.h | 2 + src/image-load-cr3.cc | 8 +- src/image-load-cr3.h | 4 + src/image-load-dds.cc | 5 +- src/image-load-dds.h | 2 + src/image-load-djvu.cc | 8 +- src/image-load-djvu.h | 4 + src/image-load-external.cc | 7 +- src/image-load-external.h | 2 + src/image-load-ffmpegthumbnailer.cc | 9 +- src/image-load-ffmpegthumbnailer.h | 4 + src/image-load-gdk.cc | 5 +- src/image-load-gdk.h | 2 + src/image-load-heif.cc | 12 +- src/image-load-heif.h | 4 + src/image-load-j2k.cc | 14 +- src/image-load-j2k.h | 4 + src/image-load-jpeg.cc | 18 ++- src/image-load-jpeg.h | 4 + src/image-load-jpegxl.cc | 12 +- src/image-load-jpegxl.h | 4 + src/image-load-libraw.cc | 8 +- src/image-load-libraw.h | 4 + src/image-load-pdf.cc | 9 +- src/image-load-pdf.h | 4 + src/image-load-psd.cc | 6 +- src/image-load-psd.h | 2 + src/image-load-svgz.cc | 6 +- src/image-load-svgz.h | 2 + src/image-load-tiff.cc | 10 +- src/image-load-tiff.h | 4 + src/image-load-webp.cc | 8 +- src/image-load-webp.h | 4 + src/image-load-zxscr.cc | 6 +- src/image-load-zxscr.h | 2 + src/image-load.cc | 5 +- src/image-load.h | 2 + src/image-overlay.cc | 6 +- src/image-overlay.h | 2 + src/image.cc | 10 +- src/image.h | 4 + src/img-view.cc | 8 +- src/img-view.h | 3 +- src/intl.h | 2 + src/jpeg-parser.cc | 5 +- src/jpeg-parser.h | 4 +- src/layout-config.cc | 5 +- src/layout-config.h | 2 + src/layout-image.cc | 6 +- src/layout-image.h | 4 + src/layout-util.cc | 9 +- src/layout.cc | 8 +- src/layout.h | 4 + src/logwindow.cc | 7 +- src/logwindow.h | 2 + src/lua.cc | 4 +- src/main-defines.h | 180 ++++++++++++++++++++++++ src/main.cc | 8 +- src/main.h | 208 ---------------------------- src/menu.cc | 5 +- src/menu.h | 3 + src/meson.build | 1 + src/metadata.cc | 8 +- src/metadata.h | 4 + src/misc.cc | 11 +- src/misc.h | 4 + src/options.cc | 6 +- src/options.h | 4 + src/osd.cc | 5 +- src/osd.h | 2 + src/pan-view.h | 2 +- src/pan-view/pan-calendar.cc | 2 + src/pan-view/pan-calendar.h | 2 - src/pan-view/pan-folder.h | 1 - src/pan-view/pan-grid.h | 1 - src/pan-view/pan-item.h | 1 - src/pan-view/pan-timeline.h | 1 - src/pan-view/pan-types.h | 2 + src/pan-view/pan-util.cc | 3 + src/pan-view/pan-util.h | 1 - src/pan-view/pan-view-filter.cc | 5 + src/pan-view/pan-view-filter.h | 1 - src/pan-view/pan-view-search.cc | 6 + src/pan-view/pan-view-search.h | 1 - src/pan-view/pan-view.cc | 9 ++ src/pan-view/pan-view.h | 1 - src/pixbuf-renderer.cc | 9 +- src/pixbuf-renderer.h | 4 + src/pixbuf-util.cc | 5 +- src/pixbuf-util.h | 2 + src/preferences.cc | 12 +- src/preferences.h | 2 + src/print.cc | 8 +- src/print.h | 2 + src/rcfile.cc | 6 +- src/rcfile.h | 2 + src/remote.cc | 8 +- src/remote.h | 2 + src/renderer-tiles.cc | 9 +- src/search-and-run.cc | 6 +- src/search-and-run.h | 2 + src/search.cc | 7 +- src/secure-save.cc | 9 +- src/secure-save.h | 4 + src/shortcuts.cc | 6 +- src/shortcuts.h | 2 + src/similar.cc | 6 +- src/similar.h | 1 + src/slideshow.cc | 6 +- src/slideshow.h | 3 + src/thumb-standard.cc | 13 +- src/thumb-standard.h | 4 + src/thumb.cc | 12 +- src/thumb.h | 4 + src/toolbar.cc | 6 +- src/toolbar.h | 4 + src/trash.cc | 8 +- src/trash.h | 2 +- src/typedefs.h | 2 + src/ui-bookmark.cc | 10 +- src/ui-bookmark.h | 2 +- src/ui-fileops.cc | 9 +- src/ui-fileops.h | 4 +- src/ui-help.cc | 9 +- src/ui-help.h | 1 + src/ui-menu.cc | 5 +- src/ui-menu.h | 2 + src/ui-misc.cc | 8 +- src/ui-misc.h | 1 + src/ui-pathsel.cc | 10 +- src/ui-pathsel.h | 2 + src/ui-tabcomp.cc | 10 +- src/ui-tabcomp.h | 1 + src/ui-tree-edit.cc | 6 +- src/ui-tree-edit.h | 1 + src/ui-utildlg.cc | 9 +- src/ui-utildlg.h | 2 + src/uri-utils.cc | 6 +- src/uri-utils.h | 2 + src/utilops.cc | 7 +- src/utilops.h | 2 +- src/view-dir-list.cc | 3 +- src/view-dir-list.h | 2 + src/view-dir-tree.cc | 4 +- src/view-dir-tree.h | 2 + src/view-dir.cc | 7 +- src/view-dir.h | 4 + src/view-file.h | 4 + src/view-file/view-file-icon.cc | 8 +- src/view-file/view-file-icon.h | 2 + src/view-file/view-file-list.cc | 6 +- src/view-file/view-file-list.h | 2 + src/view-file/view-file.cc | 8 +- src/window.cc | 8 +- src/window.h | 2 + src/zonedetect.h | 3 +- 224 files changed, 1048 insertions(+), 446 deletions(-) create mode 100644 src/main-defines.h diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc index 5db7e3af..099c5c5f 100644 --- a/src/advanced-exif.cc +++ b/src/advanced-exif.cc @@ -19,17 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "advanced-exif.h" +#include + +#include "compat.h" +#include "debug.h" +#include "dnd.h" #include "exif.h" #include "filedata.h" #include "history-list.h" +#include "intl.h" #include "layout-util.h" #include "misc.h" #include "ui-misc.h" #include "window.h" -#include "dnd.h" enum { ADVANCED_EXIF_DATA_COLUMN_WIDTH = 200 diff --git a/src/advanced-exif.h b/src/advanced-exif.h index f094ec7c..c3fb64af 100644 --- a/src/advanced-exif.h +++ b/src/advanced-exif.h @@ -22,6 +22,8 @@ #ifndef ADVANCED_EXIF_H #define ADVANCED_EXIF_H +#include + struct FileData; struct LayoutWindow; diff --git a/src/bar-comment.cc b/src/bar-comment.cc index c1d63676..730adba3 100644 --- a/src/bar-comment.cc +++ b/src/bar-comment.cc @@ -19,10 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-comment.h" +#include + #include "bar.h" +#include "compat.h" +#include "debug.h" +#include "intl.h" +#include "main-defines.h" #include "metadata.h" #include "filedata.h" #include "ui-menu.h" diff --git a/src/bar-comment.h b/src/bar-comment.h index 72be568d..9ce1932b 100644 --- a/src/bar-comment.h +++ b/src/bar-comment.h @@ -22,6 +22,8 @@ #ifndef BAR_COMMENT_H #define BAR_COMMENT_H +#include + GtkWidget *bar_pane_comment_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_comment_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-exif.cc b/src/bar-exif.cc index 1c46bd22..dca90da3 100644 --- a/src/bar-exif.cc +++ b/src/bar-exif.cc @@ -19,14 +19,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-exif.h" +#include + #include "bar.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "exif.h" #include "filedata.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "rcfile.h" diff --git a/src/bar-exif.h b/src/bar-exif.h index 30a7ab13..3bacd8ed 100644 --- a/src/bar-exif.h +++ b/src/bar-exif.h @@ -22,6 +22,8 @@ #ifndef BAR_EXIF_H #define BAR_EXIF_H +#include + GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-gps.cc b/src/bar-gps.cc index a09d79e2..1daf4c31 100644 --- a/src/bar-gps.cc +++ b/src/bar-gps.cc @@ -19,16 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include + #ifdef HAVE_LIBCHAMPLAIN #ifdef HAVE_LIBCHAMPLAIN_GTK #include "bar-gps.h" #include "bar.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" #include "layout.h" #include "metadata.h" +#include "main-defines.h" #include "menu.h" #include "misc.h" #include "rcfile.h" diff --git a/src/bar-gps.h b/src/bar-gps.h index 6938d6fa..65ab94e3 100644 --- a/src/bar-gps.h +++ b/src/bar-gps.h @@ -22,6 +22,8 @@ #ifndef BAR_GPS_H #define BAR_GPS_H +#include + GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *map_id, gint zoom, gdouble latitude, gdouble longitude, gboolean expanded, gint height); GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-histogram.cc b/src/bar-histogram.cc index b90df139..4193443d 100644 --- a/src/bar-histogram.cc +++ b/src/bar-histogram.cc @@ -19,15 +19,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-histogram.h" +#include + #include "bar.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" -#include "ui-menu.h" -#include "ui-misc.h" #include "histogram.h" +#include "intl.h" #include "rcfile.h" +#include "ui-menu.h" +#include "ui-misc.h" /* *------------------------------------------------------------------- diff --git a/src/bar-histogram.h b/src/bar-histogram.h index eea59968..dd500a44 100644 --- a/src/bar-histogram.h +++ b/src/bar-histogram.h @@ -22,6 +22,8 @@ #ifndef BAR_HISTOGRAM_H #define BAR_HISTOGRAM_H +#include + GtkWidget *bar_pane_histogram_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_histogram_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc index b48d0f48..47191103 100644 --- a/src/bar-keywords.cc +++ b/src/bar-keywords.cc @@ -19,13 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-keywords.h" +#include + #include "bar.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "filedata.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "rcfile.h" diff --git a/src/bar-keywords.h b/src/bar-keywords.h index fb582d4e..a445b71a 100644 --- a/src/bar-keywords.h +++ b/src/bar-keywords.h @@ -22,6 +22,8 @@ #ifndef BAR_KEYWORDS_H #define BAR_KEYWORDS_H +#include + struct LayoutWindow; GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-rating.cc b/src/bar-rating.cc index 54f9252d..558f121e 100644 --- a/src/bar-rating.cc +++ b/src/bar-rating.cc @@ -19,11 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-rating.h" +#include + #include "bar.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" #include "metadata.h" #include "rcfile.h" #include "ui-misc.h" diff --git a/src/bar-rating.h b/src/bar-rating.h index 63a7f014..2eda1cdf 100644 --- a/src/bar-rating.h +++ b/src/bar-rating.h @@ -22,6 +22,8 @@ #ifndef BAR_RATING_H #define BAR_RATING_H +#include + GtkWidget *bar_pane_rating_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_rating_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff --git a/src/bar-sort.cc b/src/bar-sort.cc index 44899519..462c2933 100644 --- a/src/bar-sort.cc +++ b/src/bar-sort.cc @@ -19,16 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar-sort.h" +#include + #include "collect.h" #include "collect-io.h" +#include "compat.h" +#include "debug.h" #include "editors.h" #include "filedata.h" #include "history-list.h" +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "main-defines.h" #include "misc.h" #include "rcfile.h" #include "ui-bookmark.h" diff --git a/src/bar-sort.h b/src/bar-sort.h index d96146bd..0b75e6ed 100644 --- a/src/bar-sort.h +++ b/src/bar-sort.h @@ -22,6 +22,8 @@ #ifndef BAR_SORT_H #define BAR_SORT_H +#include + struct LayoutWindow; GtkWidget *bar_sort_new_default(LayoutWindow *lw); diff --git a/src/bar.cc b/src/bar.cc index 88a2f201..d21c8e92 100644 --- a/src/bar.cc +++ b/src/bar.cc @@ -19,12 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "bar.h" +#include + #include "bar-histogram.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "metadata.h" #include "rcfile.h" #include "ui-menu.h" diff --git a/src/bar.h b/src/bar.h index 30ce6e6a..5cd84668 100644 --- a/src/bar.h +++ b/src/bar.h @@ -22,6 +22,8 @@ #ifndef BAR_H #define BAR_H +#include + struct FileData; struct LayoutWindow; diff --git a/src/cache-loader.cc b/src/cache-loader.cc index d5d9bc4a..30f58d84 100644 --- a/src/cache-loader.cc +++ b/src/cache-loader.cc @@ -19,11 +19,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "cache-loader.h" +#include + #include "filedata.h" #include "metadata.h" +#include "options.h" #include "ui-fileops.h" diff --git a/src/cache-maint.cc b/src/cache-maint.cc index d7dff19e..c8ae56c7 100644 --- a/src/cache-maint.cc +++ b/src/cache-maint.cc @@ -19,12 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "cache-maint.h" +#include + #include "cache-loader.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" #include "layout.h" +#include "main.h" +#include "main-defines.h" #include "misc.h" #include "pixbuf-util.h" #include "thumb.h" diff --git a/src/cache-maint.h b/src/cache-maint.h index bcd5da5f..760864d5 100644 --- a/src/cache-maint.h +++ b/src/cache-maint.h @@ -22,6 +22,10 @@ #ifndef CACHE_MAINT_H #define CACHE_MAINT_H +#include + +#include "typedefs.h" + struct FileData; void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent); diff --git a/src/cache.cc b/src/cache.cc index 4aa4de55..97964614 100644 --- a/src/cache.cc +++ b/src/cache.cc @@ -19,10 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "cache.h" +#include + +#include "debug.h" +#include "intl.h" +#include "main-defines.h" #include "md5-util.h" +#include "options.h" #include "secure-save.h" #include "thumb-standard.h" #include "ui-fileops.h" diff --git a/src/cellrenderericon.cc b/src/cellrenderericon.cc index e4c31bc8..399b0333 100644 --- a/src/cellrenderericon.cc +++ b/src/cellrenderericon.cc @@ -17,9 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "cellrenderericon.h" +#include + enum { FIXED_ICON_SIZE_MAX = 512 }; diff --git a/src/cellrenderericon.h b/src/cellrenderericon.h index 106e0d6b..cb949527 100644 --- a/src/cellrenderericon.h +++ b/src/cellrenderericon.h @@ -20,6 +20,8 @@ #ifndef __GQV_CELL_RENDERER_ICON_H__ #define __GQV_CELL_RENDERER_ICON_H__ +#include + #define TOGGLE_WIDTH 13 #define TOGGLE_SPACING 16 diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc index 8e0bc6fe..0b1e4a39 100644 --- a/src/collect-dlg.cc +++ b/src/collect-dlg.cc @@ -19,13 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "collect-dlg.h" + #include -#include "main.h" -#include "collect.h" -#include "collect-dlg.h" +#include +#include "collect.h" #include "collect-io.h" +#include "compat.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" #include "ui-fileops.h" #include "utilops.h" diff --git a/src/collect-dlg.h b/src/collect-dlg.h index 8d7b6bc3..912bdad7 100644 --- a/src/collect-dlg.h +++ b/src/collect-dlg.h @@ -22,6 +22,7 @@ #ifndef COLLECT_DLG_H #define COLLECT_DLG_H +struct CollectionData; void collection_dialog_save_as(CollectionData *cd); void collection_dialog_save_close(CollectionData *cd); diff --git a/src/collect-io.cc b/src/collect-io.cc index 6a0ed0ae..4532642d 100644 --- a/src/collect-io.cc +++ b/src/collect-io.cc @@ -19,12 +19,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "collect-io.h" +#include + #include "collect.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" #include "layout-util.h" +#include "main-defines.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 ea760b40..80dd94f4 100644 --- a/src/collect-io.h +++ b/src/collect-io.h @@ -22,6 +22,8 @@ #ifndef COLLECT_IO_H #define COLLECT_IO_H +#include "typedefs.h" + struct CollectionData; struct FileData; diff --git a/src/collect-table.cc b/src/collect-table.cc index 7c8799be..8c911d8a 100644 --- a/src/collect-table.cc +++ b/src/collect-table.cc @@ -19,18 +19,23 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "collect-table.h" +#include + #include "cellrenderericon.h" #include "collect-dlg.h" #include "collect-io.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "dupe.h" #include "filedata.h" #include "img-view.h" +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" diff --git a/src/collect.cc b/src/collect.cc index 0138d299..ba00f885 100644 --- a/src/collect.cc +++ b/src/collect.cc @@ -19,16 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "collect.h" +#include + #include "collect-dlg.h" #include "collect-io.h" #include "collect-table.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "main-defines.h" #include "misc.h" #include "pixbuf-util.h" #include "print.h" diff --git a/src/collect.h b/src/collect.h index 189ea97d..44c7bb47 100644 --- a/src/collect.h +++ b/src/collect.h @@ -22,6 +22,10 @@ #ifndef COLLECT_H #define COLLECT_H +#include + +#include "typedefs.h" + struct CollectTable; struct FileData; struct ThumbLoader; diff --git a/src/color-man.cc b/src/color-man.cc index cdc7e871..dd949777 100644 --- a/src/color-man.cc +++ b/src/color-man.cc @@ -19,24 +19,27 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "color-man.h" -#include "filedata.h" -#include "image.h" -#include "ui-fileops.h" - -#include +#include #ifdef HAVE_LCMS /*** color support enabled ***/ +#include + #ifdef HAVE_LCMS2 #include #else #include #endif +#include "debug.h" +#include "filedata.h" +#include "image.h" +#include "intl.h" +#include "options.h" +#include "ui-fileops.h" struct ColorManCache { cmsHPROFILE profile_in; diff --git a/src/color-man.h b/src/color-man.h index f1f5eee8..d023a070 100644 --- a/src/color-man.h +++ b/src/color-man.h @@ -22,6 +22,8 @@ #ifndef COLOR_MAN_H #define COLOR_MAN_H +#include + struct FileData; struct ImageWindow; diff --git a/src/compat.cc b/src/compat.cc index 762bcd20..4fa51b19 100644 --- a/src/compat.cc +++ b/src/compat.cc @@ -18,9 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "compat.h" +#include + #ifdef HAVE_GTK4 void gq_gtk_container_add(GtkWidget *container, GtkWidget *widget) { diff --git a/src/compat.h b/src/compat.h index 818db2f4..f413e737 100644 --- a/src/compat.h +++ b/src/compat.h @@ -21,6 +21,9 @@ #ifndef COMPAT_H #define COMPAT_H +#include + +#include /* Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS */ #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) diff --git a/src/debug.cc b/src/debug.cc index 9a73641c..f09a6400 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -18,12 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "debug.h" +#include + #include "filedata.h" +#include "intl.h" #include "logwindow.h" +#include "main.h" +#include "main-defines.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" #ifdef HAVE_EXECINFO_H diff --git a/src/debug.h b/src/debug.h index 5e65eb29..62483566 100644 --- a/src/debug.h +++ b/src/debug.h @@ -23,6 +23,8 @@ #include +#include + #define DOMAIN_DEBUG "debug" #define DOMAIN_INFO "info" diff --git a/src/desktop-file.cc b/src/desktop-file.cc index f07a88ec..c2dd7c79 100644 --- a/src/desktop-file.cc +++ b/src/desktop-file.cc @@ -19,11 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "desktop-file.h" +#include + +#include "compat.h" +#include "debug.h" #include "editors.h" +#include "intl.h" #include "layout-util.h" +#include "main.h" +#include "main-defines.h" #include "misc.h" #include "pixbuf-util.h" #include "ui-fileops.h" diff --git a/src/dnd.cc b/src/dnd.cc index eedbfcb6..f2b318e3 100644 --- a/src/dnd.cc +++ b/src/dnd.cc @@ -19,9 +19,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "dnd.h" +#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 0101d340..703acb6a 100644 --- a/src/dnd.h +++ b/src/dnd.h @@ -22,6 +22,8 @@ #ifndef DND_H #define DND_H +#include + #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 3e38179e..39389782 100644 --- a/src/dupe.cc +++ b/src/dupe.cc @@ -19,20 +19,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "dupe.h" + #include +#include -#include "main.h" -#include "dupe.h" +#include #include "cache.h" #include "collect-table.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "filedata.h" #include "history-list.h" #include "image-load.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "main-defines.h" #include "md5-util.h" #include "menu.h" #include "misc.h" @@ -47,9 +53,6 @@ #include "utilops.h" #include "window.h" -#include - - enum { DUPE_DEF_WIDTH = 800, DUPE_DEF_HEIGHT = 400 diff --git a/src/dupe.h b/src/dupe.h index 58ce2e18..5f3b26e5 100644 --- a/src/dupe.h +++ b/src/dupe.h @@ -22,6 +22,8 @@ #ifndef DUPE_H #define DUPE_H +#include + #include "similar.h" struct CollectInfo; diff --git a/src/editors.cc b/src/editors.cc index 60603bfd..f64ab145 100644 --- a/src/editors.cc +++ b/src/editors.cc @@ -19,11 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "editors.h" +#include + +#include "compat.h" +#include "debug.h" #include "filedata.h" #include "filefilter.h" +#include "intl.h" +#include "main.h" +#include "main-defines.h" +#include "options.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "utilops.h" diff --git a/src/editors.h b/src/editors.h index 8f197f77..40df1478 100644 --- a/src/editors.h +++ b/src/editors.h @@ -22,6 +22,8 @@ #ifndef EDITORS_H #define EDITORS_H +#include + struct FileData; enum EditorFlags { diff --git a/src/exif-common.cc b/src/exif-common.cc index 85b2d322..b03c7593 100644 --- a/src/exif-common.cc +++ b/src/exif-common.cc @@ -37,11 +37,12 @@ #endif #endif -#include "main.h" +#include "debug.h" #include "exif.h" - #include "filecache.h" #include "glua.h" +#include "intl.h" +#include "main-defines.h" #include "ui-fileops.h" #include "cache.h" #include "jpeg-parser.h" diff --git a/src/exif-int.h b/src/exif-int.h index 713dcc4d..441de2d4 100644 --- a/src/exif-int.h +++ b/src/exif-int.h @@ -22,6 +22,8 @@ #ifndef __EXIF_INT_H #define __EXIF_INT_H +#include + #include "exif.h" /* diff --git a/src/exif.cc b/src/exif.cc index 612d3df2..e1ace2ca 100644 --- a/src/exif.cc +++ b/src/exif.cc @@ -61,13 +61,12 @@ #include #include -#include "intl.h" - -#include "main.h" #include "exif-int.h" #include "jpeg-parser.h" +#include "debug.h" #include "format-raw.h" +#include "intl.h" #include "ui-fileops.h" diff --git a/src/exif.h b/src/exif.h index f32e733f..bbc02ec0 100644 --- a/src/exif.h +++ b/src/exif.h @@ -22,6 +22,8 @@ #ifndef __EXIF_H #define __EXIF_H +#include "typedefs.h" + struct ExifData; struct ExifItem; struct FileData; diff --git a/src/exiv2.cc b/src/exiv2.cc index 09a81899..b527fd2d 100644 --- a/src/exiv2.cc +++ b/src/exiv2.cc @@ -54,12 +54,13 @@ #include -#include "main.h" #include "exif.h" +#include "debug.h" #include "filedata.h" #include "filefilter.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" #if EXIV2_TEST_VERSION(0,28,0) diff --git a/src/filecache.cc b/src/filecache.cc index 80ad209e..eb815383 100644 --- a/src/filecache.cc +++ b/src/filecache.cc @@ -18,9 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "filecache.h" +#include + +#include "debug.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 2278f76b..7c975c04 100644 --- a/src/filecache.h +++ b/src/filecache.h @@ -21,7 +21,6 @@ #ifndef FILECACHE_H #define FILECACHE_H -#include "main.h" #include "filedata.h" struct FileCacheData; diff --git a/src/filedata.cc b/src/filedata.cc index 1cb707ca..f5b62bb7 100644 --- a/src/filedata.cc +++ b/src/filedata.cc @@ -19,11 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "filedata.h" +#include + #include "filefilter.h" #include "cache.h" +#include "debug.h" +#include "intl.h" +#include "main.h" +#include "main-defines.h" +#include "options.h" #include "thumb-standard.h" #include "ui-fileops.h" #include "metadata.h" @@ -35,6 +41,7 @@ #include "misc.h" #include +#include #ifdef DEBUG_FILEDATA gint global_file_data_count = 0; diff --git a/src/filedata.h b/src/filedata.h index 189915d4..31cb1d19 100644 --- a/src/filedata.h +++ b/src/filedata.h @@ -22,6 +22,12 @@ #ifndef FILEDATA_H #define FILEDATA_H +#include + +#include + +#include "typedefs.h" + struct ExifData; struct HistMap; diff --git a/src/filefilter.cc b/src/filefilter.cc index 3641ce4a..3ccd9310 100644 --- a/src/filefilter.cc +++ b/src/filefilter.cc @@ -19,10 +19,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "filefilter.h" +#include + #include "cache.h" +#include "debug.h" +#include "main-defines.h" #include "ui-fileops.h" #include "rcfile.h" diff --git a/src/filefilter.h b/src/filefilter.h index 56dd233b..73cb104c 100644 --- a/src/filefilter.h +++ b/src/filefilter.h @@ -22,6 +22,7 @@ #ifndef FILEFILTER_H #define FILEFILTER_H +#include "typedefs.h" struct FilterEntry { gchar *key; diff --git a/src/format-canon.cc b/src/format-canon.cc index de0800da..9eb0d55a 100644 --- a/src/format-canon.cc +++ b/src/format-canon.cc @@ -23,18 +23,14 @@ #ifndef HAVE_EXIV2 +#include "format-canon.h" + #include #include #include #include -#include "intl.h" - -#include "main.h" -#include "format-canon.h" -#include "format-raw.h" - #include "exif.h" diff --git a/src/format-fuji.cc b/src/format-fuji.cc index 045e0413..3d41f08b 100644 --- a/src/format-fuji.cc +++ b/src/format-fuji.cc @@ -24,18 +24,14 @@ #ifndef HAVE_EXIV2 +#include "format-fuji.h" + #include #include #include #include -#include "intl.h" - -#include "main.h" -#include "format-fuji.h" -#include "format-raw.h" - #include "exif.h" diff --git a/src/format-nikon.cc b/src/format-nikon.cc index 25afe373..26cdb35a 100644 --- a/src/format-nikon.cc +++ b/src/format-nikon.cc @@ -23,17 +23,14 @@ #ifndef HAVE_EXIV2 +#include "format-nikon.h" + #include #include #include #include -#include "intl.h" - -#include "main.h" -#include "format-nikon.h" - #include "exif.h" diff --git a/src/format-olympus.cc b/src/format-olympus.cc index d641cb7f..f33497f7 100644 --- a/src/format-olympus.cc +++ b/src/format-olympus.cc @@ -21,18 +21,14 @@ #ifndef HAVE_EXIV2 +#include "format-olympus.h" + #include #include #include #include -#include "intl.h" - -#include "main.h" -#include "format-olympus.h" -#include "format-raw.h" - #include "exif.h" diff --git a/src/format-raw.cc b/src/format-raw.cc index ac78e20a..70c6ba33 100644 --- a/src/format-raw.cc +++ b/src/format-raw.cc @@ -23,6 +23,8 @@ #ifndef HAVE_EXIV2 +#include "format-raw.h" + #include #include #include @@ -32,11 +34,7 @@ #include -#include "intl.h" - -#include "main.h" -#include "format-raw.h" - +#include "debug.h" #include "format-canon.h" #include "format-fuji.h" #include "format-nikon.h" diff --git a/src/fullscreen.cc b/src/fullscreen.cc index 5aa68ff3..cd72fea0 100644 --- a/src/fullscreen.cc +++ b/src/fullscreen.cc @@ -19,16 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "fullscreen.h" #include #include #include +#include + +#include "compat.h" +#include "debug.h" #include "image.h" #include "image-load.h" +#include "intl.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" #include "ui-misc.h" #include "window.h" diff --git a/src/fullscreen.h b/src/fullscreen.h index 5c34aa69..53ab0ea0 100644 --- a/src/fullscreen.h +++ b/src/fullscreen.h @@ -22,6 +22,8 @@ #ifndef FULLSCREEN_H #define FULLSCREEN_H +#include + struct ImageWindow; struct FullScreenData diff --git a/src/glua.h b/src/glua.h index ff292d0c..1c5600ae 100644 --- a/src/glua.h +++ b/src/glua.h @@ -21,10 +21,11 @@ #ifndef __GLUA_H #define __GLUA_H +#include + #ifdef HAVE_LUA #include -#include "main.h" struct FileData; diff --git a/src/histogram.cc b/src/histogram.cc index 3885bcc8..013deb46 100644 --- a/src/histogram.cc +++ b/src/histogram.cc @@ -18,11 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "histogram.h" -#include "pixbuf-util.h" +#include + +#include "debug.h" #include "filedata.h" +#include "intl.h" +#include "pixbuf-util.h" #include diff --git a/src/histogram.h b/src/histogram.h index a4f19d72..774556db 100644 --- a/src/histogram.h +++ b/src/histogram.h @@ -21,6 +21,10 @@ #ifndef HISTOGRAM_H #define HISTOGRAM_H +#include + +#include "typedefs.h" + struct FileData; struct HistMap; diff --git a/src/history-list.cc b/src/history-list.cc index da97cd84..f7519927 100644 --- a/src/history-list.cc +++ b/src/history-list.cc @@ -18,9 +18,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "history-list.h" +#include + +#include "debug.h" +#include "intl.h" +#include "options.h" #include "secure-save.h" #include "ui-fileops.h" diff --git a/src/history-list.h b/src/history-list.h index d184770a..0ca00c6c 100644 --- a/src/history-list.h +++ b/src/history-list.h @@ -21,6 +21,8 @@ #ifndef HISTORY_LIST_H #define HISTORY_LIST_H +#include + /* history lists */ gboolean history_list_load(const gchar *path); diff --git a/src/image-load-collection.cc b/src/image-load-collection.cc index ad1af91b..0c69b097 100644 --- a/src/image-load-collection.cc +++ b/src/image-load-collection.cc @@ -18,13 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" -#include "image-load.h" #include "image-load-collection.h" +#include + #include "cache.h" #include "filedata.h" +#include "image-load.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" struct ImageLoaderCOLLECTION { diff --git a/src/image-load-collection.h b/src/image-load-collection.h index dbc201af..38867747 100644 --- a/src/image-load-collection.h +++ b/src/image-load-collection.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_COLLECTION_H #define IMAGE_LOAD_COLLECTION_H +struct ImageLoaderBackend; + void image_loader_backend_set_collection(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-cr3.cc b/src/image-load-cr3.cc index 7d5e4d0d..1f386e05 100644 --- a/src/image-load-cr3.cc +++ b/src/image-load-cr3.cc @@ -24,11 +24,15 @@ /** @FIXME This is just a copy of image-load-jpeg.cc, with an adjusted * start address for a .cr3 file */ -#include "main.h" +#include "image-load-cr3.h" + +#include +#include "debug.h" #include "image-load.h" -#include "image-load-cr3.h" +#include "intl.h" #include "jpeg-parser.h" +#include "typedefs.h" #ifdef HAVE_JPEG diff --git a/src/image-load-cr3.h b/src/image-load-cr3.h index fc21b11e..08173105 100644 --- a/src/image-load-cr3.h +++ b/src/image-load-cr3.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_CR3_H #define IMAGE_LOAD_CR3_H +#include + #ifdef HAVE_JPEG +struct ImageLoaderBackend; + void image_loader_backend_set_cr3(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-dds.cc b/src/image-load-dds.cc index 78427946..5267397e 100644 --- a/src/image-load-dds.cc +++ b/src/image-load-dds.cc @@ -24,10 +24,11 @@ */ -#include "main.h" +#include "image-load-dds.h" + +#include #include "image-load.h" -#include "image-load-dds.h" struct ImageLoaderDDS { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-dds.h b/src/image-load-dds.h index c9a5cda7..6081e515 100644 --- a/src/image-load-dds.h +++ b/src/image-load-dds.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_DDS_H #define IMAGE_LOAD_DDS_H +struct ImageLoaderBackend; + void image_loader_backend_set_dds(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc index d9c2c21d..bd001283 100644 --- a/src/image-load-djvu.cc +++ b/src/image-load-djvu.cc @@ -18,15 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" - -#include "image-load.h" #include "image-load-djvu.h" +#include + #ifdef HAVE_DJVU #include #include +#include + +#include "image-load.h" struct ImageLoaderDJVU { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-djvu.h b/src/image-load-djvu.h index 83b97860..b071e10c 100644 --- a/src/image-load-djvu.h +++ b/src/image-load-djvu.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_DJVU_H #define IMAGE_LOAD_DJVU_H +#include + #ifdef HAVE_DJVU +struct ImageLoaderBackend; + void image_loader_backend_set_djvu(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-external.cc b/src/image-load-external.cc index 70e06b0b..6a3bda4e 100644 --- a/src/image-load-external.cc +++ b/src/image-load-external.cc @@ -18,13 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" - -#include "image-load.h" #include "image-load-external.h" +#include + #include "filedata.h" +#include "image-load.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" struct ImageLoaderExternal { diff --git a/src/image-load-external.h b/src/image-load-external.h index a6929d86..d674fc3c 100644 --- a/src/image-load-external.h +++ b/src/image-load-external.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_EXTERNAL_H #define IMAGE_LOAD_EXTERNAL_H +struct ImageLoaderBackend; + void image_loader_backend_set_external(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-ffmpegthumbnailer.cc b/src/image-load-ffmpegthumbnailer.cc index f65d86ea..62500319 100644 --- a/src/image-load-ffmpegthumbnailer.cc +++ b/src/image-load-ffmpegthumbnailer.cc @@ -19,15 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" -#include "image-load.h" #include "image-load-ffmpegthumbnailer.h" -#include "filedata.h" +#include #ifdef HAVE_FFMPEGTHUMBNAILER #include +#include "debug.h" +#include "filedata.h" +#include "image-load.h" +#include "options.h" + struct ImageLoaderFT { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; diff --git a/src/image-load-ffmpegthumbnailer.h b/src/image-load-ffmpegthumbnailer.h index 7b6fbc93..b26ece39 100644 --- a/src/image-load-ffmpegthumbnailer.h +++ b/src/image-load-ffmpegthumbnailer.h @@ -22,7 +22,11 @@ #ifndef IMAGE_LOAD_FT_H #define IMAGE_LOAD_FT_H +#include + #ifdef HAVE_FFMPEGTHUMBNAILER +struct ImageLoaderBackend; + void image_loader_backend_set_ft(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-gdk.cc b/src/image-load-gdk.cc index f532e682..ff32b87b 100644 --- a/src/image-load-gdk.cc +++ b/src/image-load-gdk.cc @@ -19,11 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" -#include "image-load.h" #include "image-load-gdk.h" +#include + #include "filedata.h" +#include "image-load.h" static gchar* image_loader_gdk_get_format_name(gpointer loader) diff --git a/src/image-load-gdk.h b/src/image-load-gdk.h index 100565c3..f7d9563c 100644 --- a/src/image-load-gdk.h +++ b/src/image-load-gdk.h @@ -22,6 +22,8 @@ #ifndef IMAGE_LOAD_GDK_H #define IMAGE_LOAD_GDK_H +struct ImageLoaderBackend; + void image_loader_backend_set_default(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc index 10cdbfc6..6b3f27d1 100644 --- a/src/image-load-heif.cc +++ b/src/image-load-heif.cc @@ -18,14 +18,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" - -#include "image-load.h" #include "image-load-heif.h" -#include + +#include + #ifdef HAVE_HEIF +#include + #include +#include "debug.h" +#include "image-load.h" + struct ImageLoaderHEIF { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; diff --git a/src/image-load-heif.h b/src/image-load-heif.h index 63378173..4495d6c2 100644 --- a/src/image-load-heif.h +++ b/src/image-load-heif.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_HEIF_H #define IMAGE_LOAD_HEIF_H +#include + #ifdef HAVE_HEIF +struct ImageLoaderBackend; + void image_loader_backend_set_heif(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-j2k.cc b/src/image-load-j2k.cc index cbdbfe68..72e2518c 100644 --- a/src/image-load-j2k.cc +++ b/src/image-load-j2k.cc @@ -18,16 +18,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include -#include "image-load.h" -#include "image-load-j2k.h" +#ifdef HAVE_J2K -#include "misc.h" +#include "image-load-j2k.h" -#ifdef HAVE_J2K +#include -#include "openjpeg.h" +#include "debug.h" +#include "image-load.h" +#include "intl.h" +#include "misc.h" struct ImageLoaderJ2K { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-j2k.h b/src/image-load-j2k.h index a02fa343..025a9188 100644 --- a/src/image-load-j2k.h +++ b/src/image-load-j2k.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_J2K_H #define IMAGE_LOAD_J2K_H +#include + #ifdef HAVE_J2K +struct ImageLoaderBackend; + void image_loader_backend_set_j2k(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-jpeg.cc b/src/image-load-jpeg.cc index f606854b..ea763e40 100644 --- a/src/image-load-jpeg.cc +++ b/src/image-load-jpeg.cc @@ -27,18 +27,24 @@ /** This is a Will Not Fix */ #pragma GCC diagnostic ignored "-Wclobbered" -#include "main.h" - -#include "image-load.h" -#include "image-load-jpeg.h" -#include "jpeg-parser.h" +#include #ifdef HAVE_JPEG +#include "image-load-jpeg.h" + #include +#include // for FILE and size_t in jpeglib.h + #include #include +#include "debug.h" +#include "image-load.h" +#include "intl.h" +#include "jpeg-parser.h" +#include "typedefs.h" + struct ImageLoaderJpeg { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; @@ -492,8 +498,6 @@ void image_loader_backend_set_jpeg(ImageLoaderBackend *funcs) } - #endif - /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/image-load-jpeg.h b/src/image-load-jpeg.h index c282ba5d..5921a863 100644 --- a/src/image-load-jpeg.h +++ b/src/image-load-jpeg.h @@ -22,7 +22,11 @@ #ifndef IMAGE_LOAD_JPEG_H #define IMAGE_LOAD_JPEG_H +#include + #ifdef HAVE_JPEG +struct ImageLoaderBackend; + void image_loader_backend_set_jpeg(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-jpegxl.cc b/src/image-load-jpegxl.cc index 88568f7f..e1a4c10d 100644 --- a/src/image-load-jpegxl.cc +++ b/src/image-load-jpegxl.cc @@ -50,16 +50,18 @@ * */ -#include "main.h" - -#include "image-load.h" -#include "image-load-jpegxl.h" +#include #ifdef HAVE_JPEGXL +#include "image-load-jpegxl.h" + #include -#include "jxl/decode.h" +#include + +#include "debug.h" +#include "image-load.h" struct ImageLoaderJPEGXL { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-jpegxl.h b/src/image-load-jpegxl.h index 616f05de..3a939c39 100644 --- a/src/image-load-jpegxl.h +++ b/src/image-load-jpegxl.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_JPEGXL_H #define IMAGE_LOAD_JPEGXL_H +#include + #ifdef HAVE_JPEGXL +struct ImageLoaderBackend; + void image_loader_backend_set_jpegxl(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-libraw.cc b/src/image-load-libraw.cc index 19c06c4d..175fc232 100644 --- a/src/image-load-libraw.cc +++ b/src/image-load-libraw.cc @@ -25,17 +25,21 @@ * LibRaw seems to be slower than exiv2, so let exiv2 have priority. */ -#include "main.h" +#include "image-load-libraw.h" + +#include +#include "debug.h" #include "filedata.h" #include "filefilter.h" #include "image-load.h" -#include "image-load-libraw.h" #ifdef HAVE_RAW #include #include +#include +#include struct UnmapData { diff --git a/src/image-load-libraw.h b/src/image-load-libraw.h index 9e4da258..107165b4 100644 --- a/src/image-load-libraw.h +++ b/src/image-load-libraw.h @@ -21,6 +21,10 @@ #ifndef IMAGE_LOAD_RAW_H #define IMAGE_LOAD_RAW_H +#include + +struct ImageLoader; + guchar *libraw_get_preview(ImageLoader *il, guint *data_len); void libraw_free_preview(const guchar *buf); diff --git a/src/image-load-pdf.cc b/src/image-load-pdf.cc index 27f93f9c..df8e8539 100644 --- a/src/image-load-pdf.cc +++ b/src/image-load-pdf.cc @@ -18,14 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include -#include "image-load.h" +#ifdef HAVE_PDF #include "image-load-pdf.h" -#ifdef HAVE_PDF +#include #include +#include "debug.h" +#include "image-load.h" + struct ImageLoaderPDF { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; diff --git a/src/image-load-pdf.h b/src/image-load-pdf.h index c969774b..5aa86291 100644 --- a/src/image-load-pdf.h +++ b/src/image-load-pdf.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_PDF_H #define IMAGE_LOAD_PDF_H +#include + #ifdef HAVE_PDF +struct ImageLoaderBackend; + void image_loader_backend_set_pdf(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-psd.cc b/src/image-load-psd.cc index 92f1239e..5582c024 100644 --- a/src/image-load-psd.cc +++ b/src/image-load-psd.cc @@ -48,10 +48,12 @@ * - i18n */ -#include "main.h" +#include "image-load-psd.h" + +#include +#include "debug.h" #include "image-load.h" -#include "image-load-psd.h" struct ImageLoaderPSD { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-psd.h b/src/image-load-psd.h index 67c2cab6..5f6cd6cd 100644 --- a/src/image-load-psd.h +++ b/src/image-load-psd.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_PSD_H #define IMAGE_LOAD_PSD_H +struct ImageLoaderBackend; + void image_loader_backend_set_psd(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-svgz.cc b/src/image-load-svgz.cc index 17979fbc..ef3ba157 100644 --- a/src/image-load-svgz.cc +++ b/src/image-load-svgz.cc @@ -18,10 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" -#include "image-load.h" #include "image-load-svgz.h" +#include + +#include "image-load.h" + static gchar* image_loader_svgz_get_format_name(gpointer) { diff --git a/src/image-load-svgz.h b/src/image-load-svgz.h index e1a47edd..3bcc1ede 100644 --- a/src/image-load-svgz.h +++ b/src/image-load-svgz.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_SVGZ_H #define IMAGE_LOAD_SVGZ_H +struct ImageLoaderBackend; + void image_loader_backend_set_svgz(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-tiff.cc b/src/image-load-tiff.cc index 353074a0..2e5e2d9b 100644 --- a/src/image-load-tiff.cc +++ b/src/image-load-tiff.cc @@ -25,15 +25,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" - -#include "image-load.h" -#include "image-load-tiff.h" +#include #ifdef HAVE_TIFF +#include "image-load-tiff.h" + #include +#include "debug.h" +#include "image-load.h" + struct ImageLoaderTiff { ImageLoaderBackendCbAreaUpdated area_updated_cb; ImageLoaderBackendCbSize size_cb; diff --git a/src/image-load-tiff.h b/src/image-load-tiff.h index a1e78a3f..d91505ae 100644 --- a/src/image-load-tiff.h +++ b/src/image-load-tiff.h @@ -22,7 +22,11 @@ #ifndef IMAGE_LOAD_TIFF_H #define IMAGE_LOAD_TIFF_H +#include + #ifdef HAVE_TIFF +struct ImageLoaderBackend; + void image_loader_backend_set_tiff(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-webp.cc b/src/image-load-webp.cc index d95609a8..d2fabe51 100644 --- a/src/image-load-webp.cc +++ b/src/image-load-webp.cc @@ -18,14 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include -#include "image-load.h" +#ifdef HAVE_WEBP #include "image-load-webp.h" -#ifdef HAVE_WEBP #include +#include "debug.h" +#include "image-load.h" + using ImageLoaderWEBP = struct _ImageLoaderWEBP; struct _ImageLoaderWEBP { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-webp.h b/src/image-load-webp.h index 7e4c3a93..038e7e6a 100644 --- a/src/image-load-webp.h +++ b/src/image-load-webp.h @@ -21,7 +21,11 @@ #ifndef IMAGE_LOAD_WEBP_H #define IMAGE_LOAD_WEBP_H +#include + #ifdef HAVE_WEBP +struct ImageLoaderBackend; + void image_loader_backend_set_webp(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load-zxscr.cc b/src/image-load-zxscr.cc index e1ffdeca..e1c50260 100644 --- a/src/image-load-zxscr.cc +++ b/src/image-load-zxscr.cc @@ -18,10 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include "image-load-zxscr.h" + +#include +#include "debug.h" #include "image-load.h" -#include "image-load-zxscr.h" struct ImageLoaderZXSCR { ImageLoaderBackendCbAreaUpdated area_updated_cb; diff --git a/src/image-load-zxscr.h b/src/image-load-zxscr.h index 5de9b3ae..0b1e81e1 100644 --- a/src/image-load-zxscr.h +++ b/src/image-load-zxscr.h @@ -21,6 +21,8 @@ #ifndef IMAGE_LOAD_ZXSCR_H #define IMAGE_LOAD_ZXSCR_H +struct ImageLoaderBackend; + void image_loader_backend_set_zxscr(ImageLoaderBackend *funcs); #endif diff --git a/src/image-load.cc b/src/image-load.cc index 646d87f3..1182a64f 100644 --- a/src/image-load.cc +++ b/src/image-load.cc @@ -19,9 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "image-load.h" +#include + +#include "debug.h" #include "exif.h" #include "filedata.h" #include "gq-marshal.h" @@ -35,6 +37,7 @@ #include "image-load-webp.h" #include "image-load-zxscr.h" #include "misc.h" +#include "options.h" #include "ui-fileops.h" #ifdef HAVE_DJVU diff --git a/src/image-load.h b/src/image-load.h index 7c909db5..d24902dd 100644 --- a/src/image-load.h +++ b/src/image-load.h @@ -22,6 +22,8 @@ #ifndef IMAGE_LOAD_H #define IMAGE_LOAD_H +#include + struct FileData; #define TYPE_IMAGE_LOADER (image_loader_get_type()) diff --git a/src/image-overlay.cc b/src/image-overlay.cc index 3525aeab..c57b832f 100644 --- a/src/image-overlay.cc +++ b/src/image-overlay.cc @@ -19,16 +19,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "image-overlay.h" +#include + #include "collect.h" +#include "debug.h" #include "filedata.h" #include "histogram.h" #include "image.h" #include "image-load.h" #include "img-view.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "osd.h" #include "pixbuf-renderer.h" #include "pixbuf-util.h" diff --git a/src/image-overlay.h b/src/image-overlay.h index 9ed7d54c..de230c71 100644 --- a/src/image-overlay.h +++ b/src/image-overlay.h @@ -22,6 +22,8 @@ #ifndef IMAGE_OVERLAY_H #define IMAGE_OVERLAY_H +#include + struct Histogram; struct ImageWindow; diff --git a/src/image.cc b/src/image.cc index ea4f8f6f..dd671852 100644 --- a/src/image.cc +++ b/src/image.cc @@ -19,22 +19,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "image.h" +#include + #include "collect-table.h" #include "color-man.h" +#include "compat.h" +#include "debug.h" #include "exif.h" -#include "metadata.h" +#include "filecache.h" #include "history-list.h" #include "image-load.h" +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "metadata.h" #include "pixbuf-renderer.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-misc.h" -#include "filecache.h" #include diff --git a/src/image.h b/src/image.h index 99192fc4..6f92c603 100644 --- a/src/image.h +++ b/src/image.h @@ -22,6 +22,10 @@ #ifndef IMAGE_H #define IMAGE_H +#include + +#include "typedefs.h" + struct CollectInfo; struct CollectionData; struct FileData; diff --git a/src/img-view.cc b/src/img-view.cc index d53d49cd..b6b7ff7f 100644 --- a/src/img-view.cc +++ b/src/img-view.cc @@ -19,11 +19,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "img-view.h" +#include + #include "collect.h" #include "collect-io.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "editors.h" #include "filedata.h" @@ -31,7 +34,10 @@ #include "image.h" #include "image-load.h" #include "image-overlay.h" +#include "intl.h" #include "layout-util.h" +#include "main.h" +#include "main-defines.h" #include "menu.h" #include "misc.h" #include "pixbuf-util.h" diff --git a/src/img-view.h b/src/img-view.h index f16eef04..2365dd6c 100644 --- a/src/img-view.h +++ b/src/img-view.h @@ -22,6 +22,8 @@ #ifndef IMG_VIEW_H #define IMG_VIEW_H +#include + struct CollectInfo; struct CollectionData; struct FileData; @@ -36,6 +38,5 @@ void view_window_colors_update(); gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total); - #endif /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/intl.h b/src/intl.h index c0652a27..dd6deaed 100644 --- a/src/intl.h +++ b/src/intl.h @@ -22,6 +22,8 @@ #ifndef __INTL_H__ #define __INTL_H__ +#include + #ifdef ENABLE_NLS # include # define _(String) dgettext(PACKAGE,String) diff --git a/src/jpeg-parser.cc b/src/jpeg-parser.cc index 09b998ac..b979e65a 100644 --- a/src/jpeg-parser.cc +++ b/src/jpeg-parser.cc @@ -19,9 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "jpeg-parser.h" +#include + +#include "debug.h" + gboolean jpeg_segment_find(const guchar *data, guint size, guchar app_marker, const gchar *magic, guint magic_len, guint *seg_offset, guint *seg_length) diff --git a/src/jpeg-parser.h b/src/jpeg-parser.h index dc290199..787462ec 100644 --- a/src/jpeg-parser.h +++ b/src/jpeg-parser.h @@ -22,6 +22,8 @@ #ifndef JPEG_PARSER_H #define JPEG_PARSER_H +#include + #define JPEG_MARKER 0xFF #define JPEG_MARKER_SOI 0xD8 #define JPEG_MARKER_EOI 0xD9 @@ -74,7 +76,7 @@ struct MPOEntry { struct MPOData { - guint mpo_offset; + guint mpo_offset; guint version; guint num_images; diff --git a/src/layout-config.cc b/src/layout-config.cc index ab6b6511..409a1b2b 100644 --- a/src/layout-config.cc +++ b/src/layout-config.cc @@ -19,9 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "layout-config.h" +#include + +#include "compat.h" +#include "intl.h" #include "ui-misc.h" diff --git a/src/layout-config.h b/src/layout-config.h index d23f1c09..752822d6 100644 --- a/src/layout-config.h +++ b/src/layout-config.h @@ -23,6 +23,8 @@ #define LAYOUT_CONFIG_H +#include + #include "layout.h" diff --git a/src/layout-image.cc b/src/layout-image.cc index 1b8eb347..e39c5548 100644 --- a/src/layout-image.cc +++ b/src/layout-image.cc @@ -19,10 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "layout-image.h" +#include + #include "collect.h" +#include "debug.h" #include "dnd.h" #include "editors.h" #include "exif.h" @@ -32,7 +34,9 @@ #include "image.h" #include "image-overlay.h" #include "img-view.h" +#include "intl.h" #include "layout-util.h" +#include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" diff --git a/src/layout-image.h b/src/layout-image.h index c9592ea1..817b7468 100644 --- a/src/layout-image.h +++ b/src/layout-image.h @@ -22,6 +22,10 @@ #ifndef LAYOUT_IMAGE_H #define LAYOUT_IMAGE_H +#include + +#include "typedefs.h" + struct CollectInfo; struct CollectionData; struct FileData; diff --git a/src/layout-util.cc b/src/layout-util.cc index 36a6ecf7..daebc063 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -19,9 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "layout-util.h" +#include + #include "advanced-exif.h" #include "bar-sort.h" #include "bar.h" @@ -31,17 +32,23 @@ #include "collect-dlg.h" #include "collect-io.h" #include "color-man.h" +#include "compat.h" +#include "debug.h" #include "desktop-file.h" #include "dupe.h" #include "editors.h" +#include "filedata.h" #include "fullscreen.h" #include "histogram.h" #include "history-list.h" #include "image.h" #include "image-overlay.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" #include "logwindow.h" +#include "main.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "pan-view.h" diff --git a/src/layout.cc b/src/layout.cc index b56167de..e838b49c 100644 --- a/src/layout.cc +++ b/src/layout.cc @@ -19,20 +19,26 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "layout.h" +#include + #include "bar.h" #include "bar-sort.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" #include "histogram.h" #include "history-list.h" #include "image.h" #include "image-overlay.h" +#include "intl.h" #include "layout-config.h" #include "layout-image.h" #include "layout-util.h" #include "logwindow.h" +#include "main.h" +#include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" diff --git a/src/layout.h b/src/layout.h index 4fe12369..8f3455a1 100644 --- a/src/layout.h +++ b/src/layout.h @@ -22,6 +22,10 @@ #ifndef LAYOUT_H #define LAYOUT_H +#include + +#include "options.h" + struct AnimationData; struct FileData; struct FullScreenData; diff --git a/src/logwindow.cc b/src/logwindow.cc index b2a2bb76..dbd1ec49 100644 --- a/src/logwindow.cc +++ b/src/logwindow.cc @@ -18,14 +18,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "logwindow.h" #include #include #include +#include + +#include "compat.h" +#include "debug.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "misc.h" #include "ui-misc.h" #include "window.h" diff --git a/src/logwindow.h b/src/logwindow.h index 1e91a97a..a703fdae 100644 --- a/src/logwindow.h +++ b/src/logwindow.h @@ -21,6 +21,8 @@ #ifndef LOGWINDOW_H #define LOGWINDOW_H +#include + struct LayoutWindow; enum LogType diff --git a/src/lua.cc b/src/lua.cc index 5279a2a6..55153698 100644 --- a/src/lua.cc +++ b/src/lua.cc @@ -32,10 +32,12 @@ #include #include -#include "main.h" #include "glua.h" +#include "debug.h" #include "exif.h" #include "filedata.h" +#include "main.h" +#include "main-defines.h" #include "ui-fileops.h" /** diff --git a/src/main-defines.h b/src/main-defines.h new file mode 100644 index 00000000..ca5d4e58 --- /dev/null +++ b/src/main-defines.h @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2006 John Ellis + * Copyright (C) 2008 - 2016 The Geeqie Team + * + * Author: John Ellis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef _MAIN_DEFINES_H +#define _MAIN_DEFINES_H + +#define USE_XDG 1 + +#define GQ_APPNAME "Geeqie" +#define GQ_APPNAME_LC "geeqie" +#define GQ_WEBSITE "https://www.geeqie.org/" +#define GQ_EMAIL_ADDRESS "geeqie@freelists.org" + +#define GQ_RC_DIR "." GQ_APPNAME_LC +#define GQ_COLLECTIONS_DIR "collections" +#define GQ_TRASH_DIR "trash" +#define GQ_WINDOW_LAYOUTS_DIR "layouts" +#define GQ_ARCHIVE_DIR "geeqie-archive" +#define GQ_RESOURCE_PATH_ICONS "/org/geeqie/icons" +#define GQ_RESOURCE_PATH_CREDITS "/org/geeqie/credits" +#define GQ_RESOURCE_PATH_UI "/org/geeqie/ui" + +#define GQ_SYSTEM_WIDE_DIR "/etc/" GQ_APPNAME_LC + +#define RC_FILE_NAME GQ_APPNAME_LC "rc.xml" +#define DEFAULT_WINDOW_LAYOUT "default_window_layout.xml" + +#define GQ_COLLECTION_EXT ".gqv" + +#define SCROLL_RESET_TOPLEFT 0 +#define SCROLL_RESET_CENTER 1 +#define SCROLL_RESET_NOCHANGE 2 + +#define MOUSEWHEEL_SCROLL_SIZE 20 + + +#define GQ_DEFAULT_SHELL_PATH "/bin/sh" +#define GQ_DEFAULT_SHELL_OPTIONS "-c" + +#define DEFAULT_THUMB_WIDTH 96 +#define DEFAULT_THUMB_HEIGHT 72 + +#define DEFAULT_MINIMAL_WINDOW_SIZE 100 + +#define IMAGE_MIN_WIDTH 100 +#define SIDEBAR_DEFAULT_WIDTH 250 + + +#define DEFAULT_OVERLAY_INFO "%collection:*\\n%" \ + "(%number%/%total%) [%zoom%] %name%\n" \ + "%res%|%date%|%size%\n" \ + "%formatted.Aperture%|%formatted.ShutterSpeed%|%formatted.ISOSpeedRating:ISO *%|%formatted.FocalLength%|%formatted.ExposureBias:* Ev%\n" \ + "%formatted.Camera:40%|%formatted.Flash%\n" \ + "%formatted.star_rating%" + +#define GQ_LINK_STR "↩" + +#define TIMEZONE_DATABASE_WEB "https://cdn.bertold.org/zonedetect/db/db.zip" +#define TIMEZONE_DATABASE_FILE "timezone21.bin" +#define TIMEZONE_DATABASE_VERSION "out_v1" +#define HELP_SEARCH_ENGINE "https://duckduckgo.com/?q=site:geeqie.org/help " + +#define STAR_RATING_NOT_READ -12345 +#define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark' +#define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star' + +#define GQ_ICON_ADD "list-add" +#define GQ_ICON_REMOVE "list-remove" +#define GQ_ICON_UNDO "edit-undo" +#define GQ_ICON_REDO "edit-redo" +#define GQ_ICON_OPEN "document-open" +#define GQ_ICON_OPEN_WITH "open-menu" +#define GQ_ICON_SAVE "document-save" +#define GQ_ICON_SAVE_AS "document-save-as" +#define GQ_ICON_NEW "document-new" +#define GQ_ICON_EDIT "document-edit" +#define GQ_ICON_REVERT "document-revert" +#define GQ_ICON_CLOSE "window-close" +#define GQ_ICON_RUN "system-run" +#define GQ_ICON_STOP "process-stop" +#define GQ_ICON_FULLSCREEN "view-fullscreen" +#define GQ_ICON_LEAVE_FULLSCREEN "view-restore" +#define GQ_ICON_REFRESH "view-refresh" +#define GQ_ICON_ABOUT "help-about" +#define GQ_ICON_QUIT "application-exit" +#define GQ_ICON_DELETE "edit-delete" +#define GQ_ICON_DELETE_SHRED "edit-delete-shred" +#define GQ_ICON_CLEAR "edit-clear" +#define GQ_ICON_COPY "edit-copy" +#define GQ_ICON_FIND "edit-find" +#define GQ_ICON_REPLACE "edit-find-replace" +#define GQ_ICON_PRINT "document-print" +#define GQ_ICON_FILE_FILTER "preview-file" +#define GQ_ICON_USER_TRASH "user-trash" + +#define GQ_ICON_GO_TOP "go-top" +#define GQ_ICON_GO_BOTTOM "go-bottom" +#define GQ_ICON_GO_UP "go-up" +#define GQ_ICON_GO_DOWN "go-down" +#define GQ_ICON_GO_FIRST "go-first" +#define GQ_ICON_GO_LAST "go-last" +#define GQ_ICON_GO_PREV "go-previous" +#define GQ_ICON_GO_NEXT "go-next" +#define GQ_ICON_GO_JUMP "go-jump" +#define GQ_ICON_HOME "go-home" + +#define GQ_ICON_PREV_PAGE "media-skip-backward" +#define GQ_ICON_NEXT_PAGE "media-skip-forward" +#define GQ_ICON_BACK_PAGE "media-seek-backward" +#define GQ_ICON_FORWARD_PAGE "media-seek-forward" + +#define GQ_ICON_PLAY "media-playback-start" +#define GQ_ICON_PAUSE "media-playback-pause" + +#define GQ_ICON_ZOOM_IN "zoom-in" +#define GQ_ICON_ZOOM_OUT "zoom-out" +#define GQ_ICON_ZOOM_100 "zoom-original" +#define GQ_ICON_ZOOM_FIT "zoom-fit-best" + +// might need replacing +#define GQ_ICON_PREFERENCES "preferences-system" +#define GQ_ICON_HELP "help-contents" // "help-browser"? +#define GQ_ICON_EXPORT "document-export" // use collection icon? + +// not available in some themes +#define GQ_ICON_OK "emblem-ok" +#define GQ_ICON_APPLY "emblem-ok" // need something else? +#define GQ_ICON_CANCEL "dialog-cancel" // missing in adwaita and others, seen in breeze +#define GQ_ICON_PAN_DOWN "pan-down-symbolic" // adwaita, breeze, hicolor supports this +#define GQ_ICON_PAN_UP "pan-up-symbolic" // adwaita, breeze, hicolor supports this + +#define GQ_ICON_DIALOG_ERROR "dialog-error" +#define GQ_ICON_DIALOG_INFO "dialog-information" +#define GQ_ICON_DIALOG_QUESTION "dialog-question" +#define GQ_ICON_DIALOG_WARNING "dialog-warning" + +#define GQ_ICON_UNREADABLE "emblem-unreadable" +#define GQ_ICON_LINK "emblem-symbolic-link" +#define GQ_ICON_READONLY "emblem-readonly" + +#define GQ_ICON_FLIP_HORIZONTAL "object-flip-horizontal" +#define GQ_ICON_FLIP_VERTICAL "object-flip-vertical" +#define GQ_ICON_ROTATE_LEFT "object-rotate-left" +#define GQ_ICON_ROTATE_RIGHT "object-rotate-right" + +#define GQ_ICON_DIRECTORY "folder" +#define GQ_ICON_MISSING_IMAGE "image-missing" +#define GQ_ICON_STRIKETHROUGH "format-text-strikethrough" +#define GQ_ICON_FILE "text-x-generic" +#define GQ_ICON_GENERIC "text-x-generic" +#define GQ_ICON_SELECT_FONT "font-select" +#define GQ_ICON_SELECT_COLOR "color-select" +#define GQ_ICON_COLOR_MANAGEMENT "preferences-color" // breeze has nicer "color-management" icon, missing in others + +// not done... plus many more +#define GQ_ICON_COLLECTION GTK_STOCK_INDEX +#define GQ_ICON_DND GTK_STOCK_DND_MULTIPLE +// PIXBUF_INLINE_ICON_ZOOMFILLHOR +// PIXBUF_INLINE_ICON_ZOOMFILLVERT + +#endif // _MAIN_DEFINES_H +/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/main.cc b/src/main.cc index 6d117728..94d97475 100644 --- a/src/main.cc +++ b/src/main.cc @@ -19,8 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include - #include "main.h" #include @@ -31,6 +29,8 @@ #endif #include +#include + #ifdef HAVE_DEVELOPER #include "backward.h" #endif @@ -38,13 +38,17 @@ #include "cache.h" #include "collect.h" #include "collect-io.h" +#include "compat.h" +#include "debug.h" #include "filedata.h" #include "filefilter.h" #include "history-list.h" #include "image.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "main-defines.h" #include "misc.h" #include "rcfile.h" #include "remote.h" diff --git a/src/main.h b/src/main.h index 81a7bb82..006414d9 100644 --- a/src/main.h +++ b/src/main.h @@ -22,217 +22,9 @@ #ifndef MAIN_H #define MAIN_H -#include - -#include "intl.h" - -/* - *------------------------------------- - * Standard library includes - *------------------------------------- - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - *------------------------------------- - * includes for glib / gtk / gdk-pixbuf - *------------------------------------- - */ - #include #include -#include -#include - -#include "compat.h" - -/* - *---------------------------------------------------------------------------- - * defines - *---------------------------------------------------------------------------- - */ - -#define USE_XDG 1 - -#define GQ_APPNAME "Geeqie" -#define GQ_APPNAME_LC "geeqie" -#define GQ_WEBSITE "https://www.geeqie.org/" -#define GQ_EMAIL_ADDRESS "geeqie@freelists.org" - -#define GQ_RC_DIR "." GQ_APPNAME_LC -#define GQ_COLLECTIONS_DIR "collections" -#define GQ_TRASH_DIR "trash" -#define GQ_WINDOW_LAYOUTS_DIR "layouts" -#define GQ_ARCHIVE_DIR "geeqie-archive" -#define GQ_RESOURCE_PATH_ICONS "/org/geeqie/icons" -#define GQ_RESOURCE_PATH_CREDITS "/org/geeqie/credits" -#define GQ_RESOURCE_PATH_UI "/org/geeqie/ui" - -#define GQ_SYSTEM_WIDE_DIR "/etc/" GQ_APPNAME_LC - -#define RC_FILE_NAME GQ_APPNAME_LC "rc.xml" -#define DEFAULT_WINDOW_LAYOUT "default_window_layout.xml" - -#define GQ_COLLECTION_EXT ".gqv" - -#define SCROLL_RESET_TOPLEFT 0 -#define SCROLL_RESET_CENTER 1 -#define SCROLL_RESET_NOCHANGE 2 - -#define MOUSEWHEEL_SCROLL_SIZE 20 - - -#define GQ_DEFAULT_SHELL_PATH "/bin/sh" -#define GQ_DEFAULT_SHELL_OPTIONS "-c" - -#define COLOR_PROFILE_INPUTS 4 - -#define DEFAULT_THUMB_WIDTH 96 -#define DEFAULT_THUMB_HEIGHT 72 - -#define DEFAULT_MINIMAL_WINDOW_SIZE 100 - -#define IMAGE_MIN_WIDTH 100 -#define SIDEBAR_DEFAULT_WIDTH 250 - - -#define DEFAULT_OVERLAY_INFO "%collection:*\\n%" \ - "(%number%/%total%) [%zoom%] %name%\n" \ - "%res%|%date%|%size%\n" \ - "%formatted.Aperture%|%formatted.ShutterSpeed%|%formatted.ISOSpeedRating:ISO *%|%formatted.FocalLength%|%formatted.ExposureBias:* Ev%\n" \ - "%formatted.Camera:40%|%formatted.Flash%\n" \ - "%formatted.star_rating%" - -#define GQ_LINK_STR "↩" -#include "typedefs.h" -#include "debug.h" -#include "options.h" - -#define TIMEZONE_DATABASE_WEB "https://cdn.bertold.org/zonedetect/db/db.zip" -#define TIMEZONE_DATABASE_FILE "timezone21.bin" -#define TIMEZONE_DATABASE_VERSION "out_v1" -#define HELP_SEARCH_ENGINE "https://duckduckgo.com/?q=site:geeqie.org/help " - -#define STAR_RATING_NOT_READ -12345 -#define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark' -#define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star' - -#define GQ_ICON_ADD "list-add" -#define GQ_ICON_REMOVE "list-remove" -#define GQ_ICON_UNDO "edit-undo" -#define GQ_ICON_REDO "edit-redo" -#define GQ_ICON_OPEN "document-open" -#define GQ_ICON_OPEN_WITH "open-menu" -#define GQ_ICON_SAVE "document-save" -#define GQ_ICON_SAVE_AS "document-save-as" -#define GQ_ICON_NEW "document-new" -#define GQ_ICON_EDIT "document-edit" -#define GQ_ICON_REVERT "document-revert" -#define GQ_ICON_CLOSE "window-close" -#define GQ_ICON_RUN "system-run" -#define GQ_ICON_STOP "process-stop" -#define GQ_ICON_FULLSCREEN "view-fullscreen" -#define GQ_ICON_LEAVE_FULLSCREEN "view-restore" -#define GQ_ICON_REFRESH "view-refresh" -#define GQ_ICON_ABOUT "help-about" -#define GQ_ICON_QUIT "application-exit" -#define GQ_ICON_DELETE "edit-delete" -#define GQ_ICON_DELETE_SHRED "edit-delete-shred" -#define GQ_ICON_CLEAR "edit-clear" -#define GQ_ICON_COPY "edit-copy" -#define GQ_ICON_FIND "edit-find" -#define GQ_ICON_REPLACE "edit-find-replace" -#define GQ_ICON_PRINT "document-print" -#define GQ_ICON_FILE_FILTER "preview-file" -#define GQ_ICON_USER_TRASH "user-trash" - -#define GQ_ICON_GO_TOP "go-top" -#define GQ_ICON_GO_BOTTOM "go-bottom" -#define GQ_ICON_GO_UP "go-up" -#define GQ_ICON_GO_DOWN "go-down" -#define GQ_ICON_GO_FIRST "go-first" -#define GQ_ICON_GO_LAST "go-last" -#define GQ_ICON_GO_PREV "go-previous" -#define GQ_ICON_GO_NEXT "go-next" -#define GQ_ICON_GO_JUMP "go-jump" -#define GQ_ICON_HOME "go-home" - -#define GQ_ICON_PREV_PAGE "media-skip-backward" -#define GQ_ICON_NEXT_PAGE "media-skip-forward" -#define GQ_ICON_BACK_PAGE "media-seek-backward" -#define GQ_ICON_FORWARD_PAGE "media-seek-forward" - -#define GQ_ICON_PLAY "media-playback-start" -#define GQ_ICON_PAUSE "media-playback-pause" - -#define GQ_ICON_ZOOM_IN "zoom-in" -#define GQ_ICON_ZOOM_OUT "zoom-out" -#define GQ_ICON_ZOOM_100 "zoom-original" -#define GQ_ICON_ZOOM_FIT "zoom-fit-best" - -// might need replacing -#define GQ_ICON_PREFERENCES "preferences-system" -#define GQ_ICON_HELP "help-contents" // "help-browser"? -#define GQ_ICON_EXPORT "document-export" // use collection icon? - -// not available in some themes -#define GQ_ICON_OK "emblem-ok" -#define GQ_ICON_APPLY "emblem-ok" // need something else? -#define GQ_ICON_CANCEL "dialog-cancel" // missing in adwaita and others, seen in breeze -#define GQ_ICON_PAN_DOWN "pan-down-symbolic" // adwaita, breeze, hicolor supports this -#define GQ_ICON_PAN_UP "pan-up-symbolic" // adwaita, breeze, hicolor supports this - -#define GQ_ICON_DIALOG_ERROR "dialog-error" -#define GQ_ICON_DIALOG_INFO "dialog-information" -#define GQ_ICON_DIALOG_QUESTION "dialog-question" -#define GQ_ICON_DIALOG_WARNING "dialog-warning" - -#define GQ_ICON_UNREADABLE "emblem-unreadable" -#define GQ_ICON_LINK "emblem-symbolic-link" -#define GQ_ICON_READONLY "emblem-readonly" - -#define GQ_ICON_FLIP_HORIZONTAL "object-flip-horizontal" -#define GQ_ICON_FLIP_VERTICAL "object-flip-vertical" -#define GQ_ICON_ROTATE_LEFT "object-rotate-left" -#define GQ_ICON_ROTATE_RIGHT "object-rotate-right" - -#define GQ_ICON_DIRECTORY "folder" -#define GQ_ICON_MISSING_IMAGE "image-missing" -#define GQ_ICON_STRIKETHROUGH "format-text-strikethrough" -#define GQ_ICON_FILE "text-x-generic" -#define GQ_ICON_GENERIC "text-x-generic" -#define GQ_ICON_SELECT_FONT "font-select" -#define GQ_ICON_SELECT_COLOR "color-select" -#define GQ_ICON_COLOR_MANAGEMENT "preferences-color" // breeze has nicer "color-management" icon, missing in others - -// not done... plus many more -#define GQ_ICON_COLLECTION GTK_STOCK_INDEX -#define GQ_ICON_DND GTK_STOCK_DND_MULTIPLE -// PIXBUF_INLINE_ICON_ZOOMFILLHOR -// PIXBUF_INLINE_ICON_ZOOMFILLVERT - -/* - *---------------------------------------------------------------------------- - * main.cc - *---------------------------------------------------------------------------- - */ - -/* - * This also doubles as the main.cc header. - */ - extern gboolean thumb_format_changed; extern gchar *gq_prefix; diff --git a/src/menu.cc b/src/menu.cc index 642495e8..72724e04 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -19,12 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "menu.h" +#include + #include "collect-io.h" #include "collect-table.h" #include "editors.h" +#include "intl.h" +#include "main-defines.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-menu.h" diff --git a/src/menu.h b/src/menu.h index 517c472a..1622970b 100644 --- a/src/menu.h +++ b/src/menu.h @@ -22,6 +22,9 @@ #ifndef MENU_H #define MENU_H +#include + +#include "typedefs.h" gpointer submenu_item_get_data(GtkWidget *menu); diff --git a/src/meson.build b/src/meson.build index f23dbf7d..94589c44 100644 --- a/src/meson.build +++ b/src/meson.build @@ -150,6 +150,7 @@ main_sources = files('advanced-exif.cc', 'lua.cc', 'main.cc', 'main.h', +'main-defines.h', 'md5-util.cc', 'md5-util.h', 'menu.cc', diff --git a/src/metadata.cc b/src/metadata.cc index 1a6dd1c1..9b09c56c 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -19,14 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "metadata.h" + #include -#include "main.h" -#include "metadata.h" +#include #include "cache.h" +#include "debug.h" #include "exif.h" #include "filedata.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" #include "secure-save.h" #include "ui-fileops.h" diff --git a/src/metadata.h b/src/metadata.h index 157b1837..2740edbb 100644 --- a/src/metadata.h +++ b/src/metadata.h @@ -22,6 +22,10 @@ #ifndef METADATA_H #define METADATA_H +#include + +#include "typedefs.h" + struct FileData; #define COMMENT_KEY "Xmp.dc.description" diff --git a/src/misc.cc b/src/misc.cc index 815ee46b..03638c6c 100644 --- a/src/misc.cc +++ b/src/misc.cc @@ -18,16 +18,23 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "misc.h" + #include #include -#include "main.h" -#include "misc.h" +#include +#include "debug.h" #include "filedata.h" +#include "intl.h" +#include "main.h" +#include "main-defines.h" +#include "options.h" #include "ui-fileops.h" #include +#include gdouble get_zoom_increment() { diff --git a/src/misc.h b/src/misc.h index c75d76da..37f95953 100644 --- a/src/misc.h +++ b/src/misc.h @@ -21,6 +21,10 @@ #ifndef MISC_H #define MISC_H +#include + +#include + struct FileData; const gchar *gq_gtk_entry_get_text(GtkEntry *entry); diff --git a/src/options.cc b/src/options.cc index 4bfa559a..6d629591 100644 --- a/src/options.cc +++ b/src/options.cc @@ -17,13 +17,17 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "options.h" +#include + +#include "debug.h" #include "histogram.h" /* HCHAN_RGB */ #include "image-overlay.h" /* OSD_SHOW_NOTHING */ +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "main-defines.h" #include "misc.h" #include "rcfile.h" #include "ui-bookmark.h" diff --git a/src/options.h b/src/options.h index c16aa41e..c980b21b 100644 --- a/src/options.h +++ b/src/options.h @@ -23,8 +23,12 @@ #include +#include "typedefs.h" + struct SecureSaveInfo; +#define COLOR_PROFILE_INPUTS 4 + /** * @enum DnDAction * drag and drop default action diff --git a/src/osd.cc b/src/osd.cc index 001249b6..57c68cde 100644 --- a/src/osd.cc +++ b/src/osd.cc @@ -22,12 +22,15 @@ * used for the same purposes by the Print routines */ -#include "main.h" #include "osd.h" +#include + +#include "compat.h" #include "dnd.h" #include "exif.h" #include "glua.h" +#include "intl.h" #include "metadata.h" #include "ui-fileops.h" #include "ui-misc.h" diff --git a/src/osd.h b/src/osd.h index 93499e69..97ac4575 100644 --- a/src/osd.h +++ b/src/osd.h @@ -21,6 +21,8 @@ #ifndef OSD_H #define OSD_H +#include + struct FileData; enum OsdTemplateFlags { diff --git a/src/pan-view.h b/src/pan-view.h index 791d4c3f..aa46865e 100644 --- a/src/pan-view.h +++ b/src/pan-view.h @@ -22,7 +22,7 @@ #ifndef PAN_VIEW_H #define PAN_VIEW_H -#include "filedata.h" +struct FileData; void pan_window_new(FileData *dir_fd); diff --git a/src/pan-view/pan-calendar.cc b/src/pan-view/pan-calendar.cc index 4fcb845e..b76aef63 100644 --- a/src/pan-view/pan-calendar.cc +++ b/src/pan-view/pan-calendar.cc @@ -23,7 +23,9 @@ #include +#include "debug.h" #include "misc.h" +#include "pan-item.h" #include "pan-util.h" #include "pan-view.h" #include "pan-view-filter.h" diff --git a/src/pan-view/pan-calendar.h b/src/pan-view/pan-calendar.h index cc5eb816..91fd8f36 100644 --- a/src/pan-view/pan-calendar.h +++ b/src/pan-view/pan-calendar.h @@ -22,8 +22,6 @@ #ifndef PAN_VIEW_PAN_CALENDAR_H #define PAN_VIEW_PAN_CALENDAR_H -//#include "main.h" -#include "pan-item.h" #include "pan-types.h" void pan_calendar_update(PanWindow *pw, PanItem *pi_day); diff --git a/src/pan-view/pan-folder.h b/src/pan-view/pan-folder.h index e9cc2619..1d074c26 100644 --- a/src/pan-view/pan-folder.h +++ b/src/pan-view/pan-folder.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_FOLDER_H #define PAN_VIEW_PAN_FOLDER_H -#include "main.h" #include "pan-types.h" void pan_flower_compute(PanWindow *pw, FileData *dir_fd, diff --git a/src/pan-view/pan-grid.h b/src/pan-view/pan-grid.h index a8985228..359c8526 100644 --- a/src/pan-view/pan-grid.h +++ b/src/pan-view/pan-grid.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_GRID_H #define PAN_VIEW_PAN_GRID_H -#include "main.h" #include "pan-types.h" void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height); diff --git a/src/pan-view/pan-item.h b/src/pan-view/pan-item.h index 5621bff1..aa4f291f 100644 --- a/src/pan-view/pan-item.h +++ b/src/pan-view/pan-item.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_ITEM_H #define PAN_VIEW_PAN_ITEM_H -#include "main.h" #include "pan-types.h" #include "pixbuf-renderer.h" diff --git a/src/pan-view/pan-timeline.h b/src/pan-view/pan-timeline.h index 7cfba941..596721ce 100644 --- a/src/pan-view/pan-timeline.h +++ b/src/pan-view/pan-timeline.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_TIMELINE_H #define PAN_VIEW_PAN_TIMELINE_H -#include "main.h" #include "pan-types.h" void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height); diff --git a/src/pan-view/pan-types.h b/src/pan-view/pan-types.h index 12d5b810..e4dc1398 100644 --- a/src/pan-view/pan-types.h +++ b/src/pan-view/pan-types.h @@ -22,6 +22,8 @@ #ifndef PAN_VIEW_PAN_TYPES_H #define PAN_VIEW_PAN_TYPES_H +#include + #include "cache-loader.h" #include "filedata.h" diff --git a/src/pan-view/pan-util.cc b/src/pan-view/pan-util.cc index fbb0bb26..c24fa71a 100644 --- a/src/pan-view/pan-util.cc +++ b/src/pan-view/pan-util.cc @@ -21,6 +21,9 @@ #include "pan-util.h" +#include + +#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 7f1d4a23..49ea863e 100644 --- a/src/pan-view/pan-util.h +++ b/src/pan-view/pan-util.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_UTIL_H #define PAN_VIEW_PAN_UTIL_H -#include "main.h" #include "pan-types.h" enum PanDateLengthType { diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc index 35ff1958..15b7353f 100644 --- a/src/pan-view/pan-view-filter.cc +++ b/src/pan-view/pan-view-filter.cc @@ -21,7 +21,12 @@ #include "pan-view-filter.h" +#include + +#include "compat.h" #include "image.h" +#include "intl.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "pan-view.h" diff --git a/src/pan-view/pan-view-filter.h b/src/pan-view/pan-view-filter.h index ca12f2d2..40dbcba7 100644 --- a/src/pan-view/pan-view-filter.h +++ b/src/pan-view/pan-view-filter.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_VIEW_FILTER_H #define PAN_VIEW_PAN_VIEW_FILTER_H -#include "main.h" #include "pan-types.h" enum PanViewFilterMode { diff --git a/src/pan-view/pan-view-search.cc b/src/pan-view/pan-view-search.cc index aaf7a5f4..8546150e 100644 --- a/src/pan-view/pan-view-search.cc +++ b/src/pan-view/pan-view-search.cc @@ -21,9 +21,15 @@ #include "pan-view-search.h" +#include + +#include "compat.h" #include "image.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" #include "pan-calendar.h" +#include "pan-item.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 0ac46fa4..83c10aab 100644 --- a/src/pan-view/pan-view-search.h +++ b/src/pan-view/pan-view-search.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_VIEW_SEARCH_H #define PAN_VIEW_PAN_VIEW_SEARCH_H -#include "main.h" #include "pan-types.h" void pan_search_toggle_visible(PanWindow *pw, gboolean enable); diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc index fa178521..93d4ff10 100644 --- a/src/pan-view/pan-view.cc +++ b/src/pan-view/pan-view.cc @@ -21,24 +21,33 @@ #include "pan-view.h" +#include + #include "bar-exif.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "editors.h" #include "exif.h" #include "fullscreen.h" #include "image.h" #include "img-view.h" +#include "intl.h" #include "layout-util.h" +#include "main.h" +#include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" #include "pan-calendar.h" #include "pan-folder.h" #include "pan-grid.h" +#include "pan-item.h" #include "pan-timeline.h" #include "pan-util.h" #include "pan-view-filter.h" #include "pan-view-search.h" +#include "pixbuf-renderer.h" #include "pixbuf-util.h" #include "thumb.h" #include "ui-fileops.h" diff --git a/src/pan-view/pan-view.h b/src/pan-view/pan-view.h index 8ad35211..27bf693b 100644 --- a/src/pan-view/pan-view.h +++ b/src/pan-view/pan-view.h @@ -22,7 +22,6 @@ #ifndef PAN_VIEW_PAN_VIEW_H #define PAN_VIEW_PAN_VIEW_H -#include "main.h" #include "pan-types.h" void pan_layout_update(PanWindow *pw); diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc index fe262beb..3d14a03f 100644 --- a/src/pixbuf-renderer.cc +++ b/src/pixbuf-renderer.cc @@ -19,13 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "pixbuf-renderer.h" + #include #include #include -#include "main.h" -#include "pixbuf-renderer.h" +#include +#include "debug.h" +#include "main-defines.h" +#include "options.h" #include "renderer-tiles.h" /* comment this out if not using this from within Geeqie @@ -35,7 +39,6 @@ #define GQ_BUILD 1 #ifdef GQ_BUILD -#include "main.h" #include "pixbuf-util.h" #include "exif.h" #else diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h index 0d548a17..af0d67f2 100644 --- a/src/pixbuf-renderer.h +++ b/src/pixbuf-renderer.h @@ -22,6 +22,10 @@ #ifndef PIXBUF_RENDERER_H #define PIXBUF_RENDERER_H +#include + +#include "typedefs.h" + #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)) diff --git a/src/pixbuf-util.cc b/src/pixbuf-util.cc index 997b31c0..bd55b290 100644 --- a/src/pixbuf-util.cc +++ b/src/pixbuf-util.cc @@ -19,11 +19,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "pixbuf-util.h" +#include + +#include "debug.h" #include "exif.h" #include "filedata.h" +#include "main-defines.h" #include "ui-fileops.h" #include diff --git a/src/pixbuf-util.h b/src/pixbuf-util.h index faf56b69..4df9558f 100644 --- a/src/pixbuf-util.h +++ b/src/pixbuf-util.h @@ -22,6 +22,8 @@ #ifndef PIXBUF_UTIL_H #define PIXBUF_UTIL_H +#include + struct FileData; gboolean pixbuf_to_file_as_png (GdkPixbuf *pixbuf, const gchar *filename); diff --git a/src/preferences.cc b/src/preferences.cc index c3ec5863..edb33048 100644 --- a/src/preferences.cc +++ b/src/preferences.cc @@ -19,12 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "preferences.h" +#include + #include "bar-keywords.h" #include "cache.h" #include "color-man.h" +#include "compat.h" +#include "debug.h" #include "editors.h" #include "filedata.h" #include "filefilter.h" @@ -32,7 +35,10 @@ #include "image.h" #include "image-overlay.h" #include "img-view.h" +#include "intl.h" #include "layout-util.h" +#include "main.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "osd.h" @@ -309,8 +315,8 @@ static void config_window_apply() if (options->thumbnails.max_width != c_options->thumbnails.max_width || options->thumbnails.max_height != c_options->thumbnails.max_height || options->thumbnails.quality != c_options->thumbnails.quality) - { - thumb_format_changed = TRUE; + { + thumb_format_changed = TRUE; refresh = TRUE; options->thumbnails.max_width = c_options->thumbnails.max_width; options->thumbnails.max_height = c_options->thumbnails.max_height; diff --git a/src/preferences.h b/src/preferences.h index 55d5caa2..17fbadd4 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -22,6 +22,8 @@ #ifndef PREFERENCES_H #define PREFERENCES_H +#include + struct LayoutWindow; void show_config_window(LayoutWindow *lw); diff --git a/src/print.cc b/src/print.cc index 30692419..1c71df66 100644 --- a/src/print.cc +++ b/src/print.cc @@ -18,12 +18,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "print.h" +#include + +#include "compat.h" +#include "debug.h" #include "exif.h" #include "filedata.h" #include "image-load.h" +#include "intl.h" +#include "main-defines.h" +#include "options.h" #include "osd.h" #include "pixbuf-util.h" #include "ui-misc.h" diff --git a/src/print.h b/src/print.h index dc924ce9..d61028fd 100644 --- a/src/print.h +++ b/src/print.h @@ -22,6 +22,8 @@ #ifndef PRINT_H #define PRINT_H +#include + struct FileData; /** diff --git a/src/rcfile.cc b/src/rcfile.cc index 748053df..5f028839 100644 --- a/src/rcfile.cc +++ b/src/rcfile.cc @@ -19,9 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "rcfile.h" +#include + #include "bar.h" #include "bar-comment.h" #include "bar-exif.h" @@ -29,8 +30,11 @@ #include "bar-keywords.h" #include "bar-rating.h" #include "bar-sort.h" +#include "debug.h" #include "editors.h" #include "filefilter.h" +#include "intl.h" +#include "main-defines.h" #include "pixbuf-renderer.h" #include "secure-save.h" #include "slideshow.h" diff --git a/src/rcfile.h b/src/rcfile.h index dad3ec86..16a7d642 100644 --- a/src/rcfile.h +++ b/src/rcfile.h @@ -22,6 +22,8 @@ #ifndef RCFILE_H #define RCFILE_H +#include "options.h" + struct LayoutWindow; void write_indent(GString *str, gint indent); diff --git a/src/remote.cc b/src/remote.cc index bfd4072d..5382693e 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -19,19 +19,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "remote.h" +#include + #include "cache-maint.h" #include "collect.h" #include "collect-io.h" +#include "compat.h" +#include "debug.h" #include "exif.h" #include "filedata.h" #include "filefilter.h" #include "image.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" #include "layout-util.h" +#include "main.h" +#include "main-defines.h" #include "misc.h" #include "pixbuf-renderer.h" #include "slideshow.h" diff --git a/src/remote.h b/src/remote.h index 86470313..eb0f6f26 100644 --- a/src/remote.h +++ b/src/remote.h @@ -22,6 +22,8 @@ #ifndef REMOTE_H #define REMOTE_H +#include + struct CollectionData; struct RemoteConnection { diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc index cd8257be..0a7c1c98 100644 --- a/src/renderer-tiles.cc +++ b/src/renderer-tiles.cc @@ -19,12 +19,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "renderer-tiles.h" + #include #include #include -#include "main.h" -#include "renderer-tiles.h" +#include + +#include "debug.h" +#include "options.h" /* comment this out if not using this from within Geeqie * defining GQ_BUILD does these things: @@ -33,7 +37,6 @@ #define GQ_BUILD 1 #ifdef GQ_BUILD -#include "main.h" #include "pixbuf-util.h" #include "exif.h" #else diff --git a/src/search-and-run.cc b/src/search-and-run.cc index 029bca1b..bb6a1c4d 100644 --- a/src/search-and-run.cc +++ b/src/search-and-run.cc @@ -18,10 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "search-and-run.h" +#include + +#include "compat.h" +#include "debug.h" #include "layout.h" +#include "main-defines.h" #include "ui-misc.h" #include "window.h" diff --git a/src/search-and-run.h b/src/search-and-run.h index 380719d1..3adab70e 100644 --- a/src/search-and-run.h +++ b/src/search-and-run.h @@ -21,6 +21,8 @@ #ifndef SEARCH_AND_RUN_H #define SEARCH_AND_RUN_H +#include + struct LayoutWindow; GtkWidget *search_and_run_new(LayoutWindow *lw); diff --git a/src/search.cc b/src/search.cc index 6cc8b97a..ea0d194c 100644 --- a/src/search.cc +++ b/src/search.cc @@ -19,19 +19,24 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "search.h" +#include + #include "bar-keywords.h" #include "cache.h" #include "collect-table.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "dupe.h" #include "editors.h" #include "filedata.h" #include "image-load.h" #include "img-view.h" +#include "intl.h" #include "layout-util.h" +#include "main-defines.h" #include "menu.h" #include "metadata.h" #include "misc.h" diff --git a/src/secure-save.cc b/src/secure-save.cc index 390aeaba..348c6801 100644 --- a/src/secure-save.cc +++ b/src/secure-save.cc @@ -18,13 +18,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "secure-save.h" + #include -#include "main.h" #include +#include #include -#include "secure-save.h" +#include + +#include "debug.h" +#include "intl.h" /** * @file secure-save.cc diff --git a/src/secure-save.h b/src/secure-save.h index 46d708f8..057ed42c 100644 --- a/src/secure-save.h +++ b/src/secure-save.h @@ -21,6 +21,10 @@ #ifndef SECURE_SAVE_H #define SECURE_SAVE_H +#include + +#include + /** * @enum SecureSaveErrno * see err field in #SecureSaveInfo diff --git a/src/shortcuts.cc b/src/shortcuts.cc index 8bc12eab..c7327c2b 100644 --- a/src/shortcuts.cc +++ b/src/shortcuts.cc @@ -19,11 +19,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "shortcuts.h" +#include + #include "collect.h" +#include "compat.h" +#include "intl.h" #include "layout.h" +#include "main-defines.h" #include "utilops.h" #include "ui-bookmark.h" #include "ui-fileops.h" diff --git a/src/shortcuts.h b/src/shortcuts.h index c83bf78d..9369367a 100644 --- a/src/shortcuts.h +++ b/src/shortcuts.h @@ -22,6 +22,8 @@ #ifndef SHORTCUTS_H #define SHORTCUTS_H +#include + struct LayoutWindow; GtkWidget *shortcuts_new_default(LayoutWindow *lw); diff --git a/src/similar.cc b/src/similar.cc index b174c43a..67c54681 100644 --- a/src/similar.cc +++ b/src/similar.cc @@ -19,10 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#include "main.h" #include "similar.h" +#include + +#include "options.h" + /** * @file * diff --git a/src/similar.h b/src/similar.h index b29b79dc..528c8f8b 100644 --- a/src/similar.h +++ b/src/similar.h @@ -22,6 +22,7 @@ #ifndef SIMILAR_H #define SIMILAR_H +#include struct ImageSimilarityData { diff --git a/src/slideshow.cc b/src/slideshow.cc index 924e1c61..23274393 100644 --- a/src/slideshow.cc +++ b/src/slideshow.cc @@ -19,10 +19,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" +#include "slideshow.h" + +#include + #include "collect.h" #include "image.h" -#include "slideshow.h" #include "filedata.h" #include "layout.h" #include "layout-image.h" diff --git a/src/slideshow.h b/src/slideshow.h index 15f8e47f..2ad8f10a 100644 --- a/src/slideshow.h +++ b/src/slideshow.h @@ -22,8 +22,11 @@ #ifndef SLIDESHOW_H #define SLIDESHOW_H +#include + struct CollectInfo; struct CollectionData; +struct FileData; struct ImageWindow; struct LayoutWindow; diff --git a/src/thumb-standard.cc b/src/thumb-standard.cc index e9f9c2cf..1ac949bb 100644 --- a/src/thumb-standard.cc +++ b/src/thumb-standard.cc @@ -19,18 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "thumb-standard.h" +#include + #include "cache.h" +#include "color-man.h" +#include "debug.h" +#include "exif.h" +#include "filedata.h" #include "image-load.h" #include "md5-util.h" +#include "metadata.h" +#include "options.h" #include "pixbuf-util.h" #include "ui-fileops.h" -#include "filedata.h" -#include "exif.h" -#include "metadata.h" -#include "color-man.h" /** diff --git a/src/thumb-standard.h b/src/thumb-standard.h index 0c31ab7d..6752f5f3 100644 --- a/src/thumb-standard.h +++ b/src/thumb-standard.h @@ -22,6 +22,10 @@ #ifndef THUMB_STANDARD_H #define THUMB_STANDARD_H +#include + +#include "main-defines.h" + struct FileData; struct ImageLoader; diff --git a/src/thumb.cc b/src/thumb.cc index 7afca828..674e241d 100644 --- a/src/thumb.cc +++ b/src/thumb.cc @@ -19,17 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "thumb.h" +#include + #include "cache.h" -#include "image-load.h" +#include "debug.h" +#include "exif.h" #include "filedata.h" +#include "image-load.h" +#include "intl.h" +#include "metadata.h" +#include "options.h" #include "pixbuf-util.h" #include "thumb-standard.h" #include "ui-fileops.h" -#include "exif.h" -#include "metadata.h" #include diff --git a/src/thumb.h b/src/thumb.h index 8ff8fa26..29f1c610 100644 --- a/src/thumb.h +++ b/src/thumb.h @@ -22,6 +22,10 @@ #ifndef THUMB_H #define THUMB_H +#include + +#include "typedefs.h" + struct FileData; struct ImageLoader; diff --git a/src/toolbar.cc b/src/toolbar.cc index 16f26aba..95cc6916 100644 --- a/src/toolbar.cc +++ b/src/toolbar.cc @@ -19,10 +19,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "toolbar.h" +#include + +#include "compat.h" +#include "intl.h" #include "layout-util.h" +#include "main-defines.h" #include "ui-fileops.h" #include "ui-misc.h" #include "pixbuf-util.h" diff --git a/src/toolbar.h b/src/toolbar.h index 82eea52f..f17b80df 100644 --- a/src/toolbar.h +++ b/src/toolbar.h @@ -22,6 +22,10 @@ #ifndef TOOLBAR_H #define TOOLBAR_H +#include + +#include "typedefs.h" + struct LayoutWindow; GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar); diff --git a/src/trash.cc b/src/trash.cc index 31440fb8..8e2d60d2 100644 --- a/src/trash.cc +++ b/src/trash.cc @@ -19,13 +19,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "trash.h" + +#include + #include "utilops.h" #include "window.h" +#include "debug.h" #include "editors.h" #include "filedata.h" +#include "intl.h" +#include "main-defines.h" +#include "options.h" #include "ui-fileops.h" /* diff --git a/src/trash.h b/src/trash.h index 2e234fb2..6a33ea7c 100644 --- a/src/trash.h +++ b/src/trash.h @@ -19,7 +19,7 @@ #ifndef TRASH_H #define TRASH_H -#include "ui-utildlg.h" +#include void file_util_trash_clear(); gboolean file_util_safe_unlink(const gchar *path); diff --git a/src/typedefs.h b/src/typedefs.h index a59043b8..5895d3af 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -22,6 +22,8 @@ #ifndef TYPEDEFS_H #define TYPEDEFS_H +#include + enum ZoomMode { ZOOM_RESET_ORIGINAL = 0, ZOOM_RESET_FIT_WINDOW = 1, diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc index 8e394bb9..e0a620b1 100644 --- a/src/ui-bookmark.cc +++ b/src/ui-bookmark.cc @@ -19,15 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-bookmark.h" + #include #include -#include "main.h" -#include "ui-bookmark.h" +#include +#include "compat.h" +#include "debug.h" #include "history-list.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" #include "pixbuf-util.h" +#include "typedefs.h" #include "ui-fileops.h" #include "ui-menu.h" #include "ui-misc.h" diff --git a/src/ui-bookmark.h b/src/ui-bookmark.h index cea0b5dd..8e2f1f04 100644 --- a/src/ui-bookmark.h +++ b/src/ui-bookmark.h @@ -22,6 +22,7 @@ #ifndef UI_BOOKMARK_H #define UI_BOOKMARK_H +#include /* bookmarks */ @@ -47,6 +48,5 @@ GtkWidget *history_combo_new(GtkWidget **entry, const gchar *text, void history_combo_append_history(GtkWidget *widget, const gchar *text); - #endif /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc index 7d0fca9b..8ce9e80c 100644 --- a/src/ui-fileops.cc +++ b/src/ui-fileops.cc @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-fileops.h" + #include #include #include @@ -27,11 +29,14 @@ #include #include -#include "main.h" -#include "ui-fileops.h" +#include +#include "compat.h" +#include "debug.h" +#include "main-defines.h" #include "md5-util.h" #include "filefilter.h" +#include "intl.h" #include "layout.h" #include "utilops.h" #include "secure-save.h" diff --git a/src/ui-fileops.h b/src/ui-fileops.h index f0987ad1..40269206 100644 --- a/src/ui-fileops.h +++ b/src/ui-fileops.h @@ -21,13 +21,15 @@ #ifndef UI_FILEOPS_H #define UI_FILEOPS_H -#include + #include #include #include #include +#include +#include void print_term(gboolean err, const gchar *text_utf8); diff --git a/src/ui-help.cc b/src/ui-help.cc index f7d16d61..3bd3d08e 100644 --- a/src/ui-help.cc +++ b/src/ui-help.cc @@ -19,12 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-help.h" + #include #include -#include "main.h" -#include "ui-help.h" +#include +#include "compat.h" +#include "debug.h" +#include "intl.h" +#include "main-defines.h" #include "ui-fileops.h" #include "ui-misc.h" #include "window.h" diff --git a/src/ui-help.h b/src/ui-help.h index 7685b99d..f04d2a2d 100644 --- a/src/ui-help.h +++ b/src/ui-help.h @@ -22,6 +22,7 @@ #ifndef UI_HELP_H #define UI_HELP_H +#include GtkWidget *help_window_new(const gchar *title, const gchar *subclass, diff --git a/src/ui-menu.cc b/src/ui-menu.cc index cf76167d..66dd93bd 100644 --- a/src/ui-menu.cc +++ b/src/ui-menu.cc @@ -19,10 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" -#include "layout.h" #include "ui-menu.h" +#include + +#include "layout.h" /* *----------------------------------------------------------------------------- diff --git a/src/ui-menu.h b/src/ui-menu.h index c6387226..879aae3b 100644 --- a/src/ui-menu.h +++ b/src/ui-menu.h @@ -23,6 +23,8 @@ #define UI_MENU_H +#include + /** * @struct hard_coded_window_keys * @brief hard coded window shortcut keys diff --git a/src/ui-misc.cc b/src/ui-misc.cc index 413115d5..8d56e75a 100644 --- a/src/ui-misc.cc +++ b/src/ui-misc.cc @@ -19,15 +19,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-misc.h" + #include #include -#include "main.h" +#include +#include "compat.h" +#include "debug.h" #include "history-list.h" #include "layout.h" +#include "main-defines.h" #include "misc.h" -#include "ui-misc.h" #include "utilops.h" #include diff --git a/src/ui-misc.h b/src/ui-misc.h index a5b1ca95..b385cc96 100644 --- a/src/ui-misc.h +++ b/src/ui-misc.h @@ -27,6 +27,7 @@ #include #include +#include /* these values are per GNOME HIG */ diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc index 5ed56feb..3bbbc91a 100644 --- a/src/ui-pathsel.cc +++ b/src/ui-pathsel.cc @@ -19,16 +19,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-pathsel.h" + #include #include #include #include -#include "main.h" -#include "ui-pathsel.h" +#include +#include "compat.h" +#include "debug.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" +#include "options.h" #include "ui-bookmark.h" #include "ui-fileops.h" #include "ui-menu.h" diff --git a/src/ui-pathsel.h b/src/ui-pathsel.h index 767ac5bb..1dff0c7b 100644 --- a/src/ui-pathsel.h +++ b/src/ui-pathsel.h @@ -23,6 +23,8 @@ #define UI_PATHSEL_H +#include + GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path, const gchar *filter, const gchar *filter_desc); diff --git a/src/ui-tabcomp.cc b/src/ui-tabcomp.cc index 69ad7beb..07797e2c 100644 --- a/src/ui-tabcomp.cc +++ b/src/ui-tabcomp.cc @@ -19,15 +19,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-tabcomp.h" + #include #include #include -#include "main.h" -#include "ui-tabcomp.h" +#include +#include "compat.h" +#include "debug.h" #include "history-list.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" /* expand_tilde() */ +#include "options.h" #include "ui-fileops.h" #include "ui-utildlg.h" diff --git a/src/ui-tabcomp.h b/src/ui-tabcomp.h index 501ac0ff..3d665aa7 100644 --- a/src/ui-tabcomp.h +++ b/src/ui-tabcomp.h @@ -22,6 +22,7 @@ #ifndef UI_TABCOMP_H #define UI_TABCOMP_H +#include GtkWidget *tab_completion_new_with_history(GtkWidget **entry, const gchar *text, const gchar *history_key, gint max_levels, diff --git a/src/ui-tree-edit.cc b/src/ui-tree-edit.cc index 5aac8082..8da8cb3e 100644 --- a/src/ui-tree-edit.cc +++ b/src/ui-tree-edit.cc @@ -19,12 +19,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-tree-edit.h" + #include -#include "main.h" +#include +#include "compat.h" #include "misc.h" -#include "ui-tree-edit.h" /* *------------------------------------------------------------------- diff --git a/src/ui-tree-edit.h b/src/ui-tree-edit.h index ebfabec3..9d080fdb 100644 --- a/src/ui-tree-edit.h +++ b/src/ui-tree-edit.h @@ -22,6 +22,7 @@ #ifndef UI_TREE_EDIT_H #define UI_TREE_EDIT_H +#include struct TreeEditData { diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc index b274859f..212bac8b 100644 --- a/src/ui-utildlg.cc +++ b/src/ui-utildlg.cc @@ -19,12 +19,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui-utildlg.h" + #include -#include "main.h" -#include "ui-utildlg.h" +#include +#include "compat.h" +#include "debug.h" #include "filedata.h" +#include "intl.h" +#include "main-defines.h" #include "misc.h" #include "rcfile.h" #include "ui-fileops.h" diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h index d6f65624..f9ea4d61 100644 --- a/src/ui-utildlg.h +++ b/src/ui-utildlg.h @@ -22,6 +22,8 @@ #ifndef UI_UTILDLG_H #define UI_UTILDLG_H +#include + struct FileData; #define GENERIC_DIALOG(gd) ((GenericDialog *)gd) diff --git a/src/uri-utils.cc b/src/uri-utils.cc index 5b5888aa..924970ad 100644 --- a/src/uri-utils.cc +++ b/src/uri-utils.cc @@ -18,10 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "uri-utils.h" +#include + +#include "debug.h" #include "filedata.h" +#include "intl.h" +#include "main-defines.h" #include "ui-fileops.h" #include "ui-utildlg.h" diff --git a/src/uri-utils.h b/src/uri-utils.h index 166bbd49..b85a8d67 100644 --- a/src/uri-utils.h +++ b/src/uri-utils.h @@ -21,6 +21,8 @@ #ifndef URI_UTILS_H #define URI_UTILS_H +#include + void warning_dialog_dnd_uri_error(GList *uri_error_list); GList *uri_filelist_from_uris(gchar **uris, GList **uri_error_list); gchar **uris_from_pathlist(GList *list); diff --git a/src/utilops.cc b/src/utilops.cc index 9e5a9107..1703dbab 100644 --- a/src/utilops.cc +++ b/src/utilops.cc @@ -19,17 +19,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "utilops.h" +#include + #include "cache.h" +#include "compat.h" +#include "debug.h" #include "editors.h" #include "exif.h" #include "filedata.h" #include "filefilter.h" #include "image.h" +#include "intl.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "thumb-standard.h" #include "trash.h" #include "ui-bookmark.h" diff --git a/src/utilops.h b/src/utilops.h index cb5a6829..d9096ce8 100644 --- a/src/utilops.h +++ b/src/utilops.h @@ -22,7 +22,7 @@ #ifndef UTILOPS_H #define UTILOPS_H - +#include "typedefs.h" #include "ui-utildlg.h" struct FileData; diff --git a/src/view-dir-list.cc b/src/view-dir-list.cc index 0f70a336..170dbe07 100644 --- a/src/view-dir-list.cc +++ b/src/view-dir-list.cc @@ -19,9 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-dir-list.h" +#include + #include "filedata.h" #include "layout.h" #include "ui-fileops.h" diff --git a/src/view-dir-list.h b/src/view-dir-list.h index fad98c51..03ae9efc 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 + struct FileData; struct ViewDir; diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc index 3695960b..9bb762b4 100644 --- a/src/view-dir-tree.cc +++ b/src/view-dir-tree.cc @@ -19,9 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-dir-tree.h" +#include + +#include "debug.h" #include "filedata.h" #include "layout.h" #include "ui-fileops.h" diff --git a/src/view-dir-tree.h b/src/view-dir-tree.h index 9b784f58..755f9bd1 100644 --- a/src/view-dir-tree.h +++ b/src/view-dir-tree.h @@ -22,6 +22,8 @@ #ifndef VIEW_DIR_TREE_H #define VIEW_DIR_TREE_H +#include + struct FileData; struct ViewDir; diff --git a/src/view-dir.cc b/src/view-dir.cc index 99fd70e6..fb1ba7b5 100644 --- a/src/view-dir.cc +++ b/src/view-dir.cc @@ -18,15 +18,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-dir.h" +#include + +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "dupe.h" #include "editors.h" #include "filedata.h" +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "main-defines.h" #include "menu.h" #include "ui-fileops.h" #include "ui-tree-edit.h" diff --git a/src/view-dir.h b/src/view-dir.h index bcf2bfac..f6be5e53 100644 --- a/src/view-dir.h +++ b/src/view-dir.h @@ -21,6 +21,10 @@ #ifndef VIEW_DIR_H #define VIEW_DIR_H +#include + +#include "typedefs.h" + struct FileData; struct LayoutWindow; diff --git a/src/view-file.h b/src/view-file.h index eeea7da8..48fe5b4b 100644 --- a/src/view-file.h +++ b/src/view-file.h @@ -21,6 +21,10 @@ #ifndef VIEW_FILE_H #define VIEW_FILE_H +#include + +#include "typedefs.h" + struct FileData; struct LayoutWindow; struct ThumbLoader; diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc index 24aae76e..21064f18 100644 --- a/src/view-file/view-file-icon.cc +++ b/src/view-file/view-file-icon.cc @@ -19,16 +19,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-file-icon.h" +#include + #include "cellrenderericon.h" #include "collect.h" +#include "compat.h" +#include "debug.h" #include "dnd.h" #include "img-view.h" +#include "intl.h" #include "layout-image.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" +#include "options.h" #include "utilops.h" #include "ui-fileops.h" #include "ui-misc.h" diff --git a/src/view-file/view-file-icon.h b/src/view-file/view-file-icon.h index 14fa6520..96840cd6 100644 --- a/src/view-file/view-file-icon.h +++ b/src/view-file/view-file-icon.h @@ -22,6 +22,8 @@ #ifndef VIEW_FILE_VIEW_FILE_ICON_H #define VIEW_FILE_VIEW_FILE_ICON_H +#include + #include "filedata.h" struct ViewFile; diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc index 1acb59b4..a1bc9955 100644 --- a/src/view-file/view-file-list.cc +++ b/src/view-file/view-file-list.cc @@ -19,14 +19,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-file-list.h" +#include + #include "collect.h" +#include "debug.h" #include "dnd.h" #include "img-view.h" +#include "intl.h" #include "layout.h" #include "layout-image.h" +#include "main-defines.h" #include "metadata.h" #include "misc.h" #include "utilops.h" diff --git a/src/view-file/view-file-list.h b/src/view-file/view-file-list.h index 22f0e0c5..990cce0e 100644 --- a/src/view-file/view-file-list.h +++ b/src/view-file/view-file-list.h @@ -22,6 +22,8 @@ #ifndef VIEW_FILE_VIEW_FILE_LIST_H #define VIEW_FILE_VIEW_FILE_LIST_H +#include + #include "filedata.h" struct ViewFile; diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc index cfc8f243..7384edfa 100644 --- a/src/view-file/view-file.cc +++ b/src/view-file/view-file.cc @@ -18,12 +18,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "view-file.h" +#include + +#include "compat.h" +#include "debug.h" #include "dupe.h" #include "history-list.h" +#include "intl.h" #include "layout.h" +#include "main.h" +#include "main-defines.h" #include "menu.h" #include "misc.h" #include "pixbuf-util.h" diff --git a/src/window.cc b/src/window.cc index 7aa437c1..e73423d1 100644 --- a/src/window.cc +++ b/src/window.cc @@ -18,10 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "main.h" #include "window.h" +#include + +#include "debug.h" +#include "intl.h" +#include "main.h" +#include "main-defines.h" #include "misc.h" +#include "options.h" #include "pixbuf-util.h" #include "ui-fileops.h" #include "ui-help.h" diff --git a/src/window.h b/src/window.h index 71ee4b6d..d8ca5e9f 100644 --- a/src/window.h +++ b/src/window.h @@ -21,6 +21,8 @@ #ifndef WINDOW_H #define WINDOW_H +#include + GtkWidget *window_new(const gchar *role, const gchar *icon, const gchar *icon_file, const gchar *subtitle); void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file); diff --git a/src/zonedetect.h b/src/zonedetect.h index e798cdd5..fd7d6ca1 100644 --- a/src/zonedetect.h +++ b/src/zonedetect.h @@ -25,7 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include +#include #ifndef INCL_ZONEDETECT_H_ #define INCL_ZONEDETECT_H_ -- 2.20.1