Properly fix unquoting file name

Init member
Blake-Madden · Nov 3, 2024 · af6fe30 · af6fe30
1 parent 5e9d64b
commit af6fe30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/src/gui/datamodel.cpp b/src/gui/datamodel.cpp
@@ -35,12 +35,13 @@ void I18NResultsTreeModel::AddRow(wxString fileName, wxString warningId, wxStrin
         return strVal;
     };
 
+    fileName = unquote(fileName);
     for (auto& currentNode : m_root->GetChildren())
         {
         if (*currentNode == fileName)
             {
             I18NResultsTreeModelNode* childNode = new I18NResultsTreeModelNode(
-                currentNode.get(), unquote(fileName), unquote(warningId), unquote(issue),
+                currentNode.get(), fileName, unquote(warningId), unquote(issue),
                 unquote(explanation), line, column);
             currentNode->Append(childNode);
 
@@ -52,7 +53,7 @@ void I18NResultsTreeModel::AddRow(wxString fileName, wxString warningId, wxStrin
     m_root->Append(newFile);
 
     I18NResultsTreeModelNode* childNode =
-        new I18NResultsTreeModelNode(newFile, unquote(fileName), unquote(warningId), unquote(issue),
+        new I18NResultsTreeModelNode(newFile, fileName, unquote(warningId), unquote(issue),
                                      unquote(explanation), line, column);
     newFile->Append(childNode);
     }

diff --git a/src/gui/datamodel.h b/src/gui/datamodel.h
@@ -87,7 +87,7 @@ class I18NResultsTreeModelNode
     bool m_container{ true };
 
   private:
-    I18NResultsTreeModelNode* m_parent;
+    I18NResultsTreeModelNode* m_parent{ nullptr };
     I18NResultsTreeModelNodePtrArray m_children;
     };
 

diff --git a/src/gui/i18napp.cpp b/src/gui/i18napp.cpp
@@ -1048,16 +1048,7 @@ void I18NFrame::Process()
             wxStringTokenizerMode(wxTOKEN_STRTOK | wxTOKEN_RET_EMPTY | wxTOKEN_RET_EMPTY_ALL));
         while (tokenizer.HasMoreTokens())
             {
-            wxString fileName = tokenizer.GetNextToken();
-            // strip quotes
-            if (fileName.starts_with(L'\"'))
-                {
-                fileName.erase(0, 1);
-                }
-            if (fileName.ends_with(L'\"'))
-                {
-                fileName.erase(fileName.length() - 1);
-                }
+            const wxString fileName = tokenizer.GetNextToken();
             const wxString lineNo = tokenizer.GetNextToken();
             const wxString columnNo = tokenizer.GetNextToken();
             const wxString warningValue = tokenizer.GetNextToken();