aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2017-01-06 13:51:56 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2017-01-09 10:28:40 +0000
commit667a879aa37c4b87fe164368e8f44c6497e0e7f8 (patch)
tree3ad482ef66558d1da85b79e125fa707139e4d21a
parentd54c7685cf6a370a124acadbbec2807a8b9a7150 (diff)
Unify file extension checking
Change-Id: I1323a3fcddf0c8733f59ce210c304564587f0534 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r--src/qtprojectlib/HelperFunctions.cs77
-rw-r--r--src/qtprojectlib/MocCmdChecker.cs2
-rw-r--r--src/qtprojectlib/QtProject.cs63
-rw-r--r--src/qtprojectlib/QtVSIPSettings.cs10
-rw-r--r--src/qtprojectlib/RccOptions.cs2
-rw-r--r--src/qtvstools/DefaultEditorsClient.cs2
-rw-r--r--src/qtvstools/DteEventsHandler.cs16
-rw-r--r--src/qtvstools/Translation.cs8
8 files changed, 90 insertions, 90 deletions
diff --git a/src/qtprojectlib/HelperFunctions.cs b/src/qtprojectlib/HelperFunctions.cs
index 4af5c73a..092fc652 100644
--- a/src/qtprojectlib/HelperFunctions.cs
+++ b/src/qtprojectlib/HelperFunctions.cs
@@ -122,18 +122,43 @@ namespace QtProjectLib
return qtDir;
}
- static public bool HasSourceFileExtension(string fileName)
+ static readonly HashSet<string> _sources = new HashSet<string>(new [] { ".c", ".cpp", ".cxx"},
+ StringComparer.OrdinalIgnoreCase);
+ static public bool IsSourceFile(string fileName)
{
- return fileName.EndsWith(".c", StringComparison.OrdinalIgnoreCase)
- || fileName.EndsWith(".cpp", StringComparison.OrdinalIgnoreCase)
- || fileName.EndsWith(".cxx", StringComparison.OrdinalIgnoreCase);
+ return _sources.Contains(Path.GetExtension(fileName));
}
- static public bool HasHeaderFileExtension(string fileName)
+ static readonly HashSet<string> _headers = new HashSet<string>(new[] { ".h", ".hpp", ".hxx" },
+ StringComparer.OrdinalIgnoreCase);
+ static public bool IsHeaderFile(string fileName)
{
- return fileName.EndsWith(".h", StringComparison.OrdinalIgnoreCase)
- || fileName.EndsWith(".hpp", StringComparison.OrdinalIgnoreCase)
- || fileName.EndsWith(".hxx", StringComparison.OrdinalIgnoreCase);
+ return _headers.Contains(Path.GetExtension(fileName));
+ }
+
+ public static bool IsUicFile(string fileName)
+ {
+ return ".ui".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
+ }
+
+ public static bool IsMocFile(string fileName)
+ {
+ return ".moc".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
+ }
+
+ public static bool IsQrcFile(string fileName)
+ {
+ return ".qrc".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
+ }
+
+ public static bool IsWinRCFile(string fileName)
+ {
+ return ".rc".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
+ }
+
+ public static bool IsTranslationFile(string fileName)
+ {
+ return ".ts".Equals(Path.GetExtension(fileName), StringComparison.OrdinalIgnoreCase);
}
static public void SetDebuggingEnvironment(Project prj)
@@ -938,30 +963,6 @@ namespace QtProjectLib
}
}
- // returns true if the file is a rc file (.rc)
- public static bool IsWinRCFile(VCFile vcfile)
- {
- if (vcfile == null)
- return false;
-
- if (vcfile.Extension.ToLower() == ".rc")
- return true;
-
- return false;
- }
-
- // returns true if the file is a translation file (.ts)
- public static bool IsTranslationFile(VCFile vcfile)
- {
- if (vcfile == null)
- return false;
-
- if (vcfile.Extension.ToLower() == ".ts")
- return true;
-
- return false;
- }
-
// returns false if some exception occurs
public static bool IsResource(VCFile vcfile)
{
@@ -1003,13 +1004,11 @@ namespace QtProjectLib
continue;
// can be in any filter
- if ((IsTranslationFile(vcfile)) &&
- (filter == FilesToList.FL_Translation))
+ if (IsTranslationFile(vcfile.Name) && (filter == FilesToList.FL_Translation))
fileList.Add(ChangePathFormat(vcfile.RelativePath));
// can also be in any filter
- if ((IsWinRCFile(vcfile)) &&
- (filter == FilesToList.FL_WinResource))
+ if (IsWinRCFile(vcfile.Name) && (filter == FilesToList.FL_WinResource))
fileList.Add(ChangePathFormat(vcfile.RelativePath));
if (IsGenerated(vcfile)) {
@@ -1026,15 +1025,15 @@ namespace QtProjectLib
switch (filter) {
case FilesToList.FL_UiFiles: // form files
- if (vcfile.Extension.ToLower() == ".ui")
+ if (IsUicFile(vcfile.Name))
fileList.Add(ChangePathFormat(vcfile.RelativePath));
break;
case FilesToList.FL_HFiles:
- if (HasHeaderFileExtension(vcfile.Name))
+ if (IsHeaderFile(vcfile.Name))
fileList.Add(ChangePathFormat(vcfile.RelativePath));
break;
case FilesToList.FL_CppFiles:
- if (HasSourceFileExtension(vcfile.Name))
+ if (IsSourceFile(vcfile.Name))
fileList.Add(ChangePathFormat(vcfile.RelativePath));
break;
}
diff --git a/src/qtprojectlib/MocCmdChecker.cs b/src/qtprojectlib/MocCmdChecker.cs
index 85c98e07..99bb2633 100644
--- a/src/qtprojectlib/MocCmdChecker.cs
+++ b/src/qtprojectlib/MocCmdChecker.cs
@@ -50,7 +50,7 @@ namespace QtProjectLib
string outputFile)
{
var inputMocFile = ProjectMacros.Path;
- if (outputFile.EndsWith(".moc", StringComparison.OrdinalIgnoreCase))
+ if (HelperFunctions.IsMocFile(outputFile))
inputMocFile = mocFile;
var cmds = SplitIntoCommands(cmdLine);
var mocPos = MocCommandPosition(cmds);
diff --git a/src/qtprojectlib/QtProject.cs b/src/qtprojectlib/QtProject.cs
index ba36c93c..2f67f935 100644
--- a/src/qtprojectlib/QtProject.cs
+++ b/src/qtprojectlib/QtProject.cs
@@ -130,7 +130,7 @@ namespace QtProjectLib
{
var fi = new FileInfo(uiFile);
var file = fi.Name;
- if (fi.Extension == ".ui") {
+ if (HelperFunctions.IsUicFile(file)) {
return QtVSIPSettings.GetUicDirectory(envPro)
+ "\\ui_" + file.Remove(file.Length - 3, 3) + ".h";
}
@@ -147,9 +147,9 @@ namespace QtProjectLib
var fi = new FileInfo(file);
var name = fi.Name;
- if (HelperFunctions.HasHeaderFileExtension(fi.Name))
+ if (HelperFunctions.IsHeaderFile(fi.Name))
return "moc_" + name.Substring(0, name.LastIndexOf('.')) + ".cpp";
- if (HelperFunctions.HasSourceFileExtension(fi.Name))
+ if (HelperFunctions.IsSourceFile(fi.Name))
return name.Substring(0, name.LastIndexOf('.')) + ".moc";
return null;
}
@@ -645,7 +645,7 @@ namespace QtProjectLib
private string GetPCHMocOptions(VCFile file, CompilerToolWrapper compiler)
{
// As .moc files are included, we should not add anything there
- if (!HelperFunctions.HasHeaderFileExtension(file.Name))
+ if (!HelperFunctions.IsHeaderFile(file.Name))
return string.Empty;
var additionalMocOptions = "\"-f" + compiler.GetPrecompiledHeaderThrough().Replace('\\', '/') + "\" ";
@@ -674,7 +674,7 @@ namespace QtProjectLib
var hasDifferentMocFilePerConfig = QtVSIPSettings.HasDifferentMocFilePerConfig(envPro);
var hasDifferentMocFilePerPlatform = QtVSIPSettings.HasDifferentMocFilePerPlatform(envPro);
- var mocableIsCPP = mocFileName.EndsWith(".moc", StringComparison.OrdinalIgnoreCase);
+ var mocableIsCPP = HelperFunctions.IsMocFile(mocFileName);
// Fresh C++ headers don't have a usable custom build tool. We must set the item type first.
if (!mocableIsCPP && file.ItemType != "CustomBuild")
@@ -701,7 +701,7 @@ namespace QtProjectLib
fi.Directory.Create();
mocFile = AddFileInSubfilter(Filters.GeneratedFiles(), subfilterName,
mocRelPath);
- if (mocFileName.EndsWith(".moc", StringComparison.OrdinalIgnoreCase)) {
+ if (HelperFunctions.IsMocFile(mocFileName)) {
var mocFileItem = mocFile.Object as ProjectItem;
if (mocFileItem != null)
HelperFunctions.EnsureCustomBuildToolAvailable(mocFileItem);
@@ -941,10 +941,10 @@ namespace QtProjectLib
public bool IsMoccedFileIncluded(VCFile vcFile)
{
var fullPath = vcFile.FullPath;
- if (HelperFunctions.HasHeaderFileExtension(vcFile.FullPath))
+ if (HelperFunctions.IsHeaderFile(vcFile.FullPath))
fullPath = Path.ChangeExtension(vcFile.FullPath, ".cpp");
- if (HelperFunctions.HasSourceFileExtension(fullPath)) {
+ if (HelperFunctions.IsSourceFile(fullPath)) {
vcFile = GetFileFromProject(fullPath);
if (vcFile == null)
return false;
@@ -993,10 +993,10 @@ namespace QtProjectLib
public bool HasMocStep(VCFile file, string mocOutDir)
{
- if (HelperFunctions.HasHeaderFileExtension(file.Name)) {
+ if (HelperFunctions.IsHeaderFile(file.Name))
return CheckForCommand(file, "moc.exe");
- }
- if (HelperFunctions.HasSourceFileExtension(file.Name)) {
+
+ if (HelperFunctions.IsSourceFile(file.Name)) {
foreach (VCConfiguration config in (IVCCollection) vcPro.Configurations) {
var mocFileName = string.Empty;
if (mocOutDir == null) {
@@ -1155,7 +1155,7 @@ namespace QtProjectLib
if (!HasMocStep(file))
return;
- if (HelperFunctions.HasHeaderFileExtension(file.Name)) {
+ if (HelperFunctions.IsHeaderFile(file.Name)) {
foreach (VCFileConfiguration config in (IVCCollection) file.FileConfigurations) {
var tool = HelperFunctions.GetCustomBuildTool(config);
if (tool == null)
@@ -1252,7 +1252,7 @@ namespace QtProjectLib
var qrcFiles = new List<VCFile>();
foreach (VCFile f in (IVCCollection) VCProject.Files) {
- if (f.Extension == ".qrc")
+ if (HelperFunctions.IsQrcFile(f.Name))
qrcFiles.Add(f);
}
return qrcFiles;
@@ -1638,7 +1638,7 @@ namespace QtProjectLib
if (file == null)
return null;
- if (HelperFunctions.HasHeaderFileExtension(file.Name)) {
+ if (HelperFunctions.IsHeaderFile(file.Name)) {
foreach (VCConfiguration config in (IVCCollection) vcPro.Configurations) {
var compiler = CompilerToolWrapper.Create(config);
if (compiler == null)
@@ -1662,10 +1662,10 @@ namespace QtProjectLib
public void AdjustWhitespace(string file)
{
// only replace whitespaces in known types
- if (!HelperFunctions.HasSourceFileExtension(file) &&
- !HelperFunctions.HasHeaderFileExtension(file) &&
- !file.EndsWith(".ui", StringComparison.OrdinalIgnoreCase))
+ if (!HelperFunctions.IsSourceFile(file) && !HelperFunctions.IsHeaderFile(file)
+ && !HelperFunctions.IsUicFile(file)) {
return;
+ }
try {
var prop = dte.get_Properties("TextEditor", "C/C++");
@@ -1764,9 +1764,10 @@ namespace QtProjectLib
{
DeleteGeneratedFiles();
foreach (VCFile file in (IVCCollection) vcPro.Files) {
- if (!HelperFunctions.HasHeaderFileExtension(file.Name) && !HelperFunctions.HasSourceFileExtension(file.Name))
+ if (!HelperFunctions.IsHeaderFile(file.Name)
+ && !HelperFunctions.IsSourceFile(file.Name)) {
continue;
-
+ }
if (HelperFunctions.HasQObjectDeclaration(file)) {
RemoveMocStep(file);
AddMocStep(file);
@@ -1926,7 +1927,7 @@ namespace QtProjectLib
files[j++] = file;
foreach (var file in files) {
- if (file.Name.EndsWith(".ui", StringComparison.OrdinalIgnoreCase) && !IsUic3File(file)) {
+ if (HelperFunctions.IsUicFile(file.Name) && !IsUic3File(file)) {
AddUic4BuildStep(file);
Messages.PaneMessage(dte, "Update uic step for " + file.Name + ".");
++updatedFiles;
@@ -2138,8 +2139,8 @@ namespace QtProjectLib
/// <param name="vcfile"></param>
private void RefreshMocStep(VCFile vcfile, bool singleFile)
{
- var isHeaderFile = HelperFunctions.HasHeaderFileExtension(vcfile.FullPath);
- if (!isHeaderFile && !HelperFunctions.HasSourceFileExtension(vcfile.FullPath))
+ var isHeaderFile = HelperFunctions.IsHeaderFile(vcfile.FullPath);
+ if (!isHeaderFile && !HelperFunctions.IsSourceFile(vcfile.FullPath))
return;
if (mocCmdChecker == null)
@@ -2249,7 +2250,7 @@ namespace QtProjectLib
if (moccedFile != null) {
VCFile cppFile = null;
- if (HelperFunctions.HasHeaderFileExtension(vcFile.Name))
+ if (HelperFunctions.IsHeaderFile(vcFile.Name))
cppFile = GetCppFileForMocStep(vcFile);
var moccedFileConfig = GetVCFileConfigurationByName(moccedFile, vcFileCfg.Name);
@@ -2271,10 +2272,10 @@ namespace QtProjectLib
/// <returns></returns>
private VCFile GetSourceFileForMocStep(VCFile file)
{
- if (HelperFunctions.HasHeaderFileExtension(file.Name))
+ if (HelperFunctions.IsHeaderFile(file.Name))
return file;
var fileName = file.Name;
- if (fileName.EndsWith(".moc", StringComparison.OrdinalIgnoreCase)) {
+ if (HelperFunctions.IsMocFile(fileName)) {
fileName = fileName.Substring(0, fileName.Length - 4) + ".cpp";
if (fileName.Length > 0) {
foreach (VCFile f in (IVCCollection) vcPro.Files) {
@@ -2294,7 +2295,7 @@ namespace QtProjectLib
private VCFile GetCppFileForMocStep(VCFile file)
{
string fileName = null;
- if (HelperFunctions.HasHeaderFileExtension(file.Name) || file.Name.EndsWith(".moc", StringComparison.OrdinalIgnoreCase))
+ if (HelperFunctions.IsHeaderFile(file.Name) || HelperFunctions.IsMocFile(file.Name))
fileName = file.Name.Remove(file.Name.LastIndexOf('.')) + ".cpp";
if (!string.IsNullOrEmpty(fileName)) {
foreach (VCFile f in (IVCCollection) vcPro.Files) {
@@ -2318,7 +2319,7 @@ namespace QtProjectLib
string fileName = null;
if (file.Name.StartsWith("moc_", StringComparison.OrdinalIgnoreCase))
fileName = file.Name.Substring(4, file.Name.Length - 8) + ".h";
- else if (file.Name.EndsWith(".moc", StringComparison.OrdinalIgnoreCase))
+ else if (HelperFunctions.IsMocFile(file.Name))
fileName = file.Name.Substring(0, file.Name.Length - 4) + ".cpp";
if (fileName != null) {
@@ -2606,13 +2607,13 @@ namespace QtProjectLib
var lastIndex = fileName.LastIndexOf(fi.Extension, StringComparison.Ordinal);
var baseName = fi.Name.Remove(lastIndex, fi.Extension.Length);
string delName = null;
- if (HelperFunctions.HasHeaderFileExtension(fileName))
+ if (HelperFunctions.IsHeaderFile(fileName))
delName = "moc_" + baseName + ".cpp";
- else if (HelperFunctions.HasSourceFileExtension(fileName) && !fileName.StartsWith("moc_", StringComparison.OrdinalIgnoreCase))
+ else if (HelperFunctions.IsSourceFile(fileName) && !fileName.StartsWith("moc_", StringComparison.OrdinalIgnoreCase))
delName = baseName + ".moc";
- else if (fileName.EndsWith(".ui", StringComparison.OrdinalIgnoreCase))
+ else if (HelperFunctions.IsUicFile(fileName))
delName = "ui_" + baseName + ".h";
- else if (fileName.EndsWith(".qrc", StringComparison.OrdinalIgnoreCase))
+ else if (HelperFunctions.IsQrcFile(fileName))
delName = "qrc_" + baseName + ".cpp";
if (delName != null) {
diff --git a/src/qtprojectlib/QtVSIPSettings.cs b/src/qtprojectlib/QtVSIPSettings.cs
index 5f8332b1..b793a63c 100644
--- a/src/qtprojectlib/QtVSIPSettings.cs
+++ b/src/qtprojectlib/QtVSIPSettings.cs
@@ -290,11 +290,11 @@ namespace QtProjectLib
string platformName = null;
var vcpro = (VCProject) project.Object;
foreach (VCFile vcfile in (IVCCollection) vcpro.Files) {
- if ((type == Resources.mocDirKeyword &&
- (HelperFunctions.HasHeaderFileExtension(vcfile.Name)
- || vcfile.Name.EndsWith(".moc", StringComparison.OrdinalIgnoreCase)))
- || (type == Resources.uicDirKeyword && vcfile.Name.EndsWith(".ui", StringComparison.OrdinalIgnoreCase))
- || (type == Resources.rccDirKeyword && vcfile.Name.EndsWith(".qrc", StringComparison.OrdinalIgnoreCase))) {
+ var name = vcfile.Name;
+ if ((type == Resources.mocDirKeyword && HelperFunctions.IsHeaderFile(name))
+ || (type == Resources.mocDirKeyword && HelperFunctions.IsMocFile(name))
+ || (type == Resources.uicDirKeyword && HelperFunctions.IsUicFile(name))
+ || (type == Resources.rccDirKeyword && HelperFunctions.IsQrcFile(name))) {
foreach (VCFileConfiguration config in (IVCCollection) vcfile.FileConfigurations) {
tool = HelperFunctions.GetCustomBuildTool(config);
configName = config.Name.Remove(config.Name.IndexOf('|'));
diff --git a/src/qtprojectlib/RccOptions.cs b/src/qtprojectlib/RccOptions.cs
index f5348221..43747911 100644
--- a/src/qtprojectlib/RccOptions.cs
+++ b/src/qtprojectlib/RccOptions.cs
@@ -49,7 +49,7 @@ namespace QtProjectLib
name = id;
if (id.StartsWith(".\\", StringComparison.Ordinal))
name = name.Substring(2);
- if (name.EndsWith(".qrc", StringComparison.OrdinalIgnoreCase))
+ if (HelperFunctions.IsQrcFile(name))
name = name.Substring(0, name.Length - 4);
}
diff --git a/src/qtvstools/DefaultEditorsClient.cs b/src/qtvstools/DefaultEditorsClient.cs
index 320d6ea8..0a4ef075 100644
--- a/src/qtvstools/DefaultEditorsClient.cs
+++ b/src/qtvstools/DefaultEditorsClient.cs
@@ -103,7 +103,7 @@ namespace QtVsTools
string message;
while (!aboutToExit && messageQueue.TryDequeue(out message)) {
- if (message.EndsWith(".qrc", StringComparison.OrdinalIgnoreCase))
+ if (HelperFunctions.IsQrcFile(message))
handler.OnQRCFileSaved(message);
else if (message.StartsWith("Autotests:set", StringComparison.Ordinal)) {
#if DEBUG
diff --git a/src/qtvstools/DteEventsHandler.cs b/src/qtvstools/DteEventsHandler.cs
index ee18c5e3..0088e0f5 100644
--- a/src/qtvstools/DteEventsHandler.cs
+++ b/src/qtvstools/DteEventsHandler.cs
@@ -253,13 +253,13 @@ namespace QtVsTools
var file = (VCFile) ((IVCCollection) qtPro.VCProject.Files).Item(document.FullName);
- if (file.Extension == ".ui") {
+ if (HelperFunctions.IsUicFile(file.Name)) {
if (QtVSIPSettings.AutoUpdateUicSteps() && !QtProject.HasUicStep(file))
qtPro.AddUic4BuildStep(file);
return;
}
- if (!HelperFunctions.HasSourceFileExtension(file.Name) && !HelperFunctions.HasHeaderFileExtension(file.Name))
+ if (!HelperFunctions.IsSourceFile(file.Name) && !HelperFunctions.IsHeaderFile(file.Name))
return;
if (HelperFunctions.HasQObjectDeclaration(file)) {
@@ -269,7 +269,7 @@ namespace QtVsTools
qtPro.RemoveMocStep(file);
}
- if (HelperFunctions.HasSourceFileExtension(file.Name)) {
+ if (HelperFunctions.IsSourceFile(file.Name)) {
var moccedFileName = "moc_" + file.Name;
if (qtPro.IsMoccedFileIncluded(file)) {
@@ -368,7 +368,7 @@ namespace QtVsTools
var hFilter = qtPro.FindFilterFromGuid(h.UniqueIdentifier);
var srcFilter = qtPro.FindFilterFromGuid(src.UniqueIdentifier);
- if (HelperFunctions.HasSourceFileExtension(vcFile.Name)) {
+ if (HelperFunctions.IsSourceFile(vcFile.Name)) {
if (vcFile.Name.StartsWith("moc_", StringComparison.OrdinalIgnoreCase))
return;
if (vcFile.Name.StartsWith("qrc_", StringComparison.OrdinalIgnoreCase)) {
@@ -400,7 +400,7 @@ namespace QtVsTools
HelperFunctions.EnsureCustomBuildToolAvailable(projectItem);
qtPro.AddMocStep(vcFile);
}
- } else if (HelperFunctions.HasHeaderFileExtension(vcFile.Name)) {
+ } else if (HelperFunctions.IsHeaderFile(vcFile.Name)) {
if (vcFile.Name.StartsWith("ui_", StringComparison.OrdinalIgnoreCase))
return;
if (filter == null && !HelperFunctions.IsInFilter(vcFile, h)) {
@@ -417,7 +417,7 @@ namespace QtVsTools
HelperFunctions.EnsureCustomBuildToolAvailable(projectItem);
qtPro.AddMocStep(vcFile);
}
- } else if (vcFile.Name.EndsWith(".ui", StringComparison.OrdinalIgnoreCase)) {
+ } else if (HelperFunctions.IsUicFile(vcFile.Name)) {
if (filter == null && !HelperFunctions.IsInFilter(vcFile, ui)) {
if (null == uiFilter && qtPro.VCProject.CanAddFilter(ui.Name)) {
uiFilter = (VCFilter) qtPro.VCProject.AddFilter(ui.Name);
@@ -430,7 +430,7 @@ namespace QtVsTools
}
HelperFunctions.EnsureCustomBuildToolAvailable(projectItem);
qtPro.AddUic4BuildStep(vcFile);
- } else if (vcFile.Name.EndsWith(".qrc", StringComparison.OrdinalIgnoreCase)) {
+ } else if (HelperFunctions.IsQrcFile(vcFile.Name)) {
if (filter == null && !HelperFunctions.IsInFilter(vcFile, qrc)) {
if (null == qrcFilter && qtPro.VCProject.CanAddFilter(qrc.Name)) {
qrcFilter = (VCFilter) qtPro.VCProject.AddFilter(qrc.Name);
@@ -443,7 +443,7 @@ namespace QtVsTools
}
HelperFunctions.EnsureCustomBuildToolAvailable(projectItem);
qtPro.UpdateRccStep(vcFile, null);
- } else if (HelperFunctions.IsTranslationFile(vcFile)) {
+ } else if (HelperFunctions.IsTranslationFile(vcFile.Name)) {
if (filter == null && !HelperFunctions.IsInFilter(vcFile, ts)) {
if (null == tsFilter && qtPro.VCProject.CanAddFilter(ts.Name)) {
tsFilter = (VCFilter) qtPro.VCProject.AddFilter(ts.Name);
diff --git a/src/qtvstools/Translation.cs b/src/qtvstools/Translation.cs
index 5ac557ca..80ba050d 100644
--- a/src/qtvstools/Translation.cs
+++ b/src/qtvstools/Translation.cs
@@ -76,7 +76,7 @@ namespace QtVsTools
return;
foreach (var vcFile in vcFiles) {
- if (HelperFunctions.IsTranslationFile(vcFile)) {
+ if (HelperFunctions.IsTranslationFile(vcFile.Name)) {
if (!RunlRelease(vcFile))
return;
}
@@ -96,7 +96,7 @@ namespace QtVsTools
var files = tsFilter.Files as IVCCollection;
foreach (VCFile vcFile in files) {
- if (HelperFunctions.IsTranslationFile(vcFile)) {
+ if (HelperFunctions.IsTranslationFile(vcFile.Name)) {
if (!RunlRelease(vcFile))
return;
}
@@ -219,7 +219,7 @@ namespace QtVsTools
return;
foreach (var vcFile in vcFiles) {
- if (HelperFunctions.IsTranslationFile(vcFile)) {
+ if (HelperFunctions.IsTranslationFile(vcFile.Name)) {
if (!RunlUpdate(vcFile, pro))
return;
}
@@ -239,7 +239,7 @@ namespace QtVsTools
var files = tsFilter.Files as IVCCollection;
foreach (VCFile vcFile in files) {
- if (HelperFunctions.IsTranslationFile(vcFile)) {
+ if (HelperFunctions.IsTranslationFile(vcFile.Name)) {
if (!RunlUpdate(vcFile, project))
return;
}