#92 : Small refactorings

clechasseur · Jan 18, 2020 · a64596f · a64596f
1 parent fb02d23
commit a64596f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/PathCopyCopy/src/PluginPipelineElements.cpp b/PathCopyCopy/src/PluginPipelineElements.cpp
@@ -362,8 +362,11 @@ namespace PCC
     {
         bool valid = false;
         if (p_pPluginProvider != nullptr) {
+            // Try finding the plugin we need.
             const auto spPlugin = p_pPluginProvider->GetPlugin(m_PluginId);
             if (spPlugin != nullptr) {
+                // To be valid, plugin either has to not be a pipeline plugin
+                // OR it needs to be one and have a valid pipeline.
                 const auto* const pPipelinePlugin = dynamic_cast<PCC::Plugins::PipelinePlugin*>(spPlugin.get());
                 valid = pPipelinePlugin == nullptr || pPipelinePlugin->GetPipeline(&p_rsSeenPluginIds) != nullptr;
             }

diff --git a/PathCopyCopySettings/UI/UserControls/FindReplacePipelineElementUserControl.cs b/PathCopyCopySettings/UI/UserControls/FindReplacePipelineElementUserControl.cs
@@ -32,7 +32,7 @@ namespace PathCopyCopy.Settings.UI.UserControls
     public partial class FindReplacePipelineElementUserControl : PipelineElementUserControl
     {
         /// Element we're configuring.
-        private FindReplacePipelineElement element;
+        private readonly FindReplacePipelineElement element;
 
         /// <summary>
         /// Constructor.

diff --git a/PathCopyCopySettings/UI/UserControls/PathsSeparatorPipelineElementUserControl.cs b/PathCopyCopySettings/UI/UserControls/PathsSeparatorPipelineElementUserControl.cs
@@ -32,7 +32,7 @@ namespace PathCopyCopy.Settings.UI.UserControls
     public partial class PathsSeparatorPipelineElementUserControl : PipelineElementUserControl
     {
         /// Element we're configuring.
-        private PathsSeparatorPipelineElement element;
+        private  readonly PathsSeparatorPipelineElement element;
 
         /// <summary>
         /// Constructor.

diff --git a/PathCopyCopySettings/UI/UserControls/PipelineElementWithExecutableUserControl.cs b/PathCopyCopySettings/UI/UserControls/PipelineElementWithExecutableUserControl.cs
@@ -33,7 +33,7 @@ namespace PathCopyCopy.Settings.UI.UserControls
     public partial class PipelineElementWithExecutableUserControl : PipelineElementUserControl
     {
         /// Element we're configuring.
-        private PipelineElementWithExecutable element;
+        private readonly PipelineElementWithExecutable element;
 
         /// <summary>
         /// Constructor.

diff --git a/PathCopyCopySettings/UI/UserControls/PluginPreviewUserControl.cs b/PathCopyCopySettings/UI/UserControls/PluginPreviewUserControl.cs
@@ -34,8 +34,10 @@ public partial class PluginPreviewUserControl : UserControl
         /// Plugin we're currently previewing.
         private Plugin plugin;
 
+#pragma warning disable IDE0044 // Add readonly modifier
         /// Object used to access user settings.
         private UserSettings settings;
+#pragma warning restore IDE0044 // Add readonly modifier
 
         /// <summary>
         /// Plugin to preview. Change this to update the preview displayed.

diff --git a/PathCopyCopySettings/UI/UserControls/RegexPipelineElementUserControl.cs b/PathCopyCopySettings/UI/UserControls/RegexPipelineElementUserControl.cs
@@ -33,7 +33,7 @@ namespace PathCopyCopy.Settings.UI.UserControls
     public partial class RegexPipelineElementUserControl : PipelineElementUserControl
     {
         /// Element we're configuring.
-        private RegexPipelineElement element;
+        private readonly RegexPipelineElement element;
 
         /// <summary>
         /// Constructor.