From 70214054e84b920ca3bea5119bd5d1456c809054 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Fri, 4 Oct 2013 21:03:31 -0700
Subject: Remove owning slices

They were hardly ever used, hid errors, and were obsoleted by baseful x'es.
---
 src/map/atcommand.cpp | 10 ++++------
 src/map/battle.cpp    |  6 ++----
 src/map/clif.cpp      |  2 +-
 src/map/map.cpp       |  6 ++----
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/map')

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index b7a0caa..e4d1745 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -8,8 +8,6 @@
 
 #include "../strings/mstring.hpp"
 #include "../strings/fstring.hpp"
-#include "../strings/tstring.hpp"
-#include "../strings/sstring.hpp"
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 #include "../strings/vstring.hpp"
@@ -592,8 +590,8 @@ int atcommand_config_read(ZString cfgName)
     FString line;
     while (io::getline(in, line))
     {
-        SString w1;
-        TString w2;
+        XString w1;
+        ZString w2;
         if (!split_key_value(line, &w1, &w2))
             continue;
         AtCommandInfo *p = get_atcommandinfo_byname(w1);
@@ -1784,8 +1782,8 @@ int atcommand_help(const int fd, dumb_ptr<map_session_data> sd,
         FString line;
         while (io::getline(in, line))
         {
-            SString w1;
-            TString w2;
+            XString w1;
+            ZString w2;
             if (!split_key_value(line, &w1, &w2))
                 continue;
             int level;
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index c5cb8e3..7bdac86 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -5,8 +5,6 @@
 #include <fstream>
 
 #include "../strings/fstring.hpp"
-#include "../strings/tstring.hpp"
-#include "../strings/sstring.hpp"
 #include "../strings/zstring.hpp"
 
 #include "../common/cxxstdio.hpp"
@@ -2525,8 +2523,8 @@ int battle_config_read(ZString cfgName)
             BATTLE_CONFIG_VAR(mob_splash_radius),
         };
 
-        SString w1;
-        TString w2;
+        XString w1;
+        ZString w2;
         if (!split_key_value(line, &w1, &w2))
             continue;
 
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index 90c9f4d..8287b18 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -3761,7 +3761,7 @@ void clif_parse_GetCharNameRequest(int fd, dumb_ptr<map_session_data> sd)
             NpcName name = bl->as_npc()->name;
             // [fate] elim hashed out/invisible names for the client
             auto it = std::find(name.begin(), name.end(), '#');
-            WFIFO_STRING(fd, 6, name.oislice_h(it), 24);
+            WFIFO_STRING(fd, 6, name.xislice_h(it), 24);
             WFIFOSET(fd, clif_parse_func_table[0x95].len);
         }
             break;
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 9c5f074..f8bda41 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -13,8 +13,6 @@
 #include <fstream>
 
 #include "../strings/fstring.hpp"
-#include "../strings/tstring.hpp"
-#include "../strings/sstring.hpp"
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 #include "../strings/vstring.hpp"
@@ -1441,8 +1439,8 @@ int map_config_read(ZString cfgName)
     FString line;
     while (io::getline(in, line))
     {
-        SString w1;
-        TString w2;
+        XString w1;
+        ZString w2;
         if (!split_key_value(line, &w1, &w2))
             continue;
         if (w1 == "userid")
-- 
cgit v1.2.3-70-g09d2