Fix warnings

Author: dcwhite

src/Interface/Modules/Render/ES/systems/RenderTransBasicSys.cc

@@ -85,11 +85,10 @@ class RenderBasicSysTrans :
     GLuint mSortedID;
 
     SortedObject() :
-      mName(""),
-      mSortedID(NULL)
+      mSortedID(0)
     {}
 
-    SortedObject(std::string name, GLuint ID) :
+    SortedObject(const std::string& name, GLuint ID) :
       mName(name),
       mSortedID(ID)
     {}
@@ -203,7 +202,7 @@ class RenderBasicSysTrans :
     {
       return;
     }
-    
+
     if (!srstate.front().state.get(RenderState::USE_TRANSPARENCY) &&
         !srstate.front().state.get(RenderState::USE_TRANSPARENT_EDGES) &&
         !srstate.front().state.get(RenderState::USE_TRANSPARENT_NODES))
@@ -248,14 +247,14 @@ class RenderBasicSysTrans :
           if (!indexed)
           {
             index = sortedObjects.size();
-            sortedObjects.push_back(SortedObject(pass.front().ibo.name, NULL));
+            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));
           }
 
           Core::Geometry::Vector diff = prevDir - dir;
           float distance = sqrtf(Core::Geometry::Dot(diff, diff));
-          if (distance >= 1.23 || sortedObjects[index].mSortedID == NULL)
+          if (distance >= 1.23 || sortedObjects[index].mSortedID == 0)
           {
-            if (sortedObjects[index].mSortedID != NULL)
+            if (sortedObjects[index].mSortedID != 0)
             {
               iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);
             }
@@ -400,7 +399,7 @@ class RenderBasicSysTrans :
     bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
     bool cullFace = glIsEnabled(GL_CULL_FACE);
     bool blend = glIsEnabled(GL_BLEND);
-      
+
     GL(glEnable(GL_DEPTH_TEST));
     GL(glDepthMask(GL_FALSE));
     GL(glDisable(GL_CULL_FACE));
@@ -429,7 +428,7 @@ class RenderBasicSysTrans :
           rlist.front().data->getBuffer(), rlist.front().data->getBufferSize());
 
       CPM_BSERIALIZE_NS::BSerialize colorDeserialize(
-          rlist.front().data->getBuffer(), rlist.front().data->getBufferSize()); 
+          rlist.front().data->getBuffer(), rlist.front().data->getBufferSize());
 
       int64_t posSize     = 0;
       int64_t colorSize   = 0;
@@ -520,7 +519,7 @@ class RenderBasicSysTrans :
       }
     }
 
- 
+
     if (!drawLines)
     {
       if (pass.front().renderState.mSortType == RenderState::TransparencySortType::CONTINUOUS_SORT)
@@ -541,7 +540,7 @@ class RenderBasicSysTrans :
     {
       GL(glDisable(GL_BLEND));
     }
-    		
+
     geom.front().attribs.unbind();
 
     // Reapply the default state here -- only do this if static state is
@@ -566,4 +565,3 @@ const char* getSystemName_RenderBasicTransGeom()
 
 } // namespace Render
 } // namespace SCIRun
-

src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc

@@ -82,19 +82,18 @@ class RenderColorMapSysTrans :
     GLuint mSortedID;
 
     SortedObject() :
-      mName(""),
-      mSortedID(NULL)
+      mSortedID(0)
     {}
 
-    SortedObject(std::string name, GLuint ID) :
+    SortedObject(const std::string& name, GLuint ID) :
       mName(name),
       mSortedID(ID)
     {}
   };
 
   Core::Geometry::Vector prevDir = Core::Geometry::Vector(0.0);
   std::vector<SortedObject> sortedObjects;
-  
+
   class DepthIndex {
   public:
     size_t mIndex;
@@ -117,7 +116,7 @@ class RenderColorMapSysTrans :
   };
 
   GLuint sortObjects(const Core::Geometry::Vector& dir,
-                     const es::ComponentGroup<ren::IBO>& ibo, 
+                     const es::ComponentGroup<ren::IBO>& ibo,
                      const es::ComponentGroup<Core::Datatypes::GeometryObject::SpireSubPass>& pass,
                      const es::ComponentGroup<ren::StaticIBOMan>& iboMan)
   {
@@ -169,7 +168,7 @@ class RenderColorMapSysTrans :
       result = iboMan.front().instance->addInMemoryIBO(sbuffer, pass.front().ibo.data->getBufferSize(), ibo.front().primMode, ibo.front().primType,
         numPrimitives, transIBOName);
     }
-   
+
     return result;
   }
 
@@ -210,12 +209,12 @@ class RenderColorMapSysTrans :
     }
 
     bool drawLines = (ibo.front().primMode == Core::Datatypes::GeometryObject::SpireIBO::LINES);
-    GLuint iboID = ibo.front().glid;    
+    GLuint iboID = ibo.front().glid;
 
     Core::Geometry::Vector dir(camera.front().data.worldToView[0][2],
                                camera.front().data.worldToView[1][2],
                                camera.front().data.worldToView[2][2]);
-    
+
     if (sortedObjects.size() <=0)
     {
       prevDir = dir;
@@ -246,14 +245,14 @@ class RenderColorMapSysTrans :
           if (!indexed)
           {
             index = sortedObjects.size();
-            sortedObjects.push_back(SortedObject(pass.front().ibo.name, NULL));
+            sortedObjects.push_back(SortedObject(pass.front().ibo.name, 0));
           }
 
           Core::Geometry::Vector diff = prevDir - dir;
           float distance = sqrtf(Core::Geometry::Dot(diff, diff));
-          if (distance >= 1.23 || sortedObjects[index].mSortedID == NULL)
+          if (distance >= 1.23 || sortedObjects[index].mSortedID == 0)
           {
-            if (sortedObjects[index].mSortedID != NULL)
+            if (sortedObjects[index].mSortedID != 0)
             {
               iboMan.front().instance->removeInMemoryIBO(sortedObjects[index].mSortedID);
             }
@@ -407,11 +406,11 @@ class RenderColorMapSysTrans :
     for (const ren::MatUniform& unif : matUniforms) {unif.applyUniform();}
 
     geom.front().attribs.bind();
-    
+
     bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
     bool cullFace = glIsEnabled(GL_CULL_FACE);
     bool blend = glIsEnabled(GL_BLEND);
-      
+
     GL(glEnable(GL_DEPTH_TEST));
     GL(glDepthMask(GL_FALSE));
     GL(glDisable(GL_CULL_FACE));
@@ -442,7 +441,7 @@ class RenderColorMapSysTrans :
           rlist.front().data->getBuffer(), rlist.front().data->getBufferSize());
 
       CPM_BSERIALIZE_NS::BSerialize dataDeserialize(
-          rlist.front().data->getBuffer(), rlist.front().data->getBufferSize()); 
+          rlist.front().data->getBuffer(), rlist.front().data->getBufferSize());
 
       int64_t posSize     = 0;
       int64_t dataSize    = 0;
@@ -574,4 +573,3 @@ const char* getSystemName_RenderColorMapTrans()
 
 } // namespace Render
 } // namespace SCIRun
-