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

Conflicts: 

gui/mainwindow.cpp
	gui/resultstree.cpp
This commit is contained in:
Vesa Pikki 2009-03-22 19:40:29 +02:00
parent 0953995ee3
commit 855dda69b7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/mainwindow.cpp
View File

@ -292,4 +292,7 @@ void MainWindow::ShowErrors(bool checked)
{ {
mResults.ShowResults(SHOW_ERRORS, checked); mResults.ShowResults(SHOW_ERRORS, checked);
} }
<<<<<<< HEAD:gui/mainwindow.cpp
=======
>>>>>>> gui:gui/mainwindow.cpp

3
gui/resultstree.cpp
View File

@ -77,7 +77,10 @@ void ResultsTree::AddErrorItem(const QString &file,
} }
} }
<<<<<<< HEAD:gui/resultstree.cpp
=======
>>>>>>> gui:gui/resultstree.cpp
ShowTypes ResultsTree::SeverityToShowType(const QString &severity) ShowTypes ResultsTree::SeverityToShowType(const QString &severity)
{ {
if (severity == "all") if (severity == "all")