[Scummvm-git-logs] scummvm master -> f8b04aa9d54738e8020b8f7c9e52996ff48e7524

[OMGPizzaGuy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f8b04aa9d5 ULTIMA8: Remove dead code in Ultima8::istring


Commit: f8b04aa9d54738e8020b8f7c9e52996ff48e7524
    https://github.com/scummvm/scummvm/commit/f8b04aa9d54738e8020b8f7c9e52996ff48e7524
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2021-02-24T21:08:28-06:00

Commit Message:
ULTIMA8: Remove dead code in Ultima8::istring

Changed paths:
  R engines/ultima/ultima8/misc/istring.cpp
    engines/ultima/module.mk
    engines/ultima/ultima8/misc/istring.h


diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index 690c7c02f8..c336cc0737 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -501,7 +501,6 @@ MODULE_OBJS := \
 	ultima8/misc/debugger.o \
 	ultima8/misc/encoding.o \
 	ultima8/misc/id_man.o \
-	ultima8/misc/istring.o \
 	ultima8/misc/util.o \
 	ultima8/usecode/bit_set.o \
 	ultima8/usecode/byte_set.o \
diff --git a/engines/ultima/ultima8/misc/istring.cpp b/engines/ultima/ultima8/misc/istring.cpp
deleted file mode 100644
index 461674bae2..0000000000
--- a/engines/ultima/ultima8/misc/istring.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "ultima/ultima8/misc/istring.h"
-
-namespace Ultima {
-namespace Ultima8 {
-
-void istring::split(Common::Array<istring> &arr) const {
-	const char *startP = _str, *endP;
-
-	arr.clear();
-	if (empty())
-		return;
-
-	for (;;) {
-		endP = strchr(startP + 1, ',');
-		arr.push_back(istring(startP, endP ? endP : _str + _size));
-
-		if (!endP)
-			break;
-		startP = endP;
-	}
-}
-
-} // End of namespace Ultima8
-} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/misc/istring.h b/engines/ultima/ultima8/misc/istring.h
index 69971cbc3b..110a5d81a5 100644
--- a/engines/ultima/ultima8/misc/istring.h
+++ b/engines/ultima/ultima8/misc/istring.h
@@ -24,7 +24,6 @@
 #define ULTIMA8_MISC_ISTRING_H
 
 #include "ultima/shared/std/string.h"
-#include "common/array.h"
 
 namespace Ultima {
 namespace Ultima8 {
@@ -43,8 +42,6 @@ public:
 	int Compare(const string &s) const override {
 		return compareToIgnoreCase(s);
 	}
-
-	void split(Common::Array<istring> &arr) const;
 };
 
 } // End of namespace Ultima8