renamed low-level NIF related files and include guards to conform to naming convention

apps/openmw/engine.cpp

@@ -9,7 +9,7 @@
 #include <components/bsa/bsa_archive.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/translation/translation.hpp>
-#include <components/nif/nif_file.hpp>
+#include <components/nif/niffile.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
 #include <components/nifbullet/bullet_nif_loader.hpp>

apps/openmw/mwworld/scene.cpp

@@ -1,6 +1,6 @@
 #include "scene.hpp"
 
-#include <components/nif/nif_file.hpp>
+#include <components/nif/niffile.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp" /// FIXME

components/CMakeLists.txt

@@ -15,7 +15,7 @@ add_component_dir (bsa
     )
 
 add_component_dir (nif
-    controlled effect nif_types record controller extra node record_ptr data nif_file property
+    controlled effect niftypes record controller extra node record_ptr data niffile property
     )
 
 add_component_dir (nifogre

components/nif/controlled.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_CONTROLLED_H_
-#define _NIF_CONTROLLED_H_
+#ifndef OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
+#define OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
 
 #include "extra.hpp"
 #include "controller.hpp"

components/nif/controller.hpp

@@ -21,12 +21,12 @@
 
  */
 
-#ifndef _NIF_CONTROLLER_H_
-#define _NIF_CONTROLLER_H_
+#ifndef OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
+#define OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
 
 #include "record.hpp"
-#include "nif_file.hpp"
-#include "record_ptr.hpp"
+#include "niffile.hpp"
+#include "recordptr.hpp"
 
 namespace Nif
 {

components/nif/data.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_DATA_H_
-#define _NIF_DATA_H_
+#ifndef OPENMW_COMPONENTS_NIF_DATA_HPP
+#define OPENMW_COMPONENTS_NIF_DATA_HPP
 
 #include "controlled.hpp"
 

components/nif/effect.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_EFFECT_H_
-#define _NIF_EFFECT_H_
+#ifndef OPENMW_COMPONENTS_NIF_EFFECT_HPP
+#define OPENMW_COMPONENTS_NIF_EFFECT_HPP
 
 #include "node.hpp"
 

components/nif/extra.hpp

@@ -21,12 +21,12 @@
 
  */
 
-#ifndef _NIF_EXTRA_H_
-#define _NIF_EXTRA_H_
+#ifndef OPENMW_COMPONENTS_NIF_EXTRA_HPP
+#define OPENMW_COMPONENTS_NIF_EXTRA_HPP
 
 #include "record.hpp"
-#include "nif_file.hpp"
-#include "record_ptr.hpp"
+#include "niffile.hpp"
+#include "recordptr.hpp"
 
 namespace Nif
 {

components/nif/niffile.cpp

@@ -21,7 +21,7 @@
 
  */
 
-#include "nif_file.hpp"
+#include "niffile.hpp"
 #include "record.hpp"
 #include "components/misc/stringops.hpp"
 

components/nif/niffile.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_FILE_H_
-#define _NIF_FILE_H_
+#ifndef OPENMW_COMPONENTS_NIF_NIFFILE_HPP
+#define OPENMW_COMPONENTS_NIF_NIFFILE_HPP
 
 #include <OgreResourceGroupManager.h>
 #include <OgreDataStream.h>
@@ -45,8 +45,8 @@
 #include <libs/platform/stdint.h>
 
 #include "record.hpp"
-#include "nif_types.hpp"
-#include "nif_stream.hpp"
+#include "niftypes.hpp"
+#include "nifstream.hpp"
 
 namespace Nif
 {

components/nif/nifstream.hpp

@@ -1,5 +1,5 @@
-#ifndef _NIF_STREAM_HPP_
-#define _NIF_STREAM_HPP_
+#ifndef OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
+#define OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
 
 namespace Nif
 {

components/nif/niftypes.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_TYPES_H_
-#define _NIF_TYPES_H_
+#ifndef OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
+#define OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
 
 #include <OgreVector3.h>
 #include <OgreMatrix3.h>

components/nif/node.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_NODE_H_
-#define _NIF_NODE_H_
+#ifndef OPENMW_COMPONENTS_NIF_NODE_HPP
+#define OPENMW_COMPONENTS_NIF_NODE_HPP
 
 #include <OgreMatrix4.h>
 

components/nif/property.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_PROPERTY_H_
-#define _NIF_PROPERTY_H_
+#ifndef OPENMW_COMPONENTS_NIF_PROPERTY_HPP
+#define OPENMW_COMPONENTS_NIF_PROPERTY_HPP
 
 #include "controlled.hpp"
 

components/nif/record.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_RECORD_H_
-#define _NIF_RECORD_H_
+#ifndef OPENMW_COMPONENTS_NIF_RECORD_HPP
+#define OPENMW_COMPONENTS_NIF_RECORD_HPP
 
 #include <string>
 

components/nif/recordptr.hpp

@@ -21,10 +21,10 @@
 
  */
 
-#ifndef _NIF_RECORD_PTR_H_
-#define _NIF_RECORD_PTR_H_
+#ifndef OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
+#define OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
 
-#include "nif_file.hpp"
+#include "niffile.hpp"
 #include <vector>
 
 namespace Nif

components/nifbullet/bullet_nif_loader.cpp

@@ -25,7 +25,7 @@ http://www.gnu.org/licenses/ .
 #include <Ogre.h>
 #include <cstdio>
 
-#include "../nif/nif_file.hpp"
+#include "../nif/niffile.hpp"
 #include "../nif/node.hpp"
 #include "../nif/data.hpp"
 #include "../nif/property.hpp"