diff --git a/BeefBuild/BeefProj.toml b/BeefBuild/BeefProj.toml index 9465b598..ecf7a183 100644 --- a/BeefBuild/BeefProj.toml +++ b/BeefBuild/BeefProj.toml @@ -19,8 +19,8 @@ TargetName = "$(ProjectName)_d" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib" CLibType = "Dynamic" BeefLibType = "DynamicDebug" -DebugCommandArguments = "-proddir=..\\..\\IDEHelper\\Tests -test" -DebugWorkingDirectory = "c:\\beef\\ide\\mintest" +DebugCommandArguments = "-proddir=c:\\Beef\\IDE\\mintest" +DebugWorkingDirectory = "c:\\beef\\ide" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] PreprocessorMacros = ["DEBUG", "CLI"] @@ -76,11 +76,11 @@ TargetName = "" OtherLinkFlags = "" [Configs.Debug2.Win64] -TargetDirectory = "$(WorkspaceDir)/dist" +TargetDirectory = "$(WorkspaceDir)/../IDE/dist" TargetName = "$(ProjectName)_d2" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib Rpcrt4.lib Ole32.lib" CLibType = "DynamicDebug" -DebugCommandArguments = "-proddir=c:\\beef\\IDEHelper\\Tests -test" +DebugCommandArguments = "-proddir=c:\\temp\\Beef4 -run" DebugWorkingDirectory = "c:\\beef\\IDE\\dist" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] PreprocessorMacros = ["DEBUG", "CLI"] @@ -99,8 +99,6 @@ BeefLibType = "Static" CLibType = "Static" BeefLibType = "Static" -[ProjectFolder] - [[ProjectFolder.Items]] Type = "Folder" Path = "../IDE/src" diff --git a/BeefBuild/src/BuildApp.bf b/BeefBuild/src/BuildApp.bf index 0c916fb0..124676d9 100644 --- a/BeefBuild/src/BuildApp.bf +++ b/BeefBuild/src/BuildApp.bf @@ -3,7 +3,7 @@ using System; using System.IO; using System.Threading; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; using IDE.Util; namespace BeefBuild diff --git a/BeefLibs/Beefy2D/src/BFApp.bf b/BeefLibs/Beefy2D/src/BFApp.bf index e650892d..0d931ac8 100644 --- a/BeefLibs/Beefy2D/src/BFApp.bf +++ b/BeefLibs/Beefy2D/src/BFApp.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using System.IO; diff --git a/BeefLibs/Beefy2D/src/BFWindow.bf b/BeefLibs/Beefy2D/src/BFWindow.bf index cd3682de..e6f9da70 100644 --- a/BeefLibs/Beefy2D/src/BFWindow.bf +++ b/BeefLibs/Beefy2D/src/BFWindow.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/Rand.bf b/BeefLibs/Beefy2D/src/Rand.bf index 0dca98d6..4433fff9 100644 --- a/BeefLibs/Beefy2D/src/Rand.bf +++ b/BeefLibs/Beefy2D/src/Rand.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/Utils.bf b/BeefLibs/Beefy2D/src/Utils.bf index 87c322d8..e10c46e0 100644 --- a/BeefLibs/Beefy2D/src/Utils.bf +++ b/BeefLibs/Beefy2D/src/Utils.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Reflection; using System.Threading; diff --git a/BeefLibs/Beefy2D/src/events/DialogEvent.bf b/BeefLibs/Beefy2D/src/events/DialogEvent.bf index 343e4394..e860ab2d 100644 --- a/BeefLibs/Beefy2D/src/events/DialogEvent.bf +++ b/BeefLibs/Beefy2D/src/events/DialogEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/events/DragEvent.bf b/BeefLibs/Beefy2D/src/events/DragEvent.bf index b48221d5..31f2ace3 100644 --- a/BeefLibs/Beefy2D/src/events/DragEvent.bf +++ b/BeefLibs/Beefy2D/src/events/DragEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.events diff --git a/BeefLibs/Beefy2D/src/events/EditEvent.bf b/BeefLibs/Beefy2D/src/events/EditEvent.bf index 9540996c..19c9a857 100644 --- a/BeefLibs/Beefy2D/src/events/EditEvent.bf +++ b/BeefLibs/Beefy2D/src/events/EditEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.events diff --git a/BeefLibs/Beefy2D/src/events/Event.bf b/BeefLibs/Beefy2D/src/events/Event.bf index a4eb5c72..eb61ca04 100644 --- a/BeefLibs/Beefy2D/src/events/Event.bf +++ b/BeefLibs/Beefy2D/src/events/Event.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.events diff --git a/BeefLibs/Beefy2D/src/events/KeyboardEvent.bf b/BeefLibs/Beefy2D/src/events/KeyboardEvent.bf index 9bcd6f3e..bd8fd29e 100644 --- a/BeefLibs/Beefy2D/src/events/KeyboardEvent.bf +++ b/BeefLibs/Beefy2D/src/events/KeyboardEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/events/MouseEvent.bf b/BeefLibs/Beefy2D/src/events/MouseEvent.bf index 2c9e3a14..961611d8 100644 --- a/BeefLibs/Beefy2D/src/events/MouseEvent.bf +++ b/BeefLibs/Beefy2D/src/events/MouseEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/events/ScrollEvent.bf b/BeefLibs/Beefy2D/src/events/ScrollEvent.bf index 60998c39..d2e300c8 100644 --- a/BeefLibs/Beefy2D/src/events/ScrollEvent.bf +++ b/BeefLibs/Beefy2D/src/events/ScrollEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.events diff --git a/BeefLibs/Beefy2D/src/events/WidgetParentEvent.bf b/BeefLibs/Beefy2D/src/events/WidgetParentEvent.bf index 29eed9f7..c15f0f78 100644 --- a/BeefLibs/Beefy2D/src/events/WidgetParentEvent.bf +++ b/BeefLibs/Beefy2D/src/events/WidgetParentEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/geom/Matrix4.bf b/BeefLibs/Beefy2D/src/geom/Matrix4.bf index b9a1a43c..c2c5cbb2 100644 --- a/BeefLibs/Beefy2D/src/geom/Matrix4.bf +++ b/BeefLibs/Beefy2D/src/geom/Matrix4.bf @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/geom/Point.bf b/BeefLibs/Beefy2D/src/geom/Point.bf index e626812a..8f00c1f7 100644 --- a/BeefLibs/Beefy2D/src/geom/Point.bf +++ b/BeefLibs/Beefy2D/src/geom/Point.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.geom diff --git a/BeefLibs/Beefy2D/src/geom/Rect.bf b/BeefLibs/Beefy2D/src/geom/Rect.bf index 2b6466be..54e33a05 100644 --- a/BeefLibs/Beefy2D/src/geom/Rect.bf +++ b/BeefLibs/Beefy2D/src/geom/Rect.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/geom/Vector2.bf b/BeefLibs/Beefy2D/src/geom/Vector2.bf index b1261d4d..d39b4756 100644 --- a/BeefLibs/Beefy2D/src/geom/Vector2.bf +++ b/BeefLibs/Beefy2D/src/geom/Vector2.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.geom diff --git a/BeefLibs/Beefy2D/src/geom/Vector3.bf b/BeefLibs/Beefy2D/src/geom/Vector3.bf index 46bc6799..be89f716 100644 --- a/BeefLibs/Beefy2D/src/geom/Vector3.bf +++ b/BeefLibs/Beefy2D/src/geom/Vector3.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/gfx/Color.bf b/BeefLibs/Beefy2D/src/gfx/Color.bf index af256e5e..295b1fe7 100644 --- a/BeefLibs/Beefy2D/src/gfx/Color.bf +++ b/BeefLibs/Beefy2D/src/gfx/Color.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.gfx diff --git a/BeefLibs/Beefy2D/src/gfx/ConstantDataDefinition.bf b/BeefLibs/Beefy2D/src/gfx/ConstantDataDefinition.bf index 7a726e2b..000df547 100644 --- a/BeefLibs/Beefy2D/src/gfx/ConstantDataDefinition.bf +++ b/BeefLibs/Beefy2D/src/gfx/ConstantDataDefinition.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Reflection; diff --git a/BeefLibs/Beefy2D/src/gfx/ConstantDataMemberAttribute.bf b/BeefLibs/Beefy2D/src/gfx/ConstantDataMemberAttribute.bf index d92b528e..6c0ac035 100644 --- a/BeefLibs/Beefy2D/src/gfx/ConstantDataMemberAttribute.bf +++ b/BeefLibs/Beefy2D/src/gfx/ConstantDataMemberAttribute.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/DefaultVertex.bf b/BeefLibs/Beefy2D/src/gfx/DefaultVertex.bf index 133616cc..61f974d7 100644 --- a/BeefLibs/Beefy2D/src/gfx/DefaultVertex.bf +++ b/BeefLibs/Beefy2D/src/gfx/DefaultVertex.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/gfx/DrawLayer.bf b/BeefLibs/Beefy2D/src/gfx/DrawLayer.bf index 09b8b4df..296b697b 100644 --- a/BeefLibs/Beefy2D/src/gfx/DrawLayer.bf +++ b/BeefLibs/Beefy2D/src/gfx/DrawLayer.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy; diff --git a/BeefLibs/Beefy2D/src/gfx/Font.bf b/BeefLibs/Beefy2D/src/gfx/Font.bf index a3e638e3..6828fcad 100644 --- a/BeefLibs/Beefy2D/src/gfx/Font.bf +++ b/BeefLibs/Beefy2D/src/gfx/Font.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.IO; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/gfx/Graphics.bf b/BeefLibs/Beefy2D/src/gfx/Graphics.bf index 31c4644a..f9c0f23d 100644 --- a/BeefLibs/Beefy2D/src/gfx/Graphics.bf +++ b/BeefLibs/Beefy2D/src/gfx/Graphics.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.utils; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/gfx/IDrawable.bf b/BeefLibs/Beefy2D/src/gfx/IDrawable.bf index c7cbaeaa..26a41ebd 100644 --- a/BeefLibs/Beefy2D/src/gfx/IDrawable.bf +++ b/BeefLibs/Beefy2D/src/gfx/IDrawable.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.gfx diff --git a/BeefLibs/Beefy2D/src/gfx/Image.bf b/BeefLibs/Beefy2D/src/gfx/Image.bf index 5db0c3d4..8a9eaff6 100644 --- a/BeefLibs/Beefy2D/src/gfx/Image.bf +++ b/BeefLibs/Beefy2D/src/gfx/Image.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.utils; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/gfx/Matrix.bf b/BeefLibs/Beefy2D/src/gfx/Matrix.bf index a6c1dc63..d48dfed6 100644 --- a/BeefLibs/Beefy2D/src/gfx/Matrix.bf +++ b/BeefLibs/Beefy2D/src/gfx/Matrix.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/gfx/Model.bf b/BeefLibs/Beefy2D/src/gfx/Model.bf index 149dd842..ecc51926 100644 --- a/BeefLibs/Beefy2D/src/gfx/Model.bf +++ b/BeefLibs/Beefy2D/src/gfx/Model.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/BeefLibs/Beefy2D/src/gfx/PixelSnapping.bf b/BeefLibs/Beefy2D/src/gfx/PixelSnapping.bf index b16d6cd7..2ec0ece9 100644 --- a/BeefLibs/Beefy2D/src/gfx/PixelSnapping.bf +++ b/BeefLibs/Beefy2D/src/gfx/PixelSnapping.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.gfx diff --git a/BeefLibs/Beefy2D/src/gfx/RenderCmd.bf b/BeefLibs/Beefy2D/src/gfx/RenderCmd.bf index 09b8a040..b5242bf8 100644 --- a/BeefLibs/Beefy2D/src/gfx/RenderCmd.bf +++ b/BeefLibs/Beefy2D/src/gfx/RenderCmd.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/RenderState.bf b/BeefLibs/Beefy2D/src/gfx/RenderState.bf index 9f7174a3..b8a622e6 100644 --- a/BeefLibs/Beefy2D/src/gfx/RenderState.bf +++ b/BeefLibs/Beefy2D/src/gfx/RenderState.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/BeefLibs/Beefy2D/src/gfx/Shader.bf b/BeefLibs/Beefy2D/src/gfx/Shader.bf index ce2a89b0..0d47892f 100644 --- a/BeefLibs/Beefy2D/src/gfx/Shader.bf +++ b/BeefLibs/Beefy2D/src/gfx/Shader.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.gfx diff --git a/BeefLibs/Beefy2D/src/gfx/TexCoords.bf b/BeefLibs/Beefy2D/src/gfx/TexCoords.bf index a448366b..f13ac135 100644 --- a/BeefLibs/Beefy2D/src/gfx/TexCoords.bf +++ b/BeefLibs/Beefy2D/src/gfx/TexCoords.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/Vertex3D.bf b/BeefLibs/Beefy2D/src/gfx/Vertex3D.bf index 6823c9fa..934a5e97 100644 --- a/BeefLibs/Beefy2D/src/gfx/Vertex3D.bf +++ b/BeefLibs/Beefy2D/src/gfx/Vertex3D.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/VertexDefinition.bf b/BeefLibs/Beefy2D/src/gfx/VertexDefinition.bf index 7d8c4eca..31fe029d 100644 --- a/BeefLibs/Beefy2D/src/gfx/VertexDefinition.bf +++ b/BeefLibs/Beefy2D/src/gfx/VertexDefinition.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Reflection; diff --git a/BeefLibs/Beefy2D/src/gfx/VertexElementUsage.bf b/BeefLibs/Beefy2D/src/gfx/VertexElementUsage.bf index dcc9a49d..ebb03b72 100644 --- a/BeefLibs/Beefy2D/src/gfx/VertexElementUsage.bf +++ b/BeefLibs/Beefy2D/src/gfx/VertexElementUsage.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/VertexLayout.bf b/BeefLibs/Beefy2D/src/gfx/VertexLayout.bf index 9cad253c..62154642 100644 --- a/BeefLibs/Beefy2D/src/gfx/VertexLayout.bf +++ b/BeefLibs/Beefy2D/src/gfx/VertexLayout.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/gfx/VertexMemberAttribute.bf b/BeefLibs/Beefy2D/src/gfx/VertexMemberAttribute.bf index 6d2125f6..e02f23d2 100644 --- a/BeefLibs/Beefy2D/src/gfx/VertexMemberAttribute.bf +++ b/BeefLibs/Beefy2D/src/gfx/VertexMemberAttribute.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/res/PSDReader.bf b/BeefLibs/Beefy2D/src/res/PSDReader.bf index dd53c74c..9169508b 100644 --- a/BeefLibs/Beefy2D/src/res/PSDReader.bf +++ b/BeefLibs/Beefy2D/src/res/PSDReader.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/res/ResourceManager.bf b/BeefLibs/Beefy2D/src/res/ResourceManager.bf index 90e05d00..18649c82 100644 --- a/BeefLibs/Beefy2D/src/res/ResourceManager.bf +++ b/BeefLibs/Beefy2D/src/res/ResourceManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Reflection; using Beefy.utils; diff --git a/BeefLibs/Beefy2D/src/res/SoundBank.bf b/BeefLibs/Beefy2D/src/res/SoundBank.bf index 2bb7e1bf..fd90a9c2 100644 --- a/BeefLibs/Beefy2D/src/res/SoundBank.bf +++ b/BeefLibs/Beefy2D/src/res/SoundBank.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy; diff --git a/BeefLibs/Beefy2D/src/res/SoundEvent.bf b/BeefLibs/Beefy2D/src/res/SoundEvent.bf index 963becc3..5bacdcb2 100644 --- a/BeefLibs/Beefy2D/src/res/SoundEvent.bf +++ b/BeefLibs/Beefy2D/src/res/SoundEvent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy; diff --git a/BeefLibs/Beefy2D/src/res/SoundGameObject.bf b/BeefLibs/Beefy2D/src/res/SoundGameObject.bf index 9f1bec72..230e389e 100644 --- a/BeefLibs/Beefy2D/src/res/SoundGameObject.bf +++ b/BeefLibs/Beefy2D/src/res/SoundGameObject.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.res diff --git a/BeefLibs/Beefy2D/src/res/SoundParameter.bf b/BeefLibs/Beefy2D/src/res/SoundParameter.bf index aa2c8990..02c65b84 100644 --- a/BeefLibs/Beefy2D/src/res/SoundParameter.bf +++ b/BeefLibs/Beefy2D/src/res/SoundParameter.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy; diff --git a/BeefLibs/Beefy2D/src/sys/SysBitmap.bf b/BeefLibs/Beefy2D/src/sys/SysBitmap.bf index 95d961ce..05f6d8b2 100644 --- a/BeefLibs/Beefy2D/src/sys/SysBitmap.bf +++ b/BeefLibs/Beefy2D/src/sys/SysBitmap.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.sys diff --git a/BeefLibs/Beefy2D/src/sys/SysMenu.bf b/BeefLibs/Beefy2D/src/sys/SysMenu.bf index f50f0b9e..4dc7cda1 100644 --- a/BeefLibs/Beefy2D/src/sys/SysMenu.bf +++ b/BeefLibs/Beefy2D/src/sys/SysMenu.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy; diff --git a/BeefLibs/Beefy2D/src/theme/ThemeFactory.bf b/BeefLibs/Beefy2D/src/theme/ThemeFactory.bf index 66be0490..ddb9877b 100644 --- a/BeefLibs/Beefy2D/src/theme/ThemeFactory.bf +++ b/BeefLibs/Beefy2D/src/theme/ThemeFactory.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf index fba05cc0..7e465553 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkButton.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf index e60ed591..dbb62b55 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkCheckBox.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkComboBox.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkComboBox.bf index f73c4fb7..a7a0d24a 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkComboBox.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkComboBox.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf index ce39d580..ade3ea14 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf index 8d67fdf9..c6c05cdd 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkDockingFrame.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf index 2826bfd1..b7825d13 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkEditWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkIconButton.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkIconButton.bf index 898a91a6..401b5894 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkIconButton.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkIconButton.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkInfiniteScrollbar.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkInfiniteScrollbar.bf index b09d6c78..559f8a0a 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkInfiniteScrollbar.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkInfiniteScrollbar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf index b8d3bf0a..d00143ab 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkListView.bf @@ -1,6 +1,6 @@ /// using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using Beefy.theme; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf index 9e37e817..d028919a 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkMenu.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkScrollbar.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkScrollbar.bf index a580f746..76a0a1ad 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkScrollbar.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkScrollbar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkSmartEdit.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkSmartEdit.bf index 0a277b56..7889227a 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkSmartEdit.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkSmartEdit.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy; using Beefy.widgets; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf index 0bf6d52e..e4382bd7 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTabbedView.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf index edb3d970..91bcda28 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTheme.bf @@ -1,6 +1,6 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkTooltip.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkTooltip.bf index 22a2fe29..58f0bc9e 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkTooltip.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkTooltip.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/BeefLibs/Beefy2D/src/theme/dark/DarkVirtualListViewItem.bf b/BeefLibs/Beefy2D/src/theme/dark/DarkVirtualListViewItem.bf index e3b25236..907566f8 100644 --- a/BeefLibs/Beefy2D/src/theme/dark/DarkVirtualListViewItem.bf +++ b/BeefLibs/Beefy2D/src/theme/dark/DarkVirtualListViewItem.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.theme.dark; diff --git a/BeefLibs/Beefy2D/src/utils/DisposeProxy.bf b/BeefLibs/Beefy2D/src/utils/DisposeProxy.bf index 0a359b0b..c615473c 100644 --- a/BeefLibs/Beefy2D/src/utils/DisposeProxy.bf +++ b/BeefLibs/Beefy2D/src/utils/DisposeProxy.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.utils diff --git a/BeefLibs/Beefy2D/src/utils/ISerializable.bf b/BeefLibs/Beefy2D/src/utils/ISerializable.bf index 90a35205..10b61204 100644 --- a/BeefLibs/Beefy2D/src/utils/ISerializable.bf +++ b/BeefLibs/Beefy2D/src/utils/ISerializable.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.utils diff --git a/BeefLibs/Beefy2D/src/utils/IdSpan.bf b/BeefLibs/Beefy2D/src/utils/IdSpan.bf index dafde84d..d6d2c42a 100644 --- a/BeefLibs/Beefy2D/src/utils/IdSpan.bf +++ b/BeefLibs/Beefy2D/src/utils/IdSpan.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading.Tasks; diff --git a/BeefLibs/Beefy2D/src/utils/ManualBreak.bf b/BeefLibs/Beefy2D/src/utils/ManualBreak.bf index cec471fb..71fd6925 100644 --- a/BeefLibs/Beefy2D/src/utils/ManualBreak.bf +++ b/BeefLibs/Beefy2D/src/utils/ManualBreak.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/utils/PerfTimer.bf b/BeefLibs/Beefy2D/src/utils/PerfTimer.bf index 7328c757..1fc18465 100644 --- a/BeefLibs/Beefy2D/src/utils/PerfTimer.bf +++ b/BeefLibs/Beefy2D/src/utils/PerfTimer.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.utils diff --git a/BeefLibs/Beefy2D/src/utils/SmoothValue.bf b/BeefLibs/Beefy2D/src/utils/SmoothValue.bf index e7933cff..bdebc408 100644 --- a/BeefLibs/Beefy2D/src/utils/SmoothValue.bf +++ b/BeefLibs/Beefy2D/src/utils/SmoothValue.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.utils diff --git a/BeefLibs/Beefy2D/src/utils/StructuredData.bf b/BeefLibs/Beefy2D/src/utils/StructuredData.bf index 7dc6fd3a..90706db5 100644 --- a/BeefLibs/Beefy2D/src/utils/StructuredData.bf +++ b/BeefLibs/Beefy2D/src/utils/StructuredData.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Collections; using System.Text; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/utils/TextSearcher.bf b/BeefLibs/Beefy2D/src/utils/TextSearcher.bf index 0fbffd6b..f0da5433 100644 --- a/BeefLibs/Beefy2D/src/utils/TextSearcher.bf +++ b/BeefLibs/Beefy2D/src/utils/TextSearcher.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace Beefy.utils { diff --git a/BeefLibs/Beefy2D/src/utils/UndoManager.bf b/BeefLibs/Beefy2D/src/utils/UndoManager.bf index f520b118..a3f9cb40 100644 --- a/BeefLibs/Beefy2D/src/utils/UndoManager.bf +++ b/BeefLibs/Beefy2D/src/utils/UndoManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/widgets/ButtonWidget.bf b/BeefLibs/Beefy2D/src/widgets/ButtonWidget.bf index b7fc15be..0d8658c0 100644 --- a/BeefLibs/Beefy2D/src/widgets/ButtonWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/ButtonWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/Checkbox.bf b/BeefLibs/Beefy2D/src/widgets/Checkbox.bf index 51f9b5b6..39218cdc 100644 --- a/BeefLibs/Beefy2D/src/widgets/Checkbox.bf +++ b/BeefLibs/Beefy2D/src/widgets/Checkbox.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/widgets/ComboBox.bf b/BeefLibs/Beefy2D/src/widgets/ComboBox.bf index c8b2abd8..d1b35383 100644 --- a/BeefLibs/Beefy2D/src/widgets/ComboBox.bf +++ b/BeefLibs/Beefy2D/src/widgets/ComboBox.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.widgets diff --git a/BeefLibs/Beefy2D/src/widgets/Composition.bf b/BeefLibs/Beefy2D/src/widgets/Composition.bf index 8b79b883..2a67b588 100644 --- a/BeefLibs/Beefy2D/src/widgets/Composition.bf +++ b/BeefLibs/Beefy2D/src/widgets/Composition.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Reflection; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/widgets/DesignEditableAttribute.bf b/BeefLibs/Beefy2D/src/widgets/DesignEditableAttribute.bf index 36129ae7..5d51a0d9 100644 --- a/BeefLibs/Beefy2D/src/widgets/DesignEditableAttribute.bf +++ b/BeefLibs/Beefy2D/src/widgets/DesignEditableAttribute.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.widgets diff --git a/BeefLibs/Beefy2D/src/widgets/Dialog.bf b/BeefLibs/Beefy2D/src/widgets/Dialog.bf index c1ce6ec1..b879a7e0 100644 --- a/BeefLibs/Beefy2D/src/widgets/Dialog.bf +++ b/BeefLibs/Beefy2D/src/widgets/Dialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/DockedWidget.bf b/BeefLibs/Beefy2D/src/widgets/DockedWidget.bf index 64a3310f..ac5237b3 100644 --- a/BeefLibs/Beefy2D/src/widgets/DockedWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/DockedWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using System.Diagnostics; diff --git a/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf b/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf index c970b308..83fc3246 100644 --- a/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf +++ b/BeefLibs/Beefy2D/src/widgets/DockingFrame.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.theme; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/DragHelper.bf b/BeefLibs/Beefy2D/src/widgets/DragHelper.bf index c0e19187..f013c1cb 100644 --- a/BeefLibs/Beefy2D/src/widgets/DragHelper.bf +++ b/BeefLibs/Beefy2D/src/widgets/DragHelper.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using Beefy.events; diff --git a/BeefLibs/Beefy2D/src/widgets/EditWidget.bf b/BeefLibs/Beefy2D/src/widgets/EditWidget.bf index 742a74d7..050da2fc 100644 --- a/BeefLibs/Beefy2D/src/widgets/EditWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/EditWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading; diff --git a/BeefLibs/Beefy2D/src/widgets/IMenu.bf b/BeefLibs/Beefy2D/src/widgets/IMenu.bf index 61947b1b..a2174048 100644 --- a/BeefLibs/Beefy2D/src/widgets/IMenu.bf +++ b/BeefLibs/Beefy2D/src/widgets/IMenu.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace Beefy.widgets diff --git a/BeefLibs/Beefy2D/src/widgets/ImageWidget.bf b/BeefLibs/Beefy2D/src/widgets/ImageWidget.bf index 9b650b86..6bbdd77e 100644 --- a/BeefLibs/Beefy2D/src/widgets/ImageWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/ImageWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/InfiniteScrollbar.bf b/BeefLibs/Beefy2D/src/widgets/InfiniteScrollbar.bf index 165ad395..40ae1e88 100644 --- a/BeefLibs/Beefy2D/src/widgets/InfiniteScrollbar.bf +++ b/BeefLibs/Beefy2D/src/widgets/InfiniteScrollbar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.events; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/widgets/Insets.bf b/BeefLibs/Beefy2D/src/widgets/Insets.bf index 67d5757f..ff0cd99d 100644 --- a/BeefLibs/Beefy2D/src/widgets/Insets.bf +++ b/BeefLibs/Beefy2D/src/widgets/Insets.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.geom; diff --git a/BeefLibs/Beefy2D/src/widgets/KeyCode.bf b/BeefLibs/Beefy2D/src/widgets/KeyCode.bf index 83de01f3..a381abad 100644 --- a/BeefLibs/Beefy2D/src/widgets/KeyCode.bf +++ b/BeefLibs/Beefy2D/src/widgets/KeyCode.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Reflection; diff --git a/BeefLibs/Beefy2D/src/widgets/LabelWidget.bf b/BeefLibs/Beefy2D/src/widgets/LabelWidget.bf index 3d4e0ea3..2b4a5594 100644 --- a/BeefLibs/Beefy2D/src/widgets/LabelWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/LabelWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/ListView.bf b/BeefLibs/Beefy2D/src/widgets/ListView.bf index 8e0c6ddb..6bdfd05d 100644 --- a/BeefLibs/Beefy2D/src/widgets/ListView.bf +++ b/BeefLibs/Beefy2D/src/widgets/ListView.bf @@ -1,6 +1,6 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/Menu.bf b/BeefLibs/Beefy2D/src/widgets/Menu.bf index 4e04cfce..f751c532 100644 --- a/BeefLibs/Beefy2D/src/widgets/Menu.bf +++ b/BeefLibs/Beefy2D/src/widgets/Menu.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using Beefy.theme; diff --git a/BeefLibs/Beefy2D/src/widgets/ScrollableWidget.bf b/BeefLibs/Beefy2D/src/widgets/ScrollableWidget.bf index 5e9dc269..8be69273 100644 --- a/BeefLibs/Beefy2D/src/widgets/ScrollableWidget.bf +++ b/BeefLibs/Beefy2D/src/widgets/ScrollableWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.theme; diff --git a/BeefLibs/Beefy2D/src/widgets/Scrollbar.bf b/BeefLibs/Beefy2D/src/widgets/Scrollbar.bf index 007626ef..906ce83e 100644 --- a/BeefLibs/Beefy2D/src/widgets/Scrollbar.bf +++ b/BeefLibs/Beefy2D/src/widgets/Scrollbar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using Beefy.events; diff --git a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf index 9cf95549..122a49e3 100644 --- a/BeefLibs/Beefy2D/src/widgets/TabbedView.bf +++ b/BeefLibs/Beefy2D/src/widgets/TabbedView.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using Beefy.gfx; diff --git a/BeefLibs/Beefy2D/src/widgets/Widget.bf b/BeefLibs/Beefy2D/src/widgets/Widget.bf index 025c42ff..476a1324 100644 --- a/BeefLibs/Beefy2D/src/widgets/Widget.bf +++ b/BeefLibs/Beefy2D/src/widgets/Widget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.gfx; using Beefy.events; diff --git a/BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf b/BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf index 09200774..a4525f60 100644 --- a/BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf +++ b/BeefLibs/Beefy2D/src/widgets/WidgetWindow.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using Beefy.gfx; diff --git a/BeefLibs/corlib/main.bf b/BeefLibs/corlib/main.bf index 0c2c3072..12169688 100644 --- a/BeefLibs/corlib/main.bf +++ b/BeefLibs/corlib/main.bf @@ -4,7 +4,7 @@ using System; using System.Collections; using System.Threading; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace Hey.Dude.Bro { diff --git a/BeefLibs/corlib/src/Array.bf b/BeefLibs/corlib/src/Array.bf index 9a8dc34c..31506673 100644 --- a/BeefLibs/corlib/src/Array.bf +++ b/BeefLibs/corlib/src/Array.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System @@ -22,7 +22,7 @@ namespace System [Inline] set { - // We only allow reducing the length - consider using System.Collections.Generic.List when dynamic sizing is required + // We only allow reducing the length - consider using System.Collections.List when dynamic sizing is required Runtime.Assert(value <= mLength); mLength = (int_arsize)value; } diff --git a/BeefLibs/corlib/src/BumpAllocator.bf b/BeefLibs/corlib/src/BumpAllocator.bf index 764b9ece..30ec5062 100644 --- a/BeefLibs/corlib/src/BumpAllocator.bf +++ b/BeefLibs/corlib/src/BumpAllocator.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/BeefLibs/corlib/src/Collections/Generic/BinaryHeap.bf b/BeefLibs/corlib/src/Collections/BinaryHeap.bf similarity index 98% rename from BeefLibs/corlib/src/Collections/Generic/BinaryHeap.bf rename to BeefLibs/corlib/src/Collections/BinaryHeap.bf index b9545651..fe5a7a44 100644 --- a/BeefLibs/corlib/src/Collections/Generic/BinaryHeap.bf +++ b/BeefLibs/corlib/src/Collections/BinaryHeap.bf @@ -4,7 +4,7 @@ using System.Diagnostics; -namespace System.Collections.Generic +namespace System.Collections { public class BinaryHeap { diff --git a/BeefLibs/corlib/src/Collections/Generic/Dictionary.bf b/BeefLibs/corlib/src/Collections/Dictionary.bf similarity index 99% rename from BeefLibs/corlib/src/Collections/Generic/Dictionary.bf rename to BeefLibs/corlib/src/Collections/Dictionary.bf index 07a08589..67ee05d4 100644 --- a/BeefLibs/corlib/src/Collections/Generic/Dictionary.bf +++ b/BeefLibs/corlib/src/Collections/Dictionary.bf @@ -6,7 +6,7 @@ #define VERSION_DICTIONARY #endif -namespace System.Collections.Generic +namespace System.Collections { using System; using System.Collections; diff --git a/BeefLibs/corlib/src/Collections/Generic/IComparer.bf b/BeefLibs/corlib/src/Collections/Generic/IComparer.bf deleted file mode 100644 index f4cbad1c..00000000 --- a/BeefLibs/corlib/src/Collections/Generic/IComparer.bf +++ /dev/null @@ -1,4 +0,0 @@ -namespace System.Collections.Generic -{ - -} diff --git a/BeefLibs/corlib/src/Collections/Generic/HashSet.bf b/BeefLibs/corlib/src/Collections/HashSet.bf similarity index 99% rename from BeefLibs/corlib/src/Collections/Generic/HashSet.bf rename to BeefLibs/corlib/src/Collections/HashSet.bf index 8b683491..a9c3d00f 100644 --- a/BeefLibs/corlib/src/Collections/Generic/HashSet.bf +++ b/BeefLibs/corlib/src/Collections/HashSet.bf @@ -8,13 +8,13 @@ using System; using System.Collections; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Diagnostics.Contracts; using System.Text; using System.Security; -namespace System.Collections.Generic +namespace System.Collections { /// Implementation notes: /// This uses an array-based implementation similar to Dictionary, using a buckets array diff --git a/BeefLibs/corlib/src/Collections/Generic/ICollection.bf b/BeefLibs/corlib/src/Collections/ICollection.bf similarity index 86% rename from BeefLibs/corlib/src/Collections/Generic/ICollection.bf rename to BeefLibs/corlib/src/Collections/ICollection.bf index 52d683b4..9faa6a01 100644 --- a/BeefLibs/corlib/src/Collections/Generic/ICollection.bf +++ b/BeefLibs/corlib/src/Collections/ICollection.bf @@ -1,4 +1,4 @@ -namespace System.Collections.Generic +namespace System.Collections { interface ICollection { diff --git a/BeefLibs/corlib/src/Collections/IComparer.bf b/BeefLibs/corlib/src/Collections/IComparer.bf new file mode 100644 index 00000000..499aa2b9 --- /dev/null +++ b/BeefLibs/corlib/src/Collections/IComparer.bf @@ -0,0 +1,4 @@ +namespace System.Collections +{ + +} diff --git a/BeefLibs/corlib/src/Collections/IEnumerator.bf b/BeefLibs/corlib/src/Collections/IEnumerator.bf index 89855c8a..e1950341 100644 --- a/BeefLibs/corlib/src/Collections/IEnumerator.bf +++ b/BeefLibs/corlib/src/Collections/IEnumerator.bf @@ -1,6 +1,6 @@ using System; -namespace System.Collections.Generic +namespace System.Collections { interface IEnumerator { diff --git a/BeefLibs/corlib/src/Collections/Generic/IEqualityComparer.bf b/BeefLibs/corlib/src/Collections/IEqualityComparer.bf similarity index 81% rename from BeefLibs/corlib/src/Collections/Generic/IEqualityComparer.bf rename to BeefLibs/corlib/src/Collections/IEqualityComparer.bf index bb591632..b765a91f 100644 --- a/BeefLibs/corlib/src/Collections/Generic/IEqualityComparer.bf +++ b/BeefLibs/corlib/src/Collections/IEqualityComparer.bf @@ -1,4 +1,4 @@ -namespace System.Collections.Generic +namespace System.Collections { using System; diff --git a/BeefLibs/corlib/src/Collections/Generic/KeyValuePair.bf b/BeefLibs/corlib/src/Collections/KeyValuePair.bf similarity index 93% rename from BeefLibs/corlib/src/Collections/Generic/KeyValuePair.bf rename to BeefLibs/corlib/src/Collections/KeyValuePair.bf index 7ec0588f..094cda37 100644 --- a/BeefLibs/corlib/src/Collections/Generic/KeyValuePair.bf +++ b/BeefLibs/corlib/src/Collections/KeyValuePair.bf @@ -1,4 +1,4 @@ -namespace System.Collections.Generic +namespace System.Collections { public struct KeyValuePair { diff --git a/BeefLibs/corlib/src/Collections/Generic/List.bf b/BeefLibs/corlib/src/Collections/List.bf similarity index 99% rename from BeefLibs/corlib/src/Collections/Generic/List.bf rename to BeefLibs/corlib/src/Collections/List.bf index 5b012c33..145cfc90 100644 --- a/BeefLibs/corlib/src/Collections/Generic/List.bf +++ b/BeefLibs/corlib/src/Collections/List.bf @@ -12,7 +12,7 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Reflection; -namespace System.Collections.Generic +namespace System.Collections { interface IList { diff --git a/BeefLibs/corlib/src/Collections/Generic/Queue.bf b/BeefLibs/corlib/src/Collections/Queue.bf similarity index 99% rename from BeefLibs/corlib/src/Collections/Generic/Queue.bf rename to BeefLibs/corlib/src/Collections/Queue.bf index 5e8b93d0..fdd5b260 100644 --- a/BeefLibs/corlib/src/Collections/Generic/Queue.bf +++ b/BeefLibs/corlib/src/Collections/Queue.bf @@ -6,7 +6,7 @@ #define VERSION_QUEUE #endif -namespace System.Collections.Generic +namespace System.Collections { using System; using System.Diagnostics; diff --git a/BeefLibs/corlib/src/Collections/Generic/Sorter.bf b/BeefLibs/corlib/src/Collections/Sorter.bf similarity index 99% rename from BeefLibs/corlib/src/Collections/Generic/Sorter.bf rename to BeefLibs/corlib/src/Collections/Sorter.bf index b6a4cdfd..68d4248a 100644 --- a/BeefLibs/corlib/src/Collections/Generic/Sorter.bf +++ b/BeefLibs/corlib/src/Collections/Sorter.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -namespace System.Collections.Generic +namespace System.Collections { struct Sorter { diff --git a/BeefLibs/corlib/src/Diagnostics/AsyncStreamReader.bf b/BeefLibs/corlib/src/Diagnostics/AsyncStreamReader.bf index 600e9e74..9126a1fb 100644 --- a/BeefLibs/corlib/src/Diagnostics/AsyncStreamReader.bf +++ b/BeefLibs/corlib/src/Diagnostics/AsyncStreamReader.bf @@ -1,7 +1,7 @@ using System.IO; using System.Text; using System.Threading; -using System.Collections.Generic; +using System.Collections; namespace System.Diagnostics { diff --git a/BeefLibs/corlib/src/Diagnostics/Process.bf b/BeefLibs/corlib/src/Diagnostics/Process.bf index 8a753688..06526196 100644 --- a/BeefLibs/corlib/src/Diagnostics/Process.bf +++ b/BeefLibs/corlib/src/Diagnostics/Process.bf @@ -1,7 +1,7 @@ using System.IO; using System.Threading; using System.Text; -using System.Collections.Generic; +using System.Collections; namespace System.Diagnostics { diff --git a/BeefLibs/corlib/src/Diagnostics/ProcessManager.bf b/BeefLibs/corlib/src/Diagnostics/ProcessManager.bf index e400b780..253b995e 100644 --- a/BeefLibs/corlib/src/Diagnostics/ProcessManager.bf +++ b/BeefLibs/corlib/src/Diagnostics/ProcessManager.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Threading; namespace System.Diagnostics diff --git a/BeefLibs/corlib/src/Diagnostics/ProcessStartInfo.bf b/BeefLibs/corlib/src/Diagnostics/ProcessStartInfo.bf index 1026b1be..2e11e354 100644 --- a/BeefLibs/corlib/src/Diagnostics/ProcessStartInfo.bf +++ b/BeefLibs/corlib/src/Diagnostics/ProcessStartInfo.bf @@ -1,5 +1,5 @@ using System.Text; -using System.Collections.Generic; +using System.Collections; namespace System.Diagnostics { diff --git a/BeefLibs/corlib/src/Diagnostics/SpawnedProcess.bf b/BeefLibs/corlib/src/Diagnostics/SpawnedProcess.bf index dbb8ba36..8f39e98f 100644 --- a/BeefLibs/corlib/src/Diagnostics/SpawnedProcess.bf +++ b/BeefLibs/corlib/src/Diagnostics/SpawnedProcess.bf @@ -1,5 +1,5 @@ using System.IO; -using System.Collections.Generic; +using System.Collections; namespace System.Diagnostics { diff --git a/BeefLibs/corlib/src/Environment.bf b/BeefLibs/corlib/src/Environment.bf index cf33c7d8..9789855e 100644 --- a/BeefLibs/corlib/src/Environment.bf +++ b/BeefLibs/corlib/src/Environment.bf @@ -1,5 +1,5 @@ using System.IO; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace System diff --git a/BeefLibs/corlib/src/Event.bf b/BeefLibs/corlib/src/Event.bf index b319629d..66f4b38c 100644 --- a/BeefLibs/corlib/src/Event.bf +++ b/BeefLibs/corlib/src/Event.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/BeefLibs/corlib/src/Globalization/CultureData.bf b/BeefLibs/corlib/src/Globalization/CultureData.bf index 426a5090..5abe12d6 100644 --- a/BeefLibs/corlib/src/Globalization/CultureData.bf +++ b/BeefLibs/corlib/src/Globalization/CultureData.bf @@ -1,5 +1,5 @@ using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; // This file contains portions of code released by Microsoft under the MIT license as part // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource diff --git a/BeefLibs/corlib/src/Globalization/DateTimeFormat.bf b/BeefLibs/corlib/src/Globalization/DateTimeFormat.bf index 22c14002..f5911f7f 100644 --- a/BeefLibs/corlib/src/Globalization/DateTimeFormat.bf +++ b/BeefLibs/corlib/src/Globalization/DateTimeFormat.bf @@ -6,7 +6,7 @@ namespace System { using System.Text; using System.Threading; using System.Globalization; - using System.Collections.Generic; + using System.Collections; using System.Security; using System.Diagnostics.Contracts; diff --git a/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf b/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf index 46df7558..72944dfa 100644 --- a/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf +++ b/BeefLibs/corlib/src/Globalization/DateTimeFormatInfo.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System.Globalization { enum MonthNameStyles { diff --git a/BeefLibs/corlib/src/Globalization/TimeSpanFormat.bf b/BeefLibs/corlib/src/Globalization/TimeSpanFormat.bf index 093c698b..e4b25df6 100644 --- a/BeefLibs/corlib/src/Globalization/TimeSpanFormat.bf +++ b/BeefLibs/corlib/src/Globalization/TimeSpanFormat.bf @@ -10,7 +10,7 @@ namespace System.Globalization { using System; using System.Diagnostics.Contracts; using System.Globalization; - using System.Collections.Generic; + using System.Collections; static class TimeSpanFormat { diff --git a/BeefLibs/corlib/src/IO/Directory.bf b/BeefLibs/corlib/src/IO/Directory.bf index 30f22eeb..1a1d1f24 100644 --- a/BeefLibs/corlib/src/IO/Directory.bf +++ b/BeefLibs/corlib/src/IO/Directory.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System.IO diff --git a/BeefLibs/corlib/src/IO/DynMemStream.bf b/BeefLibs/corlib/src/IO/DynMemStream.bf index fa4659d2..03be01d1 100644 --- a/BeefLibs/corlib/src/IO/DynMemStream.bf +++ b/BeefLibs/corlib/src/IO/DynMemStream.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System.IO diff --git a/BeefLibs/corlib/src/IO/File.bf b/BeefLibs/corlib/src/IO/File.bf index 392a47bd..dc63d23f 100644 --- a/BeefLibs/corlib/src/IO/File.bf +++ b/BeefLibs/corlib/src/IO/File.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; diff --git a/BeefLibs/corlib/src/IO/MemoryStream.bf b/BeefLibs/corlib/src/IO/MemoryStream.bf index 052dc807..97ce6021 100644 --- a/BeefLibs/corlib/src/IO/MemoryStream.bf +++ b/BeefLibs/corlib/src/IO/MemoryStream.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System.IO { diff --git a/BeefLibs/corlib/src/IO/NullStream.bf b/BeefLibs/corlib/src/IO/NullStream.bf index 7c429c05..6f72dd9c 100644 --- a/BeefLibs/corlib/src/IO/NullStream.bf +++ b/BeefLibs/corlib/src/IO/NullStream.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System.IO diff --git a/BeefLibs/corlib/src/IO/OpenFileDialog.bf b/BeefLibs/corlib/src/IO/OpenFileDialog.bf index 0a9e3d7b..4386d80f 100644 --- a/BeefLibs/corlib/src/IO/OpenFileDialog.bf +++ b/BeefLibs/corlib/src/IO/OpenFileDialog.bf @@ -3,7 +3,7 @@ // The original source was submitted to https://github.com/Microsoft/referencesource using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; using System.Threading; using System.Text; diff --git a/BeefLibs/corlib/src/IO/StreamReader.bf b/BeefLibs/corlib/src/IO/StreamReader.bf index 8f7f9254..07a8fd3b 100644 --- a/BeefLibs/corlib/src/IO/StreamReader.bf +++ b/BeefLibs/corlib/src/IO/StreamReader.bf @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Text; using System.Threading.Tasks; using System.Threading; -using System.Collections.Generic; +using System.Collections; namespace System.IO { diff --git a/BeefLibs/corlib/src/IO/StringStream.bf b/BeefLibs/corlib/src/IO/StringStream.bf index 2fb1296c..9d9459db 100644 --- a/BeefLibs/corlib/src/IO/StringStream.bf +++ b/BeefLibs/corlib/src/IO/StringStream.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System.IO diff --git a/BeefLibs/corlib/src/Internal.bf b/BeefLibs/corlib/src/Internal.bf index 77a89b07..03ca9fbd 100644 --- a/BeefLibs/corlib/src/Internal.bf +++ b/BeefLibs/corlib/src/Internal.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Reflection; namespace System diff --git a/BeefLibs/corlib/src/Nullable.bf b/BeefLibs/corlib/src/Nullable.bf index 59a6b55d..e108676d 100644 --- a/BeefLibs/corlib/src/Nullable.bf +++ b/BeefLibs/corlib/src/Nullable.bf @@ -1,5 +1,5 @@ using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/BeefLibs/corlib/src/Object.bf b/BeefLibs/corlib/src/Object.bf index 0518de3e..c2d235ea 100644 --- a/BeefLibs/corlib/src/Object.bf +++ b/BeefLibs/corlib/src/Object.bf @@ -1,6 +1,6 @@ using System; using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/BeefLibs/corlib/src/PropertyBag.bf b/BeefLibs/corlib/src/PropertyBag.bf index 2d19dbb6..f9864082 100644 --- a/BeefLibs/corlib/src/PropertyBag.bf +++ b/BeefLibs/corlib/src/PropertyBag.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/BeefLibs/corlib/src/Reflection/FieldInfo.bf b/BeefLibs/corlib/src/Reflection/FieldInfo.bf index 3abf443b..4456b4ae 100644 --- a/BeefLibs/corlib/src/Reflection/FieldInfo.bf +++ b/BeefLibs/corlib/src/Reflection/FieldInfo.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System.Reflection { diff --git a/BeefLibs/corlib/src/Reflection/MethodInfo.bf b/BeefLibs/corlib/src/Reflection/MethodInfo.bf index 29eb4679..7e1f1727 100644 --- a/BeefLibs/corlib/src/Reflection/MethodInfo.bf +++ b/BeefLibs/corlib/src/Reflection/MethodInfo.bf @@ -2,7 +2,7 @@ using System; using System.Reflection; using System.FFI; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace System.Reflection { diff --git a/BeefLibs/corlib/src/Span.bf b/BeefLibs/corlib/src/Span.bf index f78056dc..9ab08f41 100644 --- a/BeefLibs/corlib/src/Span.bf +++ b/BeefLibs/corlib/src/Span.bf @@ -1,5 +1,5 @@ using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/BeefLibs/corlib/src/String.bf b/BeefLibs/corlib/src/String.bf index f8e148a9..c3cc8c26 100644 --- a/BeefLibs/corlib/src/String.bf +++ b/BeefLibs/corlib/src/String.bf @@ -3,7 +3,7 @@ // The original source was submitted to https://github.com/Microsoft/referencesource using System.Diagnostics.Contracts; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading; diff --git a/BeefLibs/corlib/src/System.bf b/BeefLibs/corlib/src/System.bf index 66577048..dd55ff42 100644 --- a/BeefLibs/corlib/src/System.bf +++ b/BeefLibs/corlib/src/System.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/BeefLibs/corlib/src/Threading/Tasks/Future.bf b/BeefLibs/corlib/src/Threading/Tasks/Future.bf index 5c75c65e..54ffcc32 100644 --- a/BeefLibs/corlib/src/Threading/Tasks/Future.bf +++ b/BeefLibs/corlib/src/Threading/Tasks/Future.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System.Threading.Tasks diff --git a/BeefLibs/corlib/src/Threading/Tasks/Task.bf b/BeefLibs/corlib/src/Threading/Tasks/Task.bf index 89b16f9e..d84fe8cd 100644 --- a/BeefLibs/corlib/src/Threading/Tasks/Task.bf +++ b/BeefLibs/corlib/src/Threading/Tasks/Task.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -using System.Collections.Generic; +using System.Collections; using System.Diagnostics.Contracts; using System.Diagnostics; diff --git a/BeefLibs/corlib/src/Threading/ThreadPool.bf b/BeefLibs/corlib/src/Threading/ThreadPool.bf index 1dbc2206..7b50530f 100644 --- a/BeefLibs/corlib/src/Threading/ThreadPool.bf +++ b/BeefLibs/corlib/src/Threading/ThreadPool.bf @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; //#define DISABLE_THREADS diff --git a/BeefLibs/corlib/src/TimeZoneInfo.bf b/BeefLibs/corlib/src/TimeZoneInfo.bf index 37b98020..f1edd494 100644 --- a/BeefLibs/corlib/src/TimeZoneInfo.bf +++ b/BeefLibs/corlib/src/TimeZoneInfo.bf @@ -28,7 +28,7 @@ namespace System { using System; using System.Collections; - using System.Collections.Generic; + using System.Collections; using System.Diagnostics; using System.Diagnostics.Contracts; using System.Globalization; diff --git a/BeefLibs/corlib/src/Type.bf b/BeefLibs/corlib/src/Type.bf index fe811010..6a7cece5 100644 --- a/BeefLibs/corlib/src/Type.bf +++ b/BeefLibs/corlib/src/Type.bf @@ -1,6 +1,6 @@ using System; using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/BeefLibs/corlib/src/Windows.bf b/BeefLibs/corlib/src/Windows.bf index 4e0e62b8..c0019570 100644 --- a/BeefLibs/corlib/src/Windows.bf +++ b/BeefLibs/corlib/src/Windows.bf @@ -1,7 +1,7 @@ #if BF_PLATFORM_WINDOWS using System.IO; -using System.Collections.Generic; +using System.Collections; using System.Text; namespace System diff --git a/BeefTools/BeefPerf/src/BPApp.bf b/BeefTools/BeefPerf/src/BPApp.bf index 0e68abac..82a4c5f3 100644 --- a/BeefTools/BeefPerf/src/BPApp.bf +++ b/BeefTools/BeefPerf/src/BPApp.bf @@ -6,7 +6,7 @@ using Beefy.theme.dark; using Beefy.theme; using System.IO; using System.Threading; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using Beefy.events; using Beefy.sys; diff --git a/BeefTools/BeefPerf/src/BPClient.bf b/BeefTools/BeefPerf/src/BPClient.bf index d94f42ab..64a37302 100644 --- a/BeefTools/BeefPerf/src/BPClient.bf +++ b/BeefTools/BeefPerf/src/BPClient.bf @@ -2,7 +2,7 @@ using System.Threading; using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Net; using Beefy; diff --git a/BeefTools/BeefPerf/src/Board.bf b/BeefTools/BeefPerf/src/Board.bf index ce67da31..d9658451 100644 --- a/BeefTools/BeefPerf/src/Board.bf +++ b/BeefTools/BeefPerf/src/Board.bf @@ -3,7 +3,7 @@ using Beefy; using Beefy.gfx; using Beefy.widgets; using Beefy.geom; -using System.Collections.Generic; +using System.Collections; using Beefy.utils; using System.Diagnostics; using Beefy.theme.dark; diff --git a/BeefTools/BeefPerf/src/BpStateContext.bf b/BeefTools/BeefPerf/src/BpStateContext.bf index 8e1fbd52..236bc301 100644 --- a/BeefTools/BeefPerf/src/BpStateContext.bf +++ b/BeefTools/BeefPerf/src/BpStateContext.bf @@ -1,6 +1,6 @@ using System.Threading; using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using Beefy; diff --git a/BeefTools/BeefPerf/src/CircularBuffer.bf b/BeefTools/BeefPerf/src/CircularBuffer.bf index 413f8e0e..087bf65c 100644 --- a/BeefTools/BeefPerf/src/CircularBuffer.bf +++ b/BeefTools/BeefPerf/src/CircularBuffer.bf @@ -1,6 +1,6 @@ using System; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace BeefPerf { diff --git a/BeefTools/BeefPerf/src/FindPanel.bf b/BeefTools/BeefPerf/src/FindPanel.bf index 28b5c7d1..4489a16b 100644 --- a/BeefTools/BeefPerf/src/FindPanel.bf +++ b/BeefTools/BeefPerf/src/FindPanel.bf @@ -1,7 +1,7 @@ using Beefy.widgets; using Beefy.theme.dark; using Beefy.gfx; -using System.Collections.Generic; +using System.Collections; using System; using Beefy.events; using Beefy; diff --git a/BeefTools/BeefPerf/src/MainFrame.bf b/BeefTools/BeefPerf/src/MainFrame.bf index 24b379be..de8643c3 100644 --- a/BeefTools/BeefPerf/src/MainFrame.bf +++ b/BeefTools/BeefPerf/src/MainFrame.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/BeefTools/BeefPerf/src/PerfView.bf b/BeefTools/BeefPerf/src/PerfView.bf index a9a8e8e9..fc12f6ae 100644 --- a/BeefTools/BeefPerf/src/PerfView.bf +++ b/BeefTools/BeefPerf/src/PerfView.bf @@ -1,7 +1,7 @@ using Beefy.widgets; using Beefy.gfx; using Beefy.theme.dark; -using System.Collections.Generic; +using System.Collections; using System; using Beefy.geom; using System.Diagnostics; diff --git a/BeefTools/BeefPerf/src/ProfilePanel.bf b/BeefTools/BeefPerf/src/ProfilePanel.bf index 965bc4f0..36482056 100644 --- a/BeefTools/BeefPerf/src/ProfilePanel.bf +++ b/BeefTools/BeefPerf/src/ProfilePanel.bf @@ -1,7 +1,7 @@ using Beefy.widgets; using Beefy.theme.dark; using Beefy.gfx; -using System.Collections.Generic; +using System.Collections; using System; using System.Diagnostics; using Beefy.events; diff --git a/BeefTools/BeefPerf/src/ScriptManager.bf b/BeefTools/BeefPerf/src/ScriptManager.bf index 0aa1e203..927cc07f 100644 --- a/BeefTools/BeefPerf/src/ScriptManager.bf +++ b/BeefTools/BeefPerf/src/ScriptManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Reflection; using System.IO; using System.Diagnostics; diff --git a/BeefTools/LogViewer/src/Board.bf b/BeefTools/LogViewer/src/Board.bf index 162b732f..a76b8e37 100644 --- a/BeefTools/LogViewer/src/Board.bf +++ b/BeefTools/LogViewer/src/Board.bf @@ -5,7 +5,7 @@ using System; using System.IO; using Beefy.utils; using System.Threading; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace LogViewer diff --git a/BeefTools/MemProfiler/Board.bf b/BeefTools/MemProfiler/Board.bf index 61a3de58..74964e50 100644 --- a/BeefTools/MemProfiler/Board.bf +++ b/BeefTools/MemProfiler/Board.bf @@ -3,7 +3,7 @@ using Beefy; using Beefy.gfx; using Beefy.widgets; using Beefy.geom; -using System.Collections.Generic; +using System.Collections; using Beefy.utils; using System.Diagnostics; using Beefy.theme.dark; diff --git a/BeefTools/RandoCode/src/Program.bf b/BeefTools/RandoCode/src/Program.bf index 1dc464bd..6591e924 100644 --- a/BeefTools/RandoCode/src/Program.bf +++ b/BeefTools/RandoCode/src/Program.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.IO; using System.Threading.Tasks; diff --git a/BeefTools/TestDLL/TestDLL.cpp b/BeefTools/TestDLL/TestDLL.cpp index db6e90d2..57ff62f5 100644 --- a/BeefTools/TestDLL/TestDLL.cpp +++ b/BeefTools/TestDLL/TestDLL.cpp @@ -202,11 +202,23 @@ __declspec(dllexport) void Test2(int aa, int bb, int cc, int dd) int c = 345; } -extern "C" -__declspec(dllexport) void Test3(int a, int b) +struct ALLEGRO_COLOR { - - + float r, g, b, a; +}; + +extern "C" +__declspec(dllexport) void Test4(void* ptr, ALLEGRO_COLOR* colorPtr) +{ + printf("Color: %f %f %f %f\n", colorPtr->r, colorPtr->g, colorPtr->b, colorPtr->a); +} + +extern "C" +__declspec(dllexport) void Test3(void* ptr, ALLEGRO_COLOR color) +{ + printf("Color: %f %f %f %f\n", color.r, color.g, color.b, color.a); + + Test4(ptr, &color); //printf("Hey!\n"); diff --git a/IDE/BeefProj.toml b/IDE/BeefProj.toml index 5248f3d7..39b94f1a 100644 --- a/IDE/BeefProj.toml +++ b/IDE/BeefProj.toml @@ -48,7 +48,7 @@ OtherLinkFlags = "" TargetDirectory = "$(WorkspaceDir)/dist" TargetName = "BeefIDE_d2" OtherLinkFlags = "$(LinkFlags) Comdlg32.lib kernel32.lib user32.lib advapi32.lib shell32.lib IDEHelper64_d.lib BeefySysLib64_d.lib wsock32.lib" -DebugCommandArguments = "-workspace=c:\\Beef\\IDE\\mintest" +DebugCommandArguments = "-workspace=c:\\beef\\ide\\mintest" DebugWorkingDirectory = "$(ProjectDir)\\dist" EnvironmentVars = ["_NO_DEBUG_HEAP=1"] diff --git a/IDE/Tests/DebuggerTest01/src/Container.bf b/IDE/Tests/DebuggerTest01/src/Container.bf index 4e830774..ec5d84a6 100644 --- a/IDE/Tests/DebuggerTest01/src/Container.bf +++ b/IDE/Tests/DebuggerTest01/src/Container.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System; namespace Test diff --git a/IDE/mintest/minlib/src/System/Array.bf b/IDE/mintest/minlib/src/System/Array.bf index fb705cd7..3ccd66a4 100644 --- a/IDE/mintest/minlib/src/System/Array.bf +++ b/IDE/mintest/minlib/src/System/Array.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System @@ -22,7 +22,7 @@ namespace System [Inline] set { - // We only allow reducing the length - consider using System.Collections.Generic.List when dynamic sizing is required + // We only allow reducing the length - consider using System.Collections.List when dynamic sizing is required Runtime.Assert(value <= mLength); mLength = (.)value; } diff --git a/IDE/mintest/minlib/src/System/Collections/IEnumerator.bf b/IDE/mintest/minlib/src/System/Collections/IEnumerator.bf index 0a9ad699..ae4ef97b 100644 --- a/IDE/mintest/minlib/src/System/Collections/IEnumerator.bf +++ b/IDE/mintest/minlib/src/System/Collections/IEnumerator.bf @@ -16,7 +16,7 @@ namespace System.Collections } } -namespace System.Collections.Generic +namespace System.Collections { interface IEnumerator { diff --git a/IDE/mintest/minlib/src/System/Collections/Generic/List.bf b/IDE/mintest/minlib/src/System/Collections/List.bf similarity index 99% rename from IDE/mintest/minlib/src/System/Collections/Generic/List.bf rename to IDE/mintest/minlib/src/System/Collections/List.bf index f365a8f8..1d7c649a 100644 --- a/IDE/mintest/minlib/src/System/Collections/Generic/List.bf +++ b/IDE/mintest/minlib/src/System/Collections/List.bf @@ -12,7 +12,7 @@ using System.Diagnostics.Contracts; using System.Threading; using System.Reflection; -namespace System.Collections.Generic +namespace System.Collections { interface IList { diff --git a/IDE/mintest/minlib/src/System/Collections/Generic/Sorter.bf b/IDE/mintest/minlib/src/System/Collections/Sorter.bf similarity index 99% rename from IDE/mintest/minlib/src/System/Collections/Generic/Sorter.bf rename to IDE/mintest/minlib/src/System/Collections/Sorter.bf index 64ff0024..7caa21be 100644 --- a/IDE/mintest/minlib/src/System/Collections/Generic/Sorter.bf +++ b/IDE/mintest/minlib/src/System/Collections/Sorter.bf @@ -2,7 +2,7 @@ // of an open-sourcing initiative in 2014 of the C# core libraries. // The original source was submitted to https://github.com/Microsoft/referencesource -namespace System.Collections.Generic +namespace System.Collections { struct Sorter { diff --git a/IDE/mintest/minlib/src/System/Event.bf b/IDE/mintest/minlib/src/System/Event.bf index e38b8cc9..96a27176 100644 --- a/IDE/mintest/minlib/src/System/Event.bf +++ b/IDE/mintest/minlib/src/System/Event.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/IDE/mintest/minlib/src/System/Internal.bf b/IDE/mintest/minlib/src/System/Internal.bf index 24eafddf..b415a7a8 100644 --- a/IDE/mintest/minlib/src/System/Internal.bf +++ b/IDE/mintest/minlib/src/System/Internal.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System.Reflection; namespace System diff --git a/IDE/mintest/minlib/src/System/Nullable.bf b/IDE/mintest/minlib/src/System/Nullable.bf index 0132f2a4..de4516ae 100644 --- a/IDE/mintest/minlib/src/System/Nullable.bf +++ b/IDE/mintest/minlib/src/System/Nullable.bf @@ -1,5 +1,5 @@ using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/IDE/mintest/minlib/src/System/Object.bf b/IDE/mintest/minlib/src/System/Object.bf index 97c6d241..7b72737b 100644 --- a/IDE/mintest/minlib/src/System/Object.bf +++ b/IDE/mintest/minlib/src/System/Object.bf @@ -1,6 +1,6 @@ using System; using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/IDE/mintest/minlib/src/System/Reflection/FieldInfo.bf b/IDE/mintest/minlib/src/System/Reflection/FieldInfo.bf index 3695ed2f..482f7733 100644 --- a/IDE/mintest/minlib/src/System/Reflection/FieldInfo.bf +++ b/IDE/mintest/minlib/src/System/Reflection/FieldInfo.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; namespace System.Reflection { diff --git a/IDE/mintest/minlib/src/System/Span.bf b/IDE/mintest/minlib/src/System/Span.bf index e17feb9c..292d0739 100644 --- a/IDE/mintest/minlib/src/System/Span.bf +++ b/IDE/mintest/minlib/src/System/Span.bf @@ -1,5 +1,5 @@ using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/IDE/mintest/minlib/src/System/String.bf b/IDE/mintest/minlib/src/System/String.bf index 5385f451..508bb39e 100644 --- a/IDE/mintest/minlib/src/System/String.bf +++ b/IDE/mintest/minlib/src/System/String.bf @@ -1,5 +1,5 @@ using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace System { diff --git a/IDE/mintest/minlib/src/System/Type.bf b/IDE/mintest/minlib/src/System/Type.bf index fe811010..6a7cece5 100644 --- a/IDE/mintest/minlib/src/System/Type.bf +++ b/IDE/mintest/minlib/src/System/Type.bf @@ -1,6 +1,6 @@ using System; using System.Reflection; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; namespace System diff --git a/IDE/mintest/src/main.bf b/IDE/mintest/src/main.bf index 022f47dd..9336c4c3 100644 --- a/IDE/mintest/src/main.bf +++ b/IDE/mintest/src/main.bf @@ -12,9 +12,9 @@ //using IDE; using System; //using System.Threading; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; using System.Collections; using System.Threading; @@ -237,7 +237,8 @@ namespace Hey.Dude.Bro public static int Main(String[] args) { - Blurg.Hey(); + for (int i < 10) + Blurg.Hey(); return 1; } diff --git a/IDE/mintest/src/main2.bf b/IDE/mintest/src/main2.bf index df87d4d5..c86bc3cf 100644 --- a/IDE/mintest/src/main2.bf +++ b/IDE/mintest/src/main2.bf @@ -1,17 +1,42 @@ -// more text at the end of the first line. This is more text. +using System; using System; -class Pooble + + +class Program { - public void Test(int abcdefgh, int abcdefgh2, int abcdefgh3, int abcdefgh4, int abcdefgh5, int abcdefgh6, int abcdefgh7, int abcdefgh8) - { - } + private function bool on_send_recv_delegate(uint8* data, ref int length); - public static float sVal = 9; + struct plugin_header + { + public on_send_recv_delegate on_recv; + public on_send_recv_delegate on_send; + } - public static mixin Zorp(var z) - { - z * sVal - } + private static bool on_recv(uint8* data, ref int length) + { + //Console.WriteLine(scope String().AppendF("RECV\tID: {}", data[0])); + return true; + } + + private static bool on_send(uint8* data, ref int length) + { + //Console.WriteLine(scope String().AppendF("SEND\tID: {}", data[0])); + return true; + } + + + [CLink] + [Export] + public static void Install(void* ptr) + { + plugin_header* plugin = (plugin_header*) ptr; + + plugin.on_recv = => on_recv; + plugin.on_send = => on_send; + + //Console.WriteLine("INSTALLED!!!"); + } } + diff --git a/IDE/mintest/src/main3.bf b/IDE/mintest/src/main3.bf index 4fe86906..8606bb39 100644 --- a/IDE/mintest/src/main3.bf +++ b/IDE/mintest/src/main3.bf @@ -3,41 +3,29 @@ using System; using System.Diagnostics; using System.Threading; -using System.Collections.Generic; - -struct Smibbs -{ - public int16 mX = 11; - public int16 mY = 22; - public int16 mZ = 33; -} - -namespace PropertyStructCrash -{ - struct B - { - public int c; - } - - struct A - { - public B Prop { get; set; } - } - - class Program - { - public static void Main() - { - var c = '¥'; - } - } -} +using System.Collections; struct Blurg { public static void Hey() { - PropertyStructCrash.Program.Main(); + } + } +struct StructA +{ + public int mA = 99; +} + +/*namespace System +{ + extension String + { + public String SubText(String input, int position, int length) + { + return 0; + } + } +}*/ \ No newline at end of file diff --git a/IDE/src/BeefConfig.bf b/IDE/src/BeefConfig.bf index 89ae68f7..959f9720 100644 --- a/IDE/src/BeefConfig.bf +++ b/IDE/src/BeefConfig.bf @@ -1,6 +1,6 @@ using IDE.Util; using System; -using System.Collections.Generic; +using System.Collections; using System.IO; using Beefy.utils; diff --git a/IDE/src/Board.bf b/IDE/src/Board.bf index 4ec6c773..85c93d83 100644 --- a/IDE/src/Board.bf +++ b/IDE/src/Board.bf @@ -1,7 +1,7 @@ #if false using System; -using System.Collections.Generic; +using System.Collections; using System.Linq; using System.Text; using System.Diagnostics; diff --git a/IDE/src/BookmarkManager.bf b/IDE/src/BookmarkManager.bf index 4049cccb..c921fde1 100644 --- a/IDE/src/BookmarkManager.bf +++ b/IDE/src/BookmarkManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using IDE.ui; diff --git a/IDE/src/BuildContext.bf b/IDE/src/BuildContext.bf index 54f209ed..8d5f5faa 100644 --- a/IDE/src/BuildContext.bf +++ b/IDE/src/BuildContext.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System; using IDE.Compiler; using System.IO; diff --git a/IDE/src/Clang/ClangCompiler.bf b/IDE/src/Clang/ClangCompiler.bf index d16a8bbd..224d4e5c 100644 --- a/IDE/src/Clang/ClangCompiler.bf +++ b/IDE/src/Clang/ClangCompiler.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/Clang/ClangHelper.bf b/IDE/src/Clang/ClangHelper.bf index 668bbafe..900e2f41 100644 --- a/IDE/src/Clang/ClangHelper.bf +++ b/IDE/src/Clang/ClangHelper.bf @@ -1,7 +1,7 @@ #if false using System; -using System.Collections.Generic; +using System.Collections; using System.Linq; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/CmdTarget.bf b/IDE/src/CmdTarget.bf index aca61331..69909c55 100644 --- a/IDE/src/CmdTarget.bf +++ b/IDE/src/CmdTarget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace IDE { diff --git a/IDE/src/CommandQueueManager.bf b/IDE/src/CommandQueueManager.bf index f0fcdde2..d083b799 100644 --- a/IDE/src/CommandQueueManager.bf +++ b/IDE/src/CommandQueueManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/IDE/src/Commands.bf b/IDE/src/Commands.bf index d3d531cd..abf9dada 100644 --- a/IDE/src/Commands.bf +++ b/IDE/src/Commands.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using Beefy.widgets; using Beefy.sys; diff --git a/IDE/src/Compiler/BfCompiler.bf b/IDE/src/Compiler/BfCompiler.bf index da016b6d..3b86b3af 100644 --- a/IDE/src/Compiler/BfCompiler.bf +++ b/IDE/src/Compiler/BfCompiler.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Threading; diff --git a/IDE/src/Compiler/BfParser.bf b/IDE/src/Compiler/BfParser.bf index a1f01378..725201c6 100644 --- a/IDE/src/Compiler/BfParser.bf +++ b/IDE/src/Compiler/BfParser.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/Compiler/BfPassInstance.bf b/IDE/src/Compiler/BfPassInstance.bf index ef95b352..8d44a162 100644 --- a/IDE/src/Compiler/BfPassInstance.bf +++ b/IDE/src/Compiler/BfPassInstance.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.utils; diff --git a/IDE/src/Compiler/BfProject.bf b/IDE/src/Compiler/BfProject.bf index f44bcd2d..66b598ad 100644 --- a/IDE/src/Compiler/BfProject.bf +++ b/IDE/src/Compiler/BfProject.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/Compiler/BfResolveHelper.bf b/IDE/src/Compiler/BfResolveHelper.bf index 51c21b0d..04efa453 100644 --- a/IDE/src/Compiler/BfResolveHelper.bf +++ b/IDE/src/Compiler/BfResolveHelper.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/Compiler/BfResolvePassData.bf b/IDE/src/Compiler/BfResolvePassData.bf index bc078f52..7e088594 100644 --- a/IDE/src/Compiler/BfResolvePassData.bf +++ b/IDE/src/Compiler/BfResolvePassData.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/Compiler/BfSystem.bf b/IDE/src/Compiler/BfSystem.bf index 8508a339..40d762a9 100644 --- a/IDE/src/Compiler/BfSystem.bf +++ b/IDE/src/Compiler/BfSystem.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading; using System.Threading.Tasks; diff --git a/IDE/src/Compiler/CompilerBase.bf b/IDE/src/Compiler/CompilerBase.bf index 310b78ae..e975ce8e 100644 --- a/IDE/src/Compiler/CompilerBase.bf +++ b/IDE/src/Compiler/CompilerBase.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Threading; diff --git a/IDE/src/CompositeFile.bf b/IDE/src/CompositeFile.bf index 33101d14..5b9288ca 100644 --- a/IDE/src/CompositeFile.bf +++ b/IDE/src/CompositeFile.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System; using Beefy; using System.IO; diff --git a/IDE/src/Debugger/Breakpoint.bf b/IDE/src/Debugger/Breakpoint.bf index 5f63cdbb..9231c610 100644 --- a/IDE/src/Debugger/Breakpoint.bf +++ b/IDE/src/Debugger/Breakpoint.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/Debugger/DebugManager.bf b/IDE/src/Debugger/DebugManager.bf index e85a228d..1dab1e34 100644 --- a/IDE/src/Debugger/DebugManager.bf +++ b/IDE/src/Debugger/DebugManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/Debugger/Profiler.bf b/IDE/src/Debugger/Profiler.bf index e8f2492c..3cd60676 100644 --- a/IDE/src/Debugger/Profiler.bf +++ b/IDE/src/Debugger/Profiler.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/Debugger/StepFilter.bf b/IDE/src/Debugger/StepFilter.bf index 280cafb0..58c6809f 100644 --- a/IDE/src/Debugger/StepFilter.bf +++ b/IDE/src/Debugger/StepFilter.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/FileEditData.bf b/IDE/src/FileEditData.bf index eadab598..7298a678 100644 --- a/IDE/src/FileEditData.bf +++ b/IDE/src/FileEditData.bf @@ -2,7 +2,7 @@ using IDE.ui; using System; using System.IO; using Beefy.utils; -using System.Collections.Generic; +using System.Collections; using System.Security.Cryptography; using IDE.util; diff --git a/IDE/src/FileWatcher.bf b/IDE/src/FileWatcher.bf index df0fbbbd..500268bd 100644 --- a/IDE/src/FileWatcher.bf +++ b/IDE/src/FileWatcher.bf @@ -1,6 +1,6 @@ using System; using System.Collections; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.IO; diff --git a/IDE/src/HistoryManager.bf b/IDE/src/HistoryManager.bf index f34cf4b7..cd93ada9 100644 --- a/IDE/src/HistoryManager.bf +++ b/IDE/src/HistoryManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using IDE.ui; diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf index c766dab9..8bba43dc 100644 --- a/IDE/src/IDEApp.bf +++ b/IDE/src/IDEApp.bf @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography; using System.Text; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.IO; using System.Reflection; diff --git a/IDE/src/IDEUtils.bf b/IDE/src/IDEUtils.bf index b726b743..3aef16e8 100644 --- a/IDE/src/IDEUtils.bf +++ b/IDE/src/IDEUtils.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.IO; diff --git a/IDE/src/IPCHelper.bf b/IDE/src/IPCHelper.bf index 52279d21..cf6d144e 100644 --- a/IDE/src/IPCHelper.bf +++ b/IDE/src/IPCHelper.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace IDE { diff --git a/IDE/src/Popup.bf b/IDE/src/Popup.bf index 34dbca36..35db7457 100644 --- a/IDE/src/Popup.bf +++ b/IDE/src/Popup.bf @@ -1,7 +1,7 @@ #if false using System; -using System.Collections.Generic; +using System.Collections; using System.Linq; using System.Text; using Beefy.widgets; diff --git a/IDE/src/Program.bf b/IDE/src/Program.bf index c265a718..09a2c2ac 100644 --- a/IDE/src/Program.bf +++ b/IDE/src/Program.bf @@ -1,6 +1,6 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading; using System.Diagnostics; @@ -14,7 +14,7 @@ namespace IDE { public class Program { - //System.Collections.Generic.List list; + //System.Collections.List list; static int32 Main(String[] args) { #if SMALLTEST diff --git a/IDE/src/Project.bf b/IDE/src/Project.bf index 0eb35816..7c65400b 100644 --- a/IDE/src/Project.bf +++ b/IDE/src/Project.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.IO; using System.Diagnostics; diff --git a/IDE/src/ScriptManager.bf b/IDE/src/ScriptManager.bf index b24ca91d..c19d295f 100644 --- a/IDE/src/ScriptManager.bf +++ b/IDE/src/ScriptManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Reflection; using System.IO; using System.Diagnostics; diff --git a/IDE/src/Settings.bf b/IDE/src/Settings.bf index 8c04e8a7..1e0095e2 100644 --- a/IDE/src/Settings.bf +++ b/IDE/src/Settings.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System; using Beefy.gfx; using Beefy.geom; diff --git a/IDE/src/SimpleProgram.bf b/IDE/src/SimpleProgram.bf index ceb0c63d..73012504 100644 --- a/IDE/src/SimpleProgram.bf +++ b/IDE/src/SimpleProgram.bf @@ -3,7 +3,7 @@ using System; using Beefy; using Beefy.utils; -using System.Collections.Generic; +using System.Collections; using Beefy.widgets; using System.Diagnostics; using Beefy.res; diff --git a/IDE/src/SpellChecker.bf b/IDE/src/SpellChecker.bf index 6331d907..b0fc657e 100644 --- a/IDE/src/SpellChecker.bf +++ b/IDE/src/SpellChecker.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.IO; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/Targets.bf b/IDE/src/Targets.bf index 1357dce7..cfcfd74b 100644 --- a/IDE/src/Targets.bf +++ b/IDE/src/Targets.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/TestManager.bf b/IDE/src/TestManager.bf index bc367eb8..856503b3 100644 --- a/IDE/src/TestManager.bf +++ b/IDE/src/TestManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Threading; using System.IO; diff --git a/IDE/src/WakaTime.bf b/IDE/src/WakaTime.bf index 949acfde..1126f950 100644 --- a/IDE/src/WakaTime.bf +++ b/IDE/src/WakaTime.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.IO; using System.Text; diff --git a/IDE/src/Workspace.bf b/IDE/src/Workspace.bf index 307f5339..03c0d576 100644 --- a/IDE/src/Workspace.bf +++ b/IDE/src/Workspace.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/AttachDialog.bf b/IDE/src/ui/AttachDialog.bf index 004507ea..ca6d0b8a 100644 --- a/IDE/src/ui/AttachDialog.bf +++ b/IDE/src/ui/AttachDialog.bf @@ -1,6 +1,6 @@ using System; using System.Threading; -using System.Collections.Generic; +using System.Collections; using Beefy.events; using Beefy.widgets; using Beefy.theme.dark; diff --git a/IDE/src/ui/AutoComplete.bf b/IDE/src/ui/AutoComplete.bf index 0ccf105a..846d57a9 100644 --- a/IDE/src/ui/AutoComplete.bf +++ b/IDE/src/ui/AutoComplete.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/BinaryDataWidget.bf b/IDE/src/ui/BinaryDataWidget.bf index c6aef7dd..972ed17d 100644 --- a/IDE/src/ui/BinaryDataWidget.bf +++ b/IDE/src/ui/BinaryDataWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Globalization; diff --git a/IDE/src/ui/BreakpointPanel.bf b/IDE/src/ui/BreakpointPanel.bf index 474f68a6..2a1437e8 100644 --- a/IDE/src/ui/BreakpointPanel.bf +++ b/IDE/src/ui/BreakpointPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.IO; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/ui/BuildPropertiesDialog.bf b/IDE/src/ui/BuildPropertiesDialog.bf index b652faa2..b380c112 100644 --- a/IDE/src/ui/BuildPropertiesDialog.bf +++ b/IDE/src/ui/BuildPropertiesDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using Beefy.widgets; using Beefy.theme.dark; using Beefy.theme; diff --git a/IDE/src/ui/CallStackPanel.bf b/IDE/src/ui/CallStackPanel.bf index f72d3347..e44ce42b 100644 --- a/IDE/src/ui/CallStackPanel.bf +++ b/IDE/src/ui/CallStackPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/ClassViewPanel.bf b/IDE/src/ui/ClassViewPanel.bf index 19abbec7..dc02dc02 100644 --- a/IDE/src/ui/ClassViewPanel.bf +++ b/IDE/src/ui/ClassViewPanel.bf @@ -6,7 +6,7 @@ using Beefy.events; using Beefy.utils; using System.Diagnostics; using IDE.Compiler; -using System.Collections.Generic; +using System.Collections; using System.Threading; namespace IDE.ui diff --git a/IDE/src/ui/ConditionDialog.bf b/IDE/src/ui/ConditionDialog.bf index f769ab05..efd13222 100644 --- a/IDE/src/ui/ConditionDialog.bf +++ b/IDE/src/ui/ConditionDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/ui/DisassemblyPanel.bf b/IDE/src/ui/DisassemblyPanel.bf index e0a7f700..cd9c039c 100644 --- a/IDE/src/ui/DisassemblyPanel.bf +++ b/IDE/src/ui/DisassemblyPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; using System.Threading.Tasks; diff --git a/IDE/src/ui/ErrorsPanel.bf b/IDE/src/ui/ErrorsPanel.bf index e376e3c3..651dba35 100644 --- a/IDE/src/ui/ErrorsPanel.bf +++ b/IDE/src/ui/ErrorsPanel.bf @@ -1,7 +1,7 @@ using Beefy.widgets; using Beefy.theme.dark; using IDE.Compiler; -using System.Collections.Generic; +using System.Collections; using System.Threading; using System; using Beefy.gfx; @@ -276,7 +276,10 @@ namespace IDE.ui SetLabel(item, codeStr); let descItem = item.GetSubItem(1); - SetLabel(descItem, scope String(32)..Append(error.mError)); + String errStr = scope String(32)..Append(error.mError); + errStr.Replace('\n', ' '); + + SetLabel(descItem, errStr); let projectItem = item.GetSubItem(2); SetLabel(projectItem, error.mProject); diff --git a/IDE/src/ui/FileChangedDialog.bf b/IDE/src/ui/FileChangedDialog.bf index aaa0f8c5..0cd98092 100644 --- a/IDE/src/ui/FileChangedDialog.bf +++ b/IDE/src/ui/FileChangedDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.IO; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/ui/FindAndReplaceDialog.bf b/IDE/src/ui/FindAndReplaceDialog.bf index c2c106b4..1a4d6595 100644 --- a/IDE/src/ui/FindAndReplaceDialog.bf +++ b/IDE/src/ui/FindAndReplaceDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/FindResultsPanel.bf b/IDE/src/ui/FindResultsPanel.bf index f35be998..24fad57b 100644 --- a/IDE/src/ui/FindResultsPanel.bf +++ b/IDE/src/ui/FindResultsPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/GoToAddressDialog.bf b/IDE/src/ui/GoToAddressDialog.bf index 27035e34..e9a2e981 100644 --- a/IDE/src/ui/GoToAddressDialog.bf +++ b/IDE/src/ui/GoToAddressDialog.bf @@ -2,7 +2,7 @@ using Beefy.theme.dark; using Beefy.widgets; using Beefy.gfx; using System; -using System.Collections.Generic; +using System.Collections; using IDE.Debugger; namespace IDE.ui diff --git a/IDE/src/ui/GoToLineDialog.bf b/IDE/src/ui/GoToLineDialog.bf index 7970d67c..4549cb05 100644 --- a/IDE/src/ui/GoToLineDialog.bf +++ b/IDE/src/ui/GoToLineDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/HoverWatch.bf b/IDE/src/ui/HoverWatch.bf index 2b683f78..0e8be796 100644 --- a/IDE/src/ui/HoverWatch.bf +++ b/IDE/src/ui/HoverWatch.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/IDEListView.bf b/IDE/src/ui/IDEListView.bf index a2f3ae20..820eb64c 100644 --- a/IDE/src/ui/IDEListView.bf +++ b/IDE/src/ui/IDEListView.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/ui/ImmediatePanel.bf b/IDE/src/ui/ImmediatePanel.bf index aed03c4d..c27fefe0 100644 --- a/IDE/src/ui/ImmediatePanel.bf +++ b/IDE/src/ui/ImmediatePanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/ImmediateWidget.bf b/IDE/src/ui/ImmediateWidget.bf index 0f72e6e3..1151fe1f 100644 --- a/IDE/src/ui/ImmediateWidget.bf +++ b/IDE/src/ui/ImmediateWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/InstalledProjectDialog.bf b/IDE/src/ui/InstalledProjectDialog.bf index d8d1bb10..2c0e6297 100644 --- a/IDE/src/ui/InstalledProjectDialog.bf +++ b/IDE/src/ui/InstalledProjectDialog.bf @@ -2,7 +2,7 @@ using Beefy.theme.dark; using Beefy.widgets; using Beefy.events; using System; -using System.Collections.Generic; +using System.Collections; using Beefy.gfx; using IDE.Util; using System.IO; diff --git a/IDE/src/ui/LaunchDialog.bf b/IDE/src/ui/LaunchDialog.bf index 383e196c..bde4b6ee 100644 --- a/IDE/src/ui/LaunchDialog.bf +++ b/IDE/src/ui/LaunchDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/LeakWidget.bf b/IDE/src/ui/LeakWidget.bf index 6fd99514..32d59031 100644 --- a/IDE/src/ui/LeakWidget.bf +++ b/IDE/src/ui/LeakWidget.bf @@ -3,7 +3,7 @@ using Beefy.gfx; using Beefy.geom; using Beefy.theme.dark; using System; -using System.Collections.Generic; +using System.Collections; namespace IDE.ui { diff --git a/IDE/src/ui/LocatorAnim.bf b/IDE/src/ui/LocatorAnim.bf index 31a93542..15905a0c 100644 --- a/IDE/src/ui/LocatorAnim.bf +++ b/IDE/src/ui/LocatorAnim.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/MainFrame.bf b/IDE/src/ui/MainFrame.bf index fe9d8d31..966e9872 100644 --- a/IDE/src/ui/MainFrame.bf +++ b/IDE/src/ui/MainFrame.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/MemoryPanel.bf b/IDE/src/ui/MemoryPanel.bf index cc09ea65..3db8cefc 100644 --- a/IDE/src/ui/MemoryPanel.bf +++ b/IDE/src/ui/MemoryPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Globalization; diff --git a/IDE/src/ui/MultiSelectDialog.bf b/IDE/src/ui/MultiSelectDialog.bf index df145829..66643f06 100644 --- a/IDE/src/ui/MultiSelectDialog.bf +++ b/IDE/src/ui/MultiSelectDialog.bf @@ -1,6 +1,6 @@ using Beefy.widgets; using System; -using System.Collections.Generic; +using System.Collections; using Beefy.theme.dark; using Beefy.gfx; using Beefy.events; diff --git a/IDE/src/ui/NavigationBar.bf b/IDE/src/ui/NavigationBar.bf index 2e94743d..73b9b303 100644 --- a/IDE/src/ui/NavigationBar.bf +++ b/IDE/src/ui/NavigationBar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.events; diff --git a/IDE/src/ui/NewBreakpointDialog.bf b/IDE/src/ui/NewBreakpointDialog.bf index 6ec4104e..812bc978 100644 --- a/IDE/src/ui/NewBreakpointDialog.bf +++ b/IDE/src/ui/NewBreakpointDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/ui/NewProjectDialog.bf b/IDE/src/ui/NewProjectDialog.bf index 8b293a41..b8dc1c4f 100644 --- a/IDE/src/ui/NewProjectDialog.bf +++ b/IDE/src/ui/NewProjectDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.IO; diff --git a/IDE/src/ui/OpenFileInSolutionDialog.bf b/IDE/src/ui/OpenFileInSolutionDialog.bf index 98bcdc0d..e5019a70 100644 --- a/IDE/src/ui/OpenFileInSolutionDialog.bf +++ b/IDE/src/ui/OpenFileInSolutionDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.IO; using System.Text; using System.Threading; diff --git a/IDE/src/ui/OutputPanel.bf b/IDE/src/ui/OutputPanel.bf index 2f5c1646..2bfac320 100644 --- a/IDE/src/ui/OutputPanel.bf +++ b/IDE/src/ui/OutputPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/OutputWidget.bf b/IDE/src/ui/OutputWidget.bf index da291687..bb623258 100644 --- a/IDE/src/ui/OutputWidget.bf +++ b/IDE/src/ui/OutputWidget.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/Panel.bf b/IDE/src/ui/Panel.bf index cd5d2016..df7c2a95 100644 --- a/IDE/src/ui/Panel.bf +++ b/IDE/src/ui/Panel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/PanelHeader.bf b/IDE/src/ui/PanelHeader.bf index 63ca43aa..0cd8616f 100644 --- a/IDE/src/ui/PanelHeader.bf +++ b/IDE/src/ui/PanelHeader.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/ui/PathEditWidget.bf b/IDE/src/ui/PathEditWidget.bf index 08c55f57..cdcef731 100644 --- a/IDE/src/ui/PathEditWidget.bf +++ b/IDE/src/ui/PathEditWidget.bf @@ -3,7 +3,7 @@ using System; using System.IO; using System.Threading.Tasks; using System.Threading; -using System.Collections.Generic; +using System.Collections; namespace IDE.ui { diff --git a/IDE/src/ui/PersistentTextPosition.bf b/IDE/src/ui/PersistentTextPosition.bf index 3fca364d..0505835a 100644 --- a/IDE/src/ui/PersistentTextPosition.bf +++ b/IDE/src/ui/PersistentTextPosition.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/ProfilePanel.bf b/IDE/src/ui/ProfilePanel.bf index dabcba64..92ed2cfc 100644 --- a/IDE/src/ui/ProfilePanel.bf +++ b/IDE/src/ui/ProfilePanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/ProjectPanel.bf b/IDE/src/ui/ProjectPanel.bf index 871b88f1..e677f9f2 100644 --- a/IDE/src/ui/ProjectPanel.bf +++ b/IDE/src/ui/ProjectPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using Beefy.widgets; using Beefy.gfx; diff --git a/IDE/src/ui/ProjectProperties.bf b/IDE/src/ui/ProjectProperties.bf index cceb26af..64436583 100644 --- a/IDE/src/ui/ProjectProperties.bf +++ b/IDE/src/ui/ProjectProperties.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Diagnostics; diff --git a/IDE/src/ui/PropertiesDialog.bf b/IDE/src/ui/PropertiesDialog.bf index 2898f59f..1bd4bcc3 100644 --- a/IDE/src/ui/PropertiesDialog.bf +++ b/IDE/src/ui/PropertiesDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Reflection; using System.Text; diff --git a/IDE/src/ui/PropertiesPanel.bf b/IDE/src/ui/PropertiesPanel.bf index e0519c58..4a7b6bcd 100644 --- a/IDE/src/ui/PropertiesPanel.bf +++ b/IDE/src/ui/PropertiesPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Reflection; using Beefy.gfx; diff --git a/IDE/src/ui/QuickFind.bf b/IDE/src/ui/QuickFind.bf index bcc4bfa9..9caf1bc5 100644 --- a/IDE/src/ui/QuickFind.bf +++ b/IDE/src/ui/QuickFind.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/RenameSymbolDialog.bf b/IDE/src/ui/RenameSymbolDialog.bf index ca7e89f1..02de7655 100644 --- a/IDE/src/ui/RenameSymbolDialog.bf +++ b/IDE/src/ui/RenameSymbolDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/SettingsDialog.bf b/IDE/src/ui/SettingsDialog.bf index a1f5c3c7..f4f9b646 100644 --- a/IDE/src/ui/SettingsDialog.bf +++ b/IDE/src/ui/SettingsDialog.bf @@ -1,7 +1,7 @@ using System; using Beefy.theme.dark; using Beefy.gfx; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using Beefy.geom; diff --git a/IDE/src/ui/SourceEditWidgetContent.bf b/IDE/src/ui/SourceEditWidgetContent.bf index ae33f4a0..916427f5 100644 --- a/IDE/src/ui/SourceEditWidgetContent.bf +++ b/IDE/src/ui/SourceEditWidgetContent.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Threading; diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf index e7ca9b5d..cc737f4c 100644 --- a/IDE/src/ui/SourceViewPanel.bf +++ b/IDE/src/ui/SourceViewPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using System.Threading; diff --git a/IDE/src/ui/StatusBar.bf b/IDE/src/ui/StatusBar.bf index 00054bfe..fb033e87 100644 --- a/IDE/src/ui/StatusBar.bf +++ b/IDE/src/ui/StatusBar.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/TargetedPropertiesDialog.bf b/IDE/src/ui/TargetedPropertiesDialog.bf index bc706d81..26c4ac2b 100644 --- a/IDE/src/ui/TargetedPropertiesDialog.bf +++ b/IDE/src/ui/TargetedPropertiesDialog.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.widgets; diff --git a/IDE/src/ui/TextPanel.bf b/IDE/src/ui/TextPanel.bf index dce05b4f..c2874848 100644 --- a/IDE/src/ui/TextPanel.bf +++ b/IDE/src/ui/TextPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/ui/ThreadPanel.bf b/IDE/src/ui/ThreadPanel.bf index 6df86193..4e113d0d 100644 --- a/IDE/src/ui/ThreadPanel.bf +++ b/IDE/src/ui/ThreadPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/Tooltip.bf b/IDE/src/ui/Tooltip.bf index 6e101934..894f94fc 100644 --- a/IDE/src/ui/Tooltip.bf +++ b/IDE/src/ui/Tooltip.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy; diff --git a/IDE/src/ui/TypeWildcardEditWidget.bf b/IDE/src/ui/TypeWildcardEditWidget.bf index 1d512400..f10696f2 100644 --- a/IDE/src/ui/TypeWildcardEditWidget.bf +++ b/IDE/src/ui/TypeWildcardEditWidget.bf @@ -3,7 +3,7 @@ using System; using System.IO; using System.Threading.Tasks; using System.Threading; -using System.Collections.Generic; +using System.Collections; using Beefy.gfx; namespace IDE.ui diff --git a/IDE/src/ui/VirtualListView.bf b/IDE/src/ui/VirtualListView.bf index 0b8c2da2..282d6778 100644 --- a/IDE/src/ui/VirtualListView.bf +++ b/IDE/src/ui/VirtualListView.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.theme.dark; diff --git a/IDE/src/ui/WatchPanel.bf b/IDE/src/ui/WatchPanel.bf index 70bb186c..f074a3aa 100644 --- a/IDE/src/ui/WatchPanel.bf +++ b/IDE/src/ui/WatchPanel.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/ui/WorkspaceProperties.bf b/IDE/src/ui/WorkspaceProperties.bf index 7f4be782..1f31af25 100644 --- a/IDE/src/ui/WorkspaceProperties.bf +++ b/IDE/src/ui/WorkspaceProperties.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Threading.Tasks; using Beefy.gfx; diff --git a/IDE/src/util/Curl.bf b/IDE/src/util/Curl.bf index 22a04a96..4edf48fe 100644 --- a/IDE/src/util/Curl.bf +++ b/IDE/src/util/Curl.bf @@ -2,7 +2,7 @@ using System; using System.IO; using System.Threading; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace CURL { diff --git a/IDE/src/util/DefinesSet.bf b/IDE/src/util/DefinesSet.bf index f25af0cc..44f599d3 100644 --- a/IDE/src/util/DefinesSet.bf +++ b/IDE/src/util/DefinesSet.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace IDE.util { diff --git a/IDE/src/util/GlobalUndoManager.bf b/IDE/src/util/GlobalUndoManager.bf index 31e218b2..6f1a830f 100644 --- a/IDE/src/util/GlobalUndoManager.bf +++ b/IDE/src/util/GlobalUndoManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; using System.Diagnostics; using System.Text; using System.Threading.Tasks; diff --git a/IDE/src/util/RecentFiles.bf b/IDE/src/util/RecentFiles.bf index 1588179e..ffe8ce4e 100644 --- a/IDE/src/util/RecentFiles.bf +++ b/IDE/src/util/RecentFiles.bf @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections; using System; using System.IO; using Beefy.sys; diff --git a/IDE/src/util/ResourceGen.bf b/IDE/src/util/ResourceGen.bf index 7bb34732..88dc98be 100644 --- a/IDE/src/util/ResourceGen.bf +++ b/IDE/src/util/ResourceGen.bf @@ -1,6 +1,6 @@ using System; using System.IO; -using System.Collections.Generic; +using System.Collections; using System.Text; using System.Diagnostics; namespace IDE.util diff --git a/IDE/src/util/SettingHistoryManager.bf b/IDE/src/util/SettingHistoryManager.bf index 09413509..b45cc9e3 100644 --- a/IDE/src/util/SettingHistoryManager.bf +++ b/IDE/src/util/SettingHistoryManager.bf @@ -1,5 +1,5 @@ using System; -using System.Collections.Generic; +using System.Collections; namespace IDE.util { diff --git a/IDE/src/util/Transfer.bf b/IDE/src/util/Transfer.bf index 457786d6..d56dae28 100644 --- a/IDE/src/util/Transfer.bf +++ b/IDE/src/util/Transfer.bf @@ -3,7 +3,7 @@ using System; using System.IO; using System.Threading; using System.Diagnostics; -using System.Collections.Generic; +using System.Collections; namespace IDE.Util { diff --git a/IDEHelper/Compiler/BfCompiler.cpp b/IDEHelper/Compiler/BfCompiler.cpp index a0a45bdc..3e51efd0 100644 --- a/IDEHelper/Compiler/BfCompiler.cpp +++ b/IDEHelper/Compiler/BfCompiler.cpp @@ -3291,7 +3291,7 @@ void BfCompiler::UpdateRevisedTypes() // latestTypeDef->mOuterType = mSystem->GetOuterTypeNonPartial(latestTypeDef); // /*String fullName = typeDef->mFullNameEx.ToString(); - // if (fullName == "System.Collections.Generic.List`1.Enumerator`1") + // if (fullName == "System.Collections.List`1.Enumerator`1") // { // NOP; // } @@ -5941,9 +5941,9 @@ bool BfCompiler::DoCompile(const StringImpl& outputDirectory) mResultTypeDef = _GetRequiredType("System.Result", 1); mFunctionTypeDef = _GetRequiredType("System.Function"); mGCTypeDef = _GetRequiredType("System.GC"); - mGenericIEnumerableTypeDef = _GetRequiredType("System.Collections.Generic.IEnumerable"); - mGenericIEnumeratorTypeDef = _GetRequiredType("System.Collections.Generic.IEnumerator"); - mGenericIRefEnumeratorTypeDef = _GetRequiredType("System.Collections.Generic.IRefEnumerator"); + mGenericIEnumerableTypeDef = _GetRequiredType("System.Collections.IEnumerable", 1); + mGenericIEnumeratorTypeDef = _GetRequiredType("System.Collections.IEnumerator", 1); + mGenericIRefEnumeratorTypeDef = _GetRequiredType("System.Collections.IRefEnumerator", 1); mInlineAttributeTypeDef = _GetRequiredType("System.InlineAttribute"); mInternalTypeDef = _GetRequiredType("System.Internal"); mIDisposableTypeDef = _GetRequiredType("System.IDisposable"); diff --git a/IDEHelper/Tests/src/Extensions.bf b/IDEHelper/Tests/src/Extensions.bf index fd287a24..0da69dbd 100644 --- a/IDEHelper/Tests/src/Extensions.bf +++ b/IDEHelper/Tests/src/Extensions.bf @@ -2,7 +2,7 @@ using System; -namespace System.Collections.Generic +namespace System.Collections { extension List where T : Tests.Extensions.IGetExVal { @@ -18,7 +18,7 @@ namespace System.Collections.Generic } } -namespace System.Collections.Generic +namespace System.Collections { extension TClass { @@ -148,7 +148,7 @@ namespace Tests [Test] public static void TestList() { - System.Collections.Generic.List list = scope .(); + System.Collections.List list = scope .(); ImpGetExVal val0 = scope ImpGetExVal(); list.Add(val0); diff --git a/IDEHelper/Tests/src/Helper.bf b/IDEHelper/Tests/src/Helper.bf index 5dba3590..88216cb5 100644 --- a/IDEHelper/Tests/src/Helper.bf +++ b/IDEHelper/Tests/src/Helper.bf @@ -1,4 +1,4 @@ -namespace System.Collections.Generic +namespace System.Collections { class TClass : IDisposable {