diff --git a/Makefile b/Makefile
index 3d3c4a1db..5f827bcb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,86 +1,88 @@
-SRCS=checkbufferoverrun.cpp checkclass.cpp checkheaders.cpp checkmemoryleak.cpp checkfunctionusage.cpp checkother.cpp filelister.cpp preprocessor.cpp tokenize.cpp cppcheck.cpp settings.cpp token.cpp cppcheckexecutor.cpp errormessage.cpp
+TMPSRCS=checkbufferoverrun.cpp checkclass.cpp checkheaders.cpp checkmemoryleak.cpp checkfunctionusage.cpp checkother.cpp filelister.cpp preprocessor.cpp tokenize.cpp cppcheck.cpp settings.cpp token.cpp cppcheckexecutor.cpp errormessage.cpp
+SRCS=$(TMPSRCS:%=src/%)
OBJS=$(SRCS:%.cpp=%.o)
-TESTS=testbufferoverrun.o testcharvar.o testclass.o testconstructors.o testdivision.o testfunctionusage.o testincompletestatement.o testother.o testmemleak.o testmemleakmp.o testpreprocessor.o testredundantif.o testsimplifytokens.o testtokenize.o testtoken.o testunusedprivfunc.o testunusedvar.o testfilelister.o
+TMPTESTS=testbufferoverrun.o testcharvar.o testclass.o testconstructors.o testdivision.o testfunctionusage.o testincompletestatement.o testother.o testmemleak.o testmemleakmp.o testpreprocessor.o testredundantif.o testsimplifytokens.o testtokenize.o testtoken.o testunusedprivfunc.o testunusedvar.o testfilelister.o
+TESTS=$(TMPTESTS:%=test/%)
BIN = ${DESTDIR}/usr/bin
CFLAGS = -Wall -pedantic -g
-all: ${OBJS} main.o
+all: ${OBJS} src/main.o
g++ $(CFLAGS) -o cppcheck $^
-test: ${OBJS} testrunner.o testsuite.o ${TESTS}
+test: ${OBJS} test/testrunner.o test/testsuite.o ${TESTS}
g++ $(CFLAGS) -o testrunner $^
-cppcheckexecutor.o: cppcheckexecutor.cpp cppcheckexecutor.h cppcheck.h errorlogger.h
+cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/cppcheck.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
-cppcheck.o: cppcheck.cpp cppcheck.h settings.h errorlogger.h preprocessor.h tokenize.h token.h checkmemoryleak.h checkbufferoverrun.h checkclass.h checkheaders.h checkother.h checkfunctionusage.h filelister.h
+cppcheck.o: src/cppcheck.cpp src/cppcheck.h src/settings.h src/errorlogger.h src/preprocessor.h src/tokenize.h src/token.h src/checkmemoryleak.h src/checkbufferoverrun.h src/checkclass.h src/checkheaders.h src/checkother.h src/checkfunctionusage.h src/filelister.h
g++ $(CFLAGS) -c $*.cpp
-main.o: main.cpp cppcheck.h settings.h errorlogger.h
+main.o: src/main.cpp src/cppcheck.h src/settings.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
-checkbufferoverrun.o: checkbufferoverrun.cpp checkbufferoverrun.h tokenize.h settings.h errorlogger.h token.h
+checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-checkclass.o: checkclass.cpp checkclass.h tokenize.h settings.h errorlogger.h token.h
+checkclass.o: src/checkclass.cpp src/checkclass.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-checkfunctionusage.o: checkfunctionusage.cpp checkfunctionusage.h tokenize.h settings.h errorlogger.h token.h
+checkfunctionusage.o: src/checkfunctionusage.cpp src/checkfunctionusage.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-checkheaders.o: checkheaders.cpp checkheaders.h tokenize.h settings.h errorlogger.h token.h
+checkheaders.o: src/checkheaders.cpp src/checkheaders.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-checkmemoryleak.o: checkmemoryleak.cpp checkmemoryleak.h tokenize.h settings.h errorlogger.h token.h
+checkmemoryleak.o: src/checkmemoryleak.cpp src/checkmemoryleak.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-checkother.o: checkother.cpp checkother.h tokenize.h settings.h errorlogger.h token.h
+checkother.o: src/checkother.cpp src/checkother.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-filelister.o: filelister.cpp filelister.h
+filelister.o: src/filelister.cpp src/filelister.h
g++ $(CFLAGS) -c $*.cpp
-preprocessor.o: preprocessor.cpp preprocessor.h errorlogger.h token.h tokenize.h
+preprocessor.o: src/preprocessor.cpp src/preprocessor.h src/errorlogger.h src/token.h src/tokenize.h
g++ $(CFLAGS) -c $*.cpp
-settings.o: settings.cpp settings.h
+settings.o: src/settings.cpp src/settings.h
g++ $(CFLAGS) -c $*.cpp
-errormessage.o: errormessage.cpp errormessage.h
+errormessage.o: src/errormessage.cpp src/errormessage.h
g++ $(CFLAGS) -c $*.cpp
-testbufferoverrun.o: testbufferoverrun.cpp tokenize.h settings.h errorlogger.h token.h checkbufferoverrun.h testsuite.h
+testbufferoverrun.o: test/testbufferoverrun.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkbufferoverrun.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testcharvar.o: testcharvar.cpp tokenize.h settings.h errorlogger.h token.h checkother.h testsuite.h
+testcharvar.o: test/testcharvar.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testclass.o: testclass.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
+testclass.o: test/testclass.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testconstructors.o: testconstructors.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
+testconstructors.o: test/testconstructors.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testdivision.o: testdivision.cpp tokenize.h settings.h errorlogger.h token.h checkother.h testsuite.h
+testdivision.o: test/testdivision.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testfunctionusage.o: testfunctionusage.cpp tokenize.h settings.h errorlogger.h token.h testsuite.h checkfunctionusage.h
+testfunctionusage.o: test/testfunctionusage.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h test/testsuite.h src/checkfunctionusage.h
g++ $(CFLAGS) -c $*.cpp
-testincompletestatement.o: testincompletestatement.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
+testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
-testother.o: testother.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
+testother.o: test/testother.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
-testmemleak.o: testmemleak.cpp tokenize.h settings.h errorlogger.h token.h checkmemoryleak.h testsuite.h
+testmemleak.o: test/testmemleak.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testmemleakmp.o: testmemleakmp.cpp tokenize.h settings.h errorlogger.h token.h checkmemoryleak.h testsuite.h
+testmemleakmp.o: test/testmemleakmp.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testpreprocessor.o: testpreprocessor.cpp testsuite.h errorlogger.h preprocessor.h
+testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h src/errorlogger.h src/preprocessor.h
g++ $(CFLAGS) -c $*.cpp
-testredundantif.o: testredundantif.cpp testsuite.h errorlogger.h checkother.h
+testredundantif.o: test/testredundantif.cpp test/testsuite.h src/errorlogger.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
-testrunner.o: testrunner.cpp testsuite.h errorlogger.h
+testrunner.o: test/testrunner.cpp test/testsuite.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
-testsimplifytokens.o: testsimplifytokens.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h
+testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-testsuite.o: testsuite.cpp testsuite.h errorlogger.h
+testsuite.o: test/testsuite.cpp test/testsuite.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
-testtoken.o: testtoken.cpp testsuite.h errorlogger.h token.h
+testtoken.o: test/testtoken.cpp test/testsuite.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-testtokenize.o: testtokenize.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h
+testtokenize.o: test/testtokenize.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h
g++ $(CFLAGS) -c $*.cpp
-testunusedprivfunc.o: testunusedprivfunc.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
+testunusedprivfunc.o: test/testunusedprivfunc.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
-testunusedvar.o: testunusedvar.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
+testunusedvar.o: test/testunusedvar.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
-testfilelister.o: testfilelister.cpp filelister.h
+testfilelister.o: test/testfilelister.cpp src/filelister.h
g++ $(CFLAGS) -c $*.cpp
-token.o: token.cpp token.h
+token.o: src/token.cpp src/token.h
g++ $(CFLAGS) -c $*.cpp
-tokenize.o: tokenize.cpp tokenize.h settings.h errorlogger.h token.h filelister.h
+tokenize.o: src/tokenize.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/filelister.h
g++ $(CFLAGS) -c $*.cpp
clean:
- rm -f *.o testrunner cppcheck
+ rm -f src/*.o test/*.o testrunner cppcheck
install: cppcheck
install -d ${BIN}
install cppcheck ${BIN}
diff --git a/cppcheck.cbp b/cppcheck.cbp
index 5cd50b5df..cd3afa364 100644
--- a/cppcheck.cbp
+++ b/cppcheck.cbp
@@ -30,59 +30,57 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/runastyle b/runastyle
index 61e1f857c..cfe07bfec 100755
--- a/runastyle
+++ b/runastyle
@@ -1,4 +1,6 @@
#!/bin/bash
-astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren *.cpp
-astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren *.h
+astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.cpp
+astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.h
+astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.cpp
+astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h
diff --git a/checkbufferoverrun.cpp b/src/checkbufferoverrun.cpp
similarity index 100%
rename from checkbufferoverrun.cpp
rename to src/checkbufferoverrun.cpp
diff --git a/checkbufferoverrun.h b/src/checkbufferoverrun.h
similarity index 100%
rename from checkbufferoverrun.h
rename to src/checkbufferoverrun.h
diff --git a/checkclass.cpp b/src/checkclass.cpp
similarity index 100%
rename from checkclass.cpp
rename to src/checkclass.cpp
diff --git a/checkclass.h b/src/checkclass.h
similarity index 100%
rename from checkclass.h
rename to src/checkclass.h
diff --git a/checkfunctionusage.cpp b/src/checkfunctionusage.cpp
similarity index 100%
rename from checkfunctionusage.cpp
rename to src/checkfunctionusage.cpp
diff --git a/checkfunctionusage.h b/src/checkfunctionusage.h
similarity index 100%
rename from checkfunctionusage.h
rename to src/checkfunctionusage.h
diff --git a/checkheaders.cpp b/src/checkheaders.cpp
similarity index 100%
rename from checkheaders.cpp
rename to src/checkheaders.cpp
diff --git a/checkheaders.h b/src/checkheaders.h
similarity index 100%
rename from checkheaders.h
rename to src/checkheaders.h
diff --git a/checkmemoryleak.cpp b/src/checkmemoryleak.cpp
similarity index 100%
rename from checkmemoryleak.cpp
rename to src/checkmemoryleak.cpp
diff --git a/checkmemoryleak.h b/src/checkmemoryleak.h
similarity index 100%
rename from checkmemoryleak.h
rename to src/checkmemoryleak.h
diff --git a/checkother.cpp b/src/checkother.cpp
similarity index 100%
rename from checkother.cpp
rename to src/checkother.cpp
diff --git a/checkother.h b/src/checkother.h
similarity index 100%
rename from checkother.h
rename to src/checkother.h
diff --git a/cppcheck.cpp b/src/cppcheck.cpp
similarity index 100%
rename from cppcheck.cpp
rename to src/cppcheck.cpp
diff --git a/cppcheck.h b/src/cppcheck.h
similarity index 100%
rename from cppcheck.h
rename to src/cppcheck.h
diff --git a/cppcheckexecutor.cpp b/src/cppcheckexecutor.cpp
similarity index 100%
rename from cppcheckexecutor.cpp
rename to src/cppcheckexecutor.cpp
diff --git a/cppcheckexecutor.h b/src/cppcheckexecutor.h
similarity index 100%
rename from cppcheckexecutor.h
rename to src/cppcheckexecutor.h
diff --git a/errorlogger.h b/src/errorlogger.h
similarity index 100%
rename from errorlogger.h
rename to src/errorlogger.h
diff --git a/errormessage.cpp b/src/errormessage.cpp
similarity index 100%
rename from errormessage.cpp
rename to src/errormessage.cpp
diff --git a/errormessage.h b/src/errormessage.h
similarity index 100%
rename from errormessage.h
rename to src/errormessage.h
diff --git a/filelister.cpp b/src/filelister.cpp
similarity index 100%
rename from filelister.cpp
rename to src/filelister.cpp
diff --git a/filelister.h b/src/filelister.h
similarity index 100%
rename from filelister.h
rename to src/filelister.h
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/preprocessor.cpp b/src/preprocessor.cpp
similarity index 100%
rename from preprocessor.cpp
rename to src/preprocessor.cpp
diff --git a/preprocessor.h b/src/preprocessor.h
similarity index 100%
rename from preprocessor.h
rename to src/preprocessor.h
diff --git a/settings.cpp b/src/settings.cpp
similarity index 100%
rename from settings.cpp
rename to src/settings.cpp
diff --git a/settings.h b/src/settings.h
similarity index 100%
rename from settings.h
rename to src/settings.h
diff --git a/token.cpp b/src/token.cpp
similarity index 100%
rename from token.cpp
rename to src/token.cpp
diff --git a/token.h b/src/token.h
similarity index 100%
rename from token.h
rename to src/token.h
diff --git a/tokenize.cpp b/src/tokenize.cpp
similarity index 100%
rename from tokenize.cpp
rename to src/tokenize.cpp
diff --git a/tokenize.h b/src/tokenize.h
similarity index 100%
rename from tokenize.h
rename to src/tokenize.h
diff --git a/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
similarity index 99%
rename from testbufferoverrun.cpp
rename to test/testbufferoverrun.cpp
index a29e93f35..63e351f2a 100644
--- a/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -18,8 +18,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkbufferoverrun.h"
+#include "../src/tokenize.h"
+#include "../src/checkbufferoverrun.h"
#include "testsuite.h"
#include
diff --git a/testcharvar.cpp b/test/testcharvar.cpp
similarity index 97%
rename from testcharvar.cpp
rename to test/testcharvar.cpp
index 5c7240e43..a6e2a4162 100644
--- a/testcharvar.cpp
+++ b/test/testcharvar.cpp
@@ -18,8 +18,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkother.h"
+#include "../src/tokenize.h"
+#include "../src/checkother.h"
#include "testsuite.h"
#include
diff --git a/testclass.cpp b/test/testclass.cpp
similarity index 98%
rename from testclass.cpp
rename to test/testclass.cpp
index a7c18be4f..65bf216cb 100644
--- a/testclass.cpp
+++ b/test/testclass.cpp
@@ -19,8 +19,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkclass.h"
+#include "../src/tokenize.h"
+#include "../src/checkclass.h"
#include "testsuite.h"
#include
diff --git a/testconstructors.cpp b/test/testconstructors.cpp
similarity index 99%
rename from testconstructors.cpp
rename to test/testconstructors.cpp
index 7c304c88d..185547d05 100644
--- a/testconstructors.cpp
+++ b/test/testconstructors.cpp
@@ -19,8 +19,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkclass.h"
+#include "../src/tokenize.h"
+#include "../src/checkclass.h"
#include "testsuite.h"
#include
diff --git a/testdivision.cpp b/test/testdivision.cpp
similarity index 98%
rename from testdivision.cpp
rename to test/testdivision.cpp
index 504f464a1..b1e09f610 100644
--- a/testdivision.cpp
+++ b/test/testdivision.cpp
@@ -22,8 +22,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkother.h"
+#include "../src/tokenize.h"
+#include "../src/checkother.h"
#include "testsuite.h"
#include
diff --git a/testfilelister.cpp b/test/testfilelister.cpp
similarity index 98%
rename from testfilelister.cpp
rename to test/testfilelister.cpp
index 79d15cda9..2722a1e85 100644
--- a/testfilelister.cpp
+++ b/test/testfilelister.cpp
@@ -18,7 +18,7 @@
#include
#include "testsuite.h"
-#include "filelister.h"
+#include "../src/filelister.h"
class TestFileLister : public TestFixture
{
diff --git a/testfunctionusage.cpp b/test/testfunctionusage.cpp
similarity index 97%
rename from testfunctionusage.cpp
rename to test/testfunctionusage.cpp
index d9b5528a4..1065fb926 100644
--- a/testfunctionusage.cpp
+++ b/test/testfunctionusage.cpp
@@ -18,9 +18,9 @@
#define UNIT_TESTING
-#include "tokenize.h"
+#include "../src/tokenize.h"
#include "testsuite.h"
-#include "checkfunctionusage.h"
+#include "../src/checkfunctionusage.h"
#include
extern std::ostringstream errout;
diff --git a/testincompletestatement.cpp b/test/testincompletestatement.cpp
similarity index 97%
rename from testincompletestatement.cpp
rename to test/testincompletestatement.cpp
index a3cf1be69..289bfedd4 100644
--- a/testincompletestatement.cpp
+++ b/test/testincompletestatement.cpp
@@ -22,8 +22,8 @@
#define UNIT_TESTING
#include "testsuite.h"
-#include "tokenize.h"
-#include "checkother.h"
+#include "../src/tokenize.h"
+#include "../src/checkother.h"
#include
diff --git a/testmemleak.cpp b/test/testmemleak.cpp
similarity index 99%
rename from testmemleak.cpp
rename to test/testmemleak.cpp
index a935449c2..605d313e5 100644
--- a/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -20,8 +20,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkmemoryleak.h"
+#include "../src/tokenize.h"
+#include "../src/checkmemoryleak.h"
#include "testsuite.h"
#include
diff --git a/testmemleakmp.cpp b/test/testmemleakmp.cpp
similarity index 96%
rename from testmemleakmp.cpp
rename to test/testmemleakmp.cpp
index 295e8390e..2417f18ae 100644
--- a/testmemleakmp.cpp
+++ b/test/testmemleakmp.cpp
@@ -19,8 +19,8 @@
#define UNIT_TESTING
-#include "tokenize.h"
-#include "checkmemoryleak.h"
+#include "../src/tokenize.h"
+#include "../src/checkmemoryleak.h"
#include "testsuite.h"
#include
diff --git a/testother.cpp b/test/testother.cpp
similarity index 97%
rename from testother.cpp
rename to test/testother.cpp
index ea744cb6a..549b9bd3a 100644
--- a/testother.cpp
+++ b/test/testother.cpp
@@ -16,8 +16,8 @@
* along with this program. If not, see
diff --git a/testpreprocessor.cpp b/test/testpreprocessor.cpp
similarity index 99%
rename from testpreprocessor.cpp
rename to test/testpreprocessor.cpp
index 93c125192..5bfd25611 100644
--- a/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -23,7 +23,7 @@
#include "testsuite.h"
#define UNIT_TESTING
-#include "preprocessor.h"
+#include "../src/preprocessor.h"
#include