Resolve conflict with harfbuzz include file hb.h

Rename hb.h to handbrake.h

11 files changed, 11 insertions, 11 deletions

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 5863f5118..e922d40f7 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 67453cce5..b8c41321e 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -74,7 +74,7 @@
 #include <dbt.h>
 #endif
 
-#include "hb.h"
+#include "handbrake.h"
 #include "callbacks.h"
 #include "chapters.h"
 #include "queuehandler.h"
diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 39e570eac..94f64bb74 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "values.h"
 #include "settings.h"
 
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index e54b8964f..260f09034 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <math.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index bd9aabd16..37d21c14a 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -26,7 +26,7 @@
 
 #include "values.h"
 #include "settings.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 
 enum
diff --git a/gtk/src/main.c b/gtk/src/main.c
index f0ca67a3b..7b59bc460 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "renderer_button.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 74cff997f..f06f4552d 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index 1f12ea790..32011e4e2 100644
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -24,7 +24,7 @@
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_
 
-#include "hb.h"
+#include "handbrake.h"
 #include "values.h"
 
 void ghb_presets_load(signal_user_data_t *ud);
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 3272d4787..7ae956355 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -43,7 +43,7 @@
 #include "preview.h"
 #include "values.h"
 #include "queuehandler.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #define PREVIEW_STATE_IMAGE 0
 #define PREVIEW_STATE_LIVE 1
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 9ba93c9b7..efc8292db 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index fea0f0175..5e31f684f 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"