From 9da31a7d7b3cfcbc78e4a7fbb78ec883ddf5cf24 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sat, 10 Mar 2018 16:24:39 +0100 Subject: [PATCH] Unit tests for the FString class completed --- ChangeLog | 4 ++++ include/final/fstring.h | 3 +-- src/fstring.cpp | 8 -------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3576a8d..340cf586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-03-10 Markus Gans + * Unit tests for the FString class completed + * Minor bug fixes in FString + 2017-02-25 Markus Gans * First CppUnit tests implemented diff --git a/include/final/fstring.h b/include/final/fstring.h index b253a4ec..01070e52 100644 --- a/include/final/fstring.h +++ b/include/final/fstring.h @@ -3,7 +3,7 @@ * * * This file is part of the Final Cut widget toolkit * * * -* Copyright 2012-2017 Markus Gans * +* Copyright 2012-2018 Markus Gans * * * * The Final Cut is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public License * @@ -203,7 +203,6 @@ class FString friend const FString operator + (const char[], const FString&); friend const FString operator + (const wchar_t, const FString&); friend const FString operator + (const char, const FString&); - friend const FString operator + (const wchar_t, const std::wstring&); friend const FString operator + (const FString&, const char); friend std::ostream& operator << (std::ostream& outstr, const FString& s); diff --git a/src/fstring.cpp b/src/fstring.cpp index d8da116b..836040e5 100644 --- a/src/fstring.cpp +++ b/src/fstring.cpp @@ -2979,14 +2979,6 @@ const FString operator + (const char c, const FString& s) return tmp; } -//---------------------------------------------------------------------- -const FString operator + (const wchar_t c, const std::wstring& s) -{ - FString tmp(c); - tmp._insert (1, uInt(s.length()), s.c_str()); - return tmp; -} - //---------------------------------------------------------------------- const FString operator + (const FString& s, const char c) {