libcommon: Cleanup

skyjake · Aug 19, 2014 · 3def130 · 3def130
1 parent 57bd518
commit 3def130
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/doomsday/plugins/common/src/g_game.cpp b/doomsday/plugins/common/src/g_game.cpp
@@ -1082,10 +1082,9 @@ void G_AutoStartOrBeginTitleLoop()
         if(startEpisodeId.isEmpty())
         {
             // Pick the first playable episode.
-            auto const &episodesById = Defs().episodes.lookup("id").elements();
-            DENG2_FOR_EACH_CONST(DictionaryValue::Elements, i, episodesById)
+            for(auto const &pair : Defs().episodes.lookup("id").elements())
             {
-                Record const &episodeDef = *i->second->as<RecordValue>().record();
+                Record const &episodeDef = *pair.second->as<RecordValue>().record();
                 de::Uri startMap(episodeDef.gets("startMap"), RC_NULL);
                 if(P_MapExists(startMap.compose().toUtf8().constData()))
                 {
@@ -3188,11 +3187,9 @@ D_CMD(WarpMap)
     // Otherwise if only one playable episode is defined - select it.
     if(episodeId.isEmpty())
     {
-        DictionaryValue::Elements const &episodesById = Defs().episodes.lookup("id").elements();
-        DENG2_FOR_EACH_CONST(DictionaryValue::Elements, i, episodesById)
+        for(auto const &pair : Defs().episodes.lookup("id").elements())
         {
-            Record const &episodeDef = *i->second->as<RecordValue>().record();
-
+            Record const &episodeDef = *pair.second->as<RecordValue>().record();
             de::Uri startMap(episodeDef.gets("startMap"), RC_NULL);
             if(!P_MapExists(startMap.compose().toUtf8().constData()))
             {

diff --git a/doomsday/plugins/common/src/gamesession.cpp b/doomsday/plugins/common/src/gamesession.cpp
@@ -841,15 +841,16 @@ de::Uri GameSession::mapUriForNamedExit(String name)
     {
         // Build a lookup table mapping exit ids to exit records.
         QMap<String, Record const *> exits;
-        foreach(Value *mapIt, mgNode->geta("exit").elements())
+        for(Value const *value : mgNode->geta("exit").elements())
         {
-            Record const &exit = mapIt->as<RecordValue>().dereference();
+            Record const &exit = value->as<RecordValue>().dereference();
             String id = exit.gets("id");
             if(!id.isEmpty())
             {
                 exits.insert(id, &exit);
             }
         }
+        //qDebug() << "map exits" << exits;
 
         // Locate the named exit record.
         Record const *chosenExit = 0;

diff --git a/doomsday/plugins/common/src/hu_menu.cpp b/doomsday/plugins/common/src/hu_menu.cpp
@@ -3007,10 +3007,9 @@ void Hu_MenuInitEpisodePage()
 
     int y = 0;
     int n = 0;
-    DictionaryValue::Elements const &episodesById = Defs().episodes.lookup("id").elements();
-    DENG2_FOR_EACH_CONST(DictionaryValue::Elements, i, episodesById)
+    for(auto const &pair : Defs().episodes.lookup("id").elements())
     {
-        Record const &episodeDef = *i->second->as<RecordValue>().record();
+        Record const &episodeDef = *pair.second->as<RecordValue>().record();
 
         ButtonWidget *btn = new ButtonWidget;