Use compound assignment

Change-Id: Iab854d1d74156d131dde45b7dd2f57367649a98b
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

8 files changed, 12 insertions, 12 deletions

diff --git a/QtVsTools.Core/Common/Disposable.cs b/QtVsTools.Core/Common/Disposable.cs
index 9bae6963..f7193b38 100644
--- a/QtVsTools.Core/Common/Disposable.cs
+++ b/QtVsTools.Core/Common/Disposable.cs
@@ -33,7 +33,7 @@ namespace QtVsTools
 
         private HashSet<IDisposableEventSink> eventSinks = null;
         private HashSet<IDisposableEventSink> EventSinks =>
-            ThreadSafe(() => eventSinks ?? (eventSinks = new HashSet<IDisposableEventSink>()));
+            ThreadSafe(() => eventSinks ??= new HashSet<IDisposableEventSink>());
 
         public bool Disposed { get; private set; }
 
diff --git a/QtVsTools.Core/Extensions.cs b/QtVsTools.Core/Extensions.cs
index 41f793f0..61dc1860 100644
--- a/QtVsTools.Core/Extensions.cs
+++ b/QtVsTools.Core/Extensions.cs
@@ -12,7 +12,7 @@ namespace QtVsTools.Core
         public static string Replace(this string original, string oldValue, string newValue,
             StringComparison comparison)
         {
-            newValue = newValue ?? string.Empty;
+            newValue ??= "";
             if (string.IsNullOrEmpty(original) || string.IsNullOrEmpty(oldValue)
                 || string.Equals(oldValue, newValue, comparison)) {
                 return original;
diff --git a/QtVsTools.Core/QMakeQuery.cs b/QtVsTools.Core/QMakeQuery.cs
index 7ee0422b..55e8995c 100644
--- a/QtVsTools.Core/QMakeQuery.cs
+++ b/QtVsTools.Core/QMakeQuery.cs
@@ -69,7 +69,7 @@ namespace QtVsTools.Core
         }
 
         Dictionary<string, string> _Properties;
-        Dictionary<string, string> Properties => _Properties ?? (_Properties = QueryAllValues());
+        Dictionary<string, string> Properties => _Properties ??= QueryAllValues();
 
         Parser _PropertyParser;
         Parser PropertyParser
diff --git a/QtVsTools.Core/VersionInformation.cs b/QtVsTools.Core/VersionInformation.cs
index c8bf8510..740a6fdc 100644
--- a/QtVsTools.Core/VersionInformation.cs
+++ b/QtVsTools.Core/VersionInformation.cs
@@ -31,7 +31,7 @@ namespace QtVsTools.Core
 
         public static VersionInformation Get(string qtDir)
         {
-            qtDir = qtDir ?? Environment.GetEnvironmentVariable("QTDIR");
+            qtDir ??= Environment.GetEnvironmentVariable("QTDIR");
             if (qtDir == null)
                 return null;
 
diff --git a/QtVsTools.Package/Editors/Editor.QtDesigner.cs b/QtVsTools.Package/Editors/Editor.QtDesigner.cs
index 9861f5cd..18d7db6a 100644
--- a/QtVsTools.Package/Editors/Editor.QtDesigner.cs
+++ b/QtVsTools.Package/Editors/Editor.QtDesigner.cs
@@ -23,8 +23,8 @@ namespace QtVsTools.Editors
         public const string GuidString = "96FE523D-6182-49F5-8992-3BEA5F7E6FF6";
         public const string Title = "Qt Designer";
 
-        Guid? _Guid;
-        public override Guid Guid => (_Guid ?? (_Guid = new Guid(GuidString))).Value;
+        private Guid? guid;
+        public override Guid Guid => guid ??= new Guid(GuidString);
 
         public override string ExecutableName => "designer.exe";
 
diff --git a/QtVsTools.Package/Editors/Editor.QtLinguist.cs b/QtVsTools.Package/Editors/Editor.QtLinguist.cs
index 87287e9f..1bdfe68a 100644
--- a/QtVsTools.Package/Editors/Editor.QtLinguist.cs
+++ b/QtVsTools.Package/Editors/Editor.QtLinguist.cs
@@ -15,8 +15,8 @@ namespace QtVsTools.Editors
         public const string GuidString = "4A1333DC-5C94-4F14-A7BF-DC3D96092234";
         public const string Title = "Qt Linguist";
 
-        Guid? _Guid;
-        public override Guid Guid => (_Guid ?? (_Guid = new Guid(GuidString))).Value;
+        private Guid? guid;
+        public override Guid Guid => (guid ??= new Guid(GuidString));
 
         public override string ExecutableName => "linguist.exe";
 
diff --git a/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs b/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
index 50918b0a..3e31e6fa 100644
--- a/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
+++ b/QtVsTools.Package/Editors/Editor.QtResourceEditor.cs
@@ -16,8 +16,8 @@ namespace QtVsTools.Editors
         public const string GuidString = "D0FFB6E6-5829-4DD9-835E-2965449AC6BF";
         public const string Title = "Qt Resource Editor";
 
-        Guid? _Guid;
-        public override Guid Guid => (_Guid ?? (_Guid = new Guid(GuidString))).Value;
+        private Guid? guid;
+        public override Guid Guid => (guid ??= new Guid(GuidString));
 
         public override string ExecutableName => "QrcEditor.exe";
 
diff --git a/QtVsTools.Package/QML/Debugging/V4/Messages/QmlDebugV4Message.cs b/QtVsTools.Package/QML/Debugging/V4/Messages/QmlDebugV4Message.cs
index bbc70954..9cb11153 100644
--- a/QtVsTools.Package/QML/Debugging/V4/Messages/QmlDebugV4Message.cs
+++ b/QtVsTools.Package/QML/Debugging/V4/Messages/QmlDebugV4Message.cs
@@ -311,11 +311,11 @@ namespace QtVsTools.Qml.Debug.V4
         where TBody : class, new()
     {
         [DataMember(Name = "body", EmitDefaultValue = false)]
-        TBody body = null;
+        private TBody body;
 
         public TBody Body
         {
-            get => ThreadSafe(() => body ?? (body = new TBody()));
+            get => ThreadSafe(() => body ??= new TBody());
             set => body = value;
         }
     }