Follow ogre 1.10 conventions

ros-visualization · Jun 8, 2018 · 9a2dc98 · 9a2dc98
1 parent 6f312b5
commit 9a2dc98
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/rviz/ogre_helpers/movable_text.cpp b/src/rviz/ogre_helpers/movable_text.cpp
@@ -105,14 +105,14 @@ void MovableText::setFontName(const String &fontName)
     Ogre::MaterialManager::getSingleton().remove(mName + "Material");
   }
 
-  if (mFontName != fontName || mpMaterial.isNull() || !(mpFont.get()))
+  if (mFontName != fontName || mpMaterial.isNull() || mpFont.isNull())
   {
     mFontName = fontName;
     mpFont
         = FontManager::getSingleton().getByName(mFontName);
 
     // Workaround for getByName bug
-    if (!(mpFont.get())){
+    if (mpFont.isNull()){
       auto fonts = FontManager::getSingleton().getResourceIterator();
 
       while(fonts.hasMoreElements()){
@@ -123,7 +123,7 @@ void MovableText::setFontName(const String &fontName)
         }
       }
     }
-    if (!(mpFont.get()))
+    if (mpFont.isNull())
       throw Exception(Exception::ERR_ITEM_NOT_FOUND, "Could not find font "
           + fontName, "MovableText::setFontName");
 
@@ -230,7 +230,7 @@ void MovableText::showOnTop(bool show)
 
 void MovableText::_setupGeometry()
 {
-  assert(mpFont);
+  assert(!mpFont.isNull());
   assert(!mpMaterial.isNull());
 
   unsigned int vertexCount = 0;