From 651d87dc2a2f138301c5a21286ad121b779a5aba Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 28 Mar 2017 07:53:25 -0700
Subject: [PATCH] move Qt-related stuff out of model and into model-networking
---
libraries/entities/CMakeLists.txt | 2 +-
libraries/entities/src/EntityScriptingInterface.cpp | 2 +-
.../src/model-networking}/MeshFace.cpp | 0
.../src/model-networking}/MeshFace.h | 2 +-
.../src/model-networking}/MeshProxy.cpp | 0
.../src/model-networking}/MeshProxy.h | 2 +-
libraries/script-engine/src/ModelScriptingInterface.cpp | 2 +-
libraries/script-engine/src/ModelScriptingInterface.h | 4 ++--
8 files changed, 7 insertions(+), 7 deletions(-)
rename libraries/{model/src/model => model-networking/src/model-networking}/MeshFace.cpp (100%)
rename libraries/{model/src/model => model-networking/src/model-networking}/MeshFace.h (97%)
rename libraries/{model/src/model => model-networking/src/model-networking}/MeshProxy.cpp (100%)
rename libraries/{model/src/model => model-networking/src/model-networking}/MeshProxy.h (98%)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 1230fe8146..b2ae0f0ab7 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,6 +1,6 @@
set(TARGET_NAME entities)
setup_hifi_library(Network Script)
-link_hifi_libraries(avatars shared audio octree model fbx networking animation)
+link_hifi_libraries(avatars shared audio octree model model-networking fbx networking animation)
target_bullet()
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index f66cf1e8f1..2c332e8d05 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -21,7 +21,7 @@
#include <VariantMapToScriptValue.h>
#include <SharedUtil.h>
#include <SpatialParentFinder.h>
-#include <model/MeshProxy.h>
+#include <model-networking/MeshProxy.h>
#include "EntitiesLogging.h"
#include "EntityActionFactoryInterface.h"
diff --git a/libraries/model/src/model/MeshFace.cpp b/libraries/model-networking/src/model-networking/MeshFace.cpp
similarity index 100%
rename from libraries/model/src/model/MeshFace.cpp
rename to libraries/model-networking/src/model-networking/MeshFace.cpp
diff --git a/libraries/model/src/model/MeshFace.h b/libraries/model-networking/src/model-networking/MeshFace.h
similarity index 97%
rename from libraries/model/src/model/MeshFace.h
rename to libraries/model-networking/src/model-networking/MeshFace.h
index ef1e3a0b6b..3b81b372c3 100644
--- a/libraries/model/src/model/MeshFace.h
+++ b/libraries/model-networking/src/model-networking/MeshFace.h
@@ -16,7 +16,7 @@
#include <QScriptValueIterator>
#include <QtScript/QScriptValue>
-#include "Geometry.h"
+#include <model/Geometry.h>
using MeshPointer = std::shared_ptr<model::Mesh>;
diff --git a/libraries/model/src/model/MeshProxy.cpp b/libraries/model-networking/src/model-networking/MeshProxy.cpp
similarity index 100%
rename from libraries/model/src/model/MeshProxy.cpp
rename to libraries/model-networking/src/model-networking/MeshProxy.cpp
diff --git a/libraries/model/src/model/MeshProxy.h b/libraries/model-networking/src/model-networking/MeshProxy.h
similarity index 98%
rename from libraries/model/src/model/MeshProxy.h
rename to libraries/model-networking/src/model-networking/MeshProxy.h
index fcd36e6e9c..c5b25b7895 100644
--- a/libraries/model/src/model/MeshProxy.h
+++ b/libraries/model-networking/src/model-networking/MeshProxy.h
@@ -16,7 +16,7 @@
#include <QScriptValueIterator>
#include <QtScript/QScriptValue>
-#include "Geometry.h"
+#include <model/Geometry.h>
using MeshPointer = std::shared_ptr<model::Mesh>;
diff --git a/libraries/script-engine/src/ModelScriptingInterface.cpp b/libraries/script-engine/src/ModelScriptingInterface.cpp
index c02eb642a1..f56312568e 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.cpp
+++ b/libraries/script-engine/src/ModelScriptingInterface.cpp
@@ -12,7 +12,7 @@
#include <QScriptEngine>
#include <QScriptValueIterator>
#include <QtScript/QScriptValue>
-#include <model/MeshFace.h>
+#include <model-networking/MeshFace.h>
#include "ScriptEngine.h"
#include "ScriptEngineLogging.h"
#include "ModelScriptingInterface.h"
diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h
index e3d5b18b29..d899f532d8 100644
--- a/libraries/script-engine/src/ModelScriptingInterface.h
+++ b/libraries/script-engine/src/ModelScriptingInterface.h
@@ -17,8 +17,8 @@
#include <QScriptValue>
#include <OBJWriter.h>
#include <model/Geometry.h>
-#include <model/MeshProxy.h>
-#include <model/MeshFace.h>
+#include <model-networking/MeshProxy.h>
+#include <model-networking/MeshFace.h>
using MeshPointer = std::shared_ptr<model::Mesh>;
class ScriptEngine;