From f4398500f5a7fbe6236d5573170f8e359823d87e Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Tue, 8 Apr 2008 23:02:33 +0000 Subject: [PATCH] gqview.h -> main.h --- autogen.sh | 2 +- src/Makefile.am | 2 +- src/bar_exif.c | 2 +- src/bar_info.c | 2 +- src/bar_sort.c | 2 +- src/cache-loader.c | 2 +- src/cache.c | 2 +- src/cache_maint.c | 2 +- src/collect-dlg.c | 2 +- src/collect-io.c | 2 +- src/collect-table.c | 2 +- src/collect.c | 2 +- src/color-man.c | 2 +- src/dnd.c | 2 +- src/dupe.c | 2 +- src/editors.c | 2 +- src/exif-common.c | 2 +- src/exif.c | 2 +- src/exiv2.cc | 2 +- src/filelist.c | 2 +- src/format_canon.c | 2 +- src/format_fuji.c | 2 +- src/format_nikon.c | 2 +- src/format_olympus.c | 2 +- src/format_raw.c | 2 +- src/fullscreen.c | 2 +- src/globals.c | 2 +- src/histogram.c | 2 +- src/image-load.c | 2 +- src/image-overlay.c | 2 +- src/image.c | 2 +- src/img-view.c | 2 +- src/info.c | 2 +- src/layout.c | 2 +- src/layout_config.c | 2 +- src/layout_image.c | 2 +- src/layout_util.c | 2 +- src/main.c | 2 +- src/{gqview.h => main.h} | 0 src/menu.c | 2 +- src/pan-calendar.c | 2 +- src/pan-folder.c | 2 +- src/pan-grid.c | 2 +- src/pan-item.c | 2 +- src/pan-timeline.c | 2 +- src/pan-util.c | 2 +- src/pan-view.c | 2 +- src/pixbuf_util.c | 2 +- src/preferences.c | 2 +- src/print.c | 2 +- src/rcfile.c | 2 +- src/remote.c | 2 +- src/search.c | 2 +- src/similar.c | 2 +- src/slideshow.c | 2 +- src/thumb.c | 2 +- src/thumb_standard.c | 2 +- src/ui_bookmark.c | 2 +- src/ui_fileops.c | 2 +- src/ui_pathsel.c | 2 +- src/ui_tabcomp.c | 2 +- src/ui_utildlg.c | 2 +- src/utilops.c | 2 +- src/view_dir_list.c | 2 +- src/view_dir_tree.c | 2 +- src/view_file_icon.c | 2 +- src/view_file_list.c | 2 +- 67 files changed, 66 insertions(+), 66 deletions(-) rename src/{gqview.h => main.h} (100%) diff --git a/autogen.sh b/autogen.sh index 09e4eb09..50cfe962 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=. (test -f $srcdir/configure.in \ && test -f $srcdir/src/main.c \ - && test -f $srcdir/src/gqview.h) || { + && test -f $srcdir/src/main.h) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level geeqie directory" exit 1 diff --git a/src/Makefile.am b/src/Makefile.am index 90ef58d5..e17ca061 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -102,7 +102,6 @@ geeqie_SOURCES = \ fullscreen.c \ fullscreen.h \ globals.c \ - gqview.h \ histogram.c \ histogram.h \ image.c \ @@ -124,6 +123,7 @@ geeqie_SOURCES = \ layout_util.c \ layout_util.h \ main.c \ + main.h \ md5-util.c \ md5-util.h \ menu.c \ diff --git a/src/bar_exif.c b/src/bar_exif.c index 3b7d9e75..9f1ea94b 100644 --- a/src/bar_exif.c +++ b/src/bar_exif.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "bar_exif.h" #include "exif.h" diff --git a/src/bar_info.c b/src/bar_info.c index 27d1293b..953b2306 100644 --- a/src/bar_info.c +++ b/src/bar_info.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "exif.h" #include "bar_info.h" diff --git a/src/bar_sort.c b/src/bar_sort.c index e5c073a7..ea96435d 100644 --- a/src/bar_sort.c +++ b/src/bar_sort.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "bar_sort.h" #include "collect.h" diff --git a/src/cache-loader.c b/src/cache-loader.c index 1874f3d8..12f348a2 100644 --- a/src/cache-loader.c +++ b/src/cache-loader.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache-loader.h" #include "cache.h" diff --git a/src/cache.c b/src/cache.c index a61b0c53..55fd4757 100644 --- a/src/cache.c +++ b/src/cache.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache.h" #include "md5-util.h" diff --git a/src/cache_maint.c b/src/cache_maint.c index 86ded039..946b564e 100644 --- a/src/cache_maint.c +++ b/src/cache_maint.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "cache_maint.h" #include "cache.h" diff --git a/src/collect-dlg.c b/src/collect-dlg.c index 673e01f4..ce5c7cac 100644 --- a/src/collect-dlg.c +++ b/src/collect-dlg.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "collect-dlg.h" diff --git a/src/collect-io.c b/src/collect-io.c index 2df5e85c..1b0862ab 100644 --- a/src/collect-io.c +++ b/src/collect-io.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect-io.h" #include "collect.h" diff --git a/src/collect-table.c b/src/collect-table.c index 79770da1..56b48274 100644 --- a/src/collect-table.c +++ b/src/collect-table.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect-table.h" #include "cellrenderericon.h" diff --git a/src/collect.c b/src/collect.c index 7542a294..deaee713 100644 --- a/src/collect.c +++ b/src/collect.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "collect-dlg.h" diff --git a/src/color-man.c b/src/color-man.c index 4e3d0f58..1bc8ceb3 100644 --- a/src/color-man.c +++ b/src/color-man.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "color-man.h" #include "image.h" diff --git a/src/dnd.c b/src/dnd.c index 1e3b9053..7ae79e51 100644 --- a/src/dnd.c +++ b/src/dnd.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "dnd.h" #include "collect.h" diff --git a/src/dupe.c b/src/dupe.c index f0e4f602..4dc64b3e 100644 --- a/src/dupe.c +++ b/src/dupe.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "dupe.h" #include "cache.h" diff --git a/src/editors.c b/src/editors.c index 9738d9ff..16c9eefa 100644 --- a/src/editors.c +++ b/src/editors.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "editors.h" #include "utilops.h" diff --git a/src/exif-common.c b/src/exif-common.c index 53fa0e79..8f50d67d 100644 --- a/src/exif-common.c +++ b/src/exif-common.c @@ -21,7 +21,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "exif.h" #include "filelist.h" diff --git a/src/exif.c b/src/exif.c index 35c3d251..7fea4723 100644 --- a/src/exif.c +++ b/src/exif.c @@ -69,7 +69,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "exif-int.h" #include "format_raw.h" diff --git a/src/exiv2.cc b/src/exiv2.cc index cf596700..3b404889 100644 --- a/src/exiv2.cc +++ b/src/exiv2.cc @@ -40,7 +40,7 @@ extern "C" { #include -#include "gqview.h" +#include "main.h" #include "exif.h" #include "filelist.h" diff --git a/src/filelist.c b/src/filelist.c index 1947e50b..145e6fd4 100644 --- a/src/filelist.c +++ b/src/filelist.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "filelist.h" #include "cache.h" diff --git a/src/format_canon.c b/src/format_canon.c index f4e0646c..b87bbd31 100644 --- a/src/format_canon.c +++ b/src/format_canon.c @@ -29,7 +29,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_canon.h" #include "format_raw.h" diff --git a/src/format_fuji.c b/src/format_fuji.c index 995a1c88..f13b7576 100644 --- a/src/format_fuji.c +++ b/src/format_fuji.c @@ -24,7 +24,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_fuji.h" #include "format_raw.h" diff --git a/src/format_nikon.c b/src/format_nikon.c index 2af0e57b..dc40948a 100644 --- a/src/format_nikon.c +++ b/src/format_nikon.c @@ -25,7 +25,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_nikon.h" #include "exif.h" diff --git a/src/format_olympus.c b/src/format_olympus.c index 1953d745..9aea844f 100644 --- a/src/format_olympus.c +++ b/src/format_olympus.c @@ -21,7 +21,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_olympus.h" #include "format_raw.h" diff --git a/src/format_raw.c b/src/format_raw.c index c377c890..7f616d2b 100644 --- a/src/format_raw.c +++ b/src/format_raw.c @@ -27,7 +27,7 @@ #include "intl.h" -#include "gqview.h" +#include "main.h" #include "format_raw.h" #include "format_canon.h" diff --git a/src/fullscreen.c b/src/fullscreen.c index 223e4c39..1cbd6af6 100644 --- a/src/fullscreen.c +++ b/src/fullscreen.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "fullscreen.h" #include "image.h" diff --git a/src/globals.c b/src/globals.c index 65064567..c9b2a842 100644 --- a/src/globals.c +++ b/src/globals.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" GList *filename_filter = NULL; diff --git a/src/histogram.c b/src/histogram.c index 38c48767..f8a58339 100644 --- a/src/histogram.c +++ b/src/histogram.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "histogram.h" #include diff --git a/src/image-load.c b/src/image-load.c index 349f0200..d18a9535 100644 --- a/src/image-load.c +++ b/src/image-load.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "image-load.h" #include "filelist.h" diff --git a/src/image-overlay.c b/src/image-overlay.c index e86a6535..73fb79e9 100644 --- a/src/image-overlay.c +++ b/src/image-overlay.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "image-overlay.h" #include "collect.h" diff --git a/src/image.c b/src/image.c index 9e46f6e7..46043356 100644 --- a/src/image.c +++ b/src/image.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "image.h" diff --git a/src/img-view.c b/src/img-view.c index 803bed9a..f4f69ca5 100644 --- a/src/img-view.c +++ b/src/img-view.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "img-view.h" #include "collect.h" diff --git a/src/info.c b/src/info.c index 649547db..025d0587 100644 --- a/src/info.c +++ b/src/info.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "info.h" #include "bar_info.h" diff --git a/src/layout.c b/src/layout.c index d9fd72c6..4a233a88 100644 --- a/src/layout.c +++ b/src/layout.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout.h" #include "image.h" diff --git a/src/layout_config.c b/src/layout_config.c index 135105e4..337213d8 100644 --- a/src/layout_config.c +++ b/src/layout_config.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout_config.h" diff --git a/src/layout_image.c b/src/layout_image.c index 7a07c4a6..5106c3c0 100644 --- a/src/layout_image.c +++ b/src/layout_image.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "layout_image.h" #include "collect.h" diff --git a/src/layout_util.c b/src/layout_util.c index 47c6138e..1fcbc885 100644 --- a/src/layout_util.c +++ b/src/layout_util.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "layout_util.h" #include "bar_info.h" diff --git a/src/main.c b/src/main.c index 31d601c9..00b8b696 100644 --- a/src/main.c +++ b/src/main.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "cache.h" #include "collect.h" diff --git a/src/gqview.h b/src/main.h similarity index 100% rename from src/gqview.h rename to src/main.h diff --git a/src/menu.c b/src/menu.c index 15fafcf6..f24677e0 100644 --- a/src/menu.c +++ b/src/menu.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "menu.h" #include "cache_maint.h" diff --git a/src/pan-calendar.c b/src/pan-calendar.c index 85040230..159230fb 100644 --- a/src/pan-calendar.c +++ b/src/pan-calendar.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff --git a/src/pan-folder.c b/src/pan-folder.c index b7ca3b40..ec2eda9c 100644 --- a/src/pan-folder.c +++ b/src/pan-folder.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff --git a/src/pan-grid.c b/src/pan-grid.c index 35288696..ef7c0ecd 100644 --- a/src/pan-grid.c +++ b/src/pan-grid.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include diff --git a/src/pan-item.c b/src/pan-item.c index 998d35bf..5beec57e 100644 --- a/src/pan-item.c +++ b/src/pan-item.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" diff --git a/src/pan-timeline.c b/src/pan-timeline.c index 2abf0163..a3fabbb4 100644 --- a/src/pan-timeline.c +++ b/src/pan-timeline.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" diff --git a/src/pan-util.c b/src/pan-util.c index 79f90314..43c7017c 100644 --- a/src/pan-util.c +++ b/src/pan-util.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "pan-types.h" #include "ui_fileops.h" diff --git a/src/pan-view.c b/src/pan-view.c index 6b1316f7..8cf2a2fd 100644 --- a/src/pan-view.c +++ b/src/pan-view.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pan-view.h" #include "pan-types.h" diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c index efeff8b9..2d3fbe00 100644 --- a/src/pixbuf_util.c +++ b/src/pixbuf_util.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "pixbuf_util.h" #include "icons/icons_inline.h" diff --git a/src/preferences.c b/src/preferences.c index afdf8d31..9b30170f 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "preferences.h" #include "cache_maint.h" diff --git a/src/print.c b/src/print.c index 29fbafc2..be7015cc 100644 --- a/src/print.c +++ b/src/print.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "print.h" #include "filelist.h" diff --git a/src/rcfile.c b/src/rcfile.c index e8c81409..a5aee85a 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -12,7 +12,7 @@ #include #include -#include "gqview.h" +#include "main.h" #include "rcfile.h" #include "filelist.h" diff --git a/src/remote.c b/src/remote.c index 5d04c515..283b2604 100644 --- a/src/remote.c +++ b/src/remote.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "remote.h" diff --git a/src/search.c b/src/search.c index ddf36924..fa2e6afe 100644 --- a/src/search.c +++ b/src/search.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "search.h" #include "bar_info.h" diff --git a/src/similar.c b/src/similar.c index be2f9504..1998e81c 100644 --- a/src/similar.c +++ b/src/similar.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "similar.h" /* diff --git a/src/slideshow.c b/src/slideshow.c index 52e9fe6e..964d1146 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "collect.h" #include "image.h" #include "slideshow.h" diff --git a/src/thumb.c b/src/thumb.c index 0f4cb0c2..50450b8f 100644 --- a/src/thumb.c +++ b/src/thumb.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "thumb.h" #include "cache.h" diff --git a/src/thumb_standard.c b/src/thumb_standard.c index 875b27d0..985e1623 100644 --- a/src/thumb_standard.c +++ b/src/thumb_standard.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "thumb_standard.h" #include "cache.h" /* for cache_ensure_dir_exists */ diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c index c3891e99..39e58b3f 100644 --- a/src/ui_bookmark.c +++ b/src/ui_bookmark.c @@ -22,7 +22,7 @@ #include /* for key values */ -#include "gqview.h" +#include "main.h" #include "filelist.h" #include "ui_bookmark.h" diff --git a/src/ui_fileops.c b/src/ui_fileops.c index 62a23220..e0b17b43 100644 --- a/src/ui_fileops.c +++ b/src/ui_fileops.c @@ -25,7 +25,7 @@ #include #include /* for locale warning dialog */ -#include "gqview.h" +#include "main.h" #include "ui_fileops.h" #include "ui_utildlg.h" /* for locale warning dialog */ diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c index 8b3dbc01..22c9027f 100644 --- a/src/ui_pathsel.c +++ b/src/ui_pathsel.c @@ -28,7 +28,7 @@ #include /* for key values */ -#include "gqview.h" +#include "main.h" #include "ui_pathsel.h" #include "ui_bookmark.h" diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c index 7ab8c8f3..2a495791 100644 --- a/src/ui_tabcomp.c +++ b/src/ui_tabcomp.c @@ -25,7 +25,7 @@ #include #include -#include "gqview.h" +#include "main.h" #include "ui_tabcomp.h" #include "ui_bookmark.h" diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c index 8dedca5c..e4352d22 100644 --- a/src/ui_utildlg.c +++ b/src/ui_utildlg.c @@ -22,7 +22,7 @@ #include /* for keyboard values */ -#include "gqview.h" +#include "main.h" #include "ui_utildlg.h" #include "filelist.h" diff --git a/src/utilops.c b/src/utilops.c index 79540184..dc6a12f0 100644 --- a/src/utilops.c +++ b/src/utilops.c @@ -10,7 +10,7 @@ */ -#include "gqview.h" +#include "main.h" #include "utilops.h" diff --git a/src/view_dir_list.c b/src/view_dir_list.c index f973262b..48cf6ae2 100644 --- a/src/view_dir_list.c +++ b/src/view_dir_list.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_dir_list.h" #include "dnd.h" diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c index 91790bc0..18f24ba9 100644 --- a/src/view_dir_tree.c +++ b/src/view_dir_tree.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_dir_tree.h" diff --git a/src/view_file_icon.c b/src/view_file_icon.c index e60658b6..90a4231b 100644 --- a/src/view_file_icon.c +++ b/src/view_file_icon.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_file_icon.h" #include "cellrenderericon.h" diff --git a/src/view_file_list.c b/src/view_file_list.c index 4f2968e1..456cba3b 100644 --- a/src/view_file_list.c +++ b/src/view_file_list.c @@ -9,7 +9,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "gqview.h" +#include "main.h" #include "view_file_list.h" #include "cache_maint.h" -- 2.20.1