From 059be4e32a224f9922dadb8092d4638edcbcab90 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 12 May 2017 00:29:58 -0500
Subject: [PATCH] Update Ox

---
 src/studio/lib/project.cpp | 2 +-
 src/studio/lib/project.hpp | 2 +-
 src/studio/main.cpp        | 2 +-
 src/tools/pack.cpp         | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/studio/lib/project.cpp b/src/studio/lib/project.cpp
index 51f13284..fc81eaa5 100644
--- a/src/studio/lib/project.cpp
+++ b/src/studio/lib/project.cpp
@@ -13,7 +13,7 @@
 namespace nostalgia {
 namespace studio {
 
-using namespace ox::fs;
+using namespace ox;
 
 QString Project::ROM_FILE = "/ROM.oxfs";
 
diff --git a/src/studio/lib/project.hpp b/src/studio/lib/project.hpp
index 25c0bbab..3d616e0a 100644
--- a/src/studio/lib/project.hpp
+++ b/src/studio/lib/project.hpp
@@ -23,7 +23,7 @@ class Project: public QObject {
 
 		QString m_path = "";
 		QSharedPointer<QByteArray> m_romBuff;
-		QSharedPointer<ox::fs::FileSystem> m_fs;
+		QSharedPointer<ox::FileSystem> m_fs;
 
 	public:
 		Project(QString path);
diff --git a/src/studio/main.cpp b/src/studio/main.cpp
index aeefb4ec..8cce640c 100644
--- a/src/studio/main.cpp
+++ b/src/studio/main.cpp
@@ -14,7 +14,7 @@
 #include "mainwindow.hpp"
 
 using namespace nostalgia::studio;
-using namespace ox::clargs;
+using namespace ox;
 
 int run(int argc, char **args) {
 	ClArgs clargs(argc, (const char**) args);
diff --git a/src/tools/pack.cpp b/src/tools/pack.cpp
index d5e2e288..921a5933 100644
--- a/src/tools/pack.cpp
+++ b/src/tools/pack.cpp
@@ -17,8 +17,6 @@
 
 using namespace std;
 using namespace ox;
-using namespace ox::clargs;
-using namespace ox::fs;
 using namespace nostalgia::core;
 using namespace nostalgia::common;