[gimp] plug-ins: rename file-raw/file-formats.h to file-raw/file-raw-formats.h

[Michael Natterer <mitch src gnome org>]

commit 42f0db190f509d75e562d1e877fbb60c694c5645
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jul 30 18:35:20 2017 +0200

    plug-ins: rename file-raw/file-formats.h to file-raw/file-raw-formats.h

 plug-ins/file-raw/Makefile.am                      |   12 ++++++------
 plug-ins/file-raw/file-darktable.c                 |    2 +-
 .../{file-formats.h => file-raw-formats.h}         |    0
 plug-ins/file-raw/file-raw-placeholder.c           |    2 +-
 plug-ins/file-raw/file-raw-utils.c                 |    8 +++++---
 plug-ins/file-raw/file-raw-utils.h                 |    5 +++++
 plug-ins/file-raw/file-rawtherapee.c               |    2 +-
 po-plug-ins/POTFILES.in                            |    2 +-
 8 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/plug-ins/file-raw/Makefile.am b/plug-ins/file-raw/Makefile.am
index 468f3fa..c9dbdb9 100644
--- a/plug-ins/file-raw/Makefile.am
+++ b/plug-ins/file-raw/Makefile.am
@@ -33,19 +33,19 @@ libexec_PROGRAMS = \
 
 file_darktable_SOURCES = \
        file-darktable.c        \
+       file-raw-formats.h      \
        file-raw-utils.c        \
-       file-raw-utils.h        \
-       file-formats.h
+       file-raw-utils.h
 
 file_rawtherapee_SOURCES = \
        file-rawtherapee.c      \
+       file-raw-formats.h      \
        file-raw-utils.c        \
-       file-raw-utils.h        \
-       file-formats.h
+       file-raw-utils.h
 
 file_raw_placeholder_SOURCES = \
-       file-raw-placeholder.c  \
-       file-formats.h
+       file-raw-formats.h      \
+       file-raw-placeholder.c
 
 file_darktable_LDADD = \
        $(libgimp)              \
diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c
index d32cb38..12b7db2 100644
--- a/plug-ins/file-raw/file-darktable.c
+++ b/plug-ins/file-raw/file-darktable.c
@@ -31,7 +31,7 @@
 
 #include "libgimp/stdplugins-intl.h"
 
-#include "file-formats.h"
+#include "file-raw-formats.h"
 #include "file-raw-utils.h"
 
 
diff --git a/plug-ins/file-raw/file-formats.h b/plug-ins/file-raw/file-raw-formats.h
similarity index 100%
rename from plug-ins/file-raw/file-formats.h
rename to plug-ins/file-raw/file-raw-formats.h
diff --git a/plug-ins/file-raw/file-raw-placeholder.c b/plug-ins/file-raw/file-raw-placeholder.c
index f1b0aff..52b064e 100644
--- a/plug-ins/file-raw/file-raw-placeholder.c
+++ b/plug-ins/file-raw/file-raw-placeholder.c
@@ -27,7 +27,7 @@
 
 #include "libgimp/stdplugins-intl.h"
 
-#include "file-formats.h"
+#include "file-raw-formats.h"
 
 
 static void   query (void);
diff --git a/plug-ins/file-raw/file-raw-utils.c b/plug-ins/file-raw/file-raw-utils.c
index db6dc2a..117cb42 100644
--- a/plug-ins/file-raw/file-raw-utils.c
+++ b/plug-ins/file-raw/file-raw-utils.c
@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <libgimp/gimp.h>
-#include <file-raw-utils.h>
-
 #ifdef GDK_WINDOWING_QUARTZ
 #include <CoreServices/CoreServices.h>
 #endif
@@ -31,6 +28,11 @@
 #include <Windows.h>
 #endif
 
+#include <libgimp/gimp.h>
+
+#include "file-raw-utils.h"
+
+
 gchar *
 file_raw_get_executable_path (const gchar *main_executable,
                               const gchar *suffix,
diff --git a/plug-ins/file-raw/file-raw-utils.h b/plug-ins/file-raw/file-raw-utils.h
index ace1266..ec0e2a2 100644
--- a/plug-ins/file-raw/file-raw-utils.h
+++ b/plug-ins/file-raw/file-raw-utils.h
@@ -18,9 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __FILE_RAW_UTILS_H__
+#define __FILE_RAW_UTILS_H__
+
 gchar  * file_raw_get_executable_path  (const gchar *main_executable,
                                         const gchar *suffix,
                                         const gchar *env_variable,
                                         const gchar *mac_bundle_id,
                                         const gchar *win32_registry_key_base,
                                         gboolean    *search_path);
+
+#endif /* __FILE_RAW_UTILS_H__ */
diff --git a/plug-ins/file-raw/file-rawtherapee.c b/plug-ins/file-raw/file-rawtherapee.c
index 000c99f..eb3900e 100644
--- a/plug-ins/file-raw/file-rawtherapee.c
+++ b/plug-ins/file-raw/file-rawtherapee.c
@@ -31,7 +31,7 @@
 
 #include "libgimp/stdplugins-intl.h"
 
-#include "file-formats.h"
+#include "file-raw-formats.h"
 #include "file-raw-utils.h"
 
 
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index 60ee619..94fb49a 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -117,7 +117,7 @@ plug-ins/file-psd/psd-thumb-load.c
 plug-ins/file-psd/psd-util.c
 plug-ins/file-psd/psd.c
 plug-ins/file-raw/file-darktable.c
-plug-ins/file-raw/file-formats.h
+plug-ins/file-raw/file-raw-formats.h
 plug-ins/file-raw/file-raw-placeholder.c
 plug-ins/file-raw/file-rawtherapee.c
 plug-ins/file-sgi/sgi.c