From 1f4781f06a4037d9ee7c5fc71d46ae83ae08d1e6 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sat, 1 Sep 2018 14:46:24 -0500
Subject: [PATCH] [nostalgia] Update Ox includes

---
 .vscode/c_cpp_properties.json           | 9 +++++----
 src/nostalgia/common/point.hpp          | 2 +-
 src/nostalgia/studio/lib/json_read.hpp  | 2 +-
 src/nostalgia/studio/lib/json_write.hpp | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index f6baa1df..0103b360 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -23,7 +23,7 @@
                     "${workspaceRoot}"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": "${workspaceRoot}/build/current/compile_commands.json"
+                "databaseFilename": ""
             },
             "macFrameworkPath": [
                 "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks"
@@ -56,8 +56,9 @@
                     "${workspaceRoot}"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": "${workspaceRoot}/build/current/compile_commands.json"
-            }
+                "databaseFilename": ""
+            },
+            "compileCommands": "${workspaceFolder}/deps/ox/build/linux-x86_64-debug/compile_commands.json"
         },
         {
             "name": "Win32",
@@ -80,5 +81,5 @@
             }
         }
     ],
-    "version": 3
+    "version": 4
 }
\ No newline at end of file
diff --git a/src/nostalgia/common/point.hpp b/src/nostalgia/common/point.hpp
index 63e80b3e..027c97e0 100644
--- a/src/nostalgia/common/point.hpp
+++ b/src/nostalgia/common/point.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ox/std/types.hpp>
+#include <ox/std/error.hpp>
 
 namespace nostalgia {
 namespace common {
diff --git a/src/nostalgia/studio/lib/json_read.hpp b/src/nostalgia/studio/lib/json_read.hpp
index 50238b3e..d021cd60 100644
--- a/src/nostalgia/studio/lib/json_read.hpp
+++ b/src/nostalgia/studio/lib/json_read.hpp
@@ -12,7 +12,7 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
-#include <ox/std/types.hpp>
+#include <ox/std/error.hpp>
 
 #include "json_err.hpp"
 
diff --git a/src/nostalgia/studio/lib/json_write.hpp b/src/nostalgia/studio/lib/json_write.hpp
index b0c9e906..fa74686d 100644
--- a/src/nostalgia/studio/lib/json_write.hpp
+++ b/src/nostalgia/studio/lib/json_write.hpp
@@ -12,7 +12,7 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 
-#include <ox/std/types.hpp>
+#include <ox/std/error.hpp>
 
 #include "json_err.hpp"