Bugfix, fix for #16 (missing "\" between concatenated paths) - for real this time

Author: VioletGiraffe

CPPCheckPlugin/AnalyzerCppcheck.cs

@@ -55,14 +55,14 @@ public override void analyze(List<SourceFile> filesToAnalyze, OutputWindowPane o
 			{
 				if (!path.ToLower().Contains("qt"))
 				{
-					String includeArgument = @" -I""" + (path.EndsWith("\\") ? path : path+@"\\") + @"""";					
+					String includeArgument = " -I\"" + path + "\"";
 					cppheckargs = cppheckargs + " " + includeArgument;
 				}
 			}
 
 			foreach (SourceFile file in filesToAnalyze)
 			{
-				cppheckargs += @" """ + file.FilePath + @"""";
+				cppheckargs += " \"" + file.FilePath + "\"";
 			}
 
 			if (filesToAnalyze.Count > 1) // For single file only checking current configuration (for speed)
@@ -134,8 +134,6 @@ protected override HashSet<string> readSuppressions(string projectBasePath)
 					if (currentGroup == "cppcheck")
 					{
 						var components = line.Split(':');
-// 						if (components.Length >= 2 && components[1] == "*")                          // id and "*" for a file specified
-// 							components[1] = @"""" + projectBasePath + @"*""";                        // adding path to this specific project
 						if (components.Length >= 2 && !components[1].StartsWith("*"))           // id and some path without "*"
 							components[1] = "*" + components[1]; // adding * in front
 

CPPCheckPlugin/CPPCheckPluginPackage.cs

@@ -124,14 +124,13 @@ private void checkCurrentProject()
 				}
 				foreach (dynamic file in project.Files)
 				{
-					// Only checking cpp files (performance)
 					Type fileObjectType = file.GetType();
 					// Automatic property binding fails with VS2013 for some unknown reason, using Reflection directly instead.
 					var vcFileInterface = fileObjectType.GetInterface("Microsoft.VisualStudio.VCProjectEngine.VCFile");
 					var fileType = vcFileInterface.GetProperty("FileType").GetValue(file);
 					Type fileTypeEnumType = fileType.GetType();
 					var fileTypeEnumConstant = Enum.GetName(fileTypeEnumType, fileType);
-					if (fileTypeEnumConstant == "eFileTypeCppCode")
+					if (fileTypeEnumConstant == "eFileTypeCppCode") // Only checking cpp files (performance)
 					{
 						String fileName = file.Name;
 						// Ignoring Qt MOC and UI files

CPPCheckPlugin/SourceFile.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System;
 using System.Diagnostics;
+using System.IO;
 
 namespace VSPackage.CPPCheckPlugin
 {
@@ -15,8 +16,11 @@ public SourceFile(string fullPath, string projectBasePath)
 		// All include paths being added are resolved against projectBasePath
 		public void addIncludePath(string path)
 		{
-			if (!String.IsNullOrEmpty(_projectBasePath))
-				_includePaths.Add(cleanPath(path.Contains(":") ? path : (_projectBasePath + path)));
+			if (!String.IsNullOrEmpty(_projectBasePath) && !String.IsNullOrEmpty(path))
+			{
+				Debug.WriteLine("Processing path: " + path);
+				_includePaths.Add(cleanPath(path.Contains(":") ? path : Path.Combine(_projectBasePath, path)));
+			}
 		}
 
 		public void addIncludePaths(List<string> paths)