From 72760ddad25ac5d28409545307a01c60844a1241 Mon Sep 17 00:00:00 2001 From: soukoku Date: Thu, 17 Apr 2014 19:11:11 -0400 Subject: [PATCH] Reorg usings. --- NTwain/Data/CapReadOut.cs | 2 -- NTwain/Data/TypeReader.cs | 3 --- NTwain/Data/Types.cs | 18 +++++++---------- NTwain/DataTransferredEventArgs.cs | 20 +++++++++---------- NTwain/DeviceEventArgs.cs | 4 ++-- NTwain/ITwainOperation.cs | 7 +------ NTwain/ITwainState.cs | 1 - NTwain/MemoryManager.cs | 4 ---- NTwain/MessageLoop.cs | 3 --- NTwain/NativeMethods.cs | 3 --- NTwain/Properties/AssemblyInfo.cs | 2 +- NTwain/TentativeStateCommitable.cs | 7 +------ NTwain/TransferErrorEventArgs.cs | 3 --- NTwain/TransferReadyEventArgs.cs | 7 ++----- .../Triplets/DGControl/DGControl.Callback.cs | 1 - .../Triplets/DGControl/DGControl.Callback2.cs | 1 - .../DGControl/DGControl.Capability.cs | 1 - .../DGControl/DGControl.CustomDSData.cs | 1 - .../DGControl/DGControl.DeviceEvent.cs | 1 - .../DGControl/DGControl.EntryPoint.cs | 1 - NTwain/Triplets/DGControl/DGControl.Event.cs | 1 - .../DGControl/DGControl.FileSystem.cs | 1 - .../Triplets/DGControl/DGControl.Identity.cs | 1 - NTwain/Triplets/DGControl/DGControl.Parent.cs | 6 ++---- .../Triplets/DGControl/DGControl.PassThru.cs | 1 - .../DGControl/DGControl.PendingXfers.cs | 1 - .../DGControl/DGControl.SetupFileXfer.cs | 1 - .../DGControl/DGControl.SetupMemXfer.cs | 1 - NTwain/Triplets/DGControl/DGControl.Status.cs | 1 - .../DGControl/DGControl.StatusUtf8.cs | 1 - .../DGControl/DGControl.UserInterface.cs | 1 - .../Triplets/DGControl/DGControl.XferGroup.cs | 4 +--- NTwain/Triplets/DGImage/DGImage.CieColor.cs | 1 - .../Triplets/DGImage/DGImage.ExtImageInfo.cs | 1 - NTwain/Triplets/DGImage/DGImage.Filter.cs | 1 - .../Triplets/DGImage/DGImage.GrayResponse.cs | 1 - NTwain/Triplets/DGImage/DGImage.IccProfile.cs | 1 - .../Triplets/DGImage/DGImage.ImageFileXfer.cs | 5 ++--- NTwain/Triplets/DGImage/DGImage.ImageInfo.cs | 1 - .../Triplets/DGImage/DGImage.ImageLayout.cs | 1 - .../DGImage/DGImage.ImageMemFileXfer.cs | 1 - .../Triplets/DGImage/DGImage.ImageMemXfer.cs | 1 - .../DGImage/DGImage.ImageNativeXfer.cs | 5 ++--- .../DGImage/DGImage.JpegCompression.cs | 1 - NTwain/Triplets/DGImage/DGImage.Palette8.cs | 1 - .../Triplets/DGImage/DGImage.RgbResponse.cs | 1 - NTwain/Triplets/Dsm.Linux.cs | 6 +++--- NTwain/Triplets/Dsm.WinNew.cs | 6 +++--- NTwain/Triplets/Dsm.WinOld.cs | 6 +++--- NTwain/Triplets/Dsm.cs | 6 ++---- NTwain/Triplets/OpBase.cs | 4 ---- NTwain/TwainSession.cs | 4 ---- NTwain/TwainSessionExtensions.cs | 2 -- NTwain/TwainStateException.cs | 4 ++-- NTwain/Values/DataValues.cs | 4 ++-- NTwain/Values/ValueConverter.cs | 1 - 56 files changed, 46 insertions(+), 129 deletions(-) diff --git a/NTwain/Data/CapReadOut.cs b/NTwain/Data/CapReadOut.cs index 4d7920a..6858263 100644 --- a/NTwain/Data/CapReadOut.cs +++ b/NTwain/Data/CapReadOut.cs @@ -2,9 +2,7 @@ using NTwain.Values; using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; namespace NTwain.Data { diff --git a/NTwain/Data/TypeReader.cs b/NTwain/Data/TypeReader.cs index 2a3fc2b..c017ee1 100644 --- a/NTwain/Data/TypeReader.cs +++ b/NTwain/Data/TypeReader.cs @@ -1,9 +1,6 @@ using NTwain.Values; using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; namespace NTwain.Data { diff --git a/NTwain/Data/Types.cs b/NTwain/Data/Types.cs index 1217236..59dc789 100644 --- a/NTwain/Data/Types.cs +++ b/NTwain/Data/Types.cs @@ -1,9 +1,9 @@ // This file contains all the structs defined in the twain.h file. +using NTwain.Values; using System; using System.Runtime.InteropServices; -using NTwain.Values; - +using TW_BOOL = System.UInt16; // unsigned short // The following TWAIN basic types are mapped with "using" // to aid in mapping against the twain.h file using copy-paste. // Consumers will not see those names. @@ -11,19 +11,15 @@ using NTwain.Values; // use HandleRef instead? using TW_HANDLE = System.IntPtr; // HANDLE, todo: should really be uintptr? -using TW_MEMREF = System.IntPtr; // LPVOID -// iffy -using TW_UINTPTR = System.UIntPtr; // UINT_PTR - -using TW_INT8 = System.SByte; // char using TW_INT16 = System.Int16; // short using TW_INT32 = System.Int32; // long - -using TW_UINT8 = System.Byte; // unsigned char +using TW_INT8 = System.SByte; // char +using TW_MEMREF = System.IntPtr; // LPVOID using TW_UINT16 = System.UInt16; // unsigned short using TW_UINT32 = System.UInt32; // unsigned long - -using TW_BOOL = System.UInt16; // unsigned short +using TW_UINT8 = System.Byte; // unsigned char +// iffy +using TW_UINTPTR = System.UIntPtr; // UINT_PTR diff --git a/NTwain/DataTransferredEventArgs.cs b/NTwain/DataTransferredEventArgs.cs index d34c6ce..0ee159c 100644 --- a/NTwain/DataTransferredEventArgs.cs +++ b/NTwain/DataTransferredEventArgs.cs @@ -6,16 +6,16 @@ namespace NTwain /// /// Contains event data after whatever data from the source has been transferred. /// - public class DataTransferredEventArgs : EventArgs - { - /// - /// Gets pointer to the complete data if the transfer was native. - /// The data will be freed once the event handler ends - /// so consumers must complete whatever processing before then. + public class DataTransferredEventArgs : EventArgs + { + /// + /// Gets pointer to the complete data if the transfer was native. + /// The data will be freed once the event handler ends + /// so consumers must complete whatever processing before then. /// For image type this data is DIB (Windows), PICT (old Mac), and TIFF (Linux/OSX). - /// - /// The data pointer. - public IntPtr NativeData { get; internal set; } + /// + /// The data pointer. + public IntPtr NativeData { get; internal set; } /// /// Gets the file path to the complete data if the transfer was file or memory-file. @@ -50,5 +50,5 @@ namespace NTwain /// The extended image information. /// public TWExtImageInfo ExImageInfo { get; internal set; } - } + } } \ No newline at end of file diff --git a/NTwain/DeviceEventArgs.cs b/NTwain/DeviceEventArgs.cs index fcaf0d4..d38fb0c 100644 --- a/NTwain/DeviceEventArgs.cs +++ b/NTwain/DeviceEventArgs.cs @@ -1,5 +1,5 @@ -using System; -using NTwain.Data; +using NTwain.Data; +using System; namespace NTwain { diff --git a/NTwain/ITwainOperation.cs b/NTwain/ITwainOperation.cs index 8690a0a..f3358bc 100644 --- a/NTwain/ITwainOperation.cs +++ b/NTwain/ITwainOperation.cs @@ -1,9 +1,4 @@ -using NTwain.Data; -using NTwain.Triplets; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using NTwain.Triplets; namespace NTwain { diff --git a/NTwain/ITwainState.cs b/NTwain/ITwainState.cs index 32f3750..7bad230 100644 --- a/NTwain/ITwainState.cs +++ b/NTwain/ITwainState.cs @@ -1,5 +1,4 @@ using NTwain.Data; -using NTwain.Triplets; using System; using System.ComponentModel; namespace NTwain diff --git a/NTwain/MemoryManager.cs b/NTwain/MemoryManager.cs index c7d456d..b5c9550 100644 --- a/NTwain/MemoryManager.cs +++ b/NTwain/MemoryManager.cs @@ -1,10 +1,6 @@ using NTwain.Data; using NTwain.Properties; using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; namespace NTwain { diff --git a/NTwain/MessageLoop.cs b/NTwain/MessageLoop.cs index af13a14..2b1a190 100644 --- a/NTwain/MessageLoop.cs +++ b/NTwain/MessageLoop.cs @@ -1,10 +1,7 @@ using NTwain.Properties; using NTwain.Triplets; using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Text; using System.Threading; using System.Windows.Interop; using System.Windows.Threading; diff --git a/NTwain/NativeMethods.cs b/NTwain/NativeMethods.cs index 0da84f4..3fa0bb9 100644 --- a/NTwain/NativeMethods.cs +++ b/NTwain/NativeMethods.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; namespace NTwain { diff --git a/NTwain/Properties/AssemblyInfo.cs b/NTwain/Properties/AssemblyInfo.cs index 544fbbb..cc8dc6d 100644 --- a/NTwain/Properties/AssemblyInfo.cs +++ b/NTwain/Properties/AssemblyInfo.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using System.Runtime.InteropServices; using System.Resources; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; [assembly: AssemblyTitle("NTwain")] [assembly: AssemblyDescription("Library containing the TWAIN API for dotnet.")] diff --git a/NTwain/TentativeStateCommitable.cs b/NTwain/TentativeStateCommitable.cs index 8bee58f..7ef95e2 100644 --- a/NTwain/TentativeStateCommitable.cs +++ b/NTwain/TentativeStateCommitable.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NTwain +namespace NTwain { class TentativeStateCommitable : ICommitable { diff --git a/NTwain/TransferErrorEventArgs.cs b/NTwain/TransferErrorEventArgs.cs index 28e42f9..bce32b6 100644 --- a/NTwain/TransferErrorEventArgs.cs +++ b/NTwain/TransferErrorEventArgs.cs @@ -1,9 +1,6 @@ using NTwain.Data; using NTwain.Values; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NTwain { diff --git a/NTwain/TransferReadyEventArgs.cs b/NTwain/TransferReadyEventArgs.cs index 639a11c..1293fc4 100644 --- a/NTwain/TransferReadyEventArgs.cs +++ b/NTwain/TransferReadyEventArgs.cs @@ -1,8 +1,5 @@ -using System; -using NTwain.Data; -using NTwain.Values; -using System.Collections.Generic; -using System.Linq; +using NTwain.Data; +using System; namespace NTwain { diff --git a/NTwain/Triplets/DGControl/DGControl.Callback.cs b/NTwain/Triplets/DGControl/DGControl.Callback.cs index d6d4345..8fc218f 100644 --- a/NTwain/Triplets/DGControl/DGControl.Callback.cs +++ b/NTwain/Triplets/DGControl/DGControl.Callback.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Callback2.cs b/NTwain/Triplets/DGControl/DGControl.Callback2.cs index 379fa3c..ecb5e12 100644 --- a/NTwain/Triplets/DGControl/DGControl.Callback2.cs +++ b/NTwain/Triplets/DGControl/DGControl.Callback2.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Capability.cs b/NTwain/Triplets/DGControl/DGControl.Capability.cs index 97e1c01..d6404e2 100644 --- a/NTwain/Triplets/DGControl/DGControl.Capability.cs +++ b/NTwain/Triplets/DGControl/DGControl.Capability.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.CustomDSData.cs b/NTwain/Triplets/DGControl/DGControl.CustomDSData.cs index 3cd16cd..14c3413 100644 --- a/NTwain/Triplets/DGControl/DGControl.CustomDSData.cs +++ b/NTwain/Triplets/DGControl/DGControl.CustomDSData.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.DeviceEvent.cs b/NTwain/Triplets/DGControl/DGControl.DeviceEvent.cs index de56f65..6140c2c 100644 --- a/NTwain/Triplets/DGControl/DGControl.DeviceEvent.cs +++ b/NTwain/Triplets/DGControl/DGControl.DeviceEvent.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.EntryPoint.cs b/NTwain/Triplets/DGControl/DGControl.EntryPoint.cs index 3635743..1ae8b67 100644 --- a/NTwain/Triplets/DGControl/DGControl.EntryPoint.cs +++ b/NTwain/Triplets/DGControl/DGControl.EntryPoint.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Event.cs b/NTwain/Triplets/DGControl/DGControl.Event.cs index 723f273..b42cfe0 100644 --- a/NTwain/Triplets/DGControl/DGControl.Event.cs +++ b/NTwain/Triplets/DGControl/DGControl.Event.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.FileSystem.cs b/NTwain/Triplets/DGControl/DGControl.FileSystem.cs index 5155b90..0c6c84f 100644 --- a/NTwain/Triplets/DGControl/DGControl.FileSystem.cs +++ b/NTwain/Triplets/DGControl/DGControl.FileSystem.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Identity.cs b/NTwain/Triplets/DGControl/DGControl.Identity.cs index 7de5f89..bd865e3 100644 --- a/NTwain/Triplets/DGControl/DGControl.Identity.cs +++ b/NTwain/Triplets/DGControl/DGControl.Identity.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Parent.cs b/NTwain/Triplets/DGControl/DGControl.Parent.cs index 2916b1c..b62eace 100644 --- a/NTwain/Triplets/DGControl/DGControl.Parent.cs +++ b/NTwain/Triplets/DGControl/DGControl.Parent.cs @@ -1,7 +1,5 @@ -using System; -using NTwain.Data; -using NTwain.Values; -using System.Runtime.InteropServices; +using NTwain.Values; +using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.PassThru.cs b/NTwain/Triplets/DGControl/DGControl.PassThru.cs index cdd1f03..d0527fd 100644 --- a/NTwain/Triplets/DGControl/DGControl.PassThru.cs +++ b/NTwain/Triplets/DGControl/DGControl.PassThru.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.PendingXfers.cs b/NTwain/Triplets/DGControl/DGControl.PendingXfers.cs index 9f8b3f1..079c468 100644 --- a/NTwain/Triplets/DGControl/DGControl.PendingXfers.cs +++ b/NTwain/Triplets/DGControl/DGControl.PendingXfers.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.SetupFileXfer.cs b/NTwain/Triplets/DGControl/DGControl.SetupFileXfer.cs index 3f0ea00..54b873e 100644 --- a/NTwain/Triplets/DGControl/DGControl.SetupFileXfer.cs +++ b/NTwain/Triplets/DGControl/DGControl.SetupFileXfer.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.SetupMemXfer.cs b/NTwain/Triplets/DGControl/DGControl.SetupMemXfer.cs index a40b9be..58117b8 100644 --- a/NTwain/Triplets/DGControl/DGControl.SetupMemXfer.cs +++ b/NTwain/Triplets/DGControl/DGControl.SetupMemXfer.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.Status.cs b/NTwain/Triplets/DGControl/DGControl.Status.cs index 4ae4746..ab092fa 100644 --- a/NTwain/Triplets/DGControl/DGControl.Status.cs +++ b/NTwain/Triplets/DGControl/DGControl.Status.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.StatusUtf8.cs b/NTwain/Triplets/DGControl/DGControl.StatusUtf8.cs index ff873b7..965d87d 100644 --- a/NTwain/Triplets/DGControl/DGControl.StatusUtf8.cs +++ b/NTwain/Triplets/DGControl/DGControl.StatusUtf8.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.UserInterface.cs b/NTwain/Triplets/DGControl/DGControl.UserInterface.cs index 5a39742..3f314b7 100644 --- a/NTwain/Triplets/DGControl/DGControl.UserInterface.cs +++ b/NTwain/Triplets/DGControl/DGControl.UserInterface.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGControl/DGControl.XferGroup.cs b/NTwain/Triplets/DGControl/DGControl.XferGroup.cs index 2ba426d..ec2c371 100644 --- a/NTwain/Triplets/DGControl/DGControl.XferGroup.cs +++ b/NTwain/Triplets/DGControl/DGControl.XferGroup.cs @@ -1,6 +1,4 @@ -using System; -using NTwain.Data; -using NTwain.Values; +using NTwain.Values; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.CieColor.cs b/NTwain/Triplets/DGImage/DGImage.CieColor.cs index 4c593a2..ceb337e 100644 --- a/NTwain/Triplets/DGImage/DGImage.CieColor.cs +++ b/NTwain/Triplets/DGImage/DGImage.CieColor.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ExtImageInfo.cs b/NTwain/Triplets/DGImage/DGImage.ExtImageInfo.cs index b9fa261..2814954 100644 --- a/NTwain/Triplets/DGImage/DGImage.ExtImageInfo.cs +++ b/NTwain/Triplets/DGImage/DGImage.ExtImageInfo.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.Filter.cs b/NTwain/Triplets/DGImage/DGImage.Filter.cs index 443dddf..b6579f8 100644 --- a/NTwain/Triplets/DGImage/DGImage.Filter.cs +++ b/NTwain/Triplets/DGImage/DGImage.Filter.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.GrayResponse.cs b/NTwain/Triplets/DGImage/DGImage.GrayResponse.cs index 222d042..d59f208 100644 --- a/NTwain/Triplets/DGImage/DGImage.GrayResponse.cs +++ b/NTwain/Triplets/DGImage/DGImage.GrayResponse.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.IccProfile.cs b/NTwain/Triplets/DGImage/DGImage.IccProfile.cs index 3ecaf12..9eec995 100644 --- a/NTwain/Triplets/DGImage/DGImage.IccProfile.cs +++ b/NTwain/Triplets/DGImage/DGImage.IccProfile.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageFileXfer.cs b/NTwain/Triplets/DGImage/DGImage.ImageFileXfer.cs index 8032817..88a4614 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageFileXfer.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageFileXfer.cs @@ -1,6 +1,5 @@ -using System; -using NTwain.Data; -using NTwain.Values; +using NTwain.Values; +using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageInfo.cs b/NTwain/Triplets/DGImage/DGImage.ImageInfo.cs index 2800318..4f267f8 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageInfo.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageInfo.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageLayout.cs b/NTwain/Triplets/DGImage/DGImage.ImageLayout.cs index 8e7d3f0..df7d5c8 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageLayout.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageLayout.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs b/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs index 765b45d..a38abb9 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageMemFileXfer.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageMemXfer.cs b/NTwain/Triplets/DGImage/DGImage.ImageMemXfer.cs index 6b89178..0a34b0c 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageMemXfer.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageMemXfer.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.ImageNativeXfer.cs b/NTwain/Triplets/DGImage/DGImage.ImageNativeXfer.cs index 93914df..4433279 100644 --- a/NTwain/Triplets/DGImage/DGImage.ImageNativeXfer.cs +++ b/NTwain/Triplets/DGImage/DGImage.ImageNativeXfer.cs @@ -1,6 +1,5 @@ -using System; -using NTwain.Data; -using NTwain.Values; +using NTwain.Values; +using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.JpegCompression.cs b/NTwain/Triplets/DGImage/DGImage.JpegCompression.cs index 6d9c718..d31529a 100644 --- a/NTwain/Triplets/DGImage/DGImage.JpegCompression.cs +++ b/NTwain/Triplets/DGImage/DGImage.JpegCompression.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.Palette8.cs b/NTwain/Triplets/DGImage/DGImage.Palette8.cs index eb9d13a..7361698 100644 --- a/NTwain/Triplets/DGImage/DGImage.Palette8.cs +++ b/NTwain/Triplets/DGImage/DGImage.Palette8.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/DGImage/DGImage.RgbResponse.cs b/NTwain/Triplets/DGImage/DGImage.RgbResponse.cs index 9c4b24c..f09cd0d 100644 --- a/NTwain/Triplets/DGImage/DGImage.RgbResponse.cs +++ b/NTwain/Triplets/DGImage/DGImage.RgbResponse.cs @@ -1,6 +1,5 @@ using NTwain.Data; using NTwain.Values; -using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/Dsm.Linux.cs b/NTwain/Triplets/Dsm.Linux.cs index 53182db..5b01109 100644 --- a/NTwain/Triplets/Dsm.Linux.cs +++ b/NTwain/Triplets/Dsm.Linux.cs @@ -1,7 +1,7 @@ -using System; -using System.Runtime.InteropServices; -using NTwain.Data; +using NTwain.Data; using NTwain.Values; +using System; +using System.Runtime.InteropServices; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/Dsm.WinNew.cs b/NTwain/Triplets/Dsm.WinNew.cs index 9e8efb3..81c348e 100644 --- a/NTwain/Triplets/Dsm.WinNew.cs +++ b/NTwain/Triplets/Dsm.WinNew.cs @@ -1,7 +1,7 @@ -using System; -using System.Runtime.InteropServices; -using NTwain.Data; +using NTwain.Data; using NTwain.Values; +using System; +using System.Runtime.InteropServices; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/Dsm.WinOld.cs b/NTwain/Triplets/Dsm.WinOld.cs index 8fcbe73..7fba361 100644 --- a/NTwain/Triplets/Dsm.WinOld.cs +++ b/NTwain/Triplets/Dsm.WinOld.cs @@ -1,7 +1,7 @@ -using System; -using System.Runtime.InteropServices; -using NTwain.Data; +using NTwain.Data; using NTwain.Values; +using System; +using System.Runtime.InteropServices; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/Dsm.cs b/NTwain/Triplets/Dsm.cs index 9b089e5..f2e81fa 100644 --- a/NTwain/Triplets/Dsm.cs +++ b/NTwain/Triplets/Dsm.cs @@ -1,8 +1,6 @@ -using System; -using System.Runtime.InteropServices; -using NTwain.Data; +using NTwain.Data; using NTwain.Values; -using System.IO; +using System; namespace NTwain.Triplets { diff --git a/NTwain/Triplets/OpBase.cs b/NTwain/Triplets/OpBase.cs index 18726a4..21209f7 100644 --- a/NTwain/Triplets/OpBase.cs +++ b/NTwain/Triplets/OpBase.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NTwain.Values; namespace NTwain.Triplets { diff --git a/NTwain/TwainSession.cs b/NTwain/TwainSession.cs index 8940ad8..84835ad 100644 --- a/NTwain/TwainSession.cs +++ b/NTwain/TwainSession.cs @@ -7,12 +7,8 @@ using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; using System.IO; -using System.Linq; using System.Runtime.InteropServices; -using System.Security.Permissions; -using System.Text; using System.Threading; -using System.Windows.Threading; namespace NTwain { diff --git a/NTwain/TwainSessionExtensions.cs b/NTwain/TwainSessionExtensions.cs index 00044f3..68424a7 100644 --- a/NTwain/TwainSessionExtensions.cs +++ b/NTwain/TwainSessionExtensions.cs @@ -1,9 +1,7 @@ using NTwain.Data; using NTwain.Values; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace NTwain { diff --git a/NTwain/TwainStateException.cs b/NTwain/TwainStateException.cs index 6b5b355..acc1460 100644 --- a/NTwain/TwainStateException.cs +++ b/NTwain/TwainStateException.cs @@ -1,6 +1,6 @@ -using System; +using NTwain.Values; +using System; using System.Runtime.Serialization; -using NTwain.Values; using System.Security.Permissions; namespace NTwain diff --git a/NTwain/Values/DataValues.cs b/NTwain/Values/DataValues.cs index df54a8d..23b51df 100644 --- a/NTwain/Values/DataValues.cs +++ b/NTwain/Values/DataValues.cs @@ -1,5 +1,5 @@ -using System; -using NTwain.Data; +using NTwain.Data; +using System; namespace NTwain.Values { diff --git a/NTwain/Values/ValueConverter.cs b/NTwain/Values/ValueConverter.cs index a2921a9..f2d94c0 100644 --- a/NTwain/Values/ValueConverter.cs +++ b/NTwain/Values/ValueConverter.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace NTwain.Values {