From b9d9f803d53d59d1a2062a4c7293e157507ef7d7 Mon Sep 17 00:00:00 2001
From: KorGgenT <curtis.r.merrill@gmail.com>
Date: Mon, 20 Jan 2020 22:30:59 -0500
Subject: [PATCH] fix rebase

---
 src/computer_session.cpp | 14 +++++++-------
 src/profession.cpp       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/computer_session.cpp b/src/computer_session.cpp
index 69034b2e1f371..dc65d8e4dd43e 100644
--- a/src/computer_session.cpp
+++ b/src/computer_session.cpp
@@ -309,9 +309,9 @@ void computer_session::activate_function( computer_action action )
                         capa = std::min( sewage.charges, capa );
                         if( elem.contents.empty() ) {
                             elem.put_in( sewage );
-                            elem.contents.front().charges = capa;
+                            elem.contents.legacy_front().charges = capa;
                         } else {
-                            elem.contents.front().charges += capa;
+                            elem.contents.legacy_front().charges += capa;
                         }
                         found_item = true;
                         break;
@@ -654,7 +654,7 @@ void computer_session::activate_function( computer_action action )
                 g->u.moves -= 30;
                 item software( miss->get_item_id(), 0 );
                 software.mission_id = comp.mission_id;
-                usb->contents.clear();
+                usb->contents.clear_items();
                 usb->put_in( software );
                 print_line( _( "Software downloaded." ) );
             } else {
@@ -674,10 +674,10 @@ void computer_session::activate_function( computer_action action )
                         print_error( _( "ERROR: Please remove all but one sample from centrifuge." ) );
                     } else if( items.only_item().contents.empty() ) {
                         print_error( _( "ERROR: Please only use container with blood sample." ) );
-                    } else if( items.only_item().contents.front().typeId() != "blood" ) {
+                    } else if( items.only_item().contents.legacy_front().typeId() != "blood" ) {
                         print_error( _( "ERROR: Please only use blood samples." ) );
                     } else { // Success!
-                        const item &blood = items.only_item().contents.front();
+                        const item &blood = items.only_item().contents.legacy_front();
                         const mtype *mt = blood.get_mtype();
                         if( mt == nullptr || mt->id == mtype_id::NULL_ID() ) {
                             print_line( _( "Result: Human blood, no pathogens found." ) );
@@ -691,7 +691,7 @@ void computer_session::activate_function( computer_action action )
                             if( query_bool( _( "Download data?" ) ) ) {
                                 if( item *const usb = pick_usb() ) {
                                     item software( "software_blood_data", 0 );
-                                    usb->contents.clear();
+                                    usb->contents.clear_items();
                                     usb->put_in( software );
                                     print_line( _( "Software downloaded." ) );
                                 } else {
@@ -1248,7 +1248,7 @@ void computer_session::activate_failure( computer_failure_type fail )
                         print_error( _( "ERROR: Please use blood-contained samples." ) );
                     } else if( items.only_item().contents.empty() ) {
                         print_error( _( "ERROR: Blood draw kit, empty." ) );
-                    } else if( items.only_item().contents.front().typeId() != "blood" ) {
+                    } else if( items.only_item().contents.legacy_front().typeId() != "blood" ) {
                         print_error( _( "ERROR: Please only use blood samples." ) );
                     } else {
                         print_error( _( "ERROR: Blood sample destroyed." ) );
diff --git a/src/profession.cpp b/src/profession.cpp
index 1832564f0dca3..d447f9224587b 100644
--- a/src/profession.cpp
+++ b/src/profession.cpp
@@ -401,7 +401,7 @@ std::list<item> profession::items( bool male, const std::vector<trait_id> &trait
     for( item &it : result ) {
         clear_faults( it );
         if( it.is_holster() && it.contents.size() == 1 ) {
-            clear_faults( it.contents.front() );
+            clear_faults( it.contents.legacy_front() );
         }
         if( it.has_flag( "VARSIZE" ) ) {
             it.item_tags.insert( "FIT" );