[nx] Added nx namespace.

lib/nx/AciHeader.cpp

@@ -1,5 +1,7 @@
 #include "AciHeader.h"
 
+using namespace nx;
+
 void AciHeader::clearVariables()
 {
 	mType = TYPE_ACI0;

lib/nx/AciHeader.h

@@ -4,6 +4,8 @@
 #include <fnd/memory_blob.h>
 #include <nx/ISerialiseableBinary.h>
 
+namespace nx
+{
 	class AciHeader : public ISerialiseableBinary
 	{
 	public:
@@ -106,4 +108,5 @@ private:
 		bool isEqual(const AciHeader& other) const;
 		void copyFrom(const AciHeader& other);
 	};
+}
 

lib/nx/FacBinary.cpp

@@ -1,6 +1,6 @@
 #include "FacBinary.h"
 
-
+using namespace nx;
 
 FacBinary::FacBinary() :
 	mHeader()

lib/nx/FacBinary.h

@@ -5,6 +5,8 @@
 #include <nx/ISerialiseableBinary.h>
 #include <nx/FacHeader.h>
 
+namespace nx
+{
 	class FacBinary :
 		public ISerialiseableBinary
 	{
@@ -78,4 +80,5 @@ private:
 		bool isEqual(const FacBinary& other) const;
 		void copyFrom(const FacBinary& other);
 	};
+}
 

lib/nx/FacHeader.cpp

@@ -1,6 +1,6 @@
 #include "FacHeader.h"
 
-
+using namespace nx;
 
 FacHeader::FacHeader()
 {

lib/nx/FacHeader.h

@@ -3,6 +3,8 @@
 #include <fnd/memory_blob.h>
 #include <nx/ISerialiseableBinary.h>
 
+namespace nx
+{
 	class FacHeader :
 		public ISerialiseableBinary
 	{
@@ -80,7 +82,8 @@ private:
 
 		// variables
 		u64 mFsaRights;
-	struct sSection {
+		struct sSection
+		{
 			size_t offset;
 			size_t size;
 		} mContentOwnerIdPos, mSaveDataOwnerIdPos;
@@ -90,4 +93,5 @@ private:
 		bool isEqual(const FacHeader& other) const;
 		void copyFrom(const FacHeader& other);
 	};
+}
 

lib/nx/ISerialiseableBinary.h

@@ -1,6 +1,8 @@
 #pragma once
 #include <fnd/types.h>
 
+namespace nx
+{
 	class ISerialiseableBinary
 	{
 	public:
@@ -14,4 +16,5 @@ public:
 		virtual void importBinary(const u8* bytes) = 0;
 		virtual void importBinary(const u8* bytes, size_t len) = 0;
 	};
+}
 

lib/nx/NcaHeader.cpp

@@ -1,6 +1,9 @@
 #include "NcaHeader.h"
 #include <fnd/exception.h>
 
+using namespace nx;
+
+
 void NcaHeader::exportBinary()
 {
 	mBinaryBlob.alloc(sizeof(sNcaHeader));

lib/nx/NcaHeader.h

@@ -7,6 +7,8 @@
 #include <crypto/sha.h>
 #include <nx/ISerialiseableBinary.h>
 
+namespace nx
+{
 	class NcaHeader : public ISerialiseableBinary
 	{
 	public:
@@ -153,3 +155,5 @@ private:
 		bool isEqual(const NcaHeader& other) const;
 		void copyFrom(const NcaHeader& other);
 	};
+
+}

lib/nx/SacBinary.cpp

@@ -1,6 +1,6 @@
 #include "SacBinary.h"
 
-
+using namespace nx;
 
 SacBinary::SacBinary()
 {

lib/nx/SacBinary.h

@@ -6,6 +6,8 @@
 #include <nx/ISerialiseableBinary.h>
 #include <nx/SacEntry.h>
 
+namespace nx
+{
 	class SacBinary :
 		public ISerialiseableBinary
 	{
@@ -44,3 +46,4 @@ private:
 		void copyFrom(const SacBinary& other);
 	};
 
+}

lib/nx/SacEntry.cpp

@@ -1,5 +1,7 @@
 #include "SacEntry.h"
 
+using namespace nx;
+
 SacEntry::SacEntry() :
 	mIsServer(false),
 	mName("")

lib/nx/SacEntry.h

@@ -4,6 +4,8 @@
 #include <fnd/memory_blob.h>
 #include <nx/ISerialiseableBinary.h>
 
+namespace nx
+{
 	class SacEntry : public ISerialiseableBinary
 	{
 	public:
@@ -49,3 +51,4 @@ private:
 		bool isEqual(const SacEntry& other) const;
 		void copyFrom(const SacEntry& other);
 	};
+}

programs/ncatool/main.cpp

@@ -6,7 +6,7 @@
 #include <nx/NcaHeader.h>
 #include <inttypes.h>
 
-const size_t kNcaSectorSize = NcaHeader::kDefaultBlockSize;
+const size_t kNcaSectorSize = nx::NcaHeader::kDefaultBlockSize;
 
 void initNcaCtr(u8 ctr[crypto::aes::kAesBlockSize], u32 generation)
 {
@@ -69,7 +69,7 @@ int main(int argc, char** argv)
 		{
 			decryptNcaSectorXts(nca, sector, 1, nx::crypto::aes::nca_header_key[0], nx::crypto::aes::nca_header_key[1]);
 
-			NcaHeader hdr;
+			nx::NcaHeader hdr;
 			hdr.importBinary(sector);
 
 			printf("[NCA Header]\n");
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
 			printf("  Sections:\n");
 			for (size_t i = 0; i < hdr.getSections().getSize(); i++)
 			{
-				const NcaHeader::sSection& section = hdr.getSections()[i];
+				const nx::NcaHeader::sSection& section = hdr.getSections()[i];
 				printf("    %lu:\n", i);
 				//printf("      Start Blk: %" PRId32 "\n", section.start_blk);
 				//printf("      End Blk:   %" PRId32 "\n", section.end_blk);