From 0eefbc19f851bca6085b969f6eb8ee8880e59055 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 11 Dec 2014 01:19:28 +0200 Subject: [PATCH] CodeMaid cleanup --- .../Controls/ExportImportControl.cs | 2 +- ShareX.HelpersLib/Helpers/Helpers.cs | 2 +- ShareX.HelpersLib/Helpers/RegistryHelpers.cs | 2 +- .../UITypeEditors/JsonFileNameEditor.cs | 4 ---- ShareX.HistoryLib/ImageHistoryForm.cs | 2 +- ShareX.IndexerLib/IndexerSettings.cs | 2 +- ShareX.UploadersLib/Controls/OAuthControl.cs | 2 +- ShareX.UploadersLib/FTPClient/FTPClientForm.cs | 4 ++-- ShareX.UploadersLib/FileUploaders/AmazonS3.cs | 2 +- ShareX.UploadersLib/FileUploaders/Box.cs | 2 +- ShareX.UploadersLib/FileUploaders/Copy.cs | 4 ++-- ShareX.UploadersLib/FileUploaders/Dropbox.cs | 4 ++-- .../FileUploaders/FTP/FTPAccount.cs | 2 +- .../FileUploaders/FTP/FTPAdapter.cs | 2 +- .../FileUploaders/GfycatUploader.cs | 4 ++-- ShareX.UploadersLib/FileUploaders/GoogleDrive.cs | 4 ++-- ShareX.UploadersLib/FileUploaders/MediaFire.cs | 2 +- ShareX.UploadersLib/FileUploaders/Minus.cs | 4 ++-- ShareX.UploadersLib/FileUploaders/OneDrive.cs | 2 +- ShareX.UploadersLib/FileUploaders/OwnCloud.cs | 2 +- ShareX.UploadersLib/FileUploaders/Pushbullet.cs | 2 +- ShareX.UploadersLib/FileUploaders/SFTP.cs | 2 +- ShareX.UploadersLib/Forms/DropboxFilesForm.cs | 6 +++--- ShareX.UploadersLib/Forms/JiraUpload.cs | 2 +- ShareX.UploadersLib/Forms/TwitterTweetForm.cs | 4 ++-- ShareX.UploadersLib/Forms/UploadersConfigForm.cs | 10 +++++----- .../Forms/UploadersConfigFormHelper.cs | 16 ++++++++-------- .../HelperClasses/CertFileNameEditor.cs | 2 +- .../HelperClasses/ImageListManager.cs | 2 +- .../HelperClasses/KeyFileNameEditor.cs | 2 +- ShareX.UploadersLib/ImageUploaders/Chevereto.cs | 2 +- ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs | 2 +- ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs | 2 +- .../ImageUploaders/Photobucket.cs | 2 +- ShareX.UploadersLib/ImageUploaders/Picasa.cs | 4 ++-- .../ImageUploaders/TwitPicUploader.cs | 2 +- .../ImageUploaders/TwitSnapsUploader.cs | 2 +- ShareX.UploadersLib/ImageUploaders/Twitter.cs | 2 +- .../ImageUploaders/YfrogUploader.cs | 2 +- .../OtherServices/GoogleTranslate.cs | 2 +- .../OtherServices/GoogleTranslatorConfig.cs | 2 +- ShareX.UploadersLib/TextUploaders/Gist.cs | 4 ++-- ShareX.UploadersLib/TextUploaders/Hastebin.cs | 2 +- .../URLShorteners/BitlyURLShortener.cs | 4 ++-- .../URLShorteners/GoogleURLShortener.cs | 4 ++-- ShareX.UploadersLib/Uploader.cs | 2 +- ShareX.UploadersLib/UploadersConfig.cs | 4 ++-- ShareX/ApplicationConfig.cs | 2 +- ShareX/Controls/BeforeUploadControl.cs | 2 +- ShareX/Forms/AfterUploadForm.cs | 2 +- ShareX/Forms/ApplicationSettingsForm.cs | 4 ++-- ShareX/Forms/AutoCaptureForm.cs | 2 +- ShareX/Forms/MainForm.cs | 4 ++-- ShareX/Forms/ScreenRecordForm.cs | 2 +- ShareX/HotkeyInfo.cs | 2 +- ShareX/Program.cs | 2 +- ShareX/TaskHelpers.cs | 6 +++--- ShareX/TaskInfo.cs | 4 ++-- ShareX/UploadInfoManager.cs | 4 ++-- ShareX/UploadManager.cs | 2 +- 60 files changed, 90 insertions(+), 94 deletions(-) diff --git a/ShareX.HelpersLib/Controls/ExportImportControl.cs b/ShareX.HelpersLib/Controls/ExportImportControl.cs index c28cb66c9..1d85752ad 100644 --- a/ShareX.HelpersLib/Controls/ExportImportControl.cs +++ b/ShareX.HelpersLib/Controls/ExportImportControl.cs @@ -23,9 +23,9 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib.Properties; using Newtonsoft.Json; using Newtonsoft.Json.Converters; +using ShareX.HelpersLib.Properties; using System; using System.Globalization; using System.IO; diff --git a/ShareX.HelpersLib/Helpers/Helpers.cs b/ShareX.HelpersLib/Helpers/Helpers.cs index eefeef980..f3c703706 100644 --- a/ShareX.HelpersLib/Helpers/Helpers.cs +++ b/ShareX.HelpersLib/Helpers/Helpers.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib.Properties; using Microsoft.Win32; +using ShareX.HelpersLib.Properties; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/ShareX.HelpersLib/Helpers/RegistryHelpers.cs b/ShareX.HelpersLib/Helpers/RegistryHelpers.cs index 5aa97c54f..a68c9eb27 100644 --- a/ShareX.HelpersLib/Helpers/RegistryHelpers.cs +++ b/ShareX.HelpersLib/Helpers/RegistryHelpers.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib.Properties; using Microsoft.Win32; +using ShareX.HelpersLib.Properties; using System; using System.IO; using System.Windows.Forms; diff --git a/ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs b/ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs index bf673ba0b..9a8b2ad57 100644 --- a/ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs +++ b/ShareX.HelpersLib/UITypeEditors/JsonFileNameEditor.cs @@ -23,12 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib.Properties; using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; using System.Windows.Forms; using System.Windows.Forms.Design; diff --git a/ShareX.HistoryLib/ImageHistoryForm.cs b/ShareX.HistoryLib/ImageHistoryForm.cs index 5140e9a87..0fd4edf6b 100644 --- a/ShareX.HistoryLib/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/ImageHistoryForm.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Manina.Windows.Forms; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.Drawing; diff --git a/ShareX.IndexerLib/IndexerSettings.cs b/ShareX.IndexerLib/IndexerSettings.cs index 9af15feac..81997aedb 100644 --- a/ShareX.IndexerLib/IndexerSettings.cs +++ b/ShareX.IndexerLib/IndexerSettings.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System.ComponentModel; using System.Drawing.Design; diff --git a/ShareX.UploadersLib/Controls/OAuthControl.cs b/ShareX.UploadersLib/Controls/OAuthControl.cs index ea02d8f6d..ff407fa70 100644 --- a/ShareX.UploadersLib/Controls/OAuthControl.cs +++ b/ShareX.UploadersLib/Controls/OAuthControl.cs @@ -23,11 +23,11 @@ #endregion License Information (GPL v3) +using ShareX.UploadersLib.Properties; using System; using System.ComponentModel; using System.Drawing; using System.Windows.Forms; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/FTPClient/FTPClientForm.cs b/ShareX.UploadersLib/FTPClient/FTPClientForm.cs index 7d9d345ed..d1f0a9a0e 100644 --- a/ShareX.UploadersLib/FTPClient/FTPClientForm.cs +++ b/ShareX.UploadersLib/FTPClient/FTPClientForm.cs @@ -24,6 +24,8 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.FileUploaders; +using ShareX.UploadersLib.Properties; using System; using System.Collections.Generic; using System.Drawing; @@ -31,8 +33,6 @@ using System.Linq; using System.Net.FtpClient; using System.Windows.Forms; -using ShareX.UploadersLib.FileUploaders; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs index 44861fff3..c9ad25786 100644 --- a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs +++ b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs @@ -25,8 +25,8 @@ // Credits: https://github.com/alanedwardes -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.IO; diff --git a/ShareX.UploadersLib/FileUploaders/Box.cs b/ShareX.UploadersLib/FileUploaders/Box.cs index cab1e1670..40ce86572 100644 --- a/ShareX.UploadersLib/FileUploaders/Box.cs +++ b/ShareX.UploadersLib/FileUploaders/Box.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using Newtonsoft.Json; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/Copy.cs b/ShareX.UploadersLib/FileUploaders/Copy.cs index 5955dff08..15903b7d6 100644 --- a/ShareX.UploadersLib/FileUploaders/Copy.cs +++ b/ShareX.UploadersLib/FileUploaders/Copy.cs @@ -25,12 +25,12 @@ // Credits: https://github.com/KamilKZ -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/Dropbox.cs b/ShareX.UploadersLib/FileUploaders/Dropbox.cs index 28bae3c68..f954f5e62 100644 --- a/ShareX.UploadersLib/FileUploaders/Dropbox.cs +++ b/ShareX.UploadersLib/FileUploaders/Dropbox.cs @@ -23,14 +23,14 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; using System.Text.RegularExpressions; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs b/ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs index a7b4b739a..fd34d538c 100644 --- a/ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs +++ b/ShareX.UploadersLib/FileUploaders/FTP/FTPAccount.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.ComponentModel; using System.Drawing.Design; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs b/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs index a1d257a16..5abd9d30b 100644 --- a/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs +++ b/ShareX.UploadersLib/FileUploaders/FTP/FTPAdapter.cs @@ -24,6 +24,7 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.Collections.Generic; using System.ComponentModel; @@ -31,7 +32,6 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs index db3771f02..5aef69814 100644 --- a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs +++ b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs @@ -25,12 +25,12 @@ // Credits: https://github.com/Dinnerbone -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.IO; using System.Threading; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs index 16742446e..0a8928102 100644 --- a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs +++ b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs @@ -23,12 +23,12 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/MediaFire.cs b/ShareX.UploadersLib/FileUploaders/MediaFire.cs index a1cf5a577..df9bedd26 100644 --- a/ShareX.UploadersLib/FileUploaders/MediaFire.cs +++ b/ShareX.UploadersLib/FileUploaders/MediaFire.cs @@ -25,8 +25,8 @@ // Credits: https://github.com/michalx2 -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System.Collections.Generic; using System.Globalization; using System.IO; diff --git a/ShareX.UploadersLib/FileUploaders/Minus.cs b/ShareX.UploadersLib/FileUploaders/Minus.cs index 2360bc4c3..a3b8bb894 100644 --- a/ShareX.UploadersLib/FileUploaders/Minus.cs +++ b/ShareX.UploadersLib/FileUploaders/Minus.cs @@ -23,12 +23,12 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.Collections.Generic; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/OneDrive.cs b/ShareX.UploadersLib/FileUploaders/OneDrive.cs index 52273cdcb..16f9ac4e4 100644 --- a/ShareX.UploadersLib/FileUploaders/OneDrive.cs +++ b/ShareX.UploadersLib/FileUploaders/OneDrive.cs @@ -26,9 +26,9 @@ // Credits: https://github.com/l0nley using Newtonsoft.Json; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.FileUploaders { diff --git a/ShareX.UploadersLib/FileUploaders/OwnCloud.cs b/ShareX.UploadersLib/FileUploaders/OwnCloud.cs index b229d7d55..f3026ab1b 100644 --- a/ShareX.UploadersLib/FileUploaders/OwnCloud.cs +++ b/ShareX.UploadersLib/FileUploaders/OwnCloud.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.Collections.Specialized; diff --git a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs index 6770a0bbc..8f57cc0b9 100644 --- a/ShareX.UploadersLib/FileUploaders/Pushbullet.cs +++ b/ShareX.UploadersLib/FileUploaders/Pushbullet.cs @@ -26,8 +26,8 @@ // Credits: https://github.com/BallisticLingonberries // API Information: https://docs.pushbullet.com/http/ -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.Collections.Specialized; diff --git a/ShareX.UploadersLib/FileUploaders/SFTP.cs b/ShareX.UploadersLib/FileUploaders/SFTP.cs index f3c9385f5..3d60424bb 100644 --- a/ShareX.UploadersLib/FileUploaders/SFTP.cs +++ b/ShareX.UploadersLib/FileUploaders/SFTP.cs @@ -23,10 +23,10 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Renci.SshNet; using Renci.SshNet.Common; using Renci.SshNet.Sftp; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.IO; diff --git a/ShareX.UploadersLib/Forms/DropboxFilesForm.cs b/ShareX.UploadersLib/Forms/DropboxFilesForm.cs index 6ec9cb65e..836130008 100644 --- a/ShareX.UploadersLib/Forms/DropboxFilesForm.cs +++ b/ShareX.UploadersLib/Forms/DropboxFilesForm.cs @@ -24,14 +24,14 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.FileUploaders; +using ShareX.UploadersLib.HelperClasses; +using ShareX.UploadersLib.Properties; using System; using System.ComponentModel; using System.IO; using System.Linq; using System.Windows.Forms; -using ShareX.UploadersLib.FileUploaders; -using ShareX.UploadersLib.HelperClasses; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib.Forms { diff --git a/ShareX.UploadersLib/Forms/JiraUpload.cs b/ShareX.UploadersLib/Forms/JiraUpload.cs index 75cd7cbc4..9bb17c3e6 100644 --- a/ShareX.UploadersLib/Forms/JiraUpload.cs +++ b/ShareX.UploadersLib/Forms/JiraUpload.cs @@ -25,9 +25,9 @@ // gpailler +using ShareX.UploadersLib.Properties; using System; using System.Windows.Forms; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib.GUI { diff --git a/ShareX.UploadersLib/Forms/TwitterTweetForm.cs b/ShareX.UploadersLib/Forms/TwitterTweetForm.cs index a0ab4528c..61f02a8e8 100644 --- a/ShareX.UploadersLib/Forms/TwitterTweetForm.cs +++ b/ShareX.UploadersLib/Forms/TwitterTweetForm.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using System; -using System.Windows.Forms; using ShareX.UploadersLib.HelperClasses; using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.Properties; +using System; +using System.Windows.Forms; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index c8e9ed320..0fe8ce374 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -25,16 +25,16 @@ using CG.Web.MegaApiClient; using ShareX.HelpersLib; +using ShareX.UploadersLib.FileUploaders; +using ShareX.UploadersLib.HelperClasses; +using ShareX.UploadersLib.ImageUploaders; +using ShareX.UploadersLib.Properties; +using ShareX.UploadersLib.TextUploaders; using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Windows.Forms; -using ShareX.UploadersLib.FileUploaders; -using ShareX.UploadersLib.HelperClasses; -using ShareX.UploadersLib.ImageUploaders; -using ShareX.UploadersLib.TextUploaders; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index 040fa45e7..afcedd310 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -24,20 +24,20 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.FileUploaders; +using ShareX.UploadersLib.Forms; +using ShareX.UploadersLib.GUI; +using ShareX.UploadersLib.HelperClasses; +using ShareX.UploadersLib.ImageUploaders; +using ShareX.UploadersLib.Properties; +using ShareX.UploadersLib.TextUploaders; +using ShareX.UploadersLib.URLShorteners; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; -using ShareX.UploadersLib.FileUploaders; -using ShareX.UploadersLib.Forms; -using ShareX.UploadersLib.GUI; -using ShareX.UploadersLib.HelperClasses; -using ShareX.UploadersLib.ImageUploaders; -using ShareX.UploadersLib.TextUploaders; -using ShareX.UploadersLib.URLShorteners; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs b/ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs index 1bb2d3bb0..8bfa14559 100644 --- a/ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs +++ b/ShareX.UploadersLib/HelperClasses/CertFileNameEditor.cs @@ -23,11 +23,11 @@ #endregion License Information (GPL v3) +using ShareX.UploadersLib.Properties; using System; using System.ComponentModel; using System.Windows.Forms; using System.Windows.Forms.Design; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib.HelperClasses { diff --git a/ShareX.UploadersLib/HelperClasses/ImageListManager.cs b/ShareX.UploadersLib/HelperClasses/ImageListManager.cs index 18c58b824..6ce36287b 100644 --- a/ShareX.UploadersLib/HelperClasses/ImageListManager.cs +++ b/ShareX.UploadersLib/HelperClasses/ImageListManager.cs @@ -23,10 +23,10 @@ #endregion License Information (GPL v3) +using ShareX.UploadersLib.Properties; using System.Drawing; using System.Resources; using System.Windows.Forms; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib.HelperClasses { diff --git a/ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs b/ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs index 37c78e1c4..c1baa260c 100644 --- a/ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs +++ b/ShareX.UploadersLib/HelperClasses/KeyFileNameEditor.cs @@ -23,11 +23,11 @@ #endregion License Information (GPL v3) +using ShareX.UploadersLib.Properties; using System; using System.ComponentModel; using System.Windows.Forms; using System.Windows.Forms.Design; -using ShareX.UploadersLib.Properties; namespace ShareX.UploadersLib.HelperClasses { diff --git a/ShareX.UploadersLib/ImageUploaders/Chevereto.cs b/ShareX.UploadersLib/ImageUploaders/Chevereto.cs index 3f57a2f74..b1a59227f 100644 --- a/ShareX.UploadersLib/ImageUploaders/Chevereto.cs +++ b/ShareX.UploadersLib/ImageUploaders/Chevereto.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System.Collections.Generic; using System.IO; diff --git a/ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs b/ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs index 0c326e7b9..0f5e60d48 100644 --- a/ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs +++ b/ShareX.UploadersLib/ImageUploaders/Imgur_v2.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.Collections.Generic; using System.IO; using System.Xml.Linq; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs b/ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs index a5cb9dc1d..188f3c1d6 100644 --- a/ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs +++ b/ShareX.UploadersLib/ImageUploaders/Imgur_v3.cs @@ -25,11 +25,11 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/Photobucket.cs b/ShareX.UploadersLib/ImageUploaders/Photobucket.cs index cd8c05fd2..5abe7c388 100644 --- a/ShareX.UploadersLib/ImageUploaders/Photobucket.cs +++ b/ShareX.UploadersLib/ImageUploaders/Photobucket.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; using System.Xml.Linq; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/Picasa.cs b/ShareX.UploadersLib/ImageUploaders/Picasa.cs index d9ef58fb0..73a5356f0 100644 --- a/ShareX.UploadersLib/ImageUploaders/Picasa.cs +++ b/ShareX.UploadersLib/ImageUploaders/Picasa.cs @@ -23,13 +23,13 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Collections.Specialized; using System.IO; using System.Xml.Linq; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs b/ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs index 9bd4cb1e4..5b1d3873a 100644 --- a/ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using Newtonsoft.Json; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.ComponentModel; using System.IO; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs b/ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs index f1a44b3bd..17cf15966 100644 --- a/ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.IO; using System.Xml.Linq; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/Twitter.cs b/ShareX.UploadersLib/ImageUploaders/Twitter.cs index 0d5bbd46c..1fdfb6703 100644 --- a/ShareX.UploadersLib/ImageUploaders/Twitter.cs +++ b/ShareX.UploadersLib/ImageUploaders/Twitter.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using Newtonsoft.Json; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.IO; using System.Windows.Forms; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs b/ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs index 22cd7d44a..d80676920 100644 --- a/ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Xml.Linq; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.ImageUploaders { diff --git a/ShareX.UploadersLib/OtherServices/GoogleTranslate.cs b/ShareX.UploadersLib/OtherServices/GoogleTranslate.cs index 52f429fa3..e7b21f7c0 100644 --- a/ShareX.UploadersLib/OtherServices/GoogleTranslate.cs +++ b/ShareX.UploadersLib/OtherServices/GoogleTranslate.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json.Linq; +using ShareX.HelpersLib; using System; using System.Collections.Generic; using System.Linq; diff --git a/ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs b/ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs index a4989a10c..7b38206c9 100644 --- a/ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs +++ b/ShareX.UploadersLib/OtherServices/GoogleTranslatorConfig.cs @@ -24,8 +24,8 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using System.Collections.Generic; using ShareX.UploadersLib.OtherServices; +using System.Collections.Generic; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/TextUploaders/Gist.cs b/ShareX.UploadersLib/TextUploaders/Gist.cs index 72c4b65b7..0ec1319d4 100644 --- a/ShareX.UploadersLib/TextUploaders/Gist.cs +++ b/ShareX.UploadersLib/TextUploaders/Gist.cs @@ -23,11 +23,11 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Net; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.TextUploaders { diff --git a/ShareX.UploadersLib/TextUploaders/Hastebin.cs b/ShareX.UploadersLib/TextUploaders/Hastebin.cs index e0f634768..cd8ff7e56 100644 --- a/ShareX.UploadersLib/TextUploaders/Hastebin.cs +++ b/ShareX.UploadersLib/TextUploaders/Hastebin.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; namespace ShareX.UploadersLib.TextUploaders { diff --git a/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs b/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs index 3b6cdbea4..ea9c4dc82 100644 --- a/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs @@ -23,11 +23,11 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Web; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib.URLShorteners { diff --git a/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs b/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs index 71648d49b..c0aeee8aa 100644 --- a/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs @@ -23,10 +23,10 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; -using System.Collections.Generic; +using ShareX.HelpersLib; using ShareX.UploadersLib.HelperClasses; +using System.Collections.Generic; namespace ShareX.UploadersLib.URLShorteners { diff --git a/ShareX.UploadersLib/Uploader.cs b/ShareX.UploadersLib/Uploader.cs index 75cb26ac8..75093f072 100644 --- a/ShareX.UploadersLib/Uploader.cs +++ b/ShareX.UploadersLib/Uploader.cs @@ -24,6 +24,7 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib.HelperClasses; using System; using System.Collections.Generic; using System.Collections.Specialized; @@ -34,7 +35,6 @@ using System.Text; using System.Web; using System.Windows.Forms; -using ShareX.UploadersLib.HelperClasses; namespace ShareX.UploadersLib { diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index d7314230b..e3bcabbd1 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -25,12 +25,12 @@ using CG.Web.MegaApiClient; using ShareX.HelpersLib; -using System; -using System.Collections.Generic; using ShareX.UploadersLib.FileUploaders; using ShareX.UploadersLib.HelperClasses; using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.TextUploaders; +using System; +using System.Collections.Generic; namespace ShareX.UploadersLib { diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index 564e3e85b..e1743571c 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -24,11 +24,11 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; using System.Drawing.Design; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/Controls/BeforeUploadControl.cs b/ShareX/Controls/BeforeUploadControl.cs index c6b4c633c..c6dcde8f7 100644 --- a/ShareX/Controls/BeforeUploadControl.cs +++ b/ShareX/Controls/BeforeUploadControl.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib; using System; using System.Linq; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/Forms/AfterUploadForm.cs b/ShareX/Forms/AfterUploadForm.cs index 0ca11ee25..a8faa69b8 100644 --- a/ShareX/Forms/AfterUploadForm.cs +++ b/ShareX/Forms/AfterUploadForm.cs @@ -24,10 +24,10 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.UploadersLib; using System; using System.IO; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index 615403cd5..0aee42ec0 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -24,14 +24,14 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using ShareX.ScreenCaptureLib; using ShareX.Properties; +using ShareX.ScreenCaptureLib; +using ShareX.UploadersLib; using System; using System.Drawing; using System.IO; using System.Linq; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/Forms/AutoCaptureForm.cs b/ShareX/Forms/AutoCaptureForm.cs index 197514271..4e1249574 100644 --- a/ShareX/Forms/AutoCaptureForm.cs +++ b/ShareX/Forms/AutoCaptureForm.cs @@ -24,8 +24,8 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using ShareX.ScreenCaptureLib; using ShareX.Properties; +using ShareX.ScreenCaptureLib; using System; using System.Diagnostics; using System.Drawing; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 567b549a2..145165456 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -25,8 +25,9 @@ using ShareX.HelpersLib; using ShareX.HistoryLib; -using ShareX.ScreenCaptureLib; using ShareX.Properties; +using ShareX.ScreenCaptureLib; +using ShareX.UploadersLib; using System; using System.Collections.Generic; using System.Diagnostics; @@ -35,7 +36,6 @@ using System.Text; using System.Threading; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/Forms/ScreenRecordForm.cs b/ShareX/Forms/ScreenRecordForm.cs index 24497e21d..23fa9c1ab 100644 --- a/ShareX/Forms/ScreenRecordForm.cs +++ b/ShareX/Forms/ScreenRecordForm.cs @@ -24,8 +24,8 @@ #endregion License Information (GPL v3) using ShareX.HelpersLib; -using ShareX.ScreenCaptureLib; using ShareX.Properties; +using ShareX.ScreenCaptureLib; using System.Drawing; using System.IO; using System.Threading; diff --git a/ShareX/HotkeyInfo.cs b/ShareX/HotkeyInfo.cs index e23d9cf72..4e886b807 100644 --- a/ShareX/HotkeyInfo.cs +++ b/ShareX/HotkeyInfo.cs @@ -23,8 +23,8 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Newtonsoft.Json; +using ShareX.HelpersLib; using System.Text; using System.Windows.Forms; diff --git a/ShareX/Program.cs b/ShareX/Program.cs index 2877c3605..a6d357062 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -25,6 +25,7 @@ using ShareX.HelpersLib; using ShareX.Properties; +using ShareX.UploadersLib; using SingleInstanceApplication; using System; using System.Diagnostics; @@ -33,7 +34,6 @@ using System.Text; using System.Threading; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index c9893f5f1..a880bde0e 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -25,8 +25,10 @@ using ShareX.HelpersLib; using ShareX.ImageEffectsLib; -using ShareX.ScreenCaptureLib; using ShareX.Properties; +using ShareX.ScreenCaptureLib; +using ShareX.UploadersLib; +using ShareX.UploadersLib.HelperClasses; using System.Collections.Generic; using System.Diagnostics; using System.Drawing; @@ -34,8 +36,6 @@ using System.Drawing.Imaging; using System.IO; using System.Windows.Forms; -using ShareX.UploadersLib; -using ShareX.UploadersLib.HelperClasses; namespace ShareX { diff --git a/ShareX/TaskInfo.cs b/ShareX/TaskInfo.cs index 48c57d7ff..0a5e81f2c 100644 --- a/ShareX/TaskInfo.cs +++ b/ShareX/TaskInfo.cs @@ -25,10 +25,10 @@ using ShareX.HelpersLib; using ShareX.HistoryLib; -using System; -using System.IO; using ShareX.UploadersLib; using ShareX.UploadersLib.HelperClasses; +using System; +using System.IO; namespace ShareX { diff --git a/ShareX/UploadInfoManager.cs b/ShareX/UploadInfoManager.cs index bbf80167f..ecd28b9bf 100644 --- a/ShareX/UploadInfoManager.cs +++ b/ShareX/UploadInfoManager.cs @@ -23,14 +23,14 @@ #endregion License Information (GPL v3) -using ShareX.HelpersLib; using Microsoft.VisualBasic.FileIO; +using ShareX.HelpersLib; using ShareX.Properties; +using ShareX.UploadersLib; using System.Collections.Generic; using System.IO; using System.Linq; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX { diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs index 2b2b30a0a..a4abdb5fa 100644 --- a/ShareX/UploadManager.cs +++ b/ShareX/UploadManager.cs @@ -26,6 +26,7 @@ using ShareX.HelpersLib; using ShareX.IndexerLib; using ShareX.Properties; +using ShareX.UploadersLib; using System; using System.Drawing; using System.IO; @@ -33,7 +34,6 @@ using System.Net; using System.Web; using System.Windows.Forms; -using ShareX.UploadersLib; namespace ShareX {