disambiguate plugin/quartz #includes

Related to #1785.

diff --git a/plugin/quartz/GVTextLayout.m b/plugin/quartz/GVTextLayout.m
index 2d11611aa6ba179cb8ef561264c9cc922881ae41..10cf87dade93679165f4d51b5cda872b55ffe0f1 100644 (file)
--- a/plugin/quartz/GVTextLayout.m
+++ b/plugin/quartz/GVTextLayout.m
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "types.h"
-#include "gvcjob.h"
+#include <common/types.h>
+#include <gvc/gvcjob.h>
 
 #include "gvplugin_quartz.h"
 

diff --git a/plugin/quartz/Makefile.am b/plugin/quartz/Makefile.am
index 7578da5daae9140ddbcba76abc8bfb0ee3c34276..3c717bbe7d6932a2d0dc171a36325cc1c145f81c 100644 (file)
--- a/plugin/quartz/Makefile.am
+++ b/plugin/quartz/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/gvc \

diff --git a/plugin/quartz/gvdevice_quartz.c b/plugin/quartz/gvdevice_quartz.c
index b338d20bfc8f09eaf4d756fe83b0f3626cf4a0ec..72c2a8216099c9d257f666637664f8c5f94ef081 100644 (file)
--- a/plugin/quartz/gvdevice_quartz.c
+++ b/plugin/quartz/gvdevice_quartz.c
@@ -13,7 +13,7 @@
 
 #include "config.h"
 
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_device.h>
 
 #include "gvplugin_quartz.h"
 

diff --git a/plugin/quartz/gvloadimage_quartz.c b/plugin/quartz/gvloadimage_quartz.c
index 382d9b0a1d04b952a52141aa350e73f4cbdc8e9e..777432e95cb50988abc9e4d0abf87e7925122026 100644 (file)
--- a/plugin/quartz/gvloadimage_quartz.c
+++ b/plugin/quartz/gvloadimage_quartz.c
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "gvplugin_loadimage.h"
+#include <gvc/gvplugin_loadimage.h>
 
 #include "gvplugin_quartz.h"
 

diff --git a/plugin/quartz/gvplugin_quartz.c b/plugin/quartz/gvplugin_quartz.c
index b5728eafff4c94ac97fa6b09a337e6cfee14b717..24977b916bd3eb5f3f5e71105f833dec860496eb 100644 (file)
--- a/plugin/quartz/gvplugin_quartz.c
+++ b/plugin/quartz/gvplugin_quartz.c
@@ -13,10 +13,10 @@
 
 #include "config.h"
 
-#include "types.h"
-#include "gvplugin.h"
-#include "gvplugin_quartz.h"
-#include "gvio.h"
+#include <common/types.h>
+#include <gvc/gvplugin.h>
+#include <gvc/gvplugin_quartz.h>
+#include <gvc/gvio.h>
 
 extern gvplugin_installed_t gvrender_quartz_types;
 extern gvplugin_installed_t gvtextlayout_quartz_types;

diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c
index fb3c66e290b84c341c02fd1a78f1b59f00683c79..a34709b3de274dab07f69b95b1a5fd2a12b9f1dc 100644 (file)
--- a/plugin/quartz/gvrender_quartz.c
+++ b/plugin/quartz/gvrender_quartz.c
@@ -25,9 +25,9 @@
 #include <ImageIO/ImageIO.h>
 #endif
 
-#include "gvplugin_device.h"
-#include "gvplugin_render.h"
-#include "cgraph.h"
+#include <gvc/gvplugin_device.h>
+#include <gvc/gvplugin_render.h>
+#include <cgraph/cgraph.h>
 
 #include "gvplugin_quartz.h"
 

diff --git a/plugin/quartz/gvtextlayout_quartz.c b/plugin/quartz/gvtextlayout_quartz.c
index ae64a6ec93bc633b88a04872016bde15da9cfffb..2d9e17d24696b5c5b31630679ea9d0ccdc089648 100644 (file)
--- a/plugin/quartz/gvtextlayout_quartz.c
+++ b/plugin/quartz/gvtextlayout_quartz.c
@@ -16,8 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_textlayout.h"
-#include "gvplugin_quartz.h"
+#include <gvc/gvplugin_textlayout.h>
+#include <gvc/gvplugin_quartz.h>
 
 #if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 30200
 #include <CoreText/CoreText.h>