Fixed #include's for cppunit headers.

18 files changed, 55 insertions, 101 deletions

diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h
index f67649e..88ee195 100644
--- a/include/cppunit/TestAssert.h
+++ b/include/cppunit/TestAssert.h
@@ -2,10 +2,7 @@
 #define CPPUNIT_TESTASSERT_H
 
 #include <string>
-
-#ifndef CPPUNIT_EXCEPTION_H
-#include "Exception.h"
-#endif
+#include <cppunit/Exception.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/TestCaller.h b/include/cppunit/TestCaller.h
index ece31fa..6af6e79 100644
--- a/include/cppunit/TestCaller.h
+++ b/include/cppunit/TestCaller.h
@@ -1,11 +1,8 @@
 #ifndef CPPUNIT_TESTCALLER_H
 #define CPPUNIT_TESTCALLER_H
 
-#ifndef CPPUNIT_TESTCASE_H
-#include "TestCase.h"
-#endif
-
 #include <memory>
+#include <cppunit/TestCase.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/TestCase.h b/include/cppunit/TestCase.h
index 7484e56..ebbd135 100644
--- a/include/cppunit/TestCase.h
+++ b/include/cppunit/TestCase.h
@@ -2,14 +2,8 @@
 #define CPPUNIT_TESTCASE_H
 
 #include <string>
-
-#ifndef CPPUNIT_TEST_H
-#include "Test.h"
-#endif
-
-#ifndef CPPUNIT_TESTASSERT_H
-#include "TestAssert.h"
-#endif
+#include <cppunit/Test.h>
+#include <cppunit/TestAssert.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/TestRegistry.h b/include/cppunit/TestRegistry.h
index e596c81..f78d063 100644
--- a/include/cppunit/TestRegistry.h
+++ b/include/cppunit/TestRegistry.h
@@ -1,11 +1,9 @@
 #ifndef CPPUNIT_TESTREGISTRY_H
 #define CPPUNIT_TESTREGISTRY_H
 
-
 #include <vector>
 #include <string>
 
-
 namespace CppUnit {
 
   class Test;
diff --git a/include/cppunit/TestResult.h b/include/cppunit/TestResult.h
index 8da0c18..1c02d52 100644
--- a/include/cppunit/TestResult.h
+++ b/include/cppunit/TestResult.h
@@ -2,10 +2,7 @@
 #define CPPUNIT_TESTRESULT_H
 
 #include <vector>
-
-#ifndef CPPUNIT_TESTFAILURE_H
-#include "TestFailure.h"
-#endif
+#include <cppunit/TestFailure.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/TestSuite.h b/include/cppunit/TestSuite.h
index 5e3f6bd..7934ad4 100644
--- a/include/cppunit/TestSuite.h
+++ b/include/cppunit/TestSuite.h
@@ -3,14 +3,7 @@
 
 #include <vector>
 #include <string>
-
-#ifdef USE_TYPEINFO
-#include <typeinfo>
-#endif // USE_TYPEINFO
-
-#ifndef CPPUNIT_TEST_H
-#include "Test.h"
-#endif
+#include <cppunit/Test.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/TextTestResult.h b/include/cppunit/TextTestResult.h
index 2176b2c..8c41055 100644
--- a/include/cppunit/TextTestResult.h
+++ b/include/cppunit/TextTestResult.h
@@ -2,7 +2,7 @@
 #define CPPUNIT_TEXTTESTRESULT_H
 
 #include <iosfwd>
-#include "TestResult.h"
+#include <cppunit/TestResult.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/extensions/AbstractTestFactory.h b/include/cppunit/extensions/AbstractTestFactory.h
index 14a27c8..de0ea84 100644
--- a/include/cppunit/extensions/AbstractTestFactory.h
+++ b/include/cppunit/extensions/AbstractTestFactory.h
@@ -1,7 +1,5 @@
-#ifndef CPPUNIT_ABSTRACTTESTFACTORY_H
-#define CPPUNIT_ABSTRACTTESTFACTORY_H
-
-
+#ifndef CPPUNIT_EXTENSIONS_ABSTRACTTESTFACTORY_H
+#define CPPUNIT_EXTENSIONS_ABSTRACTTESTFACTORY_H
 
 namespace CppUnit {
 
@@ -22,4 +20,4 @@ namespace CppUnit {
 
 }  // namespace CppUnit
 
-#endif  // CPPUNIT_ABSTRACTTESTFACTORY_H
+#endif  // CPPUNIT_EXTENSIONS_ABSTRACTTESTFACTORY_H
diff --git a/include/cppunit/extensions/AutoRegisterSuite.h b/include/cppunit/extensions/AutoRegisterSuite.h
index a9fb117..e80122f 100644
--- a/include/cppunit/extensions/AutoRegisterSuite.h
+++ b/include/cppunit/extensions/AutoRegisterSuite.h
@@ -1,11 +1,9 @@
-#ifndef CPPUNIT_AUTOREGISTERSUITE_H
-#define CPPUNIT_AUTOREGISTERSUITE_H
+#ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
+#define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
 
 #include <string>
-
-#include "TestSuiteFactory.h"
-#include "TestFactoryRegistry.h"
-
+#include <cppunit/extensions/TestSuiteFactory.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
 
 namespace CppUnit {
 
@@ -44,4 +42,4 @@ namespace CppUnit {
 } // namespace CppUnit
 
 
-#endif  // CPPUNIT_AUTOREGISTERSUITE_H
+#endif  // CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H
diff --git a/include/cppunit/extensions/HelperMacros.h b/include/cppunit/extensions/HelperMacros.h
index e1a4b72..0cb3495 100644
--- a/include/cppunit/extensions/HelperMacros.h
+++ b/include/cppunit/extensions/HelperMacros.h
@@ -3,12 +3,11 @@
 // (c)Copyright 2000, Baptiste Lepilleur.
 // Created: 2001/04/15
 // //////////////////////////////////////////////////////////////////////////
-#ifndef CPPUNIT_HELPERMACROS_H
-#define CPPUNIT_HELPERMACROS_H
-
-#include "AutoRegisterSuite.h"
-#include "TestSuiteBuilder.h"
+#ifndef CPPUNIT_EXTENSIONS_HELPERMACROS_H
+#define CPPUNIT_EXTENSIONS_HELPERMACROS_H
 
+#include <cppunit/extensions/AutoRegisterSuite.h>
+#include <cppunit/extensions/TestSuiteBuilder.h>
 
 /** Begins the declaration of the test suite
  *
@@ -160,4 +159,4 @@
              CU_MAKE_UNIQUE_NAME(__autoRegisterSuite )
 
 
-#endif  // CPPUNIT_HELPERMACROS_H
+#endif  // CPPUNIT_EXTENSIONS_HELPERMACROS_H
diff --git a/include/cppunit/extensions/Makefile b/include/cppunit/extensions/Makefile
index aab8dc0..ed8aa03 100644
--- a/include/cppunit/extensions/Makefile
+++ b/include/cppunit/extensions/Makefile
@@ -16,7 +16,7 @@ SHELL = /bin/sh
 
 srcdir = .
 top_srcdir = ../../..
-prefix = /home/bastiaan/tmp/cppunit
+prefix = /usr/local
 exec_prefix = ${prefix}
 
 bindir = ${exec_prefix}/bin
@@ -61,12 +61,12 @@ host_alias = i686-pc-linux
 host_triplet = i686-pc-linux-gnu
 AS = @AS@
 CC = gcc
-CPPUNIT_BINARY_AGE = 0
-CPPUNIT_INTERFACE_AGE = 0
+CPPUNIT_BINARY_AGE = 1
+CPPUNIT_INTERFACE_AGE = 1
 CPPUNIT_MAJOR_VERSION = 1
-CPPUNIT_MICRO_VERSION = 4
+CPPUNIT_MICRO_VERSION = 5
 CPPUNIT_MINOR_VERSION = 5
-CPPUNIT_VERSION = 1.5.4
+CPPUNIT_VERSION = 1.5.5
 CXX = c++
 DLLTOOL = @DLLTOOL@
 DOT = /usr/bin/dot
@@ -76,12 +76,12 @@ LN_S = ln -s
 LT_AGE = 0
 LT_CURRENT = 4
 LT_RELEASE = 1.5
-LT_REVISION = 0
+LT_REVISION = 1
 MAKEINFO = makeinfo
 OBJDUMP = @OBJDUMP@
 PACKAGE = cppunit
 RANLIB = ranlib
-VERSION = 1.5.4
+VERSION = 1.5.5
 enable_dot = yes
 enable_html_docs = yes
 enable_latex_docs = no
diff --git a/include/cppunit/extensions/Orthodox.h b/include/cppunit/extensions/Orthodox.h
index a7778e3..109afae 100644
--- a/include/cppunit/extensions/Orthodox.h
+++ b/include/cppunit/extensions/Orthodox.h
@@ -1,10 +1,7 @@
+#ifndef CPPUNIT_EXTENSIONS_ORTHODOX_H
+#define CPPUNIT_EXTENSIONS_ORTHODOX_H
 
-#ifndef CPPUNIT_ORTHODOX_H
-#define CPPUNIT_ORTHODOX_H
-
-#ifndef CPPUNIT_TESTCASE_H
-#include "TestCase.h"
-#endif
+#include <cppunit/TestCase.h>
 
 namespace CppUnit {
 
@@ -92,4 +89,4 @@ template <class ClassUnderTest> ClassUnderTest Orthodox<ClassUnderTest>::call (C
 
 } // namespace CppUnit
 
-#endif
\ No newline at end of file
+#endif
diff --git a/include/cppunit/extensions/RepeatedTest.h b/include/cppunit/extensions/RepeatedTest.h
index a8c3246..b96b6ec 100644
--- a/include/cppunit/extensions/RepeatedTest.h
+++ b/include/cppunit/extensions/RepeatedTest.h
@@ -1,10 +1,7 @@
+#ifndef CPPUNIT_EXTENSIONS_REPEATEDTEST_H
+#define CPPUNIT_EXTENSIONS_REPEATEDTEST_H
 
-#ifndef CPPUNIT_REPEATEDTEST_H
-#define CPPUNIT_REPEATEDTEST_H
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#include "TestDecorator.h"
-#endif
+#include <cppunit/extensions/TestDecorator.h>
 
 namespace CppUnit {
 
@@ -59,4 +56,4 @@ inline void RepeatedTest::run (TestResult *result)
 
 } // namespace CppUnit
 
-#endif
\ No newline at end of file
+#endif // CPPUNIT_EXTENSIONS_REPEATEDTEST_H
diff --git a/include/cppunit/extensions/TestDecorator.h b/include/cppunit/extensions/TestDecorator.h
index 54494f3..ab637d2 100644
--- a/include/cppunit/extensions/TestDecorator.h
+++ b/include/cppunit/extensions/TestDecorator.h
@@ -1,11 +1,7 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTDECORATOR_H
+#define CPPUNIT_EXTENSIONS_TESTDECORATOR_H
 
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#define CPPUNIT_TESTDECORATOR_H
-
-#ifndef CPPUNIT_TEST_H
-#include "../Test.h"
-#endif
+#include <cppunit/Test.h>
 
 namespace CppUnit {
 
diff --git a/include/cppunit/extensions/TestFactoryRegistry.h b/include/cppunit/extensions/TestFactoryRegistry.h
index 637ab1b..c26b987 100644
--- a/include/cppunit/extensions/TestFactoryRegistry.h
+++ b/include/cppunit/extensions/TestFactoryRegistry.h
@@ -1,5 +1,5 @@
-#ifndef CPPUNIT_TESTFACTORYREGISTRY_H
-#define CPPUNIT_TESTFACTORYREGISTRY_H
+#ifndef CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
+#define CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
 
 #if _MSC_VER > 1000     // VC++
 #pragma warning( disable : 4786 )   // disable warning debug symbol > 255...
@@ -7,7 +7,7 @@
 
 #include <map>
 #include <string>
-#include "cppunit/extensions/AbstractTestFactory.h"
+#include <cppunit/extensions/AbstractTestFactory.h>
 
 namespace CppUnit {
 
@@ -81,4 +81,4 @@ namespace CppUnit {
 }  // namespace CppUnit
 
 
-#endif  // CPPUNIT_TESTFACTORYREGISTRY_H
+#endif  // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H
diff --git a/include/cppunit/extensions/TestSetUp.h b/include/cppunit/extensions/TestSetUp.h
index bcd47d0..8b2ffa2 100644
--- a/include/cppunit/extensions/TestSetUp.h
+++ b/include/cppunit/extensions/TestSetUp.h
@@ -1,10 +1,7 @@
+#ifndef CPPUNIT_EXTENSIONS_TESTSETUP_H
+#define CPPUNIT_EXTENSIONS_TESTSETUP_H
 
-#ifndef CPP_UINT_TESTSETUP_H
-#define CPP_UINT_TESTSETUP_H
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#include "TestDecorator.h"
-#endif
+#include <cppunit/extensions/TestDecorator.h>
 
 namespace CppUnit {
 
@@ -34,5 +31,5 @@ inline TestSetup::run (TestResult *result)
 
 } //  namespace CppUnit
 
-#endif
+#endif // CPPUNIT_EXTENSIONS_TESTSETUP_H
 
diff --git a/include/cppunit/extensions/TestSuiteBuilder.h b/include/cppunit/extensions/TestSuiteBuilder.h
index 981fde9..b20d2f9 100644
--- a/include/cppunit/extensions/TestSuiteBuilder.h
+++ b/include/cppunit/extensions/TestSuiteBuilder.h
@@ -1,10 +1,9 @@
-#ifndef CPPUNIT_TESTSUITEBUILDER_H
-#define CPPUNIT_TESTSUITEBUILDER_H
+#ifndef CPPUNIT_EXTENSIONS_TESTSUITEBUILDER_H
+#define CPPUNIT_EXTENSIONS_TESTSUITEBUILDER_H
 
 #include <memory>
-
-#include "cppunit/TestSuite.h"
-#include "cppunit/TestCaller.h"
+#include <cppunit/TestSuite.h>
+#include <cppunit/TestCaller.h>
 
 namespace CppUnit {
 
@@ -52,4 +51,4 @@ namespace CppUnit {
 
 }  // namespace CppUnit
 
-#endif  // CPPUNIT_TESTSUITEBUILDER_H
+#endif  // CPPUNIT_EXTENSIONS_TESTSUITEBUILDER_H
diff --git a/include/cppunit/extensions/TestSuiteFactory.h b/include/cppunit/extensions/TestSuiteFactory.h
index b438fe4..1df6c70 100644
--- a/include/cppunit/extensions/TestSuiteFactory.h
+++ b/include/cppunit/extensions/TestSuiteFactory.h
@@ -1,10 +1,7 @@
-#ifndef CPPUNIT_TESTSUITEFACTORY_H
-#define CPPUNIT_TESTSUITEFACTORY_H
-
-#ifndef CPPUNIT_ABSTRACTTESTFACTORY_H
-#include "AbstractTestFactory.h"
-#endif
+#ifndef CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
+#define CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H
 
+#include <cppunit/extensions/AbstractTestFactory.h>
 
 namespace CppUnit {
 
@@ -22,4 +19,4 @@ namespace CppUnit {
 
 }  // namespace CppUnit
 
-#endif  // CPPUNIT_TESTSUITEFACTORY_H
+#endif  // CPPUNIT_EXTENSIONS_TESTSUITEFACTORY_H