Browse Source

Initial batch of edits to remove expectation that the Rocket include structure will be in the global include path. These still expect Rocket/Core to be in global scope at this time

David Wimsey 11 years ago
parent
commit
e31da5b46e

+ 1 - 1
Include/Rocket/Controls.h

@@ -28,6 +28,6 @@
 #ifndef ROCKETCONTROLS_H
 #define ROCKETCONTROLS_H
 
-#include <Rocket/Controls/Controls.h>
+#include "Controls/Controls.h"
 
 #endif

+ 13 - 13
Include/Rocket/Controls/Controls.h

@@ -28,19 +28,19 @@
 #ifndef ROCKETCONTROLSCONTROLS_H
 #define ROCKETCONTROLSCONTROLS_H
 
-#include <Rocket/Controls/DataFormatter.h>
-#include <Rocket/Controls/ElementDataGrid.h>
-#include <Rocket/Controls/ElementDataGridCell.h>
-#include <Rocket/Controls/ElementDataGridExpandButton.h>
-#include <Rocket/Controls/ElementDataGridRow.h>
-#include <Rocket/Controls/ElementForm.h>
-#include <Rocket/Controls/ElementFormControl.h>
-#include <Rocket/Controls/ElementFormControlDataSelect.h>
-#include <Rocket/Controls/ElementFormControlInput.h>
-#include <Rocket/Controls/ElementFormControlSelect.h>
-#include <Rocket/Controls/ElementFormControlTextArea.h>
-#include <Rocket/Controls/ElementTabSet.h>
-#include <Rocket/Controls/SelectOption.h>
+#include "DataFormatter.h"
+#include "ElementDataGrid.h"
+#include "ElementDataGridCell.h"
+#include "ElementDataGridExpandButton.h"
+#include "ElementDataGridRow.h"
+#include "ElementForm.h"
+#include "ElementFormControl.h"
+#include "ElementFormControlDataSelect.h"
+#include "ElementFormControlInput.h"
+#include "ElementFormControlSelect.h"
+#include "ElementFormControlTextArea.h"
+#include "ElementTabSet.h"
+#include "SelectOption.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/DataFormatter.h

@@ -30,7 +30,7 @@
 
 #include <Rocket/Core/ScriptInterface.h>
 #include <Rocket/Core/String.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/DataQuery.h

@@ -28,7 +28,7 @@
 #ifndef ROCKETCONTROLSDATAQUERY_H
 #define ROCKETCONTROLSDATAQUERY_H
 
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 #include <Rocket/Core/TypeConverter.h>
 #include <Rocket/Core/Log.h>
 

+ 1 - 1
Include/Rocket/Controls/DataSource.h

@@ -28,7 +28,7 @@
 #ifndef ROCKETCONTROLSDATASOURCE_H
 #define ROCKETCONTROLSDATASOURCE_H
 
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 #include <Rocket/Core/String.h>
 #include <list>
 #include <map>

+ 1 - 1
Include/Rocket/Controls/DataSourceListener.h

@@ -28,7 +28,7 @@
 #ifndef ROCKETCONTROLSDATASOURCELISTENER_H
 #define ROCKETCONTROLSDATASOURCELISTENER_H
 
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 #include <Rocket/Core/String.h>
 
 namespace Rocket {

+ 2 - 2
Include/Rocket/Controls/ElementDataGrid.h

@@ -28,8 +28,8 @@
 #ifndef ROCKETCONTROLSELEMENTDATAGRID_H
 #define ROCKETCONTROLSELEMENTDATAGRID_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/DataSourceListener.h>
+#include "Header.h"
+#include "DataSourceListener.h"
 #include <Rocket/Core/Element.h>
 
 namespace Rocket {

+ 1 - 1
Include/Rocket/Controls/ElementDataGridCell.h

@@ -30,7 +30,7 @@
 
 #include <Rocket/Core/Element.h>
 #include <Rocket/Core/EventListener.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/ElementDataGridExpandButton.h

@@ -29,7 +29,7 @@
 #define ROCKETCONTROLSELEMENTDATAGRIDEXPANDBUTTON_H
 
 #include <Rocket/Core/Element.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 3 - 3
Include/Rocket/Controls/ElementDataGridRow.h

@@ -28,9 +28,9 @@
 #ifndef ROCKETCONTROLSELEMENTDATAGRIDROW_H
 #define ROCKETCONTROLSELEMENTDATAGRIDROW_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/DataSourceListener.h>
-#include <Rocket/Controls/DataQuery.h>
+#include "Header.h"
+#include "DataSourceListener.h"
+#include "DataQuery.h"
 #include <Rocket/Core/Element.h>
 #include <queue>
 

+ 1 - 1
Include/Rocket/Controls/ElementForm.h

@@ -29,7 +29,7 @@
 #define ROCKETCONTROLSELEMENTFORM_H
 
 #include <Rocket/Core/Element.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/ElementFormControl.h

@@ -29,7 +29,7 @@
 #define ROCKETCONTROLSELEMENTFORMCONTROL_H
 
 #include <Rocket/Core/Element.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 3 - 3
Include/Rocket/Controls/ElementFormControlDataSelect.h

@@ -28,9 +28,9 @@
 #ifndef ROCKETCONTROLSELEMENTFORMCONTROLDATASELECT_H
 #define ROCKETCONTROLSELEMENTFORMCONTROLDATASELECT_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/ElementFormControlSelect.h>
-#include <Rocket/Controls/DataSourceListener.h>
+#include "Header.h"
+#include "ElementFormControlSelect.h"
+#include "DataSourceListener.h"
 
 namespace Rocket {
 namespace Controls {

+ 2 - 2
Include/Rocket/Controls/ElementFormControlInput.h

@@ -28,8 +28,8 @@
 #ifndef ROCKETCONTROLSELEMENTFORMCONTROLINPUT_H
 #define ROCKETCONTROLSELEMENTFORMCONTROLINPUT_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/ElementFormControl.h>
+#include "Header.h"
+#include "ElementFormControl.h"
 
 namespace Rocket {
 namespace Controls {

+ 3 - 3
Include/Rocket/Controls/ElementFormControlSelect.h

@@ -28,9 +28,9 @@
 #ifndef ROCKETCONTROLSELEMENTFORMCONTROLSELECT_H
 #define ROCKETCONTROLSELEMENTFORMCONTROLSELECT_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/ElementFormControl.h>
-#include <Rocket/Controls/SelectOption.h>
+#include "Header.h"
+#include "ElementFormControl.h"
+#include "SelectOption.h"
 
 namespace Rocket {
 namespace Controls {

+ 2 - 2
Include/Rocket/Controls/ElementFormControlTextArea.h

@@ -28,8 +28,8 @@
 #ifndef ROCKETCONTROLSELEMENTFORMCONTROLTEXTAREA_H
 #define ROCKETCONTROLSELEMENTFORMCONTROLTEXTAREA_H
 
-#include <Rocket/Controls/Header.h>
-#include <Rocket/Controls/ElementFormControl.h>
+#include "Header.h"
+#include "ElementFormControl.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/ElementTabSet.h

@@ -30,7 +30,7 @@
 
 #include <Rocket/Core/Element.h>
 #include <Rocket/Core/EventListener.h>
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Controls {

+ 1 - 1
Include/Rocket/Controls/SelectOption.h

@@ -28,7 +28,7 @@
 #ifndef ROCKETCONTROLSSELECTOPTION_H
 #define ROCKETCONTROLSSELECTOPTION_H
 
-#include <Rocket/Controls/Header.h>
+#include "Header.h"
 #include <Rocket/Core/String.h>
 
 namespace Rocket {

+ 1 - 1
Include/Rocket/Debugger.h

@@ -28,6 +28,6 @@
 #ifndef ROCKETDEBUGGER_H
 #define ROCKETDEBUGGER_H
 
-#include <Rocket/Debugger/Debugger.h>
+#include "Debugger/Debugger.h"
 
 #endif

+ 1 - 1
Include/Rocket/Debugger/Debugger.h

@@ -29,7 +29,7 @@
 #define ROCKETDEBUGGERDEBUGGER_H
 
 #include <Rocket/Core/Types.h>
-#include <Rocket/Debugger/Header.h>
+#include "Header.h"
 
 namespace Rocket {
 namespace Core {