Rewrite include definitions

Remove relative includes, replace with paths rooted at the project component root directory, even for headers in the same directory. Use quoted includes for project components, use angled includes for external headers. This style follows the Google style guide and simplifies the automatic sorting and grouping of includes.
sodevel · Mar 16, 2022 · 8c56e08 · 8c56e08
1 parent a027912
commit 8c56e08
Show file tree

Hide file tree

Showing 77 changed files with 253 additions and 254 deletions.
diff --git a/sdk/plugin_interface/component.h b/sdk/plugin_interface/component.h
@@ -29,7 +29,7 @@
 #include <vector>
 #include <utility>
 
-#include "wx/wx.h"
+#include <wx/wx.h>
 #include "fontcontainer.h"
 
 #define COMPONENT_TYPE_ABSTRACT 0

diff --git a/sdk/plugin_interface/xrcconv.cpp b/sdk/plugin_interface/xrcconv.cpp
@@ -24,7 +24,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "xrcconv.h"
-#include "wx/tokenzr.h"
+#include <wx/tokenzr.h>
 
 #include <set>
 

diff --git a/src/codegen/codegen.cpp b/src/codegen/codegen.cpp
@@ -25,9 +25,9 @@
 
 #include "codegen.h"
 
-#include "../model/objectbase.h"
-#include "../rad/appdata.h"
-#include "../utils/wxfbexception.h"
+#include "model/objectbase.h"
+#include "rad/appdata.h"
+#include "utils/wxfbexception.h"
 
 #include <wx/tokenzr.h>
 

diff --git a/src/codegen/codegen.h b/src/codegen/codegen.h
@@ -32,8 +32,8 @@
 #ifndef __CODEGEN__
 #define __CODEGEN__
 
-#include "../model/types.h"
-#include "../utils/wxfbdefs.h"
+#include "model/types.h"
+#include "utils/wxfbdefs.h"
 
 #include <map>
 #include <vector>

diff --git a/src/codegen/codeparser.h b/src/codegen/codeparser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../utils/debug.h"
+#include "utils/debug.h"
 
 #include <unordered_map>
 #include <wx/textfile.h>

diff --git a/src/codegen/codewriter.cpp b/src/codegen/codewriter.cpp
@@ -26,8 +26,8 @@
 
 #include "codewriter.h"
 
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
 
 #include <md5/md5.hh>
 

diff --git a/src/codegen/cppcg.cpp b/src/codegen/cppcg.cpp
@@ -25,14 +25,14 @@
 
 #include "cppcg.h"
 
-#include "../model/objectbase.h"
-#include "../rad/appdata.h"
-#include "../rad/revision.h"
-#include "../rad/version.h"
-#include "../utils/filetocarray.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
-#include "codewriter.h"
+#include "model/objectbase.h"
+#include "rad/appdata.h"
+#include "rad/revision.h"
+#include "rad/version.h"
+#include "utils/filetocarray.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
+#include "codegen/codewriter.h"
 
 #include <algorithm>
 

diff --git a/src/codegen/cppcg.h b/src/codegen/cppcg.h
@@ -35,8 +35,8 @@ The value of all properties that are file or a directory paths must be absolute,
 #ifndef _CPP_CODE_GEN_
 #define _CPP_CODE_GEN_
 
-#include "codegen.h"
-#include "codeparser.h"
+#include "codegen/codegen.h"
+#include "codegen/codeparser.h"
 
 #include <set>
 #include <vector>

diff --git a/src/codegen/luacg.cpp b/src/codegen/luacg.cpp
@@ -28,14 +28,14 @@
 
 #include "luacg.h"
 
-#include "../model/objectbase.h"
-#include "../rad/appdata.h"
-#include "../rad/revision.h"
-#include "../rad/version.h"
-#include "../utils/debug.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
-#include "codewriter.h"
+#include "model/objectbase.h"
+#include "rad/appdata.h"
+#include "rad/revision.h"
+#include "rad/version.h"
+#include "utils/debug.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
+#include "codegen/codewriter.h"
 
 #include <algorithm>
 

diff --git a/src/codegen/luacg.h b/src/codegen/luacg.h
@@ -40,7 +40,7 @@ none
 #define fbfSILENT true
 #define fbfMESSAGE false
 
-#include "codegen.h"
+#include "codegen/codegen.h"
 
 #include <map>
 #include <set>

diff --git a/src/codegen/phpcg.cpp b/src/codegen/phpcg.cpp
@@ -28,14 +28,14 @@
 
 #include "phpcg.h"
 
-#include "codewriter.h"
-#include "../utils/typeconv.h"
-#include "../utils/debug.h"
-#include "../rad/appdata.h"
-#include "../rad/revision.h"
-#include "../rad/version.h"
-#include "../model/objectbase.h"
-#include "../utils/wxfbexception.h"
+#include "codegen/codewriter.h"
+#include "utils/typeconv.h"
+#include "utils/debug.h"
+#include "rad/appdata.h"
+#include "rad/revision.h"
+#include "rad/version.h"
+#include "model/objectbase.h"
+#include "utils/wxfbexception.h"
 
 #include <algorithm>
 

diff --git a/src/codegen/phpcg.h b/src/codegen/phpcg.h
@@ -44,7 +44,7 @@ The value of all properties that are file or a directory paths must be absolute,
 #define fbfSILENT true
 #define fbfMESSAGE false
 
-#include "codegen.h"
+#include "codegen/codegen.h"
 
 #include <set>
 #include <vector>

diff --git a/src/codegen/pythoncg.cpp b/src/codegen/pythoncg.cpp
@@ -28,14 +28,14 @@
 
 #include "pythoncg.h"
 
-#include "../model/objectbase.h"
-#include "../rad/appdata.h"
-#include "../rad/revision.h"
-#include "../rad/version.h"
-#include "../utils/debug.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
-#include "codewriter.h"
+#include "model/objectbase.h"
+#include "rad/appdata.h"
+#include "rad/revision.h"
+#include "rad/version.h"
+#include "utils/debug.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
+#include "codegen/codewriter.h"
 
 #include <algorithm>
 

diff --git a/src/codegen/pythoncg.h b/src/codegen/pythoncg.h
@@ -41,7 +41,7 @@ The value of all properties that are file or a directory paths must be absolute,
 #define fbfSILENT true
 #define fbfMESSAGE false
 
-#include "codegen.h"
+#include "codegen/codegen.h"
 
 #include <map>
 #include <set>

diff --git a/src/codegen/xrccg.cpp b/src/codegen/xrccg.cpp
@@ -25,9 +25,9 @@
 
 #include "xrccg.h"
 
-#include "../model/objectbase.h"
-#include "../utils/typeconv.h"
-#include "codewriter.h"
+#include "model/objectbase.h"
+#include "utils/typeconv.h"
+#include "codegen/codewriter.h"
 
 #include <ticpp.h>
 

diff --git a/src/codegen/xrccg.h b/src/codegen/xrccg.h
@@ -26,7 +26,7 @@
 #ifndef _XRC_CODE_GEN_
 #define _XRC_CODE_GEN_
 
-#include "codegen.h"
+#include "codegen/codegen.h"
 
 namespace ticpp
 {

diff --git a/src/model/database.cpp b/src/model/database.cpp
@@ -25,13 +25,13 @@
 
 #include "database.h"
 
-#include "../rad/bitmaps.h"
-#include "../rad/wxfbmanager.h"
-#include "../utils/debug.h"
-#include "../utils/stringutils.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
-#include "objectbase.h"
+#include "rad/bitmaps.h"
+#include "rad/wxfbmanager.h"
+#include "utils/debug.h"
+#include "utils/stringutils.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
+#include "model/objectbase.h"
 
 #include <ticpp.h>
 #include <wx/dir.h>

diff --git a/src/model/database.h b/src/model/database.h
@@ -26,8 +26,8 @@
 #ifndef __OBJ_DATABASE__
 #define __OBJ_DATABASE__
 
-#include "../utils/wxfbdefs.h"
-#include "types.h"
+#include "utils/wxfbdefs.h"
+#include "model/types.h"
 
 #include <set>
 #include <functional>

diff --git a/src/model/objectbase.cpp b/src/model/objectbase.cpp
@@ -25,10 +25,10 @@
 
 #include "objectbase.h"
 
-#include "../rad/appdata.h"
-#include "../utils/debug.h"
-#include "../utils/stringutils.h"
-#include "../utils/typeconv.h"
+#include "rad/appdata.h"
+#include "utils/debug.h"
+#include "utils/stringutils.h"
+#include "utils/typeconv.h"
 
 #include <ticpp.h>
 #include <wx/tokenzr.h>

diff --git a/src/model/objectbase.h b/src/model/objectbase.h
@@ -33,8 +33,8 @@
 #ifndef __OBJ__
 #define __OBJ__
 
-#include "../utils/wxfbdefs.h"
-#include "types.h"
+#include "utils/wxfbdefs.h"
+#include "model/types.h"
 
 #include <component.h>
 #include <list>

diff --git a/src/model/types.cpp b/src/model/types.cpp
@@ -25,7 +25,7 @@
 
 #include "types.h"
 
-#include "../utils/stringutils.h"
+#include "utils/stringutils.h"
 
 #include <wx/tokenzr.h>
 

diff --git a/src/model/xrcfilter.cpp b/src/model/xrcfilter.cpp
@@ -25,9 +25,9 @@
 
 #include "xrcfilter.h"
 
-#include "../utils/debug.h"
-#include "../utils/typeconv.h"
-#include "objectbase.h"
+#include "utils/debug.h"
+#include "utils/typeconv.h"
+#include "model/objectbase.h"
 
 PObjectBase XrcLoader::GetProject( ticpp::Document* xrcDoc )
 {

diff --git a/src/model/xrcfilter.h b/src/model/xrcfilter.h
@@ -26,7 +26,7 @@
 #ifndef __XRC_FILTER__
 #define __XRC_FILTER__
 
-#include "database.h"
+#include "model/database.h"
 
 #include <ticpp.h>
 

diff --git a/src/rad/about.cpp b/src/rad/about.cpp
@@ -25,7 +25,7 @@
 
 #include "about.h"
 
-#include "appdata.h"
+#include "rad/appdata.h"
 
 #include <wx/html/htmlwin.h>
 #include <wx/mimetype.h>

diff --git a/src/rad/appdata.cpp b/src/rad/appdata.cpp
@@ -25,22 +25,22 @@
 
 #include "appdata.h"
 
-#include "bitmaps.h"
-#include "wxfbevent.h"
-#include "wxfbmanager.h"
-
-#include "../codegen/codewriter.h"
-#include "../codegen/cppcg.h"
-#include "../codegen/luacg.h"
-#include "../codegen/phpcg.h"
-#include "../codegen/pythoncg.h"
-#include "../model/objectbase.h"
-#include "../utils/stringutils.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
-#include "../utils/wxfbipc.h"
-#include "dataobject/dataobject.h"
-#include "xrcpreview/xrcpreview.h"
+#include "rad/bitmaps.h"
+#include "rad/wxfbevent.h"
+#include "rad/wxfbmanager.h"
+
+#include "codegen/codewriter.h"
+#include "codegen/cppcg.h"
+#include "codegen/luacg.h"
+#include "codegen/phpcg.h"
+#include "codegen/pythoncg.h"
+#include "model/objectbase.h"
+#include "utils/stringutils.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
+#include "utils/wxfbipc.h"
+#include "rad/dataobject/dataobject.h"
+#include "rad/xrcpreview/xrcpreview.h"
 
 #include <ticpp.h>
 

diff --git a/src/rad/appdata.h b/src/rad/appdata.h
@@ -26,8 +26,8 @@
 #ifndef __APP_DATA__
 #define __APP_DATA__
 
-#include "../model/database.h"
-#include "cmdproc.h"
+#include "model/database.h"
+#include "rad/cmdproc.h"
 
 namespace ticpp
 {

diff --git a/src/rad/bitmaps.cpp b/src/rad/bitmaps.cpp
@@ -25,9 +25,9 @@
 
 #include "bitmaps.h"
 
-#include "../utils/stringutils.h"
-#include "../utils/typeconv.h"
-#include "../utils/wxfbexception.h"
+#include "utils/stringutils.h"
+#include "utils/typeconv.h"
+#include "utils/wxfbexception.h"
 
 #include <default.xpm>
 #include <ticpp.h>