From 19239df5d1dc7db733dc6083d4eeeeb29d9a4976 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Fri, 5 Oct 2018 19:24:00 +0200
Subject: [PATCH] Remove more redundant program code from FString

---
 .travis.yml.swp             | Bin 12288 -> 0 bytes
 src/fstring.cpp             |  46 ------------------------------------
 src/include/final/fstring.h |   4 ----
 3 files changed, 50 deletions(-)
 delete mode 100644 .travis.yml.swp

diff --git a/.travis.yml.swp b/.travis.yml.swp
deleted file mode 100644
index be64c3db98014291cd8b6e2de91942cacc3f6d66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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

diff --git a/src/fstring.cpp b/src/fstring.cpp
index 0a5f1ef6..a8e40270 100644
--- a/src/fstring.cpp
+++ b/src/fstring.cpp
@@ -265,52 +265,6 @@ const FString FString::operator + (const FString& s)
   return tmp;
 }
 
-//----------------------------------------------------------------------
-const FString FString::operator + (const std::wstring& s)
-{
-  FString tmp(string);
-  tmp._insert (length, uInt(s.length()), s.c_str());
-  return tmp;
-}
-
-//----------------------------------------------------------------------
-const FString FString::operator + (const wchar_t s[])
-{
-  FString tmp(string);
-  tmp._insert (length, uInt(std::wcslen(s)), s);
-  return tmp;
-}
-
-//----------------------------------------------------------------------
-const FString FString::operator + (const std::string& s)
-{
-  FString tmp(string);
-
-  if ( ! s.empty() )
-  {
-    wchar_t* wc_string = c_to_wc_str(s.c_str());
-    tmp._insert (length, uInt(std::wcslen(wc_string)), wc_string);
-    delete[] wc_string;
-  }
-
-  return tmp;
-}
-
-//----------------------------------------------------------------------
-const FString FString::operator + (const char s[])
-{
-  FString tmp(string);
-
-  if ( s )
-  {
-    wchar_t* wc_string = c_to_wc_str(s);
-    tmp._insert (length, uInt(std::wcslen(wc_string)), wc_string);
-    delete[] wc_string;
-  }
-
-  return tmp;
-}
-
 //----------------------------------------------------------------------
 const FString FString::operator + (const wchar_t c)
 {
diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h
index 2f563a4b..d59eff85 100644
--- a/src/include/final/fstring.h
+++ b/src/include/final/fstring.h
@@ -102,10 +102,6 @@ class FString
     const FString& operator += (const FString&);
 
     const FString operator + (const FString&);
-    const FString operator + (const std::wstring&);
-    const FString operator + (const wchar_t[]);
-    const FString operator + (const std::string&);
-    const FString operator + (const char[]);
     const FString operator + (const wchar_t);
     const FString operator + (const char);