DeleteDictionaryAndKeysAndItems to DeleteDictionaryAndKeysAndValues

BeefLibs/Beefy2D/src/gfx/Font.bf

@@ -53,8 +53,8 @@ namespace Beefy.gfx
 		[CallingConvention(.Stdcall), CLink]
 		static extern int32 FTFont_GetKerning(FTFont* font, int32 char8CodeA, int32 char8CodeB);
 
-		static Dictionary<String, String> sFontNameMap ~ DeleteDictionaryAndKeysAndItems!(_);
-		static Dictionary<String, String> sFontFailMap ~ DeleteDictionaryAndKeysAndItems!(_);
+		static Dictionary<String, String> sFontNameMap ~ DeleteDictionaryAndKeysAndValues!(_);
+		static Dictionary<String, String> sFontFailMap ~ DeleteDictionaryAndKeysAndValues!(_);
 		static Monitor sMonitor = new .() ~ delete _;
 
 		struct FTFont
@@ -201,7 +201,7 @@ namespace Beefy.gfx
 		{
 			using (sMonitor.Enter())
 			{
-				DeleteDictionaryAndKeysAndItems!(sFontNameMap);
+				DeleteDictionaryAndKeysAndValues!(sFontNameMap);
 				sFontNameMap = null;
 			}
 		}

BeefLibs/corlib/src/Diagnostics/ProcessStartInfo.bf

@@ -19,7 +19,7 @@ namespace System.Diagnostics
 		String mDirectory = new String() ~ delete _;
 		String mVerb = new String("Open") ~ delete _;
 
-		public Dictionary<String, String> mEnvironmentVariables ~ DeleteDictionaryAndKeysAndItems!(_); 
+		public Dictionary<String, String> mEnvironmentVariables ~ DeleteDictionaryAndKeysAndValues!(_); 
 
 		public bool UseShellExecute { get { return mUseShellExecute; } set { mUseShellExecute = value; } };
 		public bool RedirectStandardInput { get { return mRedirectStandardInput; } set { mRedirectStandardInput = value; } };

BeefLibs/corlib/src/PropertyBag.bf

@@ -4,7 +4,7 @@ namespace System
 {
 	class PropertyBag
 	{
-		public Dictionary<String, Object> mProperties ~ DeleteDictionaryAndKeysAndItems!(_);
+		public Dictionary<String, Object> mProperties ~ DeleteDictionaryAndKeysAndValues!(_);
 
 		public void Add<T>(String key, T value) where T : struct
 		{

BeefLibs/corlib/src/System.bf

@@ -153,7 +153,7 @@ static
 	}
 
 	[NoShow]
-	[Obsolete("This mixin has been replaced by ClearAndDeleteItems", false)]
+	[Obsolete("Replaced by ClearAndDeleteItems", false)]
 	public static mixin DeleteAndClearItems(var container)
 	{
 		for (var value in container)
@@ -187,7 +187,7 @@ static
 		}
 	}
 
-	public static mixin DeleteDictionaryAndItems(var container)
+	public static mixin DeleteDictionaryAndValues(var container)
 	{
 		if (container != null)
 		{
@@ -199,6 +199,8 @@ static
 		}
 	}
 
+	[NoShow]
+	[Obsolete("Replaced by DeleteDictionaryAndKeysAndValues", false)]
 	public static mixin DeleteDictionaryAndKeysAndItems(var container)
 	{
 		if (container != null)
@@ -212,6 +214,19 @@ static
 		}
 	}
 
+	public static mixin DeleteDictionaryAndKeysAndValues(var container)
+	{
+		if (container != null)
+		{
+			for (var value in container)
+			{
+				delete value.key;
+				delete value.value;
+			}
+			delete container;
+		}
+	}
+
 	public static mixin DeleteAndNullify(var val)
 	{
 		delete val;

BeefLibs/corlib/src/TimeZoneInfo.bf

@@ -224,7 +224,7 @@ namespace System {
             }
 
 #if FEATURE_WIN32_REGISTRY
-            public Dictionary<String, TimeZoneInfo> m_systemTimeZones ~ DeleteDictionaryAndKeysAndItems!(_);
+            public Dictionary<String, TimeZoneInfo> m_systemTimeZones ~ DeleteDictionaryAndKeysAndValues!(_);
             //public ReadOnlyCollection<TimeZoneInfo> m_readOnlySystemTimeZones;
             public bool m_allSystemTimeZonesRead;
 

IDE/src/CompositeFile.bf

@@ -14,7 +14,7 @@ namespace IDE
 		public Monitor mMonitor = new .() ~ delete _;
 		static String sVersionStr = "///@singleFileVersion ";
 		static String sSectionStr = "///@embed ";
-		public Dictionary<String, String> mData = new .() ~ DeleteDictionaryAndKeysAndItems!(_);
+		public Dictionary<String, String> mData = new .() ~ DeleteDictionaryAndKeysAndValues!(_);
 		public String mFilePath ~ delete _;
 		public bool mPendingSave;
 		public bool mHasChanges;

IDE/src/FileWatcher.bf

@@ -52,7 +52,7 @@ namespace IDE
         // One watcher per directory
 		public static int32 sDbgFileCreateDelay;
         Dictionary<String, WatcherEntry> mWatchers = new Dictionary<String, WatcherEntry>();
-        Dictionary<String, DepInfo> mWatchedFiles = new Dictionary<String, DepInfo>() ~ DeleteDictionaryAndKeysAndItems!(_); // Including ref count
+        Dictionary<String, DepInfo> mWatchedFiles = new Dictionary<String, DepInfo>() ~ DeleteDictionaryAndKeysAndValues!(_); // Including ref count
         List<ChangeRecord> mChangeList = new .() ~ DeleteContainerAndItems!(_);
 		Dictionary<String, ChangeRecord> mChangeMap = new .() ~ delete _;
         List<Object> mDependencyChangeList = new List<Object>() ~ delete _;

IDE/src/IDEApp.bf

@@ -446,7 +446,7 @@ namespace IDE
             public String mFileName ~ delete _;
             public String mArgs  ~ delete _;
             public String mWorkingDir  ~ delete _;
-			public Dictionary<String, String> mEnvVars ~ DeleteDictionaryAndKeysAndItems!(_);
+			public Dictionary<String, String> mEnvVars ~ DeleteDictionaryAndKeysAndValues!(_);
             public ArgsFileKind mUseArgsFile;
             public int32 mParallelGroup = -1;
 			public bool mIsTargetRun;

IDE/src/Project.bf

@@ -1253,7 +1253,7 @@ namespace IDE
 
         public class Config
         {
-            public Dictionary<String, Options> mPlatforms = new Dictionary<String, Options>() ~ DeleteDictionaryAndKeysAndItems!(_);
+            public Dictionary<String, Options> mPlatforms = new Dictionary<String, Options>() ~ DeleteDictionaryAndKeysAndValues!(_);
         }
 
 		public class Dependency
@@ -1284,7 +1284,7 @@ namespace IDE
         public int32 mCurResVer;
         public int32 mLastGeneratedResVer;
 
-        public Dictionary<String, Config> mConfigs = new Dictionary<String, Config>() ~ DeleteDictionaryAndKeysAndItems!(_);
+        public Dictionary<String, Config> mConfigs = new Dictionary<String, Config>() ~ DeleteDictionaryAndKeysAndValues!(_);
 		public GeneralOptions mGeneralOptions = new GeneralOptions() ~ delete _;
 		public BeefGlobalOptions mBeefGlobalOptions = new BeefGlobalOptions() ~ delete _;
 
@@ -1913,7 +1913,7 @@ namespace IDE
 				}
 			}
 
-			DeleteDictionaryAndKeysAndItems!(mConfigs);
+			DeleteDictionaryAndKeysAndValues!(mConfigs);
 			mConfigs = new Dictionary<String, Config>();
 
 			for (var configNameSV in data.Enumerate("Configs"))

IDE/src/ScriptManager.bf

@@ -39,8 +39,8 @@ namespace IDE
 				public Object mTargetObject;
 			}
 
-			public Dictionary<String, Target> mTargets = new .() ~ DeleteDictionaryAndKeysAndItems!(_);
-			public Dictionary<String, Cmd> mCmds = new .() ~ DeleteDictionaryAndKeysAndItems!(_);
+			public Dictionary<String, Target> mTargets = new .() ~ DeleteDictionaryAndKeysAndValues!(_);
+			public Dictionary<String, Cmd> mCmds = new .() ~ DeleteDictionaryAndKeysAndValues!(_);
 		}
 
 		public enum CmdFlags

IDE/src/Workspace.bf

@@ -314,11 +314,11 @@ namespace IDE
 
         public class Config
         {
-            public Dictionary<String, Options> mPlatforms = new Dictionary<String, Options>() ~ DeleteDictionaryAndKeysAndItems!(_);
+            public Dictionary<String, Options> mPlatforms = new Dictionary<String, Options>() ~ DeleteDictionaryAndKeysAndValues!(_);
         }
 
 		public BeefGlobalOptions mBeefGlobalOptions = new BeefGlobalOptions() ~ delete _;
-        public Dictionary<String, Config> mConfigs = new Dictionary<String, Config>() ~ DeleteDictionaryAndKeysAndItems!(_);
+        public Dictionary<String, Config> mConfigs = new Dictionary<String, Config>() ~ DeleteDictionaryAndKeysAndValues!(_);
 		public HashSet<String> mExtraPlatforms = new .() ~ DeleteContainerAndItems!(_);
 
         public class ProjectSourceCompileInstance
@@ -892,7 +892,7 @@ namespace IDE
 
         public void Deserialize(StructuredData data)
         {
-			DeleteDictionaryAndKeysAndItems!(mConfigs);
+			DeleteDictionaryAndKeysAndValues!(mConfigs);
 			mConfigs = new Dictionary<String, Config>();
 
 			using (data.Open("Workspace"))

IDE/src/ui/AutoComplete.bf

@@ -17,7 +17,7 @@ namespace IDE.ui
 	{
 		public String mDocString = new String(256) ~ delete _;
 		public String mBriefString ~ delete _;
-		public Dictionary<String, String> mParamInfo ~ DeleteDictionaryAndKeysAndItems!(_);
+		public Dictionary<String, String> mParamInfo ~ DeleteDictionaryAndKeysAndValues!(_);
 
 		public String ShowDocString
 		{

IDE/src/ui/OpenFileInSolutionDialog.bf

@@ -56,7 +56,7 @@ namespace IDE.ui
 				delete _;
 			};
         public static int32 sCurrentMRUIndex = 1;
-		static Dictionary<String, TimeEntry> sTimeCache = new .() ~ DeleteDictionaryAndKeysAndItems!(_);
+		static Dictionary<String, TimeEntry> sTimeCache = new .() ~ DeleteDictionaryAndKeysAndValues!(_);
 
         protected EntryListView mFileList;
         EditWidget mEditWidget;

IDE/src/ui/ProjectProperties.bf

@@ -38,7 +38,7 @@ namespace IDE.ui
         }
         
         public Project mProject;
-        Dictionary<String, ValueContainer<bool>> mDependencyValuesMap ~ DeleteDictionaryAndKeysAndItems!(_);
+        Dictionary<String, ValueContainer<bool>> mDependencyValuesMap ~ DeleteDictionaryAndKeysAndValues!(_);
 		Project.Options[] mCurProjectOptions ~ delete _;
 		float mLockFlashPct;
 		public int32 mNewDebugSessionCountdown;

IDE/src/ui/SourceViewPanel.bf

@@ -162,7 +162,7 @@ namespace IDE.ui
 		public String mFileName ~ delete _;
 		public String mBackupFileName ~ delete _; // Didn't match hash
 		public String mFoundPath ~ delete _;
-		public Dictionary<String, String> mRemapMap = new .() ~ DeleteDictionaryAndKeysAndItems!(_);
+		public Dictionary<String, String> mRemapMap = new .() ~ DeleteDictionaryAndKeysAndValues!(_);
 		
 		public ~this()
 		{