GNOME.org
 

[eog: 1/2] build: Use #ifdef consistently

commit a4a9c3e5d9b68c39f410d8dd81ca66ac2bc3c3cc
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Sat Jul 6 22:34:30 2019 +0200

    build: Use #ifdef consistently
    
    Both `#if` and `#ifdef` are used through the entire source code for
    conditional groups.
    
    This has been changed to use only `#ifdef`.

 meson.build                 |  8 ++++----
 src/eog-application.c       |  2 +-
 src/eog-image-jpeg.c        |  8 ++++----
 src/eog-image-jpeg.h        |  2 +-
 src/eog-image.h             |  2 +-
 src/eog-metadata-details.c  |  4 ++--
 src/eog-metadata-details.h  |  8 ++++----
 src/eog-metadata-reader.h   |  6 +++---
 src/eog-metadata-sidebar.c  | 16 ++++++++--------
 src/eog-properties-dialog.c | 34 +++++++++++++++++-----------------
 10 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/meson.build b/meson.build
index b35840ec..d054a8af 100644
--- a/meson.build
+++ b/meson.build
@@ -119,21 +119,21 @@ if enable_libexif
          'libexif support requested but library not found. Please use -Dlibexif=false')
 
   common_deps += libexif_dep
-  config_h.set10('HAVE_EXIF', true)
+  config_h.set('HAVE_EXIF', true)
 endif
 
 # Little CMS (optional)
 enable_cms = get_option('cms')
 if enable_cms
   common_deps += dependency('lcms2')
-  config_h.set10('HAVE_LCMS', true)
+  config_h.set('HAVE_LCMS', true)
 endif
 
 # Exempi (optional)
 enable_xmp = get_option('xmp')
 if enable_xmp
   common_deps += dependency('exempi-2.0', version: '>= 1.99.5')
-  config_h.set10('HAVE_EXEMPI', true)
+  config_h.set('HAVE_EXEMPI', true)
 endif
 
 # Jpeg (semi-optional)
@@ -156,7 +156,7 @@ if enable_libjpeg
   '''
   have_jpeg_80 = cc.compiles(jpeg_80_check_src, dependencies: libjpeg_dep, name: 'libjpeg version is 8 or 
greater')
 
-  config_h.set10('HAVE_JPEG', true)
+  config_h.set('HAVE_JPEG', true)
 endif
 config_h.set('HAVE_LIBJPEG', enable_libjpeg)
 
diff --git a/src/eog-application.c b/src/eog-application.c
index 95ca9ac0..3a3133c6 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -45,7 +45,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #endif
 
diff --git a/src/eog-image-jpeg.c b/src/eog-image-jpeg.c
index 0eaf5f86..151f91af 100644
--- a/src/eog-image-jpeg.c
+++ b/src/eog-image-jpeg.c
@@ -34,7 +34,7 @@
 #include "eog-image-jpeg.h"
 #include "eog-image-private.h"
 
-#if HAVE_JPEG
+#ifdef HAVE_JPEG
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -48,7 +48,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 #include <libexif/exif-data.h>
 #endif
 
@@ -298,7 +298,7 @@ _save_jpeg_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
        jpeg_write_coefficients (&dstinfo, dst_coef_arrays);
 
        /* handle EXIF/IPTC data explicitly */
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        /* exif_chunk and exif are mutally exclusvie, this is what we assure here */
        g_assert (priv->exif_chunk == NULL);
        if (priv->exif != NULL)
@@ -429,7 +429,7 @@ _save_any_as_jpeg (EogImage *image, const char *file, EogImageSaveInfo *source,
        jpeg_start_compress (&cinfo, TRUE);
 
        /* write EXIF/IPTC data explicitly */
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        /* exif_chunk and exif are mutally exclusvie, this is what we assure here */
        g_assert (priv->exif_chunk == NULL);
        if (priv->exif != NULL)
diff --git a/src/eog-image-jpeg.h b/src/eog-image-jpeg.h
index 9dd26c1c..7e8d9164 100644
--- a/src/eog-image-jpeg.h
+++ b/src/eog-image-jpeg.h
@@ -1,7 +1,7 @@
 #ifndef _EOG_IMAGE_JPEG_H_
 #define _EOG_IMAGE_JPEG_H_
 
-#if HAVE_JPEG
+#ifdef HAVE_JPEG
 
 #include <glib.h>
 #include "eog-image.h"
diff --git a/src/eog-image.h b/src/eog-image.h
index 23f2fb31..c6cd1e11 100644
--- a/src/eog-image.h
+++ b/src/eog-image.h
@@ -164,7 +164,7 @@ const gchar*      eog_image_get_caption              (EogImage   *img);
 
 const gchar      *eog_image_get_collate_key          (EogImage   *img);
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 ExifData*      eog_image_get_exif_info            (EogImage   *img);
 #endif
 
diff --git a/src/eog-metadata-details.c b/src/eog-metadata-details.c
index 6cdffdad..208f1eaa 100644
--- a/src/eog-metadata-details.c
+++ b/src/eog-metadata-details.c
@@ -26,11 +26,11 @@
 #include "eog-metadata-details.h"
 #include "eog-util.h"
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 #include <libexif/exif-entry.h>
 #include <libexif/exif-utils.h>
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #include <exempi/xmpconsts.h>
 #endif
diff --git a/src/eog-metadata-details.h b/src/eog-metadata-details.h
index 4f302990..abaecef1 100644
--- a/src/eog-metadata-details.h
+++ b/src/eog-metadata-details.h
@@ -26,10 +26,10 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 #include <libexif/exif-data.h>
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #endif
 
@@ -62,12 +62,12 @@ GType               eog_metadata_details_get_type    (void) G_GNUC_CONST;
 G_GNUC_INTERNAL
 GtkWidget          *eog_metadata_details_new         (void);
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 G_GNUC_INTERNAL
 void                eog_metadata_details_update      (EogMetadataDetails *details,
                                                      ExifData       *data);
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 G_GNUC_INTERNAL
 void                eog_metadata_details_xmp_update  (EogMetadataDetails *view,
                                                      XmpPtr          xmp_data);
diff --git a/src/eog-metadata-reader.h b/src/eog-metadata-reader.h
index 26788ebd..05b12007 100644
--- a/src/eog-metadata-reader.h
+++ b/src/eog-metadata-reader.h
@@ -23,13 +23,13 @@
 #define _EOG_METADATA_READER_H_
 
 #include <glib-object.h>
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 #include "eog-exif-util.h"
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #endif
-#if HAVE_LCMS
+#ifdef HAVE_LCMS
 #include <lcms2.h>
 #endif
 
diff --git a/src/eog-metadata-sidebar.c b/src/eog-metadata-sidebar.c
index b9131d13..010db48b 100644
--- a/src/eog-metadata-sidebar.c
+++ b/src/eog-metadata-sidebar.c
@@ -45,14 +45,14 @@
 #include "eog-exif-util.h"
 #endif
 
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #include <exempi/xmpconsts.h>
 #endif
 
 /* There's no exempi support in the sidebar yet */
-#if HAVE_EXIF  /*|| HAVE_EXEMPI */
-#define HAVE_METADATA 1
+#if defined(HAVE_EXIF) /*|| defined(HAVE_EXEMPI) */
+#define HAVE_METADATA
 #endif
 
 enum {
@@ -73,7 +73,7 @@ struct _EogMetadataSidebarPrivate {
        GtkWidget *filesize_label;
        GtkWidget *folder_label;
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        GtkWidget *aperture_label;
        GtkWidget *exposure_label;
        GtkWidget *focallen_label;
@@ -184,12 +184,12 @@ eog_metadata_sidebar_update_general_section (EogMetadataSidebar *sidebar)
        g_object_unref (parent_file);
 }
 
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
 static void
 eog_metadata_sidebar_update_metadata_section (EogMetadataSidebar *sidebar)
 {
        EogMetadataSidebarPrivate *priv = sidebar->priv;
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        EogImage *img = priv->image;
        ExifData *exif_data = NULL;
 
@@ -234,7 +234,7 @@ eog_metadata_sidebar_update (EogMetadataSidebar *sidebar)
        g_return_if_fail (EOG_IS_METADATA_SIDEBAR (sidebar));
 
        eog_metadata_sidebar_update_general_section (sidebar);
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
        eog_metadata_sidebar_update_metadata_section (sidebar);
 #endif
 }
@@ -455,7 +455,7 @@ eog_metadata_sidebar_class_init (EogMetadataSidebarClass *klass)
        gtk_widget_class_bind_template_child_private (widget_class,
                                                      EogMetadataSidebar,
                                                      folder_label);
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        gtk_widget_class_bind_template_child_private (widget_class,
                                                      EogMetadataSidebar,
                                                      aperture_label);
diff --git a/src/eog-properties-dialog.c b/src/eog-properties-dialog.c
index 07507f01..5ce7bfbb 100644
--- a/src/eog-properties-dialog.c
+++ b/src/eog-properties-dialog.c
@@ -29,7 +29,7 @@
 #include "eog-util.h"
 #include "eog-thumb-view.h"
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
 #include "eog-exif-util.h"
 #endif
 
@@ -39,15 +39,15 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 #include <exempi/xmp.h>
 #include <exempi/xmpconsts.h>
 #endif
-#if HAVE_EXIF || HAVE_EXEMPI
-#define HAVE_METADATA 1
+#if defined(HAVE_EXIF) || defined(HAVE_EXEMPI)
+#define HAVE_METADATA
 #endif
 
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
 #include "eog-metadata-details.h"
 #endif
 
@@ -99,7 +99,7 @@ struct _EogPropertiesDialogPrivate {
        GtkWidget      *xmp_box;
        GtkWidget      *xmp_box_label;
 #endif
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
        GtkWidget      *metadata_box;
        GtkWidget      *metadata_details_expander;
        GtkWidget      *metadata_details;
@@ -217,7 +217,7 @@ pd_update_general_tab (EogPropertiesDialog *prop_dlg,
        g_free (bytes_str);
 }
 
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
 static void
 eog_xmp_set_label (XmpPtr xmp,
                   const char *ns,
@@ -272,17 +272,17 @@ eog_xmp_set_label (XmpPtr xmp,
 }
 #endif
 
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
 static void
 pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
                        EogImage            *image)
 {
        EogPropertiesDialogPrivate *priv;
        GtkNotebook *notebook;
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        ExifData    *exif_data;
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
        XmpPtr      xmp_data;
 #endif
 
@@ -293,10 +293,10 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
        notebook = GTK_NOTEBOOK (priv->notebook);
 
        if (TRUE
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
            && !eog_image_has_data (image, EOG_IMAGE_DATA_EXIF)
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
            && !eog_image_has_data (image, EOG_IMAGE_DATA_XMP)
 #endif
            ) {
@@ -324,7 +324,7 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
                }
        }
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        exif_data = (ExifData *) eog_image_get_exif_info (image);
 
        eog_exif_util_set_label_text (GTK_LABEL (priv->exif_aperture_label),
@@ -358,7 +358,7 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
        exif_data_unref(exif_data);
 #endif
 
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
        xmp_data = (XmpPtr) eog_image_get_xmp_info (image);
 
        if (xmp_data != NULL) {
@@ -679,7 +679,7 @@ eog_properties_dialog_class_init (EogPropertiesDialogClass *klass)
                                                     EogPropertiesDialog,
                                                     folder_button);
 
-#if HAVE_EXIF
+#ifdef HAVE_EXIF
        gtk_widget_class_bind_template_child_private(wklass,
                                                     EogPropertiesDialog,
                                                     exif_aperture_label);
@@ -705,7 +705,7 @@ eog_properties_dialog_class_init (EogPropertiesDialogClass *klass)
                                                     EogPropertiesDialog,
                                                     exif_date_label);
 #endif
-#if HAVE_EXEMPI
+#ifdef HAVE_EXEMPI
        gtk_widget_class_bind_template_child_private(wklass,
                                                     EogPropertiesDialog,
                                                     xmp_location_label);
@@ -754,7 +754,7 @@ static void
 eog_properties_dialog_init (EogPropertiesDialog *prop_dlg)
 {
        EogPropertiesDialogPrivate *priv;
-#if HAVE_METADATA
+#ifdef HAVE_METADATA
        GtkWidget *sw;
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]