From 0e7930f2b6f9062af1c3b5ff56cbda777da4cac3 Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Thu, 12 Aug 2021 18:50:51 -0600 Subject: [PATCH] Removed intermediate class. --- LibationWinForms/BookLiberation/AudioDecodeForm.cs | 7 +------ .../BookLiberation/BaseForms/LiberationBaseForm.cs | 10 +--------- LibationWinForms/BookLiberation/DownloadForm.cs | 7 +------ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/LibationWinForms/BookLiberation/AudioDecodeForm.cs b/LibationWinForms/BookLiberation/AudioDecodeForm.cs index 1e0dd1a9..4d8f66b8 100644 --- a/LibationWinForms/BookLiberation/AudioDecodeForm.cs +++ b/LibationWinForms/BookLiberation/AudioDecodeForm.cs @@ -6,12 +6,7 @@ using System; namespace LibationWinForms.BookLiberation { - public partial class AudioDecodeForm -#if DEBUG - : DebugIntermediate -#else - : LiberationBaseForm -#endif + public partial class AudioDecodeForm : LiberationBaseForm { public virtual string DecodeActionName { get; } = "Decoding"; public AudioDecodeForm() => InitializeComponent(); diff --git a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs index f04788b7..21618888 100644 --- a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs +++ b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs @@ -9,7 +9,7 @@ using System.Windows.Forms; namespace LibationWinForms.BookLiberation.BaseForms { - public abstract class LiberationBaseForm : Form + public class LiberationBaseForm : Form { protected IStreamable Streamable { get; private set; } protected LogMe LogMe { get; private set; } @@ -177,12 +177,4 @@ namespace LibationWinForms.BookLiberation.BaseForms public virtual void OnCoverImageDiscovered(object sender, byte[] coverArt) { } #endregion } - - #region VS Design View Hack - /// - /// This class is a hack so that VS designer will work wif an abstract base class. - /// https://stackoverflow.com/questions/1620847/how-can-i-get-visual-studio-2008-windows-forms-designer-to-render-a-form-that-im/2406058#2406058 - /// - public class DebugIntermediate : LiberationBaseForm { } - #endregion } diff --git a/LibationWinForms/BookLiberation/DownloadForm.cs b/LibationWinForms/BookLiberation/DownloadForm.cs index 1eb50c9e..e503deac 100644 --- a/LibationWinForms/BookLiberation/DownloadForm.cs +++ b/LibationWinForms/BookLiberation/DownloadForm.cs @@ -7,12 +7,7 @@ using System.Windows.Forms; namespace LibationWinForms.BookLiberation { - public partial class DownloadForm -#if DEBUG - : DebugIntermediate -#else - : LiberationBaseForm -#endif + public partial class DownloadForm : LiberationBaseForm { public DownloadForm() {