From 1e74dcc3603cde652dff1a63642a80209b866c85 Mon Sep 17 00:00:00 2001 From: Ben Olden-Cooligan Date: Sat, 1 Oct 2022 16:38:06 -0700 Subject: [PATCH] Fix namespaces and imports --- NAPS2.Lib.Gtk/EtoForms/{Mac => Gtk}/GtkEtoPlatform.cs | 1 - NAPS2.Lib.Gtk/EtoForms/{Mac => Gtk}/GtkListView.cs | 1 - NAPS2.Lib.Mac/Modules/MacModule.cs | 1 - NAPS2.Lib.Tests/Automation/AutomationHelper.cs | 2 +- NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs | 4 +--- NAPS2.Lib.Tests/Automation/TestModule.cs | 1 - NAPS2.Lib.Tests/Scan/AutoSaverTests.cs | 3 ++- NAPS2.Lib.Tests/Serialization/SecureStorageTests.cs | 3 ++- NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs | 3 +-- NAPS2.Lib.WinForms/Modules/GdiModule.cs | 1 - .../Platform/Windows/WindowsApplicationLifecycle.cs | 3 +-- NAPS2.Lib.WinForms/WinForms/FDesktop.cs | 1 - NAPS2.Lib.WinForms/WinForms/FEmailProvider.cs | 2 -- NAPS2.Lib.WinForms/WinForms/FViewer.cs | 2 -- NAPS2.Lib.WinForms/WinForms/TiffViewer.cs | 2 -- NAPS2.Lib.WinForms/WinForms/TiffViewerCtl.cs | 2 -- NAPS2.Lib/Platform/Windows/StillImage.cs | 3 +-- NAPS2.Lib/Recovery/RecoverableFolder.cs | 1 - NAPS2.Lib/Util/CultureHelper.cs | 1 - NAPS2.Sdk.Tests/Images/RenderTests.cs | 3 +-- NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs | 1 - NAPS2.Sdk.Tests/Mocks/ScanDriverFactoryBuilder.cs | 2 +- NAPS2.Sdk/ImportExport/Pdf/PdfImporter.cs | 3 +-- NAPS2.Sdk/ImportExport/ScannedImageImporter.cs | 3 +-- NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs | 1 - NAPS2.Sdk/Scan/ScanOptions.cs | 1 - NAPS2.Tools/Project/Verification/VirusScanCommand.cs | 2 -- 27 files changed, 13 insertions(+), 40 deletions(-) rename NAPS2.Lib.Gtk/EtoForms/{Mac => Gtk}/GtkEtoPlatform.cs (96%) rename NAPS2.Lib.Gtk/EtoForms/{Mac => Gtk}/GtkListView.cs (99%) diff --git a/NAPS2.Lib.Gtk/EtoForms/Mac/GtkEtoPlatform.cs b/NAPS2.Lib.Gtk/EtoForms/Gtk/GtkEtoPlatform.cs similarity index 96% rename from NAPS2.Lib.Gtk/EtoForms/Mac/GtkEtoPlatform.cs rename to NAPS2.Lib.Gtk/EtoForms/Gtk/GtkEtoPlatform.cs index 84a4081a3..b2d031440 100644 --- a/NAPS2.Lib.Gtk/EtoForms/Mac/GtkEtoPlatform.cs +++ b/NAPS2.Lib.Gtk/EtoForms/Gtk/GtkEtoPlatform.cs @@ -2,7 +2,6 @@ using Eto.Drawing; using Eto.Forms; using Eto.GtkSharp.Drawing; using NAPS2.Images.Gtk; -using sd = System.Drawing; namespace NAPS2.EtoForms.Gtk; diff --git a/NAPS2.Lib.Gtk/EtoForms/Mac/GtkListView.cs b/NAPS2.Lib.Gtk/EtoForms/Gtk/GtkListView.cs similarity index 99% rename from NAPS2.Lib.Gtk/EtoForms/Mac/GtkListView.cs rename to NAPS2.Lib.Gtk/EtoForms/Gtk/GtkListView.cs index 19cae172e..180b06eca 100644 --- a/NAPS2.Lib.Gtk/EtoForms/Mac/GtkListView.cs +++ b/NAPS2.Lib.Gtk/EtoForms/Gtk/GtkListView.cs @@ -2,7 +2,6 @@ using Eto.Forms; using Eto.GtkSharp; using Gtk; using Orientation = Gtk.Orientation; -using GtkImageView = Gtk.Image; namespace NAPS2.EtoForms.Gtk; diff --git a/NAPS2.Lib.Mac/Modules/MacModule.cs b/NAPS2.Lib.Mac/Modules/MacModule.cs index 8f870f471..f4f6fbf81 100644 --- a/NAPS2.Lib.Mac/Modules/MacModule.cs +++ b/NAPS2.Lib.Mac/Modules/MacModule.cs @@ -3,7 +3,6 @@ using NAPS2.EtoForms.Mac; using NAPS2.EtoForms.Ui; using NAPS2.Images.Mac; using NAPS2.ImportExport; -using NAPS2.ImportExport.Images; using NAPS2.ImportExport.Pdf; using NAPS2.Scan; using NAPS2.Update; diff --git a/NAPS2.Lib.Tests/Automation/AutomationHelper.cs b/NAPS2.Lib.Tests/Automation/AutomationHelper.cs index 71e51c46c..df4cbf518 100644 --- a/NAPS2.Lib.Tests/Automation/AutomationHelper.cs +++ b/NAPS2.Lib.Tests/Automation/AutomationHelper.cs @@ -1,8 +1,8 @@ -using System.Drawing; using NAPS2.Automation; using NAPS2.Modules; using NAPS2.Scan.Internal; using NAPS2.Sdk.Tests; +using NAPS2.Sdk.Tests.Mocks; using Ninject; using Xunit.Abstractions; diff --git a/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs b/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs index 9685e85df..2b49c5cec 100644 --- a/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs +++ b/NAPS2.Lib.Tests/Automation/CommandLineIntegrationTests.cs @@ -1,10 +1,8 @@ -using System.Drawing; using NAPS2.Automation; using NAPS2.ImportExport.Pdf; using NAPS2.Sdk.Tests; using NAPS2.Sdk.Tests.Asserts; -using NAPS2.Sdk.Tests.Images; -using NAPS2.Sdk.Tests.Ocr; +using NAPS2.Sdk.Tests.Mocks; using Ninject; using Xunit; using Xunit.Abstractions; diff --git a/NAPS2.Lib.Tests/Automation/TestModule.cs b/NAPS2.Lib.Tests/Automation/TestModule.cs index e624bb396..d5da39f13 100644 --- a/NAPS2.Lib.Tests/Automation/TestModule.cs +++ b/NAPS2.Lib.Tests/Automation/TestModule.cs @@ -1,5 +1,4 @@ using NAPS2.Automation; -using NAPS2.ImportExport.Images; using NAPS2.Ocr; using NAPS2.Recovery; using NAPS2.Scan; diff --git a/NAPS2.Lib.Tests/Scan/AutoSaverTests.cs b/NAPS2.Lib.Tests/Scan/AutoSaverTests.cs index e5959f0d0..76168acb9 100644 --- a/NAPS2.Lib.Tests/Scan/AutoSaverTests.cs +++ b/NAPS2.Lib.Tests/Scan/AutoSaverTests.cs @@ -2,11 +2,12 @@ using NAPS2.ImportExport; using NAPS2.ImportExport.Pdf; using NAPS2.Scan; +using NAPS2.Sdk.Tests; using NAPS2.Sdk.Tests.Asserts; using NAPS2.WinForms; using Xunit; -namespace NAPS2.Sdk.Tests.Scan; +namespace NAPS2.Lib.Tests.Scan; public class AutoSaverTests : ContextualTests { diff --git a/NAPS2.Lib.Tests/Serialization/SecureStorageTests.cs b/NAPS2.Lib.Tests/Serialization/SecureStorageTests.cs index 14b512282..6bb6daf33 100644 --- a/NAPS2.Lib.Tests/Serialization/SecureStorageTests.cs +++ b/NAPS2.Lib.Tests/Serialization/SecureStorageTests.cs @@ -1,7 +1,8 @@ +using NAPS2.Sdk.Tests; using NAPS2.Serialization; using Xunit; -namespace NAPS2.Sdk.Tests.Serialization; +namespace NAPS2.Lib.Tests.Serialization; public class SecureStorageTests { diff --git a/NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs b/NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs index b1783495e..041ada8fa 100644 --- a/NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs +++ b/NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs @@ -1,5 +1,4 @@ -using System.Windows.Forms; -using Xunit; +using Xunit; namespace NAPS2.Lib.Tests.Asserts; diff --git a/NAPS2.Lib.WinForms/Modules/GdiModule.cs b/NAPS2.Lib.WinForms/Modules/GdiModule.cs index cc5be9241..093daca16 100644 --- a/NAPS2.Lib.WinForms/Modules/GdiModule.cs +++ b/NAPS2.Lib.WinForms/Modules/GdiModule.cs @@ -1,5 +1,4 @@ using NAPS2.Images.Gdi; -using NAPS2.ImportExport.Images; using Ninject.Modules; namespace NAPS2.Modules; diff --git a/NAPS2.Lib.WinForms/Platform/Windows/WindowsApplicationLifecycle.cs b/NAPS2.Lib.WinForms/Platform/Windows/WindowsApplicationLifecycle.cs index 3af4b62b6..eac1c2a4d 100644 --- a/NAPS2.Lib.WinForms/Platform/Windows/WindowsApplicationLifecycle.cs +++ b/NAPS2.Lib.WinForms/Platform/Windows/WindowsApplicationLifecycle.cs @@ -1,5 +1,4 @@ -using System.Reflection; -using System.Security.Principal; +using System.Security.Principal; using System.Windows.Forms; using NAPS2.Remoting; diff --git a/NAPS2.Lib.WinForms/WinForms/FDesktop.cs b/NAPS2.Lib.WinForms/WinForms/FDesktop.cs index fc2600249..5dfccd361 100644 --- a/NAPS2.Lib.WinForms/WinForms/FDesktop.cs +++ b/NAPS2.Lib.WinForms/WinForms/FDesktop.cs @@ -1,7 +1,6 @@ using System.Drawing; using System.Threading; using System.Windows.Forms; -using Eto.WinForms; using NAPS2.EtoForms; using NAPS2.EtoForms.WinForms; using NAPS2.ImportExport; diff --git a/NAPS2.Lib.WinForms/WinForms/FEmailProvider.cs b/NAPS2.Lib.WinForms/WinForms/FEmailProvider.cs index 5c82c52df..213f22f31 100644 --- a/NAPS2.Lib.WinForms/WinForms/FEmailProvider.cs +++ b/NAPS2.Lib.WinForms/WinForms/FEmailProvider.cs @@ -1,7 +1,5 @@ using System.Drawing; using System.Windows.Forms; -using Eto.WinForms; -using NAPS2.EtoForms; using NAPS2.ImportExport.Email; using NAPS2.ImportExport.Email.Mapi; using NAPS2.ImportExport.Email.Oauth; diff --git a/NAPS2.Lib.WinForms/WinForms/FViewer.cs b/NAPS2.Lib.WinForms/WinForms/FViewer.cs index a7e280521..01889094c 100644 --- a/NAPS2.Lib.WinForms/WinForms/FViewer.cs +++ b/NAPS2.Lib.WinForms/WinForms/FViewer.cs @@ -1,8 +1,6 @@ using System.ComponentModel; using System.Globalization; using System.Windows.Forms; -using Eto.WinForms; -using NAPS2.EtoForms; using NAPS2.Images.Gdi; using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon; diff --git a/NAPS2.Lib.WinForms/WinForms/TiffViewer.cs b/NAPS2.Lib.WinForms/WinForms/TiffViewer.cs index b79b42138..06a99e095 100644 --- a/NAPS2.Lib.WinForms/WinForms/TiffViewer.cs +++ b/NAPS2.Lib.WinForms/WinForms/TiffViewer.cs @@ -1,8 +1,6 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; -using Eto.WinForms; -using NAPS2.EtoForms; namespace NAPS2.WinForms; diff --git a/NAPS2.Lib.WinForms/WinForms/TiffViewerCtl.cs b/NAPS2.Lib.WinForms/WinForms/TiffViewerCtl.cs index eeec1cf2b..4ed24c7ce 100644 --- a/NAPS2.Lib.WinForms/WinForms/TiffViewerCtl.cs +++ b/NAPS2.Lib.WinForms/WinForms/TiffViewerCtl.cs @@ -1,8 +1,6 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; -using Eto.WinForms; -using NAPS2.EtoForms; namespace NAPS2.WinForms; diff --git a/NAPS2.Lib/Platform/Windows/StillImage.cs b/NAPS2.Lib/Platform/Windows/StillImage.cs index 72fec68ba..e0e5cad4f 100644 --- a/NAPS2.Lib/Platform/Windows/StillImage.cs +++ b/NAPS2.Lib/Platform/Windows/StillImage.cs @@ -1,5 +1,4 @@ -using System.Reflection; -using Microsoft.Win32; +using Microsoft.Win32; namespace NAPS2.Platform.Windows; diff --git a/NAPS2.Lib/Recovery/RecoverableFolder.cs b/NAPS2.Lib/Recovery/RecoverableFolder.cs index ef44915c3..a8e98578d 100644 --- a/NAPS2.Lib/Recovery/RecoverableFolder.cs +++ b/NAPS2.Lib/Recovery/RecoverableFolder.cs @@ -1,5 +1,4 @@ using System.Collections.Immutable; -using System.Threading; using NAPS2.ImportExport.Images; using NAPS2.Scan; using NAPS2.Serialization; diff --git a/NAPS2.Lib/Util/CultureHelper.cs b/NAPS2.Lib/Util/CultureHelper.cs index 2ef974c51..2c38913a8 100644 --- a/NAPS2.Lib/Util/CultureHelper.cs +++ b/NAPS2.Lib/Util/CultureHelper.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Globalization; -using System.Reflection; using NAPS2.Lang; namespace NAPS2.Util; diff --git a/NAPS2.Sdk.Tests/Images/RenderTests.cs b/NAPS2.Sdk.Tests/Images/RenderTests.cs index d4264f0b3..470299007 100644 --- a/NAPS2.Sdk.Tests/Images/RenderTests.cs +++ b/NAPS2.Sdk.Tests/Images/RenderTests.cs @@ -1,5 +1,4 @@ -using NAPS2.Images.Bitwise; -using NAPS2.Sdk.Tests.Asserts; +using NAPS2.Sdk.Tests.Asserts; using Xunit; namespace NAPS2.Sdk.Tests.Images; diff --git a/NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs b/NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs index cab3973a2..b3f92266c 100644 --- a/NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs +++ b/NAPS2.Sdk.Tests/ImportExport/ImportPostProcessorTests.cs @@ -1,6 +1,5 @@ using NAPS2.ImportExport.Images; using NAPS2.Scan; -using NAPS2.Sdk.Tests.Asserts; using Xunit; namespace NAPS2.Sdk.Tests.ImportExport; diff --git a/NAPS2.Sdk.Tests/Mocks/ScanDriverFactoryBuilder.cs b/NAPS2.Sdk.Tests/Mocks/ScanDriverFactoryBuilder.cs index 928df654c..d015e06a4 100644 --- a/NAPS2.Sdk.Tests/Mocks/ScanDriverFactoryBuilder.cs +++ b/NAPS2.Sdk.Tests/Mocks/ScanDriverFactoryBuilder.cs @@ -3,7 +3,7 @@ using Moq; using NAPS2.Scan; using NAPS2.Scan.Internal; -namespace NAPS2.Sdk.Tests; +namespace NAPS2.Sdk.Tests.Mocks; public class ScanDriverFactoryBuilder { diff --git a/NAPS2.Sdk/ImportExport/Pdf/PdfImporter.cs b/NAPS2.Sdk/ImportExport/Pdf/PdfImporter.cs index 557dbcd3f..1ed2355d7 100644 --- a/NAPS2.Sdk/ImportExport/Pdf/PdfImporter.cs +++ b/NAPS2.Sdk/ImportExport/Pdf/PdfImporter.cs @@ -1,5 +1,4 @@ -using System.Threading; -using NAPS2.ImportExport.Images; +using NAPS2.ImportExport.Images; using NAPS2.ImportExport.Pdf.Pdfium; using NAPS2.Scan; diff --git a/NAPS2.Sdk/ImportExport/ScannedImageImporter.cs b/NAPS2.Sdk/ImportExport/ScannedImageImporter.cs index 906c855e4..bad3a9b24 100644 --- a/NAPS2.Sdk/ImportExport/ScannedImageImporter.cs +++ b/NAPS2.Sdk/ImportExport/ScannedImageImporter.cs @@ -1,5 +1,4 @@ -using System.Threading; -using NAPS2.ImportExport.Images; +using NAPS2.ImportExport.Images; using NAPS2.ImportExport.Pdf; namespace NAPS2.ImportExport; diff --git a/NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs b/NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs index 358cb3125..a435398c9 100644 --- a/NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs +++ b/NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs @@ -1,5 +1,4 @@ using System.Collections.Concurrent; -using System.Reflection; using GrpcDotNetNamedPipes; namespace NAPS2.Remoting.Worker; diff --git a/NAPS2.Sdk/Scan/ScanOptions.cs b/NAPS2.Sdk/Scan/ScanOptions.cs index 6e91847b6..546135631 100644 --- a/NAPS2.Sdk/Scan/ScanOptions.cs +++ b/NAPS2.Sdk/Scan/ScanOptions.cs @@ -1,5 +1,4 @@ using NAPS2.Ocr; -using NAPS2.Scan.Internal.Sane; namespace NAPS2.Scan; diff --git a/NAPS2.Tools/Project/Verification/VirusScanCommand.cs b/NAPS2.Tools/Project/Verification/VirusScanCommand.cs index 8c1abdbd2..4ce3782d7 100644 --- a/NAPS2.Tools/Project/Verification/VirusScanCommand.cs +++ b/NAPS2.Tools/Project/Verification/VirusScanCommand.cs @@ -1,8 +1,6 @@ -using System.Text; using NAPS2.Tools.Project.Targets; using VirusTotalNet; using VirusTotalNet.ResponseCodes; -using VirusTotalNet.Results; namespace NAPS2.Tools.Project.Verification;