Skip to content

Commit 4aa2876

Browse files
nemaakhileshdanmar
authored andcommitted
Fixed cppcheck-opensource#7278 (GUI: error rechecking with some files)
1 parent 979dfc3 commit 4aa2876

8 files changed

Lines changed: 66 additions & 9 deletions

File tree

‎gui/erroritem.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Q_DECLARE_METATYPE(ErrorItem);
8484
class ErrorLine {
8585
public:
8686
QString file;
87+
QString file0;
8788
unsigned int line;
8889
QString errorId;
8990
bool inconclusive;

‎gui/mainwindow.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,6 @@ void MainWindow::HandleCLIParams(const QStringList &params)
221221
LoadProjectFile(params[index + 1]);
222222
} else if ((index = params.indexOf(QRegExp(".*\\.cppcheck$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
223223
LoadProjectFile(params[index]);
224-
} else if ((index = params.indexOf(QRegExp(".*\\.xml$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
225-
LoadResults(params[index]);
226224
} else if (params.contains("-l")) {
227225
QString logFile;
228226
index = params.indexOf("-l");
@@ -239,6 +237,8 @@ void MainWindow::HandleCLIParams(const QStringList &params)
239237
} else {
240238
LoadResults(logFile);
241239
}
240+
} else if ((index = params.indexOf(QRegExp(".*\\.xml$", Qt::CaseInsensitive), 0)) >= 0 && index < params.length() && QFile(params[index]).exists()) {
241+
LoadResults(params[index],QDir::currentPath());
242242
} else
243243
DoCheckFiles(params);
244244
}
@@ -815,6 +815,7 @@ void MainWindow::ReCheckSelected(QStringList files, bool all)
815815
for (int i = 0; i < files.size(); ++i)
816816
mUI.mResults->ClearRecheckFile(files[i]);
817817

818+
mCurrentDirectory = mUI.mResults->GetCheckDirectory();
818819
FileList pathList;
819820
pathList.AddPathList(files);
820821
if (mProject)

‎gui/resultstree.cpp‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ bool ResultsTree::AddErrorItem(const ErrorItem &item)
171171
data["line"] = item.lines[0];
172172
data["id"] = item.errorId;
173173
data["inconclusive"] = item.inconclusive;
174-
data["file0"] = item.file0;
174+
data["file0"] = StripPath(item.file0, true);
175175
stditem->setData(QVariant(data));
176176

177177
//Add backtrace files as children
@@ -347,8 +347,11 @@ void ResultsTree::ClearRecheckFile(const QString &filename)
347347
if (!item)
348348
continue;
349349

350+
QString actualfile((!mCheckPath.isEmpty() && filename.startsWith(mCheckPath)) ? filename.mid(mCheckPath.length() + 1) : filename);
350351
QVariantMap data = item->data().toMap();
351-
if (filename == data["file"].toString()) {
352+
QString storedfile = data["file"].toString();
353+
storedfile = ((!mCheckPath.isEmpty() && storedfile.startsWith(mCheckPath)) ? storedfile.mid(mCheckPath.length() + 1) : storedfile);
354+
if (actualfile == storedfile) {
352355
mModel.removeRow(i);
353356
break;
354357
}
@@ -833,12 +836,27 @@ void ResultsTree::RecheckSelectedFiles()
833836
item = item->parent();
834837
QVariantMap data = item->data().toMap();
835838
QString currentFile = data["file"].toString();
836-
if (Path::isHeader(currentFile.toStdString())) {
837-
if (!selectedItems.contains(data["file0"].toString()))
838-
selectedItems<<data["file0"].toString();
839+
if (!currentFile.isEmpty()) {
840+
QString fileNameWithCheckPath;
841+
QFileInfo curfileInfo(currentFile);
842+
if (!curfileInfo.exists() && !mCheckPath.isEmpty() && currentFile.indexOf(mCheckPath) != 0)
843+
fileNameWithCheckPath = mCheckPath + "/" + currentFile;
844+
else
845+
fileNameWithCheckPath = currentFile;
846+
const QFileInfo fileInfo(fileNameWithCheckPath);
847+
if (!fileInfo.exists()) {
848+
AskFileDir(currentFile);
849+
return;
850+
}
851+
if (Path::isHeader(currentFile.toStdString())) {
852+
if (!data["file0"].toString().isEmpty() && !selectedItems.contains(data["file0"].toString())) {
853+
selectedItems<<((!mCheckPath.isEmpty() && (data["file0"].toString().indexOf(mCheckPath) != 0)) ? (mCheckPath + "/" + data["file0"].toString()) : data["file0"].toString());
854+
if (!selectedItems.contains(fileNameWithCheckPath))
855+
selectedItems<<fileNameWithCheckPath;
856+
}
857+
} else if (!selectedItems.contains(fileNameWithCheckPath))
858+
selectedItems<<fileNameWithCheckPath;
839859
}
840-
if (!selectedItems.contains(currentFile))
841-
selectedItems<<currentFile;
842860
}
843861
emit CheckSelected(selectedItems);
844862
}
@@ -1043,6 +1061,12 @@ void ResultsTree::SetCheckDirectory(const QString &dir)
10431061
mCheckPath = dir;
10441062
}
10451063

1064+
1065+
QString ResultsTree::GetCheckDirectory(void)
1066+
{
1067+
return mCheckPath;
1068+
}
1069+
10461070
QString ResultsTree::StripPath(const QString &path, bool saving) const
10471071
{
10481072
if ((!saving && mShowFullPath) || (saving && mSaveFullPath)) {

‎gui/resultstree.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,14 @@ class ResultsTree : public QTreeView {
122122
*/
123123
void SetCheckDirectory(const QString &dir);
124124

125+
/**
126+
* @brief Get the directory we are checking
127+
*
128+
* @return Directory containing source files
129+
*/
130+
131+
QString GetCheckDirectory(void);
132+
125133
/**
126134
* @brief Check if there are any visible results in view.
127135
* @return true if there is at least one visible warning/error.

‎gui/resultsview.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,11 @@ void ResultsView::SetCheckDirectory(const QString &dir)
230230
mUI.mTree->SetCheckDirectory(dir);
231231
}
232232

233+
QString ResultsView::GetCheckDirectory(void)
234+
{
235+
return mUI.mTree->GetCheckDirectory();
236+
}
237+
233238
void ResultsView::CheckingStarted(int count)
234239
{
235240
mUI.mProgress->setVisible(true);

‎gui/resultsview.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,14 @@ class ResultsView : public QWidget {
106106
*/
107107
void SetCheckDirectory(const QString &dir);
108108

109+
/**
110+
* @brief Get the directory we are checking
111+
*
112+
* @return Directory containing source files
113+
*/
114+
115+
QString GetCheckDirectory(void);
116+
109117
/**
110118
* @brief Inform the view that checking has started
111119
*

‎gui/xmlreportv2.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
#include "xmlreport.h"
2828
#include "xmlreportv2.h"
2929
#include "cppcheck.h"
30+
#include "path.h"
3031

3132
static const char ResultElementName[] = "results";
3233
static const char CppcheckElementName[] = "cppcheck";
3334
static const char ErrorElementName[] = "error";
3435
static const char ErrorsElementName[] = "errors";
3536
static const char LocationElementName[] = "location";
3637
static const char FilenameAttribute[] = "file";
38+
static const char IncludedFromFilenameAttribute[] = "file0";
3739
static const char LineAttribute[] = "line";
3840
static const char IdAttribute[] = "id";
3941
static const char SeverityAttribute[] = "severity";
@@ -120,6 +122,9 @@ void XmlReportV2::WriteError(const ErrorItem &error)
120122
mXmlWriter->writeStartElement(LocationElementName);
121123

122124
QString file = QDir::toNativeSeparators(error.files[i]);
125+
if (Path::isHeader(file.toStdString()) && !error.file0.isEmpty()) {
126+
mXmlWriter->writeAttribute(IncludedFromFilenameAttribute, quoteMessage(error.file0));
127+
}
123128
file = XmlReport::quoteMessage(file);
124129
mXmlWriter->writeAttribute(FilenameAttribute, file);
125130
const QString line = QString::number(error.lines[i]);
@@ -206,9 +211,12 @@ ErrorItem XmlReportV2::ReadError(QXmlStreamReader *reader)
206211
if (mXmlReader->name() == LocationElementName) {
207212
QXmlStreamAttributes attribs = mXmlReader->attributes();
208213
QString file = attribs.value("", FilenameAttribute).toString();
214+
QString file0 = attribs.value("", IncludedFromFilenameAttribute).toString();
209215
file = XmlReport::unquoteMessage(file);
210216
if (item.file.isEmpty())
211217
item.file = file;
218+
if (!file0.isEmpty())
219+
item.file0 = XmlReport::unquoteMessage(file0);
212220
item.files.push_back(file);
213221
const int line = attribs.value("", LineAttribute).toString().toUInt();
214222
item.lines.push_back(line);

‎lib/errorlogger.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ std::string ErrorLogger::ErrorMessage::toXML(bool verbose, int version) const
287287

288288
for (std::list<FileLocation>::const_reverse_iterator it = _callStack.rbegin(); it != _callStack.rend(); ++it) {
289289
printer.OpenElement("location", false);
290+
if (Path::isHeader((*it).getfile()) && !file0.empty())
291+
printer.PushAttribute("file0", Path::toNativeSeparators(file0).c_str());
290292
printer.PushAttribute("file", (*it).getfile().c_str());
291293
printer.PushAttribute("line", (*it).line);
292294
printer.CloseElement(false);

0 commit comments

Comments
 (0)