(#6) Non-relative #include(s) for module headers

Adjusted `#include`s not to depend on relative folder structure and instead be based on module of origin, as this: `#include "<module>/<header>.h"` This is allowed by the fact that the `src` directory is added to the INCLUDES search path.
wrye-bash · Nov 3, 2016 · 7213d5c · 7213d5c
1 parent 6aba1e0
commit 7213d5c
Show file tree

Hide file tree

Showing 604 changed files with 817 additions and 816 deletions.
diff --git a/src/capi/CBash.cpp b/src/capi/CBash.cpp
@@ -45,7 +45,7 @@
 // included.  CBashConfig.h is included from CBash.h, so defining it here works.
 #define COMPILING_CBASH
 #include "CBash.h"
-#include "Collection.h"
+#include "main/Collection.h"
 #include "Version.h"
 #include <vector>
 #include <stdarg.h>

diff --git a/src/game/FalloutNewVegas/FNVFile.cpp b/src/game/FalloutNewVegas/FNVFile.cpp
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 // FNVFile.cpp
-#include "../Common.h"
-#include "../GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 #include "FNVFile.h"
 
 FNVFile::FNVFile(Collection *_Parent, char * FileName, char * ModName, const uint32_t _flags):

diff --git a/src/game/FalloutNewVegas/FNVFile.h b/src/game/FalloutNewVegas/FNVFile.h
@@ -35,10 +35,12 @@
  * ***** END LICENSE BLOCK ***** */
 #pragma once
 // FNVFile.h
-#include "../Common.h"
-#include "../ModFile.h"
-#include "../GenericRecord.h"
-#include "../GRUPRecord.h"
+#include "common/Common.h"
+#include "common/ModFile.h"
+#include "common/GenericRecord.h"
+
+#include "GRUPRecord.h"
+
 #include "Records/GMSTRecord.h"
 #include "Records/TXSTRecord.h"
 #include "Records/MICNRecord.h"

diff --git a/src/game/FalloutNewVegas/Records/ACHRRecord.cpp b/src/game/FalloutNewVegas/Records/ACHRRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ACHRRecord.h"
 #include "CELLRecord.h"
 

diff --git a/src/game/FalloutNewVegas/Records/ACHRRecord.h b/src/game/FalloutNewVegas/Records/ACHRRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ACRERecord.cpp b/src/game/FalloutNewVegas/Records/ACRERecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ACRERecord.h"
 #include "CELLRecord.h"
 

diff --git a/src/game/FalloutNewVegas/Records/ACRERecord.h b/src/game/FalloutNewVegas/Records/ACRERecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ACTIRecord.cpp b/src/game/FalloutNewVegas/Records/ACTIRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ACTIRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/ACTIRecord.h b/src/game/FalloutNewVegas/Records/ACTIRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ADDNRecord.cpp b/src/game/FalloutNewVegas/Records/ADDNRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ADDNRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/ADDNRecord.h b/src/game/FalloutNewVegas/Records/ADDNRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ALCHRecord.cpp b/src/game/FalloutNewVegas/Records/ALCHRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ALCHRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/ALCHRecord.h b/src/game/FalloutNewVegas/Records/ALCHRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ALOCRecord.cpp b/src/game/FalloutNewVegas/Records/ALOCRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ALOCRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/ALOCRecord.h b/src/game/FalloutNewVegas/Records/ALOCRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/AMEFRecord.cpp b/src/game/FalloutNewVegas/Records/AMEFRecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "AMEFRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/AMEFRecord.h b/src/game/FalloutNewVegas/Records/AMEFRecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/AMMORecord.cpp b/src/game/FalloutNewVegas/Records/AMMORecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "AMMORecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/AMMORecord.h b/src/game/FalloutNewVegas/Records/AMMORecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/ANIORecord.cpp b/src/game/FalloutNewVegas/Records/ANIORecord.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\Common.h"
+#include "common/Common.h"
 #include "ANIORecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/ANIORecord.h b/src/game/FalloutNewVegas/Records/ANIORecord.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #pragma once
-#include "..\..\Common.h"
-#include "..\..\GenericRecord.h"
+#include "common/Common.h"
+#include "common/GenericRecord.h"
 
 namespace FNV
 {

diff --git a/src/game/FalloutNewVegas/Records/API/ACHRRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ACHRRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ACHRRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ACRERecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ACRERecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ACRERecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ACTIRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ACTIRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ACTIRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ADDNRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ADDNRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ADDNRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ALCHRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ALCHRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ALCHRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ALOCRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ALOCRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ALOCRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/AMEFRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/AMEFRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\AMEFRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/AMMORecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/AMMORecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\AMMORecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ANIORecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ANIORecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ANIORecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ARMARecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ARMARecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ARMARecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ARMORecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ARMORecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ARMORecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/ASPCRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/ASPCRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\ASPCRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/AVIFRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/AVIFRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\AVIFRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/BOOKRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/BOOKRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\BOOKRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/BPTDRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/BPTDRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\BPTDRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/CAMSRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/CAMSRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\CAMSRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/CCRDRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/CCRDRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\CCRDRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/CDCKRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/CDCKRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\CDCKRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/CELLRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/CELLRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\CELLRecord.h"
 
 namespace FNV

diff --git a/src/game/FalloutNewVegas/Records/API/CHALRecordAPI.cpp b/src/game/FalloutNewVegas/Records/API/CHALRecordAPI.cpp
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "..\..\..\Common.h"
+#include "common/Common.h"
 #include "..\CHALRecord.h"
 
 namespace FNV