Skip to content
Snippets Groups Projects
Commit ad25d074 authored by Shon Ferguson's avatar Shon Ferguson
Browse files

Changed namespace from NifLib to Niflib.

Commented out functions written by Amorilia that I need to figure out how to fix.
parent 9773cb50
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
All rights reserved. Please see niflib.h for licence. */ All rights reserved. Please see niflib.h for licence. */
#include "NIF_IO.h" #include "NIF_IO.h"
namespace NifLib { namespace Niflib {
int BlockSearch( istream& in ) { int BlockSearch( istream& in ) {
......
...@@ -11,7 +11,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -11,7 +11,7 @@ All rights reserved. Please see niflib.h for licence. */
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include "nif_math.h" #include "nif_math.h"
namespace NifLib { namespace Niflib {
using namespace std; using namespace std;
#ifndef NULL #ifndef NULL
......
...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */
#define _REF_H_ #define _REF_H_
#include <ostream> #include <ostream>
#include "dll_export.h" #include "dll_export.h"
namespace NifLib { namespace Niflib {
/** /**
* Smart Pointer Template * Smart Pointer Template
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
All rights reserved. Please see niflib.h for licence. */ All rights reserved. Please see niflib.h for licence. */
#include "Type.h" #include "Type.h"
using namespace NifLib; using namespace Niflib;
Type::Type (const string & type_name, const Type * par_type ) : name(type_name), base_type(par_type) {} Type::Type (const string & type_name, const Type * par_type ) : name(type_name), base_type(par_type) {}
......
...@@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "dll_export.h" #include "dll_export.h"
using namespace std; using namespace std;
namespace NifLib { namespace Niflib {
/** /**
* Run Time Type Inforamtion Class * Run Time Type Inforamtion Class
......
...@@ -3,7 +3,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -3,7 +3,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "AVObject.h" #include "AVObject.h"
#include "../obj/NiAVObject.h" #include "../obj/NiAVObject.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
AVObject::AVObject() : object(NULL) {}; AVObject::AVObject() : object(NULL) {};
......
...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../NIF_IO.h" #include "../NIF_IO.h"
namespace NifLib { namespace Niflib {
// Forward define of referenced blocks // Forward define of referenced blocks
class NiAVObject; class NiAVObject;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
All rights reserved. Please see niflib.h for licence. */ All rights reserved. Please see niflib.h for licence. */
#include "BoundingBox.h" #include "BoundingBox.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
BoundingBox::BoundingBox() : unknownInt((uint)1) {}; BoundingBox::BoundingBox() : unknownInt((uint)1) {};
......
...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../NIF_IO.h" #include "../NIF_IO.h"
namespace NifLib { namespace Niflib {
/*! /*!
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
All rights reserved. Please see niflib.h for licence. */ All rights reserved. Please see niflib.h for licence. */
#include "ByteArray.h" #include "ByteArray.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
ByteArray::ByteArray() : dataSize((uint)0) {}; ByteArray::ByteArray() : dataSize((uint)0) {};
......
...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../NIF_IO.h" #include "../NIF_IO.h"
namespace NifLib { namespace Niflib {
/*! /*!
......
...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../obj/NiInterpolator.h" #include "../obj/NiInterpolator.h"
#include "../obj/NiObject.h" #include "../obj/NiObject.h"
#include "../obj/NiStringPalette.h" #include "../obj/NiStringPalette.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
ControllerLink::ControllerLink() : interpolator(NULL), unknownLink1(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)0), propertyTypeOffset((uint)0), controllerTypeOffset((uint)0), variableOffset1((uint)0), variableOffset2((uint)0) {}; ControllerLink::ControllerLink() : interpolator(NULL), unknownLink1(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)0), propertyTypeOffset((uint)0), controllerTypeOffset((uint)0), variableOffset1((uint)0), variableOffset2((uint)0) {};
......
...@@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -8,7 +8,7 @@ All rights reserved. Please see niflib.h for licence. */
// Include structures // Include structures
#include "../Ref.h" #include "../Ref.h"
namespace NifLib { namespace Niflib {
// Forward define of referenced blocks // Forward define of referenced blocks
class NiInterpolator; class NiInterpolator;
......
...@@ -3,7 +3,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -3,7 +3,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "Footer.h" #include "Footer.h"
#include "../obj/NiAVObject.h" #include "../obj/NiAVObject.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
Footer::Footer() : numRoots((uint)0) {}; Footer::Footer() : numRoots((uint)0) {};
......
...@@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */
// Include structures // Include structures
#include "../Ref.h" #include "../Ref.h"
namespace NifLib { namespace Niflib {
// Forward define of referenced blocks // Forward define of referenced blocks
class NiAVObject; class NiAVObject;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
All rights reserved. Please see niflib.h for licence. */ All rights reserved. Please see niflib.h for licence. */
#include "FurniturePosition.h" #include "FurniturePosition.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {}; FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {};
......
...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../NIF_IO.h" #include "../NIF_IO.h"
namespace NifLib { namespace Niflib {
/*! /*!
......
...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -5,7 +5,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "ShortString.h" #include "ShortString.h"
#include "ShortString.h" #include "ShortString.h"
#include "ShortString.h" #include "ShortString.h"
using namespace NifLib; using namespace Niflib;
//Constructor //Constructor
Header::Header() : version((uint)0x04000002), endianType((byte)1), userVersion((uint)0), numBlocks((uint)0), unknownInt1((uint)0), unknownInt3((uint)0), numBlockTypes((ushort)0), unknownInt2((uint)0) {}; Header::Header() : version((uint)0x04000002), endianType((byte)1), userVersion((uint)0), numBlocks((uint)0), unknownInt1((uint)0), unknownInt3((uint)0), numBlockTypes((ushort)0), unknownInt2((uint)0) {};
......
...@@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -9,7 +9,7 @@ All rights reserved. Please see niflib.h for licence. */
// Include structures // Include structures
#include "ShortString.h" #include "ShortString.h"
namespace NifLib { namespace Niflib {
/*! /*!
......
...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */ ...@@ -6,7 +6,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "../NIF_IO.h" #include "../NIF_IO.h"
namespace NifLib { namespace Niflib {
/*! /*!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment