Fix remaining warnings

Change-Id: I6ee39a9de5da3c1beb63803b2bdb2f39c59c449d
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

9 files changed, 40 insertions, 29 deletions

diff --git a/QMakeFileReader/evaluator/proitems.cpp b/QMakeFileReader/evaluator/proitems.cpp
index b9905f30..4da50dc4 100644
--- a/QMakeFileReader/evaluator/proitems.cpp
+++ b/QMakeFileReader/evaluator/proitems.cpp
@@ -341,7 +341,7 @@ static QString ProStringList_join(const ProStringList &this_, const QChar *sep,
         totalLength += this_.at(i).size();
 
     if (sz)
-        totalLength += sepSize * (sz - 1);
+        totalLength += int(sepSize) * (sz - 1);
 
     QString res(totalLength, Qt::Uninitialized);
     QChar *ptr = (QChar *)res.constData();
diff --git a/QtVsTools.Package/Package/QtHelp.cs b/QtVsTools.Package/Package/QtHelp.cs
index d981b6a5..9a069ac2 100644
--- a/QtVsTools.Package/Package/QtHelp.cs
+++ b/QtVsTools.Package/Package/QtHelp.cs
@@ -196,8 +196,9 @@ namespace QtVsTools
                     using (var connection = new SQLiteConnection(builder.ToString())) {
                         connection.Open();
                         using (var command = new SQLiteCommand(linksForKeyword, connection)) {
-                            using (var reader =
-                                Task.Run(async () => await command.ExecuteReaderAsync()).Result) {
+                            var reader = QtVsToolsPackage.Instance.JoinableTaskFactory
+                                .Run(async () => await command.ExecuteReaderAsync());
+                            using (reader) {
                                 while (reader.Read()) {
                                     var title = GetString(reader, 0);
                                     if (string.IsNullOrWhiteSpace(title))
diff --git a/QtVsTools.Package/Package/QtMsBuildConverter.cs b/QtVsTools.Package/Package/QtMsBuildConverter.cs
index df3f6458..e673dd54 100644
--- a/QtVsTools.Package/Package/QtMsBuildConverter.cs
+++ b/QtVsTools.Package/Package/QtMsBuildConverter.cs
@@ -191,7 +191,7 @@ namespace QtVsTools
             try {
                 if (solution.UnloadProject(
                     ref projectGuid,
-                    (uint)_VSProjectUnloadStatus.UNLOADSTATUS_LoadPendingIfNeeded)
+                    (uint)_VSProjectUnloadStatus.UNLOADSTATUS_UnloadedByUser)
                     != VSConstants.S_OK)
                     return ErrorMessage(
                         string.Format(SR.GetString("ErrorConvertingProject"), projectName));
diff --git a/QtVsTools.Package/QML/Classification/QmlAsyncClassifier.cs b/QtVsTools.Package/QML/Classification/QmlAsyncClassifier.cs
index b1c3deda..66610cf2 100644
--- a/QtVsTools.Package/QML/Classification/QmlAsyncClassifier.cs
+++ b/QtVsTools.Package/QML/Classification/QmlAsyncClassifier.cs
@@ -265,7 +265,7 @@ namespace QtVsTools.Qml.Classification
             currentTagList = null;
             this.classificationType = classificationType;
 
-            AsyncParse(buffer.CurrentSnapshot);
+            Parse(buffer.CurrentSnapshot);
         }
 
         private void TextView_Closed(object sender, EventArgs e)
@@ -284,16 +284,16 @@ namespace QtVsTools.Qml.Classification
         private void Buffer_Changed(object sender, TextContentChangedEventArgs e)
         {
             timer.Stop();
-            AsyncParse(e.After);
+            Parse(e.After);
         }
 
         private void Timer_Tick(object sender, EventArgs e)
         {
             timer.Stop();
-            AsyncParse(Buffer.CurrentSnapshot);
+            Parse(Buffer.CurrentSnapshot);
         }
 
-        private async void AsyncParse(ITextSnapshot snapshot)
+        private void Parse(ITextSnapshot snapshot)
         {
             lock (criticalSection) {
                 if (flag)
@@ -309,7 +309,7 @@ namespace QtVsTools.Qml.Classification
             ParserKey oldParserKey = null;
             TagListKey oldTagListKey = null;
 
-            await Task.Run(() =>
+            _ = Task.Run(() =>
             {
                 var parser = ParserStore.Instance.Get(this, newParserKey);
 
@@ -342,7 +342,7 @@ namespace QtVsTools.Qml.Classification
                 flag = false;
             }
 
-            await Task.Run(() =>
+            _ = Task.Run(() =>
             {
                 if (oldParserKey != null)
                     ParserStore.Instance.Release(this, oldParserKey);
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
index 293b5cc3..5256521f 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Program.cs
@@ -164,13 +164,12 @@ namespace QtVsTools.Qml.Debug.AD7
         {
             var debugMode = new DBGMODE[1];
             int res = VSConstants.S_FALSE;
-            vsDebuggerThreadDispatcher
-                .BeginInvoke(new Action(() =>
-                {
-                    ThreadHelper.ThrowIfNotOnUIThread();
-                    res = VsDebugger.GetMode(debugMode);
-                }), new object[0])
-                .Wait();
+
+            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(async () =>
+            {
+                await QtVsToolsPackage.Instance.JoinableTaskFactory.SwitchToMainThreadAsync();
+                res = VsDebugger.GetMode(debugMode);
+            });
 
             if (res != VSConstants.S_OK)
                 return false;
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
index 1d5f3b61..43c51e73 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7StackFrame.cs
@@ -32,6 +32,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Debugger.Interop;
+using Microsoft.VisualStudio.Threading;
 
 namespace QtVsTools.Qml.Debug.AD7
 {
@@ -57,7 +58,7 @@ namespace QtVsTools.Qml.Debug.AD7
         private string Name { get; set; }
         public int FrameNumber { get; set; }
         private IEnumerable<int> Scopes { get; set; }
-        private Task InitThread { get; set; }
+        private JoinableTask InitThread { get; set; }
 
         public static StackFrame Create(
             string name,
@@ -85,7 +86,11 @@ namespace QtVsTools.Qml.Debug.AD7
             Name = string.Format("{0}@{1}:{2}", name, context.FilePath, context.FileLine + 1);
             FrameNumber = number;
             Scopes = scopes;
-            InitThread = Task.Run(() => InitializeProperties());
+            InitThread = QtVsToolsPackage.Instance.JoinableTaskFactory.RunAsync(async () =>
+            {
+                InitializeProperties();
+                await Task.Yield();
+            });
             return true;
         }
 
@@ -134,7 +139,7 @@ namespace QtVsTools.Qml.Debug.AD7
             if (guidFilter != Guid.Empty && !Property.Filter.LocalsSelected(ref guidFilter))
                 return VSConstants.S_OK;
 
-            InitThread.Wait();
+            InitThread.Join();
             pcelt = 0;
             ppEnum = PropertyEnum.Create(Properties
                 .SelectMany(x => x.Value
diff --git a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
index 8444caad..d6295017 100644
--- a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
+++ b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Client.cs
@@ -95,14 +95,17 @@ namespace QtVsTools.Qml.Debug.V4
         {
             this.sink = sink;
 
-            Task.WaitAny(new[]
+            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(async () =>
             {
-                // Try to start client thread
-                // Unblock if thread was abruptly terminated (e.g. DLL not found)
-                clientThread = Task.Run(() => ClientThread()),
+                await Task.WhenAny(new[]
+                {
+                    // Try to start client thread
+                    // Unblock if thread was abruptly terminated (e.g. DLL not found)
+                    clientThread = Task.Run(() => ClientThread()),
 
-                // Unblock if client was created (i.e. client thread is running)
-                Task.Run(() => clientCreated.WaitOne())
+                    // Unblock if client was created (i.e. client thread is running)
+                    Task.Run(() => clientCreated.WaitOne())
+                });
             });
 
             if (State == DebugClientState.Unavailable) {
@@ -130,7 +133,9 @@ namespace QtVsTools.Qml.Debug.V4
         {
             if (State != DebugClientState.Unavailable) {
                 NativeMethods.DebugClientShutdown(client);
-                clientThread.Wait();
+
+                QtVsToolsPackage.Instance.JoinableTaskFactory.Run(
+                    async () => await Task.WhenAll(new[] { clientThread }));
             }
         }
 
diff --git a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
index 844ac385..bba7c6fe 100644
--- a/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
+++ b/QtVsTools.Package/QML/Debugging/V4/QmlDebugV4Protocol.cs
@@ -92,7 +92,8 @@ namespace QtVsTools.Qml.Debug.V4
         protected override void DisposeFinally()
         {
             eventReceived.Set();
-            eventHandlingThread.Wait();
+            QtVsToolsPackage.Instance.JoinableTaskFactory.Run(
+                async () => await Task.WhenAll(new[] { eventHandlingThread }));
             eventReceived.Dispose();
         }
 
diff --git a/QtVsTools.Package/QtVsToolsPackage.cs b/QtVsTools.Package/QtVsToolsPackage.cs
index a1856863..efccedcc 100644
--- a/QtVsTools.Package/QtVsToolsPackage.cs
+++ b/QtVsTools.Package/QtVsToolsPackage.cs
@@ -174,7 +174,7 @@ namespace QtVsTools
                 await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
                 var timeUiThreadBegin = initTimer.Elapsed;
 
-                if ((Dte = VsServiceProvider.GetService<DTE>()) == null)
+                if ((Dte = await VsServiceProvider.GetServiceAsync<DTE>()) == null)
                     throw new Exception("Unable to get service: DTE");
 
                 QtVSIPSettings.Options = Options;