disambiguate plugin/visio #includes

Related to #1785.

diff --git a/plugin/visio/Makefile.am b/plugin/visio/Makefile.am
index 3cdffe9c61e3241720e383ef3afd78fa0adb5d22..f1022070a8f6cd26796790ee0f1d213adb49eee6 100644 (file)
--- a/plugin/visio/Makefile.am
+++ b/plugin/visio/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/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
index 6e7c045cad9997b80f50eae684680ec3f2c04316..8e6d9e0c9d47a9cd523d48710a19c0feb4d7e3e1 100644 (file)
--- a/plugin/visio/VisioGraphic.cpp
+++ b/plugin/visio/VisioGraphic.cpp
@@ -32,8 +32,8 @@
 #include <cstdlib>
 #include "VisioGraphic.h"
 
-#include "gvcjob.h"
-#include "gvio.h"
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 
 namespace Visio
 {

diff --git a/plugin/visio/VisioGraphic.h b/plugin/visio/VisioGraphic.h
index e99a2382bf2146d894952b5880f1e59e43ac4764..18ff935da633fabc2411706fa57ff30f72eea5e6 100644 (file)
--- a/plugin/visio/VisioGraphic.h
+++ b/plugin/visio/VisioGraphic.h
@@ -14,7 +14,7 @@
 #ifndef VISIOGRAPHIC_H
 #define VISIOGRAPHIC_H
 
-#include "types.h"
+#include <common/types.h>
 
 namespace Visio
 {

diff --git a/plugin/visio/VisioRender.cpp b/plugin/visio/VisioRender.cpp
index 481e82e5e1ec2ccb3c32e3ef100bff5e24c668d1..2b6964640e66d9df87025fdb2f577d28c49199eb 100644 (file)
--- a/plugin/visio/VisioRender.cpp
+++ b/plugin/visio/VisioRender.cpp
@@ -29,10 +29,10 @@
 
 #include "VisioRender.h"
 
-#include "const.h"
-#include "macros.h"
-#include "gvcjob.h"
-#include "gvio.h"
+#include <common/const.h>
+#include <common/macros.h>
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 
 namespace Visio
 {

diff --git a/plugin/visio/VisioRender.h b/plugin/visio/VisioRender.h
index c993d4bed6184552c3bb967edb71f45c0949de60..de86647d582dd3aad805cfb15353c5ae1ee0e191 100644 (file)
--- a/plugin/visio/VisioRender.h
+++ b/plugin/visio/VisioRender.h
@@ -17,7 +17,7 @@
 #include <map>
 #include <vector>
 
-#include "types.h"
+#include <common/types.h>
 
 #include "VisioGraphic.h"
 #include "VisioText.h"

diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp
index 3c6441a04f63db1c344690f7f51e6b999e0cc66d..46fbfeb47cd2f2d0fa6a4459116d7eebd4006213 100644 (file)
--- a/plugin/visio/VisioText.cpp
+++ b/plugin/visio/VisioText.cpp
@@ -15,8 +15,8 @@
 
 #include "VisioText.h"
 
-#include "gvcjob.h"
-#include "gvio.h"
+#include <gvc/gvcjob.h>
+#include <gvc/gvio.h>
 #include <cstdlib>
 #include <string.h>
 

diff --git a/plugin/visio/VisioText.h b/plugin/visio/VisioText.h
index f1f410a56456ac4f3b4548788edc9f29b249e326..484ab7a228513bab3cba37d5efe01849ec511868 100644 (file)
--- a/plugin/visio/VisioText.h
+++ b/plugin/visio/VisioText.h
@@ -14,7 +14,7 @@
 #ifndef VISIOTEXT_H
 #define VISIOTEXT_H
 
-#include "types.h"
+#include <common/types.h>
 
 namespace Visio
 {

diff --git a/plugin/visio/gvplugin_visio.c b/plugin/visio/gvplugin_visio.c
index da2421e60d039c0a22b53c7f1c03be2f0a58edfa..631c2b74263a63728b1bc0f4449d6c5e18e940ab 100644 (file)
--- a/plugin/visio/gvplugin_visio.c
+++ b/plugin/visio/gvplugin_visio.c
@@ -17,7 +17,7 @@
 #endif
 
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvdevice_vdx_types[];
 extern gvplugin_installed_t gvrender_vdx_types[];

diff --git a/plugin/visio/gvrender_visio_vdx.cpp b/plugin/visio/gvrender_visio_vdx.cpp
index e8c1abb9b182cb1b69d1341525b05cd541258299..0b7b572688dac9a0c847e21810994554286cf6b2 100644 (file)
--- a/plugin/visio/gvrender_visio_vdx.cpp
+++ b/plugin/visio/gvrender_visio_vdx.cpp
@@ -17,8 +17,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gvplugin_render.h"
-#include "gvplugin_device.h"
+#include <gvc/gvplugin_render.h>
+#include <gvc/gvplugin_device.h>
 
 #include "VisioRender.h"