Cleanup

skyjake · Jan 26, 2017 · e4d9f15 · e4d9f15
1 parent 224f63c
commit e4d9f15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/doomsday/apps/client/src/world/base/map.cpp b/doomsday/apps/client/src/world/base/map.cpp
@@ -3163,7 +3163,7 @@ void Map::deserializeInternalState(Reader &from, world::IThinkerMapping const &t
             }
             catch (Error const &er)
             {
-                LOG_MAP_WARNING("Error when reading state of object %i: %s")
+                LOG_MAP_WARNING("Error when reading state of object %s: %s")
                         << id << er.asText();
             }
 

diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp
@@ -1413,7 +1413,7 @@ DENG2_AUDIENCE_METHOD(ModelDrawable, AboutToGLInit)
 namespace internal {
 
 static struct {
-    char const *text;
+    String const text;
     ModelDrawable::TextureMap map;
 } const mappings[] {
     { "diffuse",  ModelDrawable::Diffuse  },
@@ -1443,7 +1443,7 @@ String ModelDrawable::textureMapToText(TextureMap map) // static
         if (mapping.map == map)
             return mapping.text;
     }
-    return "unknown";
+    return QStringLiteral("unknown");
 }
 
 ModelDrawable::ModelDrawable() : d(new Impl(this))