Cleanup

skyjake · Jan 1, 2016 · b8278f9 · b8278f9
1 parent 1a6c3f9
commit b8278f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/doomsday/apps/client/src/render/environ.cpp b/doomsday/apps/client/src/render/environ.cpp
@@ -166,7 +166,7 @@ DENG2_PIMPL(Environment)
         if(found != maps.constEnd())
         {
             EnvMaps const &env = found.value();
-            DENG2_ASSERT(env.interior.isEmpty() && env.exterior.isEmpty());
+            DENG2_ASSERT(!(env.interior.isEmpty() && env.exterior.isEmpty()));
 
             if(!env.exterior.isEmpty())
             {

diff --git a/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
@@ -719,7 +719,7 @@ void LabelWidget::setMaximumTextWidth(int pixels)
     setMaximumTextWidth(Const(pixels));
 }
 
-void de::LabelWidget::setMaximumTextWidth(Rule const &pixels)
+void LabelWidget::setMaximumTextWidth(Rule const &pixels)
 {
     changeRef(d->maxTextWidth, pixels);
     requestGeometry();

diff --git a/doomsday/sdk/libgui/src/graphics/gltexture.cpp b/doomsday/sdk/libgui/src/graphics/gltexture.cpp
@@ -13,7 +13,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "de/GLTexture"
@@ -146,8 +146,7 @@ DENG2_PIMPL(GLTexture)
 
     void glBind() const
     {
-        DENG2_ASSERT(name != 0);
-
+        //DENG2_ASSERT(name != 0);
         glBindTexture(texTarget, name); LIBGUI_ASSERT_GL_OK();
     }
 
@@ -161,7 +160,7 @@ DENG2_PIMPL(GLTexture)
      * calling.
      */
     void glUpdateParamsOfBoundTexture()
-    {        
+    {
         glTexParameteri(texTarget, GL_TEXTURE_WRAP_S,     glWrap(wrap.x));
         glTexParameteri(texTarget, GL_TEXTURE_WRAP_T,     glWrap(wrap.y));
         glTexParameteri(texTarget, GL_TEXTURE_MAG_FILTER, magFilter == Nearest? GL_NEAREST : GL_LINEAR);