Cleanup nullptr comparisons.

Framework/API/inc/MantidAPI/BoxController.h

@@ -369,7 +369,7 @@ public:
   // { return m_useWriteBuffer; }
   /// Returns if current box controller is file backed. Assumes that
   /// BC(workspace) is fileBackd if fileIO is defined;
-  bool isFileBacked() const { return (m_fileIO != nullptr); }
+  bool isFileBacked() const { return bool(m_fileIO); }
   /// returns the pointer to the class, responsible for fileIO operations;
   IBoxControllerIO *getFileIO() { return m_fileIO.get(); }
   /// makes box controller file based by providing class, responsible for

Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h

@@ -65,7 +65,7 @@ public:
    */
   virtual bool fulfillsCriterion(const Kernel::IPropertyManager *algo) const {
     // Find the property
-    if (algo == nullptr)
+    if (!algo)
       return true;
     Mantid::Kernel::Property *prop = nullptr;
     try {

Framework/API/inc/MantidAPI/ImplicitFunctionParser.h

@@ -83,7 +83,7 @@ protected:
   }
 
   void checkSuccessorExists() {
-    if (nullptr == m_successor.get()) {
+    if (!m_successor) {
       std::string message = "There is no successor function parser. Is this an "
                             "empty composite function?";
       throw std::runtime_error(message);

Framework/API/inc/MantidAPI/WorkspaceProperty.h

@@ -401,12 +401,10 @@ private:
     g_log.debug() << " Input WorkspaceGroup found " << std::endl;
 
     std::vector<std::string> wsGroupNames = wsGroup->getNames();
-    std::vector<std::string>::iterator it = wsGroupNames.begin();
-
     std::string error;
 
     // Cycle through each workspace in the group ...
-    for (; it != wsGroupNames.end(); ++it) {
+    for (auto it = wsGroupNames.begin(); it != wsGroupNames.end(); ++it) {
       std::string memberWsName = *it;
       boost::shared_ptr<Workspace> memberWs =
           AnalysisDataService::Instance().retrieve(memberWsName);
@@ -421,7 +419,7 @@ private:
       } else {
         // ... and if it is a workspace of incorrect type, exclude the group by
         // returning an error.
-        if (nullptr == boost::dynamic_pointer_cast<TYPE>(memberWs)) {
+        if (!boost::dynamic_pointer_cast<TYPE>(memberWs)) {
           error = "Workspace " + memberWsName + " is not of type " +
                   Kernel::PropertyWithValue<boost::shared_ptr<TYPE>>::type() +
                   ".";

Framework/DataObjects/inc/MantidDataObjects/BoxControllerNeXusIO.h

@@ -43,7 +43,7 @@ public:
   BoxControllerNeXusIO(API::BoxController *const theBC);
 
   ///@return true if the file to write events is opened and false otherwise
-  bool isOpened() const override { return (m_File != nullptr); }
+  bool isOpened() const override { return m_File; }
   /// get the full file name of the file used for IO operations
   const std::string &getFileName() const override { return m_fileName; }
   /**Return the size of the NeXus data block used in NeXus data array*/

Framework/DataObjects/inc/MantidDataObjects/MDBoxIterator.tcc

@@ -157,7 +157,7 @@ TMDE(void MDBoxIterator)::jumpTo(size_t index) {
 
 //----------------------------------------------------------------------------------------------
 /// @return true if the iterator is currently valid
-TMDE(bool MDBoxIterator)::valid() const { return (m_current != nullptr); }
+TMDE(bool MDBoxIterator)::valid() const { return m_current; }
 
 //----------------------------------------------------------------------------------------------
 /// Advance to the next cell. If the current cell is the last one in the

Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h

@@ -152,9 +152,7 @@ public:
   getMinimumExtents(size_t depth = 2) override;
 
   /// Return true if the underlying box is a MDGridBox.
-  bool isGridBox() {
-    return (dynamic_cast<MDGridBox<MDE, nd> *>(data) != nullptr);
-  }
+  bool isGridBox() { return dynamic_cast<MDGridBox<MDE, nd> *>(data); }
 
   /** @returns a pointer to the box (MDBox or MDGridBox) contained within, */
   MDBoxBase<MDE, nd> *getBox() { return data; }

Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc

@@ -767,7 +767,7 @@ TMDE(void MDEventWorkspace)::getLinePlot(const Mantid::Kernel::VMD &start,
     if (isInBounds(coord.getBareArray())) {
       box = this->data->getBoxAtCoord(coord.getBareArray());
 
-      if (box != nullptr) {
+      if (box) {
         if (!box->getIsMasked()) {
           // What is our normalization factor?
           signal_t normalizer = 1.0;

Framework/DataObjects/inc/MantidDataObjects/TableColumn.h

@@ -330,7 +330,7 @@ inline void TableColumn<API::Boolean>::fromDouble(size_t i, double value) {
   m_data[i] = value != 0.0;
 }
 
-/// Shared pointer to a column with aoutomatic type cast and data type check.
+/// Shared pointer to a column with automatic type cast and data type check.
 /// Can be created with TableWorkspace::getColumn(...)
 template <class T>
 class TableColumn_ptr : public boost::shared_ptr<TableColumn<T>> {
@@ -341,7 +341,7 @@ public:
   TableColumn_ptr(boost::shared_ptr<API::Column> c)
       : boost::shared_ptr<TableColumn<T>>(
             boost::dynamic_pointer_cast<TableColumn<T>>(c)) {
-    if (this->get() == nullptr) {
+    if (!this->get()) {
       std::string str = "Data type of column " + c->name() +
                         " does not match " + typeid(T).name();
       throw std::runtime_error(str);
@@ -357,7 +357,7 @@ public:
     */
   TableColumn_ptr(boost::shared_ptr<API::Column> c)
       : TableColumn_ptr<API::Boolean>(c) {
-    if (this->get() == nullptr) {
+    if (!this->get()) {
       std::string str = "Data type of column " + c->name() +
                         " does not match " + typeid(API::Boolean).name();
       throw std::runtime_error(str);

Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h

@@ -125,7 +125,7 @@ private:
    */
   template <class T>
   void savetoTableWorkspace(T *input, Mantid::API::TableRow &table) {
-    if (input != nullptr) {
+    if (input) {
       table << *input;
     } else {
       table << "";

Framework/Kernel/inc/MantidKernel/Chainable.h

@@ -59,7 +59,7 @@ public:
     checkSuccessor();
     return *m_successor;
   }
-  bool hasSuccessor() const { return m_successor.get() != nullptr; }
+  bool hasSuccessor() const { return bool(m_successor); }
   virtual ~Chainable() = 0;
 };
 

Framework/Kernel/inc/MantidKernel/FunctionTask.h

@@ -61,7 +61,7 @@ public:
   //---------------------------------------------------------------------------------------------
   /** Main method that performs the work for the task. */
   void run() override {
-    if (m_voidFunc != nullptr)
+    if (m_voidFunc)
       m_voidFunc();
     else
       throw std::runtime_error("FunctionTask: NULL method pointer provided.");

MantidQt/SliceViewer/src/SliceViewerFunctions.cpp

@@ -71,7 +71,7 @@ bool EXPORT_OPT_MANTIDQT_SLICEVIEWER shouldAutoScaleForNewlySetWorkspace(
 */
 bool EXPORT_OPT_MANTIDQT_SLICEVIEWER isRebinInConsistentState(
     Mantid::API::IMDWorkspace *rebinnedWS, bool useRebinMode) {
-  return (rebinnedWS != nullptr) && useRebinMode;
+  return rebinnedWS && useRebinMode;
 }
 }
 }