Merge branch 'master' of git@github.com:danmar/cppcheck

AUTHORS

@@ -6,6 +6,7 @@ Gianluca Scacco
 Hoang Tuan Su
 Kimmo Varis
 Leandro Penz
+Nguyen Duong Tuan
 Nicolas Le Cam
 Reijo Tomperi
 Slava Semushin

cppcheck.cbp

@@ -30,20 +30,24 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="gui/checkdialog.cpp" />
+		<Unit filename="gui/applicationdialog.cpp" />
-		<Unit filename="gui/checkdialog.h" />
+		<Unit filename="gui/applicationdialog.h" />
+		<Unit filename="gui/applicationlist.cpp" />
+		<Unit filename="gui/applicationlist.h" />
 		<Unit filename="gui/checkthread.cpp" />
 		<Unit filename="gui/checkthread.h" />
 		<Unit filename="gui/common.h" />
 		<Unit filename="gui/main.cpp" />
 		<Unit filename="gui/mainwindow.cpp" />
 		<Unit filename="gui/mainwindow.h" />
+		<Unit filename="gui/qrc_gui.cpp" />
 		<Unit filename="gui/resultstree.cpp" />
 		<Unit filename="gui/resultstree.h" />
 		<Unit filename="gui/resultsview.cpp" />
 		<Unit filename="gui/resultsview.h" />
 		<Unit filename="gui/settingsdialog.cpp" />
 		<Unit filename="gui/settingsdialog.h" />
+		<Unit filename="gui/test.cpp" />
 		<Unit filename="gui/threadhandler.cpp" />
 		<Unit filename="gui/threadhandler.h" />
 		<Unit filename="gui/threadresult.cpp" />

gui/applicationdialog.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/applicationdialog.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/applicationlist.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/applicationlist.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/checkthread.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/checkthread.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/common.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/main.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/mainwindow.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/mainwindow.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/resultstree.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/resultstree.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/resultsview.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/resultsview.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/settingsdialog.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/settingsdialog.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/threadhandler.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/threadhandler.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/threadresult.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gui/threadresult.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/check.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkautovariables.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki, Gianluca Scacco
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkautovariables.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki, Gianluca Scacco
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkbufferoverrun.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkbufferoverrun.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkclass.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkclass.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkdangerousfunctions.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkdangerousfunctions.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkfunctionusage.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkfunctionusage.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkheaders.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkheaders.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkmemoryleak.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkmemoryleak.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkother.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkother.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checksecurity.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checksecurity.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkstl.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/checkstl.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/cppcheck.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/cppcheck.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/cppcheckexecutor.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/cppcheckexecutor.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/errorlogger.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/errorlogger.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/filelister.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/filelister.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/mathlib.cpp

@@ -1,7 +1,6 @@
-/*
+/*
- * Cppcheck - A tool for static C/C++ code analysis
+ * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki, Nguyen Duong Tuan
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/mathlib.h

@@ -1,7 +1,6 @@
-/*
+/*
- * Cppcheck - A tool for static C/C++ code analysis
+ * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki, Nguyen Duong Tuan
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/preprocessor.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/preprocessor.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/settings.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/settings.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/threadexecutor.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/threadexecutor.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/token.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/token.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/tokenize.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1744,28 +1743,54 @@ bool Tokenizer::simplifyConditions()
         if (! tok4)
             break;
         if ((tok->str() == "&&" || tok->str() == "||" || tok->str() == "(") &&
-            Token::Match(tok->tokAt(1), "%num% %any% %num%") &&
+            (Token::Match(tok->tokAt(1), "%num% %any% %num%") ||
+             Token::Match(tok->tokAt(1), "%bool% %any% %bool%")) &&
             (tok4->str() == "&&" || tok4->str() == "||" || tok4->str() == ")"))
         {
-            double op1 = (strstr(tok->strAt(1), "0x")) ? std::strtol(tok->strAt(1), 0, 16) : std::atof(tok->strAt(1));
-            double op2 = (strstr(tok->strAt(3), "0x")) ? std::strtol(tok->strAt(3), 0, 16) : std::atof(tok->strAt(3));
             std::string cmp = tok->strAt(2);
-
             bool result = false;
-            if (cmp == "==")
+            if (Token::Match(tok->tokAt(1), "%num%"))
-                result = (op1 == op2);
+            {
-            else if (cmp == "!=")
+                // Compare numbers
-                result = (op1 != op2);
+                double op1 = (strstr(tok->strAt(1), "0x")) ? std::strtol(tok->strAt(1), 0, 16) : std::atof(tok->strAt(1));
-            else if (cmp == ">=")
+                double op2 = (strstr(tok->strAt(3), "0x")) ? std::strtol(tok->strAt(3), 0, 16) : std::atof(tok->strAt(3));
-                result = (op1 >= op2);
+
-            else if (cmp == ">")
+                if (cmp == "==")
-                result = (op1 > op2);
+                    result = (op1 == op2);
-            else if (cmp == "<=")
+                else if (cmp == "!=")
-                result = (op1 <= op2);
+                    result = (op1 != op2);
-            else if (cmp == "<")
+                else if (cmp == ">=")
-                result = (op1 < op2);
+                    result = (op1 >= op2);
+                else if (cmp == ">")
+                    result = (op1 > op2);
+                else if (cmp == "<=")
+                    result = (op1 <= op2);
+                else if (cmp == "<")
+                    result = (op1 < op2);
+                else
+                    cmp = "";
+            }
             else
-                cmp = "";
+            {
+                // Compare boolean
+                bool op1 = (tok->strAt(1) == std::string("true"));
+                bool op2 = (tok->strAt(3) == std::string("true"));
+
+                if (cmp == "==")
+                    result = (op1 == op2);
+                else if (cmp == "!=")
+                    result = (op1 != op2);
+                else if (cmp == ">=")
+                    result = (op1 >= op2);
+                else if (cmp == ">")
+                    result = (op1 > op2);
+                else if (cmp == "<=")
+                    result = (op1 <= op2);
+                else if (cmp == "<")
+                    result = (op1 < op2);
+                else
+                    cmp = "";
+            }
 
             if (! cmp.empty())
             {
@@ -2387,36 +2412,40 @@ bool Tokenizer::elseif()
 
 bool Tokenizer::simplifyRedundantParanthesis()
 {
+    if (!createLinks())
+        return false;
+
     bool ret = false;
     for (Token *tok = _tokens; tok; tok = tok->next())
     {
-        bool foundSomething = true;
+        if (tok->str() != "(")
-        while (foundSomething && Token::simpleMatch(tok, "( ("))
+            continue;
+
+        while (Token::simpleMatch(tok, "( (") &&
+               tok->link()->previous() == tok->next()->link())
         {
-            foundSomething = false;
+            // We have "(( *something* ))", remove the inner
-            int parlevel = 0;
+            // paranthesis
+            tok->deleteNext();
+            tok->link()->previous()->previous()->deleteNext();
+            ret = true;
+        }
 
-            for (Token *tok2 = tok; tok2; tok2 = tok2->next())
+        if (Token::Match(tok, "( ( %bool% )") ||
-            {
+            Token::Match(tok, "( ( %num% )"))
-                if (tok2->str() == "(")
+        {
-                    ++parlevel;
+            tok->tokAt(2)->deleteNext();
+            tok->deleteNext();
+            ret = true;
+        }
 
-                else if (tok2->str() == ")")
+        if (Token::Match(tok, "( %bool% ) )") ||
-                {
+            Token::Match(tok, "( %num% ) )"))
-                    --parlevel;
+        {
-                    if (parlevel == 1)
+            tok = tok->next();
-                    {
+            tok->deleteNext();
-                        if (Token::simpleMatch(tok2, ") )"))
+            tok->previous()->deleteThis();
-                        {
+            ret = true;
-                            tok->deleteNext();
-                            tok2->deleteNext();
-                            ret = true;
-                            foundSomething = true;
-                        }
-                        break;
-                    }
-                }
-            }
         }
     }
     return ret;

src/tokenize.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testautovariables.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki, Gianluca Scacco
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testbufferoverrun.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testcharvar.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testclass.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testconstructors.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testcppcheck.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testdangerousfunctions.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testdivision.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testfilelister.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testfunctionusage.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testincompletestatement.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testmathlib.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testmemleak.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testmemleakmp.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testother.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testpreprocessor.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testredundantif.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testrunner.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testsecurity.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testsimplifytokens.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/teststl.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testsuite.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testsuite.h

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testtoken.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testtokenize.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1616,22 +1615,43 @@ private:
 
     void removeParantheses3()
     {
-        const char code[] = "void foo()\n"
+        {
-                            "{\n"
+            const char code[] = "void foo()\n"
-                            "    if (( true )==true){}\n"
+                                "{\n"
-                            "}";
+                                "    if (( true )==(true)){}\n"
+                                "}";
 
-        // tokenize..
+            // tokenize..
-        Tokenizer tokenizer;
+            Tokenizer tokenizer;
-        std::istringstream istr(code);
+            std::istringstream istr(code);
-        tokenizer.tokenize(istr, "test.cpp");
+            tokenizer.tokenize(istr, "test.cpp");
 
-        tokenizer.simplifyTokenList();
+            tokenizer.simplifyTokenList();
 
-        std::ostringstream ostr;
+            std::ostringstream ostr;
-        for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
+            for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
-            ostr << " " << tok->str();
+                ostr << " " << tok->str();
-        TODO_ASSERT_EQUALS(std::string(" void foo ( ) { { } }"), ostr.str());
+            ASSERT_EQUALS(std::string(" void foo ( ) { { } }"), ostr.str());
+        }
+
+        {
+            const char code[] = "void foo()\n"
+                                "{\n"
+                                "    if (( 2 )==(2)){}\n"
+                                "}";
+
+            // tokenize..
+            Tokenizer tokenizer;
+            std::istringstream istr(code);
+            tokenizer.tokenize(istr, "test.cpp");
+
+            tokenizer.simplifyTokenList();
+
+            std::ostringstream ostr;
+            for (const Token *tok = tokenizer.tokens(); tok; tok = tok->next())
+                ostr << " " << tok->str();
+            ASSERT_EQUALS(std::string(" void foo ( ) { { } }"), ostr.str());
+        }
     }
 
     void simplify_numeric_condition()

test/testunusedprivfunc.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

test/testunusedvar.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

tools/dmake.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

tools/errmsg.cpp

@@ -1,7 +1,6 @@
 /*
  * Cppcheck - A tool for static C/C++ code analysis
- * Copyright (C) 2007-2009 Daniel Marjamäki, Reijo Tomperi, Nicolas Le Cam,
+ * Copyright (C) 2007-2009 Daniel Marjamäki and Cppcheck team.
- * Leandro Penz, Kimmo Varis, Vesa Pikki
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by