(#34) Update include directives

nick-thompson · nick-thompson · commit 2ccb18daa228 · 2021-01-08T09:15:15.000-05:00
diff --git a/react_juce/core/AppHarness.cpp b/react_juce/core/AppHarness.cpp
@@ -7,9 +7,7 @@
   ==============================================================================
 */
 
-#pragma once
-
-#include "blueprint_AppHarness.h"
+#include "AppHarness.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/AppHarness.h b/react_juce/core/AppHarness.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include "blueprint_EcmascriptEngine.h"
-#include "blueprint_FileWatcher.h"
-#include "blueprint_ReactApplicationRoot.h"
+#include "EcmascriptEngine.h"
+#include "FileWatcher.h"
+#include "ReactApplicationRoot.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/CanvasView.h b/react_juce/core/CanvasView.h
@@ -9,7 +9,8 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/core/EcmascriptEngine.cpp b/react_juce/core/EcmascriptEngine.cpp
@@ -81,7 +81,7 @@
  #pragma GCC diagnostic pop
 #endif
 
-#include "blueprint_EcmascriptEngine.h"
+#include "EcmascriptEngine.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/GenericEditor.cpp b/react_juce/core/GenericEditor.cpp
@@ -7,7 +7,7 @@
   ==============================================================================
 */
 
-#pragma once
+#include "GenericEditor.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/GenericEditor.h b/react_juce/core/GenericEditor.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "blueprint_AppHarness.h"
-#include "blueprint_ReactApplicationRoot.h"
+#include "AppHarness.h"
+#include "ReactApplicationRoot.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/ImageView.h b/react_juce/core/ImageView.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/RawTextView.h b/react_juce/core/RawTextView.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/ReactApplicationRoot.cpp b/react_juce/core/ReactApplicationRoot.cpp
@@ -7,9 +7,7 @@
   ==============================================================================
 */
 
-#pragma once
-
-#include "blueprint_ReactApplicationRoot.h"
+#include "ReactApplicationRoot.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/ReactApplicationRoot.h b/react_juce/core/ReactApplicationRoot.h
@@ -9,10 +9,10 @@
 
 #pragma once
 
-#include "blueprint_EcmascriptEngine.h"
-#include "blueprint_FileWatcher.h"
-#include "blueprint_View.h"
-#include "blueprint_ViewManager.h"
+#include "EcmascriptEngine.h"
+#include "FileWatcher.h"
+#include "View.h"
+#include "ViewManager.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/ScrollView.cpp b/react_juce/core/ScrollView.cpp
@@ -7,7 +7,8 @@
   ==============================================================================
 */
 
-#include "blueprint_ScrollView.h"
+#include "ScrollView.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/core/ScrollView.h b/react_juce/core/ScrollView.h
@@ -9,7 +9,8 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/core/ScrollViewContentShadowView.h b/react_juce/core/ScrollViewContentShadowView.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "blueprint_ShadowView.h"
-#include "blueprint_View.h"
+#include "ShadowView.h"
+#include "View.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/ShadowView.cpp b/react_juce/core/ShadowView.cpp
@@ -7,6 +7,9 @@
   ==============================================================================
 */
 
+#include "ShadowView.h"
+
+
 namespace blueprint
 {
 
diff --git a/react_juce/core/ShadowView.h b/react_juce/core/ShadowView.h
@@ -9,7 +9,8 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
+
 
 #define BP_SPREAD_SETTER_PERCENT(setter) setter, setter##Percent
 #define BP_SPREAD_SETTER_AUTO(setter) BP_SPREAD_SETTER_PERCENT(setter), setter##Auto
diff --git a/react_juce/core/TextShadowView.cpp b/react_juce/core/TextShadowView.cpp
@@ -7,7 +7,7 @@
   ==============================================================================
 */
 
-#pragma once
+#include "TextShadowView.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/TextShadowView.h b/react_juce/core/TextShadowView.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "blueprint_ShadowView.h"
-#include "blueprint_View.h"
+#include "ShadowView.h"
+#include "View.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/TextView.h b/react_juce/core/TextView.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "blueprint_View.h"
+#include "View.h"
 
 
 namespace blueprint
diff --git a/react_juce/core/View.cpp b/react_juce/core/View.cpp
@@ -7,6 +7,8 @@
   ==============================================================================
 */
 
+#include "View.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/core/View.h b/react_juce/core/View.h
@@ -11,6 +11,7 @@
 
 #include <map>
 
+
 namespace blueprint
 {
 
diff --git a/react_juce/core/ViewManager.cpp b/react_juce/core/ViewManager.cpp
@@ -7,13 +7,14 @@
   ==============================================================================
 */
 
-#include "blueprint_ViewManager.h"
-#include "blueprint_CanvasView.h"
-#include "blueprint_ImageView.h"
-#include "blueprint_ScrollView.h"
-#include "blueprint_ScrollViewContentShadowView.h"
-#include "blueprint_TextView.h"
-#include "blueprint_TextShadowView.h"
+#include "ViewManager.h"
+#include "CanvasView.h"
+#include "ImageView.h"
+#include "ScrollView.h"
+#include "ScrollViewContentShadowView.h"
+#include "TextView.h"
+#include "TextShadowView.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/core/ViewManager.h b/react_juce/core/ViewManager.h
@@ -11,8 +11,9 @@
 
 #include <map>
 
-#include "blueprint_View.h"
-#include "blueprint_ShadowView.h"
+#include "View.h"
+#include "ShadowView.h"
+
 
 namespace blueprint
 {
diff --git a/react_juce/react_juce.cpp b/react_juce/react_juce.cpp
@@ -51,7 +51,7 @@
  #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 
-#include "blueprint.h"
+#include "react_juce.h"
 
 #include "yoga/yoga/log.cpp"
 #include "yoga/yoga/event/event.cpp"
@@ -74,16 +74,16 @@
  #pragma GCC diagnostic pop
 #endif
 
-#include "core/blueprint_AppHarness.cpp"
-#include "core/blueprint_EcmascriptEngine.cpp"
+#include "core/AppHarness.cpp"
+#include "core/EcmascriptEngine.cpp"
 
 #if JUCE_MODULE_AVAILABLE_juce_audio_processors
-    #include "core/blueprint_GenericEditor.cpp"
+    #include "core/GenericEditor.cpp"
 #endif
 
-#include "core/blueprint_ReactApplicationRoot.cpp"
-#include "core/blueprint_ShadowView.cpp"
-#include "core/blueprint_TextShadowView.cpp"
-#include "core/blueprint_View.cpp"
-#include "core/blueprint_ViewManager.cpp"
-#include "core/blueprint_ScrollView.cpp"
+#include "core/ReactApplicationRoot.cpp"
+#include "core/ShadowView.cpp"
+#include "core/TextShadowView.cpp"
+#include "core/View.cpp"
+#include "core/ViewManager.cpp"
+#include "core/ScrollView.cpp"
diff --git a/react_juce/react_juce.h b/react_juce/react_juce.h
@@ -5,11 +5,11 @@
  * JUCE Module Format.txt file in the JUCE directory.
 
    BEGIN_JUCE_MODULE_DECLARATION
-    ID:                 blueprint
+    ID:                 react_juce
     vendor:             Nick Thompson
     version:            0.1.0
-    name:               Blueprint
-    description:        A React.js render backend targeting JUCE Components.
+    name:               React-JUCE
+    description:        Write cross-platform native apps with React.js and JUCE
     minimumCppStandard: 17
     dependencies:       juce_gui_basics
     searchpaths:        ./ ./duktape/ ./duktape/src-noline/ ./yoga
@@ -28,11 +28,11 @@
 
 //==============================================================================
 #if JUCE_EXCEPTIONS_DISABLED
-    #error "Blueprint module requires exceptions to be enabled!"
+    #error "React-JUCE module requires exceptions to be enabled!"
 #endif
 
 #if ! JUCE_CXX17_IS_AVAILABLE
-    #error "Blueprint module requires a C++17 compatible toolchain!"
+    #error "React-JUCE module requires a C++17 compatible toolchain!"
 #endif
 
 //==============================================================================
@@ -110,26 +110,26 @@
  #pragma GCC diagnostic pop
 #endif
 
-#include "core/blueprint_AppHarness.h"
-#include "core/blueprint_EcmascriptEngine.h"
-#include "core/blueprint_CanvasView.h"
+#include "core/AppHarness.h"
+#include "core/EcmascriptEngine.h"
+#include "core/CanvasView.h"
 
 #if JUCE_MODULE_AVAILABLE_juce_audio_processors
-    #include "core/blueprint_GenericEditor.h"
+    #include "core/GenericEditor.h"
 #endif
 
-#include "core/blueprint_ImageView.h"
-#include "core/blueprint_FileWatcher.h"
-#include "core/blueprint_RawTextView.h"
-#include "core/blueprint_ReactApplicationRoot.h"
-#include "core/blueprint_ScrollView.h"
-#include "core/blueprint_ScrollViewContentShadowView.h"
-#include "core/blueprint_ShadowView.h"
-#include "core/blueprint_TextShadowView.h"
-#include "core/blueprint_TextView.h"
-#include "core/blueprint_View.h"
-#include "core/blueprint_ViewManager.h"
+#include "core/ImageView.h"
+#include "core/FileWatcher.h"
+#include "core/RawTextView.h"
+#include "core/ReactApplicationRoot.h"
+#include "core/ScrollView.h"
+#include "core/ScrollViewContentShadowView.h"
+#include "core/ShadowView.h"
+#include "core/TextShadowView.h"
+#include "core/TextView.h"
+#include "core/View.h"
+#include "core/ViewManager.h"
 
 #if BLUEPRINT_COMPILE_UNIT_TESTS
-    #include "tests/blueprint_EcmascriptEngineTests.h"
+    #include "tests/EcmascriptEngineTests.h"
 #endif

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`
`10`	`10`	`#pragma once`
`11`	`11`
`12`		`-#include "blueprint_View.h"`
	`12`	`+#include "View.h"`
	`13`	`+`
`13`	`14`
`14`	`15`	`namespace blueprint`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`==============================================================================`
`8`	`8`	`*/`
`9`	`9`
`10`		`-#include "blueprint_ScrollView.h"`
	`10`	`+#include "ScrollView.h"`
	`11`	`+`
`11`	`12`
`12`	`13`	`namespace blueprint`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`==============================================================================`
`8`	`8`	`*/`
`9`	`9`
	`10`	`+#include "ShadowView.h"`
	`11`	`+`
	`12`	`+`
`10`	`13`	`namespace blueprint`
`11`	`14`	`{`
`12`	`15`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`==============================================================================`
`8`	`8`	`*/`
`9`	`9`
	`10`	`+#include "View.h"`
	`11`	`+`
`10`	`12`
`11`	`13`	`namespace blueprint`
`12`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`#include <map>`
`13`	`13`
	`14`	`+`
`14`	`15`	`namespace blueprint`
`15`	`16`	`{`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@`
`11`	`11`
`12`	`12`	`#include <map>`
`13`	`13`
`14`		`-#include "blueprint_View.h"`
`15`		`-#include "blueprint_ShadowView.h"`
	`14`	`+#include "View.h"`
	`15`	`+#include "ShadowView.h"`
	`16`	`+`
`16`	`17`
`17`	`18`	`namespace blueprint`
`18`	`19`	`{`