code clean

sergiye · sergiye · commit 650f7a183e0c · 2024-11-16T23:42:51.000+02:00
diff --git a/Aga.Controls/Tree/TreeViewAdv.cs b/Aga.Controls/Tree/TreeViewAdv.cs
@@ -796,25 +796,26 @@ internal void SetIsExpanded(TreeNodeAdv node, bool value, bool ignoreChildren, b
 			eargs.Node = node;
 			eargs.Value = value;
 			eargs.IgnoreChildren = ignoreChildren;
+			eargs.ChangedByUser = byUser;
 
 			if (AsyncExpanding && LoadOnDemand && !_threadPool.IsMyThread(Thread.CurrentThread))
 			{
-				WaitCallback wc = delegate(object argument) { SetIsExpanded((ExpandArgs)argument, byUser); };
+				WaitCallback wc = delegate(object argument) { SetIsExpanded((ExpandArgs)argument); };
 				_threadPool.QueueUserWorkItem(wc, eargs);
 			}
 			else
-				SetIsExpanded(eargs, byUser);
+				SetIsExpanded(eargs);
 		}
 
-		private void SetIsExpanded(ExpandArgs eargs, bool byUser)
+		private void SetIsExpanded(ExpandArgs eargs)
 		{
 			bool update = !eargs.IgnoreChildren && !AsyncExpanding;
 			if (update)
 				BeginUpdate();
 			try
 			{
 				if (IsMyNode(eargs.Node) && eargs.Node.IsExpanded != eargs.Value)
-					SetIsExpanded(eargs.Node, eargs.Value, byUser);
+					SetIsExpanded(eargs.Node, eargs.Value, eargs.ChangedByUser);
 
 				if (!eargs.IgnoreChildren)
 					SetIsExpandedRecursive(eargs.Node, eargs.Value);
diff --git a/HidSharp/HidSharp.NETStandard.csproj b/HidSharp/HidSharp.NETStandard.csproj
diff --git a/HidSharp/HidSharp.csproj b/HidSharp/HidSharp.csproj
@@ -1,17 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <OutputType>Library</OutputType>
+    <TargetFramework>net472</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <OutputPath>..\bin\</OutputPath>
-    <Company>Illusory Studios LLC</Company>
-    <Copyright>Copyright © 2010-2019 James F. Bellinger &lt;http://www.zer7.com/software/hidsharp&gt;</Copyright>
-    <Description>C# HID wrappers</Description>
-    <Product>HidSharp</Product>
-    <AssemblyTitle>HidSharp</AssemblyTitle>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
-    <InformationalVersion>2.1.0</InformationalVersion>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <AssemblyName>HidSharp</AssemblyName>
+    <RootNamespace>HidSharp</RootNamespace>
+    <OutputPath>..\bin</OutputPath>
   </PropertyGroup>
-</Project>
+
+</Project>
diff --git a/HidSharp/Platform/Libusb/NativeMethods.cs b/HidSharp/Platform/Libusb/NativeMethods.cs
@@ -88,11 +88,6 @@ public enum TransferType : byte
 			Interrupt	
 		}
 		
-		public struct Version
-		{
-			public ushort Major, Minor, Micro, Nano;
-		}
-		
 		public enum Error
 		{
 			None = 0,
diff --git a/OpenHardwareMonitor.sln b/OpenHardwareMonitor.sln
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HidSharp.NETStandard", "HidSharp\HidSharp.NETStandard.csproj", "{9CE1E1E2-8F82-4170-92B2-0F7F8A66F4E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HidSharp", "HidSharp\HidSharp.csproj", "{9CE1E1E2-8F82-4170-92B2-0F7F8A66F4E8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/OpenHardwareMonitor/UI/MainForm.cs b/OpenHardwareMonitor/UI/MainForm.cs
@@ -46,7 +46,9 @@ public sealed partial class MainForm : Form
     private readonly UnitManager _unitManager;
     private readonly UpdateVisitor _updateVisitor = new();
     private readonly WmiProvider _wmiProvider;
+#if DEBUG
     private readonly Timer _checkUpdatesTimer;
+#endif
 
     private int _delayCount;
     private bool _selectionDragging;
diff --git a/OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj b/OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFramework>net472</TargetFramework>
     <AssemblyName>OpenHardwareMonitorLib</AssemblyName>
     <RootNamespace>OpenHardwareMonitor</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -38,7 +38,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\HidSharp\HidSharp.NETStandard.csproj" />
+    <ProjectReference Include="..\HidSharp\HidSharp.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Management" />

Original file line number	Diff line number	Diff line change
`@@ -796,25 +796,26 @@ internal void SetIsExpanded(TreeNodeAdv node, bool value, bool ignoreChildren, b`
`796`	`796`	`eargs.Node = node;`
`797`	`797`	`eargs.Value = value;`
`798`	`798`	`eargs.IgnoreChildren = ignoreChildren;`
	`799`	`+ eargs.ChangedByUser = byUser;`
`799`	`800`
`800`	`801`	`if (AsyncExpanding && LoadOnDemand && !_threadPool.IsMyThread(Thread.CurrentThread))`
`801`	`802`	`{`
`802`		`- WaitCallback wc = delegate(object argument) { SetIsExpanded((ExpandArgs)argument, byUser); };`
	`803`	`+ WaitCallback wc = delegate(object argument) { SetIsExpanded((ExpandArgs)argument); };`
`803`	`804`	`_threadPool.QueueUserWorkItem(wc, eargs);`
`804`	`805`	`}`
`805`	`806`	`else`
`806`		`- SetIsExpanded(eargs, byUser);`
	`807`	`+ SetIsExpanded(eargs);`
`807`	`808`	`}`
`808`	`809`
`809`		`- private void SetIsExpanded(ExpandArgs eargs, bool byUser)`
	`810`	`+ private void SetIsExpanded(ExpandArgs eargs)`
`810`	`811`	`{`
`811`	`812`	`bool update = !eargs.IgnoreChildren && !AsyncExpanding;`
`812`	`813`	`if (update)`
`813`	`814`	`BeginUpdate();`
`814`	`815`	`try`
`815`	`816`	`{`
`816`	`817`	`if (IsMyNode(eargs.Node) && eargs.Node.IsExpanded != eargs.Value)`
`817`		`- SetIsExpanded(eargs.Node, eargs.Value, byUser);`
	`818`	`+ SetIsExpanded(eargs.Node, eargs.Value, eargs.ChangedByUser);`
`818`	`819`
`819`	`820`	`if (!eargs.IgnoreChildren)`
`820`	`821`	`SetIsExpandedRecursive(eargs.Node, eargs.Value);`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,6 @@ public enum TransferType : byte`
`88`	`88`	`Interrupt`
`89`	`89`	`}`
`90`	`90`
`91`		`- public struct Version`
`92`		`- {`
`93`		`- public ushort Major, Minor, Micro, Nano;`
`94`		`- }`
`95`		`-`
`96`	`91`	`public enum Error`
`97`	`92`	`{`
`98`	`93`	`None = 0,`