10 files changed, 20 insertions, 20 deletions
diff --git a/include/cppunit/Test.h b/include/cppunit/Test.h
index a56be0f..2a8fada 100644
--- a/include/cppunit/Test.h
+++ b/include/cppunit/Test.h
@@ -51,7 +51,7 @@ public:
    * You should override doGetChildTestAt() method.
    * 
    * \param index Zero based index of the child test to return.
-   * \return Pointer on the test. Never \c NULL.
+   * \return Pointer on the test. Never \c nullptr.
    * \exception std::out_of_range is \a index is < 0 or >= getChildTestCount().
    */
   virtual Test *getChildTestAt( int index ) const;
@@ -83,7 +83,7 @@ public:
 
   /*! \brief Finds the test with the specified name in the hierarchy.
    * \param testName Name of the test to find.
-   * \return Pointer on the first test found that is named \a testName. Never \c NULL.
+   * \return Pointer on the first test found that is named \a testName. Never \c nullptr.
    * \exception std::invalid_argument if no test named \a testName is found.
    */
   virtual Test *findTest( const std::string &testName ) const;
@@ -105,7 +105,7 @@ protected:
 
   /*! \brief Returns the child test of the specified valid index.
    * \param index Zero based valid index of the child test to return.
-   * \return Pointer on the test. Never \c NULL.
+   * \return Pointer on the test. Never \c nullptr.
    */
   virtual Test *doGetChildTestAt( int index ) const =0;
 };
diff --git a/include/cppunit/TestPath.h b/include/cppunit/TestPath.h
index 8934479..4eb6a26 100644
--- a/include/cppunit/TestPath.h
+++ b/include/cppunit/TestPath.h
@@ -83,7 +83,7 @@ public:
   virtual bool isValid() const;
 
   /*! \brief Adds a test to the path.
-   * \param test Pointer on the test to add. Must not be \c NULL.
+   * \param test Pointer on the test to add. Must not be \c nullptr.
    */
   virtual void add( Test *test );
 
@@ -93,7 +93,7 @@ public:
   virtual void add( const TestPath &path );
 
   /*! \brief Inserts a test at the specified index.
-   * \param test Pointer on the test to insert. Must not be \c NULL.
+   * \param test Pointer on the test to insert. Must not be \c nullptr.
    * \param index Zero based index indicating where the test is inserted.
    * \exception std::out_of_range is \a index < 0 or \a index > getTestCount().
    */
@@ -132,13 +132,13 @@ public:
 
   /*! \brief Returns the test of the specified index.
    * \param index Zero based index of the test to return.
-   * \return Pointer on the test at index \a index. Never \c NULL.
+   * \return Pointer on the test at index \a index. Never \c nullptr.
    * \exception std::out_of_range is \a index < 0 or \a index >= getTestCount().
    */
   virtual Test *getTestAt( int index ) const;
 
   /*! \brief Get the last test of the path.
-   * \return Pointer on the last test (test at the bottom of the hierarchy). Never \c NULL.
+   * \return Pointer on the last test (test at the bottom of the hierarchy). Never \c nullptr.
    * \exception std::out_of_range if the path is not valid ( isValid() returns \c false ).
    */
   virtual Test *getChildTest() const;
@@ -185,7 +185,7 @@ protected:
    *                   the root test if the path string is relative.
    * \param pathAsString Path string. May be absolute or relative.
    * \param testNames Test name components are added to that container.
-   * \return Pointer on the resolved root test. Never \c NULL.
+   * \return Pointer on the resolved root test. Never \c nullptr.
    * \exception std::invalid_argument if either the root name can not be resolved or if
    *            pathAsString contains no name components.
    */
diff --git a/include/cppunit/TestSuite.h b/include/cppunit/TestSuite.h
index 63c0a6b..e02d1e2 100644
--- a/include/cppunit/TestSuite.h
+++ b/include/cppunit/TestSuite.h
@@ -47,7 +47,7 @@ public:
   ~TestSuite();
 
   /*! Adds the specified test to the suite.
-   * \param test Test to add. Must not be \c NULL.
+   * \param test Test to add. Must not be \c nullptr.
     */
   void addTest( Test *test );
 
diff --git a/include/cppunit/XmlOutputter.h b/include/cppunit/XmlOutputter.h
index 2bf9411..36fe954 100644
--- a/include/cppunit/XmlOutputter.h
+++ b/include/cppunit/XmlOutputter.h
@@ -52,7 +52,7 @@ public:
   virtual ~XmlOutputter();
 
   /*! \brief Adds the specified hook to the outputter.
-   * \param hook Hook to add. Must not be \c NULL.
+   * \param hook Hook to add. Must not be \c nullptr.
    */
   virtual void addHook( XmlOutputterHook *hook );
 
diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h b/include/cppunit/extensions/TestSuiteBuilderContext.h
index 04f4b9b..f66a203 100644
--- a/include/cppunit/extensions/TestSuiteBuilderContext.h
+++ b/include/cppunit/extensions/TestSuiteBuilderContext.h
@@ -47,7 +47,7 @@ public:
 
   /*! \brief Adds a test to the fixture suite.
    *
-   * \param test Test to add to the fixture suite. Must not be \c NULL.
+   * \param test Test to add to the fixture suite. Must not be \c nullptr.
    */
   void addTest( Test *test );
 
diff --git a/include/cppunit/plugin/DynamicLibraryManager.h b/include/cppunit/plugin/DynamicLibraryManager.h
index d70ccde..4ec9d91 100644
--- a/include/cppunit/plugin/DynamicLibraryManager.h
+++ b/include/cppunit/plugin/DynamicLibraryManager.h
@@ -49,7 +49,7 @@ public:
 
   /*! \brief Returns a pointer on the specified symbol exported by the library.
    * \param symbol Name of the symbol exported by the library.
-   * \return Pointer on the symbol. Should be casted to the actual type. Never \c NULL.
+   * \return Pointer on the symbol. Should be casted to the actual type. Never \c nullptr.
    * \exception DynamicLibraryManagerException if the symbol is not found.
    */
   Symbol findSymbol( const std::string &symbol );
@@ -72,14 +72,14 @@ private:
    * 
    * May throw any exceptions (indicates failure).
    * \param libraryName Name of the library to load.
-   * \return Handle of the loaded library. \c NULL indicates failure.
+   * \return Handle of the loaded library. \c nullptr indicates failure.
    */
   LibraryHandle doLoadLibrary( const std::string &libraryName );
 
   /*! Releases the loaded library.
    *
    * The handle of the library to free is in \c m_libraryHandle. It is never
-   * \c NULL.
+   * \c nullptr.
    * \warning Must NOT throw any exceptions (called from destructor).
    */
   void doReleaseLibrary();
@@ -88,7 +88,7 @@ private:
    * 
    * May throw any exceptions (indicates failure).
    * \param symbol Name of the symbol exported by the library.
-   * \return Pointer on the symbol. \c NULL indicates failure.
+   * \return Pointer on the symbol. \c nullptr indicates failure.
    */
   Symbol doFindSymbol( const std::string &symbol );
 
diff --git a/include/cppunit/plugin/PlugInManager.h b/include/cppunit/plugin/PlugInManager.h
index c9d72d8..9b73af5 100644
--- a/include/cppunit/plugin/PlugInManager.h
+++ b/include/cppunit/plugin/PlugInManager.h
@@ -40,7 +40,7 @@ public:
    * \param libraryFileName Name of the file that contains the TestPlugIn.
    * \param parameters List of string passed to the plug-in.
    * \return Pointer on the DynamicLibraryManager associated to the library.
-   *         Valid until the library is unloaded. Never \c NULL.
+   *         Valid until the library is unloaded. Never \c nullptr.
    * \exception DynamicLibraryManagerException is thrown if an error occurs during loading.
    */
   void load( const std::string &libraryFileName,
diff --git a/include/cppunit/portability/Stream.h b/include/cppunit/portability/Stream.h
index e9beb8c..9968fa2 100644
--- a/include/cppunit/portability/Stream.h
+++ b/include/cppunit/portability/Stream.h
@@ -199,7 +199,7 @@ public:
 
    OStream &operator <<( const char *v )
    {
-      return write( v ? v : "NULL" );
+      return write( v ? v : "nullptr" );
    }
 
    OStream &operator <<( char c )
diff --git a/include/cppunit/tools/XmlElement.h b/include/cppunit/tools/XmlElement.h
index 70e21f8..3478a35 100644
--- a/include/cppunit/tools/XmlElement.h
+++ b/include/cppunit/tools/XmlElement.h
@@ -90,7 +90,7 @@ public:
                      int numericValue );
 
   /*! \brief Adds a child element to the element.
-   * \param element Child element to add. Must not be \c NULL.
+   * \param element Child element to add. Must not be \c nullptr.
    */
   void addElement( XmlElement *element );
 
@@ -101,7 +101,7 @@ public:
 
   /*! \brief Returns the child element at the specified index.
    * \param index Zero based index of the element to return.
-   * \returns Element at the specified index. Never \c NULL.
+   * \returns Element at the specified index. Never \c nullptr.
    * \exception std::invalid_argument if \a index < 0 or index >= elementCount().
    */
   XmlElement *elementAt( int index ) const;
diff --git a/include/cppunit/ui/text/TextTestRunner.h b/include/cppunit/ui/text/TextTestRunner.h
index 6250166..25fc717 100644
--- a/include/cppunit/ui/text/TextTestRunner.h
+++ b/include/cppunit/ui/text/TextTestRunner.h
@@ -63,7 +63,7 @@ class TestResultCollector;
 class CPPUNIT_API TextTestRunner : public CPPUNIT_NS::TestRunner
 {
 public:
-  TextTestRunner( Outputter *outputter =NULL );
+  TextTestRunner( Outputter *outputter = nullptr );
 
   virtual ~TextTestRunner();