Fix #1428: Include debug.h in all .cc files

#1428

- Include debug.h in meson global_arguments
- Remove individual "#include debug.h" statements

Author: caclark

meson.build

@@ -55,6 +55,9 @@ add_global_arguments('-Wno-overlength-strings', language : 'c')
 # To compile originally-C files as C++
 add_global_arguments('-Wno-error=deprecated-declarations', language : 'cpp')
 
+# To enable debug statements in all files
+add_global_arguments('-include', 'debug.h', language : 'cpp')
+
 # Project requirements
 # code_sources is all human-written geeqie C/C++ code
 code_sources = []

src/advanced-exif.cc

@@ -33,7 +33,6 @@
 #include <config.h>
 
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "exif.h"
 #include "filedata.h"

src/archives.cc

@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "intl.h"
 
 #if HAVE_ARCHIVE

src/bar-comment.cc

@@ -33,7 +33,6 @@
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "layout.h"

src/bar-exif.cc

@@ -32,7 +32,6 @@
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "exif.h"
 #include "filedata.h"

src/bar-gps.cc

@@ -40,7 +40,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "filedata.h"
 #include "intl.h"

src/bar-histogram.cc

@@ -31,7 +31,6 @@
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
 #include "intl.h"

src/bar-keywords.cc

@@ -30,7 +30,6 @@
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "filedata.h"
 #include "intl.h"

src/bar-rating.cc

@@ -29,7 +29,6 @@
 
 #include "bar.h"
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "metadata.h"

src/bar-sort.cc

@@ -29,7 +29,6 @@
 #include "collect-io.h"
 #include "collect.h"
 #include "compat.h"
-#include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "history-list.h"

src/bar.cc

@@ -30,7 +30,6 @@
 #include <config.h>
 
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "layout.h"

src/cache-maint.cc

@@ -32,7 +32,6 @@
 #include "cache-loader.h"
 #include "cache.h"
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "layout.h"

src/cache.cc

@@ -32,7 +32,6 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "intl.h"
 #include "main-defines.h"
 #include "md5-util.h"

src/collect-io.cc

@@ -38,7 +38,6 @@
 #include <config.h>
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "layout-util.h"

src/collect-table.cc

@@ -33,7 +33,6 @@
 #include "collect-io.h"
 #include "collect.h"
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "dupe.h"
 #include "filedata.h"

src/collect.cc

@@ -34,7 +34,6 @@
 #include "collect-io.h"
 #include "collect-table.h"
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "img-view.h"
 #include "intl.h"

src/color-man.cc

@@ -38,7 +38,6 @@
 #  include <lcms.h>
 #endif
 
-#include "debug.h"
 #include "filedata.h"
 #include "image.h"
 #include "intl.h"

src/command-line-handling.cc

@@ -26,7 +26,6 @@
 #include "collect-io.h"
 #include "collect.h"
 #include "compat.h"
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "filefilter.h"

src/debug.cc

@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "debug.h"
 
 #include <sys/time.h>
 

src/desktop-file.cc

@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include "compat.h"
-#include "debug.h"
 #include "editors.h"
 #include "intl.h"
 #include "layout-util.h"

src/dupe.cc

@@ -37,7 +37,6 @@
 #include "collect-table.h"
 #include "collect.h"
 #include "compat.h"
-#include "debug.h"
 #include "dnd.h"
 #include "filedata.h"
 #include "history-list.h"

src/editors.cc

@@ -30,7 +30,6 @@
 #include <glib-object.h>
 
 #include "compat.h"
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "intl.h"

src/exif-common.cc

@@ -43,7 +43,6 @@
 #endif
 
 #include "cache.h"
-#include "debug.h"
 #include "exif.h"
 /* Required to prevent clang-tidy warnings */
 #include "exif-int.h"

src/exif.cc

@@ -59,7 +59,6 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#include "debug.h"
 #include "exif-int.h"
 #include "format-raw.h"
 #include "intl.h"

src/exiv2.cc

@@ -38,7 +38,6 @@
 #  include <libintl.h>
 #endif
 
-#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
 #include "misc.h"

src/filecache.cc

@@ -20,7 +20,6 @@
 
 #include "filecache.h"
 
-#include "debug.h"
 #include "filedata.h"
 #include "typedefs.h"
 

src/filedata/filedata.cc

@@ -38,7 +38,6 @@
 #include <config.h>
 
 #include "cache.h"
-#include "debug.h"
 #include "exif.h"
 #include "filefilter.h"
 #include "histogram.h"

src/filedata/filelist.cc

@@ -36,7 +36,6 @@
 #include <glib.h>
 
 #include "cache.h"
-#include "debug.h"
 #include "filefilter.h"
 #include "main.h"
 #include "options.h"

src/filefilter.cc

@@ -28,7 +28,6 @@
 #include <config.h>
 
 #include "cache.h"
-#include "debug.h"
 #include "main-defines.h"
 #include "options.h"
 #include "rcfile.h"

src/format-raw.cc

@@ -30,7 +30,6 @@
 
 #include <glib.h>
 
-#include "debug.h"
 #include "exif.h"
 #include "format-canon.h"
 #include "format-fuji.h"

src/fullscreen.cc

@@ -30,7 +30,6 @@
 #include <glib-object.h>
 
 #include "compat.h"
-#include "debug.h"
 #include "image-load.h"
 #include "image.h"
 #include "intl.h"

src/histogram.cc

@@ -26,7 +26,6 @@
 #include <gdk/gdk.h>
 #include <glib-object.h>
 
-#include "debug.h"
 #include "filedata.h"
 #include "intl.h"
 #include "pixbuf-util.h"

src/history-list.cc

@@ -23,7 +23,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include "debug.h"
 #include "intl.h"
 #include "options.h"
 #include "secure-save.h"

src/image-load-exr.cc

@@ -24,7 +24,6 @@
 #include <OpenEXR/ImfRgbaFile.h>
 #include <vector>
 
-#include "debug.h"
 #include "image-load.h"
 #include "ui-fileops.h"
 

src/image-load-ffmpegthumbnailer.cc

@@ -30,7 +30,6 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "filedata.h"
 #include "image-load.h"
 #include "options.h"

src/image-load-fits.cc

@@ -24,7 +24,6 @@
 #include <fitsio.h>
 #include <limits>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-heif.cc

@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <libheif/heif.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-j2k.cc

@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <openjpeg.h>
 
-#include "debug.h"
 #include "image-load.h"
 #include "intl.h"
 #include "misc.h"

src/image-load-jpeg.cc

@@ -38,7 +38,6 @@
 #include <jerror.h>
 #include <jpeglib.h>
 
-#include "debug.h"
 #include "image-load.h"
 #include "intl.h"
 #include "jpeg-parser.h"

src/image-load-jpegxl.cc

@@ -63,7 +63,6 @@
 #include <jxl/decode.h> //TODO Use decode_cxx.h?
 #include <jxl/types.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-npy.cc

@@ -23,7 +23,6 @@
 #include <cstring>
 #include <regex>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-pdf.cc

@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <poppler.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-psd.cc

@@ -57,7 +57,6 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-tiff.cc

@@ -37,7 +37,6 @@
 #include <tiff.h>
 #include <tiffio.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-webp.cc

@@ -25,7 +25,6 @@
 #include <glib.h>
 #include <webp/decode.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load-zxscr.cc

@@ -24,7 +24,6 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include "debug.h"
 #include "image-load.h"
 
 namespace

src/image-load.cc

@@ -27,7 +27,6 @@
 
 #include <config.h>
 
-#include "debug.h"
 #include "exif.h"
 #include "filedata.h"
 #include "gq-marshal.h"

src/image-overlay.cc

@@ -31,7 +31,6 @@
 #include <pango/pango.h>
 
 #include "collect.h"
-#include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
 #include "image-load.h"

src/image.cc

@@ -31,7 +31,6 @@
 #include "collect.h"
 #include "color-man.h"
 #include "compat.h"
-#include "debug.h"
 #include "exif.h"
 #include "filecache.h"
 #include "filedata.h"