walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: Ensure native path separators in reports. 

Ensure that native separators are used in saved reports. Reports may
be parsed by other programs/scripts so it is important that paths
are properly formatted.
This commit is contained in:
Kimmo Varis 2010-07-17 21:07:09 +03:00
parent c606dc8403
commit 93bfa24d3e
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/csvreport.cpp
View File

@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QDir>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include "csvreport.h" #include "csvreport.h"
@ -59,7 +60,8 @@ void CsvReport::WriteError(const ErrorItem &error)
*/ */
QString line; QString line;
line += QString("%1,%2,").arg(error.files[error.files.size() - 1]).arg(error.lines[error.lines.size() - 1]); const QString file = QDir::toNativeSeparators(error.files[error.files.size() - 1]);
line += QString("%1,%2,").arg(file).arg(error.lines[error.lines.size() - 1]);
line += QString("%1,%2").arg(error.severity).arg(error.msg); line += QString("%1,%2").arg(error.severity).arg(error.msg);
mTxtWriter << line << endl; mTxtWriter << line << endl;

4
gui/txtreport.cpp
View File

@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QDir>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include "txtreport.h" #include "txtreport.h"
@ -62,7 +63,8 @@ void TxtReport::WriteError(const ErrorItem &error)
for (int i = 0; i < error.lines.size(); i++) for (int i = 0; i < error.lines.size(); i++)
{ {
line += QString("[%1:%2]").arg(error.files[i]).arg(error.lines[i]); const QString file = QDir::toNativeSeparators(error.files[i]);
line += QString("[%1:%2]").arg(file).arg(error.lines[i]);
if (i < error.lines.size() - 1 && error.lines.size() > 0) if (i < error.lines.size() - 1 && error.lines.size() > 0)
{ {
line += " -> "; line += " -> ";

4
gui/xmlreport.cpp
View File

@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QDir>
#include <QFile> #include <QFile>
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QDebug> #include <QDebug>
@ -88,7 +89,8 @@ void XmlReport::WriteError(const ErrorItem &error)
*/ */
mXmlWriter->writeStartElement(ErrorElementName); mXmlWriter->writeStartElement(ErrorElementName);
mXmlWriter->writeAttribute(FilenameAttribute, error.files[error.files.size() - 1]); const QString file = QDir::toNativeSeparators(error.files[error.files.size() - 1]);
mXmlWriter->writeAttribute(FilenameAttribute, file);
const QString line = QString::number(error.lines[error.lines.size() - 1]); const QString line = QString::number(error.lines[error.lines.size() - 1]);
mXmlWriter->writeAttribute(LineAttribute, line); mXmlWriter->writeAttribute(LineAttribute, line);
mXmlWriter->writeAttribute(IdAttribute, error.id); mXmlWriter->writeAttribute(IdAttribute, error.id);