From 8c56e08ceb2b1dabfeb62149b951da5753c6a8df Mon Sep 17 00:00:00 2001 From: Steffen Olszewski Date: Wed, 16 Mar 2022 14:49:23 +0100 Subject: [PATCH] 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. --- sdk/plugin_interface/component.h | 2 +- sdk/plugin_interface/xrcconv.cpp | 2 +- src/codegen/codegen.cpp | 6 +-- src/codegen/codegen.h | 4 +- src/codegen/codeparser.h | 2 +- src/codegen/codewriter.cpp | 4 +- src/codegen/cppcg.cpp | 16 ++++---- src/codegen/cppcg.h | 4 +- src/codegen/luacg.cpp | 16 ++++---- src/codegen/luacg.h | 2 +- src/codegen/phpcg.cpp | 16 ++++---- src/codegen/phpcg.h | 2 +- src/codegen/pythoncg.cpp | 16 ++++---- src/codegen/pythoncg.h | 2 +- src/codegen/xrccg.cpp | 6 +-- src/codegen/xrccg.h | 2 +- src/model/database.cpp | 14 +++---- src/model/database.h | 4 +- src/model/objectbase.cpp | 8 ++-- src/model/objectbase.h | 4 +- src/model/types.cpp | 2 +- src/model/xrcfilter.cpp | 6 +-- src/model/xrcfilter.h | 2 +- src/rad/about.cpp | 2 +- src/rad/appdata.cpp | 32 +++++++-------- src/rad/appdata.h | 4 +- src/rad/bitmaps.cpp | 6 +-- src/rad/cpppanel/cpppanel.cpp | 20 ++++----- src/rad/cpppanel/cpppanel.h | 2 +- src/rad/customkeys.cpp | 2 +- src/rad/customkeys.h | 2 +- src/rad/dataobject/dataobject.cpp | 6 +-- src/rad/dataobject/dataobject.h | 2 +- src/rad/designer/innerframe.cpp | 2 +- src/rad/designer/innerframe.h | 3 +- src/rad/designer/menubar.h | 2 +- src/rad/designer/visualeditor.cpp | 14 +++---- src/rad/designer/visualeditor.h | 4 +- src/rad/designer/visualobj.cpp | 6 +-- src/rad/designer/visualobj.h | 2 +- src/rad/dialogfindcomponent.cpp | 6 +-- src/rad/genericpanel.cpp | 2 +- src/rad/genericpanel.h | 2 +- src/rad/geninheritclass/geninhertclass.cpp | 2 +- src/rad/geninheritclass/geninhertclass.h | 4 +- src/rad/inspector/objinspect.cpp | 16 ++++---- src/rad/inspector/objinspect.h | 2 +- src/rad/inspector/wxfbadvprops.cpp | 4 +- src/rad/inspector/wxfbadvprops.h | 2 +- src/rad/luapanel/luapanel.cpp | 16 ++++---- src/rad/luapanel/luapanel.h | 2 +- src/rad/mainframe.cpp | 48 +++++++++++----------- src/rad/mainframe.h | 6 +-- src/rad/menueditor.cpp | 2 +- src/rad/menueditor.h | 2 +- src/rad/objecttree/objecttree.cpp | 10 ++--- src/rad/objecttree/objecttree.h | 4 +- src/rad/palette.cpp | 8 ++-- src/rad/palette.h | 2 +- src/rad/phppanel/phppanel.cpp | 16 ++++---- src/rad/phppanel/phppanel.h | 2 +- src/rad/pythonpanel/pythonpanel.cpp | 16 ++++---- src/rad/pythonpanel/pythonpanel.h | 2 +- src/rad/wxfbevent.h | 2 +- src/rad/wxfbmanager.cpp | 6 +-- src/rad/wxfbmanager.h | 2 +- src/rad/xrcpanel/xrcpanel.cpp | 18 ++++---- src/rad/xrcpanel/xrcpanel.h | 2 +- src/rad/xrcpreview/xrcpreview.cpp | 12 +++--- src/rad/xrcpreview/xrcpreview.h | 2 +- src/utils/filetocarray.cpp | 12 +++--- src/utils/m_wxfb.cpp | 4 +- src/utils/stringutils.cpp | 4 +- src/utils/typeconv.cpp | 6 +-- src/utils/typeconv.h | 4 +- src/utils/wxfbipc.cpp | 2 +- src/wxFormBuilder.rc | 2 +- 77 files changed, 253 insertions(+), 254 deletions(-) diff --git a/sdk/plugin_interface/component.h b/sdk/plugin_interface/component.h index f7ae1bf28..b005f87f1 100644 --- a/sdk/plugin_interface/component.h +++ b/sdk/plugin_interface/component.h @@ -29,7 +29,7 @@ #include #include -#include "wx/wx.h" +#include #include "fontcontainer.h" #define COMPONENT_TYPE_ABSTRACT 0 diff --git a/sdk/plugin_interface/xrcconv.cpp b/sdk/plugin_interface/xrcconv.cpp index 390e63903..adbbb7109 100644 --- a/sdk/plugin_interface/xrcconv.cpp +++ b/sdk/plugin_interface/xrcconv.cpp @@ -24,7 +24,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "xrcconv.h" -#include "wx/tokenzr.h" +#include #include diff --git a/src/codegen/codegen.cpp b/src/codegen/codegen.cpp index 84465bb41..91b4f8771 100644 --- 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 diff --git a/src/codegen/codegen.h b/src/codegen/codegen.h index 0a899d517..aaaac7e82 100644 --- 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 #include diff --git a/src/codegen/codeparser.h b/src/codegen/codeparser.h index 18c7e550f..1ccbb6577 100644 --- 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 #include diff --git a/src/codegen/codewriter.cpp b/src/codegen/codewriter.cpp index ca8d12ffd..928602265 100644 --- 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 diff --git a/src/codegen/cppcg.cpp b/src/codegen/cppcg.cpp index dff63cb93..8515235e5 100644 --- 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 diff --git a/src/codegen/cppcg.h b/src/codegen/cppcg.h index 3b358a330..e22b5ee1a 100644 --- 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 #include diff --git a/src/codegen/luacg.cpp b/src/codegen/luacg.cpp index 438131aaa..e71ca025d 100644 --- 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 diff --git a/src/codegen/luacg.h b/src/codegen/luacg.h index 4ce3f2334..a5d0a97c1 100644 --- 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 #include diff --git a/src/codegen/phpcg.cpp b/src/codegen/phpcg.cpp index 7d6f75c29..888f7015d 100644 --- 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 diff --git a/src/codegen/phpcg.h b/src/codegen/phpcg.h index 408d1d2f5..70e9a9a78 100644 --- 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 #include diff --git a/src/codegen/pythoncg.cpp b/src/codegen/pythoncg.cpp index a38d61d75..065d6294b 100644 --- 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 diff --git a/src/codegen/pythoncg.h b/src/codegen/pythoncg.h index 723b865e7..1b7457397 100644 --- 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 #include diff --git a/src/codegen/xrccg.cpp b/src/codegen/xrccg.cpp index 703234e93..ba6341a71 100644 --- 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 diff --git a/src/codegen/xrccg.h b/src/codegen/xrccg.h index 4cd99bdc2..e717d19b3 100644 --- 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 index c30bf947c..22f3d1b5c 100644 --- 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 #include diff --git a/src/model/database.h b/src/model/database.h index 743a06f88..dee7030a6 100644 --- 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 #include diff --git a/src/model/objectbase.cpp b/src/model/objectbase.cpp index b8f727c2b..b3ceef6ec 100644 --- 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 #include diff --git a/src/model/objectbase.h b/src/model/objectbase.h index 17fdc920b..148b0e8ae 100644 --- 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 #include diff --git a/src/model/types.cpp b/src/model/types.cpp index 6dae142ef..a1aebcec0 100644 --- 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 diff --git a/src/model/xrcfilter.cpp b/src/model/xrcfilter.cpp index f50564fd2..004889c1a 100644 --- 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 index d79463930..47dfb1d7a 100644 --- 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 diff --git a/src/rad/about.cpp b/src/rad/about.cpp index 57f0985ed..b56b5fd37 100644 --- 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 #include diff --git a/src/rad/appdata.cpp b/src/rad/appdata.cpp index 9036fa075..17f0e277b 100644 --- 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 diff --git a/src/rad/appdata.h b/src/rad/appdata.h index 782907190..6754c11dd 100644 --- 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 index f7f86ba09..085e513b2 100644 --- 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 #include diff --git a/src/rad/cpppanel/cpppanel.cpp b/src/rad/cpppanel/cpppanel.cpp index 06ae00138..4811a238a 100644 --- a/src/rad/cpppanel/cpppanel.cpp +++ b/src/rad/cpppanel/cpppanel.cpp @@ -27,19 +27,19 @@ #include "cpppanel.h" -#include "../appdata.h" -#include "../auitabart.h" -#include "../bitmaps.h" -#include "../codeeditor/codeeditor.h" -#include "../wxfbevent.h" +#include "rad/appdata.h" +#include "rad/auitabart.h" +#include "rad/bitmaps.h" +#include "rad/codeeditor/codeeditor.h" +#include "rad/wxfbevent.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" -#include "../../model/objectbase.h" +#include "model/objectbase.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/cppcg.h" +#include "codegen/codewriter.h" +#include "codegen/cppcg.h" #include #include diff --git a/src/rad/cpppanel/cpppanel.h b/src/rad/cpppanel/cpppanel.h index 5f564dad4..f26d677f3 100644 --- a/src/rad/cpppanel/cpppanel.h +++ b/src/rad/cpppanel/cpppanel.h @@ -26,7 +26,7 @@ #ifndef __CPP_PANEL__ #define __CPP_PANEL__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/customkeys.cpp b/src/rad/customkeys.cpp index 073d7e7a5..43d8655e2 100644 --- a/src/rad/customkeys.cpp +++ b/src/rad/customkeys.cpp @@ -28,7 +28,7 @@ #include "codegen/cppcg.h" #include "model/objectbase.h" -#include +#include "rad/appdata.h" BEGIN_EVENT_TABLE(CustomKeysEvtHandler,wxEvtHandler) EVT_CHAR(CustomKeysEvtHandler::OnKeyPress) diff --git a/src/rad/customkeys.h b/src/rad/customkeys.h index cea862681..1fb30f2f0 100644 --- a/src/rad/customkeys.h +++ b/src/rad/customkeys.h @@ -26,7 +26,7 @@ #ifndef __KEYS_HANDLER__ #define __KEYS_HANDLER__ -#include "wx/wx.h" +#include // This class is not needed because shortcuts are made through acceletors // of the MainFrame menubar. diff --git a/src/rad/dataobject/dataobject.cpp b/src/rad/dataobject/dataobject.cpp index e03be55d9..18d16cb65 100644 --- a/src/rad/dataobject/dataobject.cpp +++ b/src/rad/dataobject/dataobject.cpp @@ -23,9 +23,9 @@ /////////////////////////////////////////////////////////////////////////////// #include "dataobject.h" -#include "../../model/objectbase.h" -#include "../../utils/typeconv.h" -#include "../appdata.h" +#include "model/objectbase.h" +#include "utils/typeconv.h" +#include "rad/appdata.h" #include diff --git a/src/rad/dataobject/dataobject.h b/src/rad/dataobject/dataobject.h index f6fdf10f0..d17a048e7 100644 --- a/src/rad/dataobject/dataobject.h +++ b/src/rad/dataobject/dataobject.h @@ -23,7 +23,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/designer/innerframe.cpp b/src/rad/designer/innerframe.cpp index 3e757e9a9..53c3ab999 100644 --- a/src/rad/designer/innerframe.cpp +++ b/src/rad/designer/innerframe.cpp @@ -24,7 +24,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "innerframe.h" -#include "window_buttons.h" +#include "rad/designer/window_buttons.h" #include diff --git a/src/rad/designer/innerframe.h b/src/rad/designer/innerframe.h index 4b45436ec..717a0e8db 100644 --- a/src/rad/designer/innerframe.h +++ b/src/rad/designer/innerframe.h @@ -25,7 +25,7 @@ #ifndef __INNER_FRAME__ #define __INNER_FRAME__ -#include "../../utils/debug.h" +#include "utils/debug.h" #include #include @@ -94,4 +94,3 @@ END_DECLARE_EVENT_TYPES() wx__DECLARE_EVT1(wxEVT_INNER_FRAME_RESIZED, id, &func)*/ #endif //__INNER_FRAME__ - diff --git a/src/rad/designer/menubar.h b/src/rad/designer/menubar.h index 033b11b66..a1870ebc9 100644 --- a/src/rad/designer/menubar.h +++ b/src/rad/designer/menubar.h @@ -26,7 +26,7 @@ #ifndef __MENUBAR__ #define __MENUBAR__ -#include "wx/wx.h" +#include #include typedef std::vector MenuVector; diff --git a/src/rad/designer/visualeditor.cpp b/src/rad/designer/visualeditor.cpp index 6ed409bb6..efe511d15 100644 --- a/src/rad/designer/visualeditor.cpp +++ b/src/rad/designer/visualeditor.cpp @@ -25,13 +25,13 @@ #include "visualeditor.h" -#include "../../model/objectbase.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" -#include "../appdata.h" -#include "../wxfbevent.h" -#include "../wxfbmanager.h" -#include "menubar.h" +#include "model/objectbase.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" +#include "rad/appdata.h" +#include "rad/wxfbevent.h" +#include "rad/wxfbmanager.h" +#include "rad/designer/menubar.h" #include diff --git a/src/rad/designer/visualeditor.h b/src/rad/designer/visualeditor.h index b359ad73b..d49e8c745 100644 --- a/src/rad/designer/visualeditor.h +++ b/src/rad/designer/visualeditor.h @@ -26,8 +26,8 @@ #ifndef __VISUAL_EDITOR__ #define __VISUAL_EDITOR__ -#include "innerframe.h" -#include "visualobj.h" +#include "rad/designer/innerframe.h" +#include "rad/designer/visualobj.h" #include /** diff --git a/src/rad/designer/visualobj.cpp b/src/rad/designer/visualobj.cpp index f84b4501c..70faab1ec 100644 --- a/src/rad/designer/visualobj.cpp +++ b/src/rad/designer/visualobj.cpp @@ -25,9 +25,9 @@ #include "visualeditor.h" -#include "../../model/objectbase.h" -#include "../../utils/typeconv.h" -#include "../appdata.h" +#include "model/objectbase.h" +#include "utils/typeconv.h" +#include "rad/appdata.h" using namespace TypeConv; diff --git a/src/rad/designer/visualobj.h b/src/rad/designer/visualobj.h index d444ba24e..45e0b0692 100644 --- a/src/rad/designer/visualobj.h +++ b/src/rad/designer/visualobj.h @@ -26,7 +26,7 @@ #ifndef __VISUAL_OBJS__ #define __VISUAL_OBJS__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/dialogfindcomponent.cpp b/src/rad/dialogfindcomponent.cpp index fc279874d..a10bbabbe 100644 --- a/src/rad/dialogfindcomponent.cpp +++ b/src/rad/dialogfindcomponent.cpp @@ -29,9 +29,9 @@ #include -#include "appdata.h" -#include "../model/objectbase.h" -#include "../utils/wxfbdefs.h" +#include "rad/appdata.h" +#include "model/objectbase.h" +#include "utils/wxfbdefs.h" DialogFindComponent::DialogFindComponent(wxWindow* parent, diff --git a/src/rad/genericpanel.cpp b/src/rad/genericpanel.cpp index 788e43ecb..08b870e23 100644 --- a/src/rad/genericpanel.cpp +++ b/src/rad/genericpanel.cpp @@ -23,7 +23,7 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "rad/genericpanel.h" +#include "genericpanel.h" BEGIN_EVENT_TABLE(GenericWindow,wxPanel) EVT_PAINT(GenericWindow::OnPaint) diff --git a/src/rad/genericpanel.h b/src/rad/genericpanel.h index 290efbbec..8854d843f 100644 --- a/src/rad/genericpanel.h +++ b/src/rad/genericpanel.h @@ -26,7 +26,7 @@ #ifndef __GENERIC_PANEL__ #define __GENERIC_PANEL__ -#include "wx/wx.h" +#include class GenericWindow : public wxPanel { diff --git a/src/rad/geninheritclass/geninhertclass.cpp b/src/rad/geninheritclass/geninhertclass.cpp index dbb1b09c5..a29586f24 100644 --- a/src/rad/geninheritclass/geninhertclass.cpp +++ b/src/rad/geninheritclass/geninhertclass.cpp @@ -24,7 +24,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "geninhertclass.h" -#include "../../model/objectbase.h" +#include "model/objectbase.h" GenInheritedClassDlg::GenInheritedClassDlg( wxWindow* parent, PObjectBase project ) : diff --git a/src/rad/geninheritclass/geninhertclass.h b/src/rad/geninheritclass/geninhertclass.h index ed110f91a..4aa113129 100644 --- a/src/rad/geninheritclass/geninhertclass.h +++ b/src/rad/geninheritclass/geninhertclass.h @@ -33,8 +33,8 @@ the wxFormBuilder GUI code. @date 01/14/2007 */ -#include "../../utils/wxfbdefs.h" -#include "geninhertclass_gui.h" +#include "utils/wxfbdefs.h" +#include "rad/geninheritclass/geninhertclass_gui.h" /** Holds the details of the class to generate. */ class GenClassDetails diff --git a/src/rad/inspector/objinspect.cpp b/src/rad/inspector/objinspect.cpp index c0315fd9a..2fd33501d 100644 --- a/src/rad/inspector/objinspect.cpp +++ b/src/rad/inspector/objinspect.cpp @@ -28,16 +28,16 @@ #include "objinspect.h" -#include "wxfbadvprops.h" +#include "rad/inspector/wxfbadvprops.h" -#include "../../utils/debug.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "utils/debug.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" -#include "../appdata.h" -#include "../auitabart.h" -#include "../bitmaps.h" -#include "../wxfbevent.h" +#include "rad/appdata.h" +#include "rad/auitabart.h" +#include "rad/bitmaps.h" +#include "rad/wxfbevent.h" #include #include diff --git a/src/rad/inspector/objinspect.h b/src/rad/inspector/objinspect.h index f5d5a6957..66b3b9804 100644 --- a/src/rad/inspector/objinspect.h +++ b/src/rad/inspector/objinspect.h @@ -29,7 +29,7 @@ #ifndef __OBJ_INSPECT__ #define __OBJ_INSPECT__ -#include "../../model/objectbase.h" +#include "model/objectbase.h" #include #include diff --git a/src/rad/inspector/wxfbadvprops.cpp b/src/rad/inspector/wxfbadvprops.cpp index 616df7516..a48e18eb0 100644 --- a/src/rad/inspector/wxfbadvprops.cpp +++ b/src/rad/inspector/wxfbadvprops.cpp @@ -28,8 +28,8 @@ /////////////////////////////////////////////////////////////////////////////// #include "wxfbadvprops.h" -#include "../../utils/typeconv.h" -#include "../appdata.h" +#include "utils/typeconv.h" +#include "rad/appdata.h" #include diff --git a/src/rad/inspector/wxfbadvprops.h b/src/rad/inspector/wxfbadvprops.h index 962001b0c..e5588e286 100644 --- a/src/rad/inspector/wxfbadvprops.h +++ b/src/rad/inspector/wxfbadvprops.h @@ -29,7 +29,7 @@ #ifndef __WXFBADVPROPS_H__ #define __WXFBADVPROPS_H__ -#include "fontcontainer.h" +#include #include #include diff --git a/src/rad/luapanel/luapanel.cpp b/src/rad/luapanel/luapanel.cpp index 38dd4f69b..01db6f51d 100644 --- a/src/rad/luapanel/luapanel.cpp +++ b/src/rad/luapanel/luapanel.cpp @@ -27,17 +27,17 @@ #include "luapanel.h" -#include "../appdata.h" -#include "../codeeditor/codeeditor.h" -#include "../wxfbevent.h" +#include "rad/appdata.h" +#include "rad/codeeditor/codeeditor.h" +#include "rad/wxfbevent.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" -#include "../../model/objectbase.h" +#include "model/objectbase.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/luacg.h" +#include "codegen/codewriter.h" +#include "codegen/luacg.h" #include diff --git a/src/rad/luapanel/luapanel.h b/src/rad/luapanel/luapanel.h index db43a9750..d32c6527c 100644 --- a/src/rad/luapanel/luapanel.h +++ b/src/rad/luapanel/luapanel.h @@ -35,7 +35,7 @@ #ifndef __LUA_PANEL__ #define __LUA_PANEL__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/mainframe.cpp b/src/rad/mainframe.cpp index e8e30666d..ace901517 100644 --- a/src/rad/mainframe.cpp +++ b/src/rad/mainframe.cpp @@ -25,30 +25,30 @@ /////////////////////////////////////////////////////////////////////////////// #include "mainframe.h" -#include "../model/xrcfilter.h" -#include "../utils/stringutils.h" -#include "../utils/wxfbexception.h" -#include "revision.h" -#include "version.h" -#include "about.h" -#include "appdata.h" -#include "auitabart.h" -#include "bitmaps.h" -#include "cpppanel/cpppanel.h" -#include "designer/visualeditor.h" -#include "geninheritclass/geninhertclass.h" -#include "inspector/objinspect.h" -#include "luapanel/luapanel.h" -#include "objecttree/objecttree.h" -#include "palette.h" -#include "phppanel/phppanel.h" -#include "pythonpanel/pythonpanel.h" -#include "title.h" -#include "wx/config.h" -#include "wxfbevent.h" -#include "wxfbmanager.h" -#include "xrcpanel/xrcpanel.h" -#include "dialogfindcomponent.h" +#include "model/xrcfilter.h" +#include "utils/stringutils.h" +#include "utils/wxfbexception.h" +#include "rad/revision.h" +#include "rad/version.h" +#include "rad/about.h" +#include "rad/appdata.h" +#include "rad/auitabart.h" +#include "rad/bitmaps.h" +#include "rad/cpppanel/cpppanel.h" +#include "rad/designer/visualeditor.h" +#include "rad/geninheritclass/geninhertclass.h" +#include "rad/inspector/objinspect.h" +#include "rad/luapanel/luapanel.h" +#include "rad/objecttree/objecttree.h" +#include "rad/palette.h" +#include "rad/phppanel/phppanel.h" +#include "rad/pythonpanel/pythonpanel.h" +#include "rad/title.h" +#include +#include "rad/wxfbevent.h" +#include "rad/wxfbmanager.h" +#include "rad/xrcpanel/xrcpanel.h" +#include "rad/dialogfindcomponent.h" enum { diff --git a/src/rad/mainframe.h b/src/rad/mainframe.h index 6f5298701..1f61e0ebc 100644 --- a/src/rad/mainframe.h +++ b/src/rad/mainframe.h @@ -25,13 +25,13 @@ #pragma once -#include "wx/splitter.h" -#include "wx/wx.h" +#include +#include #include #include -#include "../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" class wxFBEvent; class wxFBObjectEvent; diff --git a/src/rad/menueditor.cpp b/src/rad/menueditor.cpp index ad83b45d1..d38e082fa 100644 --- a/src/rad/menueditor.cpp +++ b/src/rad/menueditor.cpp @@ -25,7 +25,7 @@ #include "menueditor.h" -#include "../model/objectbase.h" +#include "model/objectbase.h" enum { diff --git a/src/rad/menueditor.h b/src/rad/menueditor.h index 642b9d60c..da849364f 100644 --- a/src/rad/menueditor.h +++ b/src/rad/menueditor.h @@ -25,7 +25,7 @@ #ifndef __MENUEDITOR__ #define __MENUEDITOR__ -#include "../model/database.h" +#include "model/database.h" #include diff --git a/src/rad/objecttree/objecttree.cpp b/src/rad/objecttree/objecttree.cpp index eceed194c..074ff3a85 100644 --- a/src/rad/objecttree/objecttree.cpp +++ b/src/rad/objecttree/objecttree.cpp @@ -25,11 +25,11 @@ #include "objecttree.h" -#include "../../model/objectbase.h" -#include "../appdata.h" -#include "../bitmaps.h" -#include "../menueditor.h" -#include "../wxfbevent.h" +#include "model/objectbase.h" +#include "rad/appdata.h" +#include "rad/bitmaps.h" +#include "rad/menueditor.h" +#include "rad/wxfbevent.h" #include diff --git a/src/rad/objecttree/objecttree.h b/src/rad/objecttree/objecttree.h index 90f7af7de..1bb2fa192 100644 --- a/src/rad/objecttree/objecttree.h +++ b/src/rad/objecttree/objecttree.h @@ -26,8 +26,8 @@ #ifndef __OBJECT_TREE__ #define __OBJECT_TREE__ -#include "../../utils/wxfbdefs.h" -#include "../customkeys.h" +#include "utils/wxfbdefs.h" +#include "rad/customkeys.h" #include diff --git a/src/rad/palette.cpp b/src/rad/palette.cpp index 5e10122b6..e969de3f6 100644 --- a/src/rad/palette.cpp +++ b/src/rad/palette.cpp @@ -25,10 +25,10 @@ #include "palette.h" -#include "../model/objectbase.h" -#include "../utils/debug.h" -#include "appdata.h" -#include "auitabart.h" +#include "model/objectbase.h" +#include "utils/debug.h" +#include "rad/appdata.h" +#include "rad/auitabart.h" #include #include diff --git a/src/rad/palette.h b/src/rad/palette.h index f038e2451..c5c47783d 100644 --- a/src/rad/palette.h +++ b/src/rad/palette.h @@ -26,7 +26,7 @@ #ifndef __PALETTE__ #define __PALETTE__ -#include "../model/database.h" +#include "model/database.h" #include #include diff --git a/src/rad/phppanel/phppanel.cpp b/src/rad/phppanel/phppanel.cpp index 1ba0e7c4f..7a4ea20c8 100644 --- a/src/rad/phppanel/phppanel.cpp +++ b/src/rad/phppanel/phppanel.cpp @@ -27,17 +27,17 @@ #include "phppanel.h" -#include "../appdata.h" -#include "../codeeditor/codeeditor.h" -#include "../wxfbevent.h" +#include "rad/appdata.h" +#include "rad/codeeditor/codeeditor.h" +#include "rad/wxfbevent.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" -#include "../../model/objectbase.h" +#include "model/objectbase.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/phpcg.h" +#include "codegen/codewriter.h" +#include "codegen/phpcg.h" #include diff --git a/src/rad/phppanel/phppanel.h b/src/rad/phppanel/phppanel.h index 312c676b4..ace3a9a31 100644 --- a/src/rad/phppanel/phppanel.h +++ b/src/rad/phppanel/phppanel.h @@ -38,7 +38,7 @@ #ifndef __PHP_PANEL__ #define __PHP_PANEL__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/pythonpanel/pythonpanel.cpp b/src/rad/pythonpanel/pythonpanel.cpp index 9222c7103..56af282bc 100644 --- a/src/rad/pythonpanel/pythonpanel.cpp +++ b/src/rad/pythonpanel/pythonpanel.cpp @@ -27,17 +27,17 @@ #include "pythonpanel.h" -#include "../appdata.h" -#include "../codeeditor/codeeditor.h" -#include "../wxfbevent.h" +#include "rad/appdata.h" +#include "rad/codeeditor/codeeditor.h" +#include "rad/wxfbevent.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" -#include "../../model/objectbase.h" +#include "model/objectbase.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/pythoncg.h" +#include "codegen/codewriter.h" +#include "codegen/pythoncg.h" #include diff --git a/src/rad/pythonpanel/pythonpanel.h b/src/rad/pythonpanel/pythonpanel.h index 55fb6c81b..a261c0c6f 100644 --- a/src/rad/pythonpanel/pythonpanel.h +++ b/src/rad/pythonpanel/pythonpanel.h @@ -35,7 +35,7 @@ #ifndef __PYTHON_PANEL__ #define __PYTHON_PANEL__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/wxfbevent.h b/src/rad/wxfbevent.h index 565ee982b..653ded51a 100644 --- a/src/rad/wxfbevent.h +++ b/src/rad/wxfbevent.h @@ -26,7 +26,7 @@ #ifndef __WXFBEVENT__ #define __WXFBEVENT__ -#include "../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/wxfbmanager.cpp b/src/rad/wxfbmanager.cpp index ad79efb65..11115e510 100644 --- a/src/rad/wxfbmanager.cpp +++ b/src/rad/wxfbmanager.cpp @@ -23,9 +23,9 @@ /////////////////////////////////////////////////////////////////////////////// #include "wxfbmanager.h" -#include "../model/objectbase.h" -#include "appdata.h" -#include "designer/visualeditor.h" +#include "model/objectbase.h" +#include "rad/appdata.h" +#include "rad/designer/visualeditor.h" #define CHECK_NULL( THING, THING_NAME, RETURN ) \ if ( !THING ) \ diff --git a/src/rad/wxfbmanager.h b/src/rad/wxfbmanager.h index f9807416e..d447e51cd 100644 --- a/src/rad/wxfbmanager.h +++ b/src/rad/wxfbmanager.h @@ -24,7 +24,7 @@ #ifndef WXFBMANAGER #define WXFBMANAGER -#include "../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include diff --git a/src/rad/xrcpanel/xrcpanel.cpp b/src/rad/xrcpanel/xrcpanel.cpp index 0eb19c32d..109a49f6c 100644 --- a/src/rad/xrcpanel/xrcpanel.cpp +++ b/src/rad/xrcpanel/xrcpanel.cpp @@ -27,15 +27,15 @@ #include "xrcpanel.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/xrccg.h" - -#include "../../model/objectbase.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" -#include "../appdata.h" -#include "../codeeditor/codeeditor.h" -#include "../wxfbevent.h" +#include "codegen/codewriter.h" +#include "codegen/xrccg.h" + +#include "model/objectbase.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" +#include "rad/appdata.h" +#include "rad/codeeditor/codeeditor.h" +#include "rad/wxfbevent.h" #include diff --git a/src/rad/xrcpanel/xrcpanel.h b/src/rad/xrcpanel/xrcpanel.h index 058348431..8c19640f3 100644 --- a/src/rad/xrcpanel/xrcpanel.h +++ b/src/rad/xrcpanel/xrcpanel.h @@ -26,7 +26,7 @@ #ifndef __XRC_PANEL__ #define __XRC_PANEL__ -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" #include #include diff --git a/src/rad/xrcpreview/xrcpreview.cpp b/src/rad/xrcpreview/xrcpreview.cpp index 964770c05..558709a05 100644 --- a/src/rad/xrcpreview/xrcpreview.cpp +++ b/src/rad/xrcpreview/xrcpreview.cpp @@ -23,12 +23,12 @@ /////////////////////////////////////////////////////////////////////////////// #include "xrcpreview.h" -#include "../../codegen/codewriter.h" -#include "../../codegen/xrccg.h" -#include "../../model/objectbase.h" -#include "../../utils/annoyingdialog.h" -#include "../../utils/typeconv.h" -#include "../../utils/wxfbexception.h" +#include "codegen/codewriter.h" +#include "codegen/xrccg.h" +#include "model/objectbase.h" +#include "utils/annoyingdialog.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" #include #include diff --git a/src/rad/xrcpreview/xrcpreview.h b/src/rad/xrcpreview/xrcpreview.h index 55ab26fa6..6a68f55f7 100644 --- a/src/rad/xrcpreview/xrcpreview.h +++ b/src/rad/xrcpreview/xrcpreview.h @@ -23,7 +23,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#include "../../utils/wxfbdefs.h" +#include "utils/wxfbdefs.h" class wxWindow; diff --git a/src/utils/filetocarray.cpp b/src/utils/filetocarray.cpp index f29198229..f29241a69 100644 --- a/src/utils/filetocarray.cpp +++ b/src/utils/filetocarray.cpp @@ -1,11 +1,11 @@ #include "filetocarray.h" -#include "../rad/appdata.h" -#include "../model/objectbase.h" -#include "../codegen/codewriter.h" -#include "../codegen/cppcg.h" -#include "typeconv.h" -#include "wxfbexception.h" +#include "rad/appdata.h" +#include "model/objectbase.h" +#include "codegen/codewriter.h" +#include "codegen/cppcg.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" #include diff --git a/src/utils/m_wxfb.cpp b/src/utils/m_wxfb.cpp index da41aa855..d70b84786 100644 --- a/src/utils/m_wxfb.cpp +++ b/src/utils/m_wxfb.cpp @@ -1,8 +1,8 @@ #include #include -#include "../rad/revision.h" -#include "../rad/version.h" +#include "rad/revision.h" +#include "rad/version.h" FORCE_LINK_ME(m_wxfb) diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 9d83c2625..12abd9dc4 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -25,8 +25,8 @@ #include "stringutils.h" -#include "typeconv.h" -#include "wxfbexception.h" +#include "utils/typeconv.h" +#include "utils/wxfbexception.h" #include #include diff --git a/src/utils/typeconv.cpp b/src/utils/typeconv.cpp index 95d0f3709..fd2ba9ac9 100644 --- a/src/utils/typeconv.cpp +++ b/src/utils/typeconv.cpp @@ -25,9 +25,9 @@ #include "typeconv.h" -#include "../rad/appdata.h" -#include "../rad/bitmaps.h" -#include "../rad/inspector/objinspect.h" +#include "rad/appdata.h" +#include "rad/bitmaps.h" +#include "rad/inspector/objinspect.h" #include #include diff --git a/src/utils/typeconv.h b/src/utils/typeconv.h index 4d71a85c6..7b841f64b 100644 --- a/src/utils/typeconv.h +++ b/src/utils/typeconv.h @@ -26,8 +26,8 @@ #ifndef __TYPE_UTILS__ #define __TYPE_UTILS__ -#include "../model/types.h" -#include "fontcontainer.h" +#include "model/types.h" +#include // macros para la conversión entre wxString <-> wxString #define _WXSTR(x) TypeConv::_StringToWxString(x) diff --git a/src/utils/wxfbipc.cpp b/src/utils/wxfbipc.cpp index db5dd5363..e3f2f0218 100644 --- a/src/utils/wxfbipc.cpp +++ b/src/utils/wxfbipc.cpp @@ -28,7 +28,7 @@ #include "wxfbipc.h" -#include "debug.h" +#include "utils/debug.h" #include #include diff --git a/src/wxFormBuilder.rc b/src/wxFormBuilder.rc index 0398fc7af..557fd4066 100644 --- a/src/wxFormBuilder.rc +++ b/src/wxFormBuilder.rc @@ -23,6 +23,6 @@ // /////////////////////////////////////////////////////////////////////////////// -#include "wx/msw/wx.rc" +#include A ICON "wxFormBuilder.ico"