some code review changes

src/item.cpp

@@ -184,7 +184,7 @@ item::item() : bday( calendar::start_of_cataclysm )
 {
     type = nullitem();
     charges = 0;
-    contents = item_contents( type->pocket_data );
+    contents = item_contents( type->pockets );
 }
 
 item::item( const itype *type, time_point turn, int qty ) : type( type ), bday( turn )
@@ -250,7 +250,7 @@ item::item( const itype *type, time_point turn, int qty ) : type( type ), bday(
     if( type->relic_data ) {
         relic_data = *type->relic_data;
     }
-    contents = type->pocket_data;
+    contents = item_contents( type->pockets );
 }
 
 item::item( const itype_id &id, time_point turn, int qty )

src/item_contents.cpp

@@ -14,21 +14,6 @@ static pocket_data legacy_pocket_data;
 static item_pocket legacy_pocket( &legacy_pocket_data );
 } // namespace fake_item
 
-void item_contents::serialize( JsonOut &json ) const
-{
-    json.start_object();
-
-    json.member( "contents", contents );
-
-    json.end_object();
-}
-
-void item_contents::deserialize( JsonIn &jsin )
-{
-    JsonObject data = jsin.get_object();
-    optional( data, was_loaded, "contents", contents );
-}
-
 void item_contents::add_legacy_pocket()
 {
     for( const item_pocket &pocket : contents ) {

src/item_factory.cpp

@@ -17,7 +17,6 @@
 #include "catacharset.h"
 #include "debug.h"
 #include "enums.h"
-#include "generic_factory.h"
 #include "init.h"
 #include "item.h"
 #include "item_category.h"
@@ -2185,7 +2184,7 @@ void Item_factory::load_basic_info( const JsonObject &jo, itype &def, const std:
         }
     }
 
-    assign( jo, "pocket_data", def.pocket_data );
+    assign( jo, "pocket_data", def.pockets );
 
     load_slot_optional( def.container, jo, "container_data", src );
     load_slot_optional( def.armor, jo, "armor_data", src );

src/item_location.cpp

@@ -566,7 +566,7 @@ class item_location::impl::item_in_container : public item_location::impl
 
             const int container_mv = container->contents.obtain_cost( *target() );
             if( container_mv == 0 ) {
-                debugmsg( string_format( "ERROR: %s does not contain %s", container->tname(), target()->tname() ) );
+                debugmsg( "ERROR: %s does not contain %s", container->tname(), target()->tname() );
                 return 0;
             }
             return container_mv + container.obtain_cost( ch, qty );

src/item_pocket.cpp

@@ -48,15 +48,6 @@ void pocket_data::load( const JsonObject &jo )
     optional( jo, was_loaded, "rigid", rigid, false );
 }
 
-void item_pocket::serialize( JsonOut &json ) const
-{
-    json.start_object();
-
-    json.member( "contents", contents );
-
-    json.end_object();
-}
-
 bool item_pocket::operator==( const item_pocket &rhs ) const
 {
     return *data == *rhs.data;
@@ -87,12 +78,6 @@ bool item_pocket::stacks_with( const item_pocket &rhs ) const
     } );
 }
 
-void item_pocket::deserialize( JsonIn &jsin )
-{
-    JsonObject data = jsin.get_object();
-    optional( data, was_loaded, "contents", contents );
-}
-
 std::list<item> item_pocket::all_items()
 {
     std::list<item> all_items;

src/itype.h

@@ -925,7 +925,7 @@ struct itype {
         units::mass integral_weight = -1_gram;
 
         // information related to being able to store things inside the item.
-        std::vector<pocket_data> pocket_data;
+        std::vector<pocket_data> pockets;
 
         /**
          * Space occupied by items of this type

src/iuse.cpp

@@ -7937,17 +7937,17 @@ int iuse::foodperson( player *p, item *it, bool t, const tripoint &pos )
 int iuse::radiocar( player *p, item *it, bool, const tripoint & )
 {
     int choice = -1;
-    std::list<item> all_items{ it->contents.all_items() };
-    auto bomb_it = std::find_if( all_items.begin(), all_items.end(), []( const item & c ) {
-        return c.has_flag( "RADIOCARITEM" );
+    std::list<item *> all_items{ it->contents.all_items_ptr() };
+    auto bomb_it = std::find_if( all_items.begin(), all_items.end(), []( const item * c ) {
+        return c->has_flag( "RADIOCARITEM" );
     } );
     if( bomb_it == all_items.end() ) {
         choice = uilist( _( "Using RC car:" ), {
             _( "Turn on" ), _( "Put a bomb to car" )
         } );
     } else {
         choice = uilist( _( "Using RC car:" ), {
-            _( "Turn on" ), bomb_it->tname()
+            _( "Turn on" ), ( *bomb_it )->tname()
         } );
     }
     if( choice < 0 ) {
@@ -8001,9 +8001,9 @@ int iuse::radiocar( player *p, item *it, bool, const tripoint & )
         } else { // Disarm the car
             p->moves -= to_moves<int>( 2_seconds );
 
-            p->inv.assign_empty_invlet( *bomb_it, *p, true ); // force getting an invlet.
-            p->i_add( *bomb_it );
-            it->contents.remove_item( *bomb_it );
+            p->inv.assign_empty_invlet( **bomb_it, *p, true ); // force getting an invlet.
+            p->i_add( **bomb_it );
+            it->contents.remove_item( **bomb_it );
 
             p->add_msg_if_player( _( "You disarmed your RC car." ) );
         }
@@ -8433,9 +8433,9 @@ int iuse::autoclave( player *p, item *it, bool t, const tripoint &pos )
 
         bool empty = true;
         item *clean_cbm = nullptr;
-        for( item &bio : it->contents.all_items() ) {
-            if( bio.is_bionic() ) {
-                clean_cbm = &bio;
+        for( item *bio : it->contents.all_items_ptr() ) {
+            if( bio->is_bionic() ) {
+                clean_cbm = bio;
             }
         }
         if( clean_cbm ) {

src/savegame_json.cpp

@@ -151,6 +151,36 @@ static void deserialize( weak_ptr_fast<monster> &obj, JsonIn &jsin )
     //    }
 }
 
+void item_contents::serialize( JsonOut &json ) const
+{
+    json.start_object();
+
+    json.member( "contents", contents );
+
+    json.end_object();
+}
+
+void item_contents::deserialize( JsonIn &jsin )
+{
+    JsonObject data = jsin.get_object();
+    optional( data, was_loaded, "contents", contents );
+}
+
+void item_pocket::serialize( JsonOut &json ) const
+{
+    json.start_object();
+
+    json.member( "contents", contents );
+
+    json.end_object();
+}
+
+void item_pocket::deserialize( JsonIn &jsin )
+{
+    JsonObject data = jsin.get_object();
+    optional( data, was_loaded, "contents", contents );
+}
+
 std::vector<item> item::magazine_convert()
 {
     std::vector<item> res;