Create private global header and move constants there

Also some miscellaneous cleanup

Change-Id: I0ef0719e763c864311768b40e21017e219f94f65
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

6 files changed, 17 insertions, 12 deletions

diff --git a/src/datavis3dqml2/datavis3dqml2.pro b/src/datavis3dqml2/datavis3dqml2.pro
index 61f57cac..0ac506a3 100644
--- a/src/datavis3dqml2/datavis3dqml2.pro
+++ b/src/datavis3dqml2/datavis3dqml2.pro
@@ -9,7 +9,7 @@ uri = com.digia.QtDataVis3D
 staticlib:DEFINES+=QT_DATAVIS3D_STATICLIB
 
 # Input
-INCLUDEPATH += ../datavis3d/engine
+INCLUDEPATH += ../datavis3d/engine ../datavis3d/global
 
 SOURCES += \
     datavis3dqml2_plugin.cpp \
diff --git a/src/datavis3dqml2/datavis3dqml2_plugin.h b/src/datavis3dqml2/datavis3dqml2_plugin.h
index c60f17f4..4985287f 100644
--- a/src/datavis3dqml2/datavis3dqml2_plugin.h
+++ b/src/datavis3dqml2/datavis3dqml2_plugin.h
@@ -42,8 +42,7 @@
 #ifndef DATAVIS3DQML2_PLUGIN_H
 #define DATAVIS3DQML2_PLUGIN_H
 
-#include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
+#include "datavis3dglobal_p.h"
 #include "qdataitem.h"
 #include "qdatarow.h"
 #include "qdataset.h"
diff --git a/src/datavis3dqml2/declarativebars.h b/src/datavis3dqml2/declarativebars.h
index a416ea3e..d47070c5 100644
--- a/src/datavis3dqml2/declarativebars.h
+++ b/src/datavis3dqml2/declarativebars.h
@@ -42,9 +42,8 @@
 #ifndef DECLARATIVEBARS_H
 #define DECLARATIVEBARS_H
 
+#include "datavis3dglobal_p.h"
 #include "bars3dcontroller_p.h"
-#include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
 #include "declarativebars_p.h"
 
 #include <qsgsimpletexturenode.h>
diff --git a/src/datavis3dqml2/declarativebars_p.h b/src/datavis3dqml2/declarativebars_p.h
index d4354324..e078d21f 100644
--- a/src/datavis3dqml2/declarativebars_p.h
+++ b/src/datavis3dqml2/declarativebars_p.h
@@ -43,7 +43,7 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists purely as an
+// This file is not part of the QtDataVis3D API.  It exists purely as an
 // implementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
@@ -52,8 +52,7 @@
 #ifndef DECLARATIVEBARS_P_H
 #define DECLARATIVEBARS_P_H
 
-#include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
+#include "datavis3dglobal_p.h"
 #include <QString>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE
diff --git a/src/datavis3dqml2/declarativemaps.h b/src/datavis3dqml2/declarativemaps.h
index 69e3cee6..503ac1bf 100644
--- a/src/datavis3dqml2/declarativemaps.h
+++ b/src/datavis3dqml2/declarativemaps.h
@@ -42,9 +42,8 @@
 #ifndef DECLARATIVEMAPS_H
 #define DECLARATIVEMAPS_H
 
+#include "datavis3dglobal_p.h"
 #include "maps3dcontroller_p.h"
-#include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
 #include "declarativemaps_p.h"
 
 #include <qsgsimpletexturenode.h>
diff --git a/src/datavis3dqml2/declarativemaps_p.h b/src/datavis3dqml2/declarativemaps_p.h
index 1efe9523..afbc5cf9 100644
--- a/src/datavis3dqml2/declarativemaps_p.h
+++ b/src/datavis3dqml2/declarativemaps_p.h
@@ -39,11 +39,20 @@
 **
 ****************************************************************************/
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtDataVis3D API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
 #ifndef DECLARATIVEMAPS_P_H
 #define DECLARATIVEMAPS_P_H
 
-#include "qdatavis3dglobal.h"
-#include "qdatavis3dnamespace.h"
+#include "datavis3dglobal_p.h"
 #include <QString>
 
 QT_DATAVIS3D_BEGIN_NAMESPACE