Fix namespaces and imports

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;
 

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;
 

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;

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;
 

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.Mocks;
-using NAPS2.Sdk.Tests.Ocr;
 using Ninject;
 using Xunit;
 using Xunit.Abstractions;

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;

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
 {

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
 {

NAPS2.Lib.WinForms.Tests/Asserts/FormAsserts.cs

@@ -1,5 +1,4 @@
-using System.Windows.Forms;
+using Xunit;
-using Xunit;
 
 namespace NAPS2.Lib.Tests.Asserts;
 

NAPS2.Lib.WinForms/Modules/GdiModule.cs

@@ -1,5 +1,4 @@
 using NAPS2.Images.Gdi;
-using NAPS2.ImportExport.Images;
 using Ninject.Modules;
 
 namespace NAPS2.Modules;

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;
 

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;

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;

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;
 

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;
 

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;
 

NAPS2.Lib/Platform/Windows/StillImage.cs

@@ -1,5 +1,4 @@
-using System.Reflection;
+using Microsoft.Win32;
-using Microsoft.Win32;
 
 namespace NAPS2.Platform.Windows;
 

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;

NAPS2.Lib/Util/CultureHelper.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Globalization;
-using System.Reflection;
 using NAPS2.Lang;
 
 namespace NAPS2.Util;

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;

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;

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
 {

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;
 

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;

NAPS2.Sdk/Remoting/Worker/WorkerFactory.cs

@@ -1,5 +1,4 @@
 using System.Collections.Concurrent;
-using System.Reflection;
 using GrpcDotNetNamedPipes;
 
 namespace NAPS2.Remoting.Worker;

NAPS2.Sdk/Scan/ScanOptions.cs

@@ -1,5 +1,4 @@
 using NAPS2.Ocr;
-using NAPS2.Scan.Internal.Sane;
 
 namespace NAPS2.Scan;
 

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;