refactoring

Author: panda-ptr

CxxTestProps/inc/StringConst.h

@@ -5,7 +5,7 @@
 // 'StrConst' - String-Const, all methods are const.
 struct StrConst
 {
-	constexpr static const char* struct_ = "StrConst";
+	constexpr static std::string_view struct_ = "StrConst";
 
 	std::string reverseString() const;
 

CxxTestProps/inc/StringConstOverload.h

@@ -4,7 +4,7 @@
 
 struct StrConstOverload 
 {
-	constexpr static const char* struct_ = "StrConstOverload";
+	constexpr static std::string_view struct_ = "StrConstOverload";
 
 	std::string reverseString();
 

CxxTestProps/inc/StringMute.h

@@ -5,7 +5,7 @@
 // 'StrMute' - String-Mutable, all methods are non-const.
 struct StrMute
 {
-	constexpr static const char* struct_ = "StrMute";
+	constexpr static std::string_view struct_ = "StrMute";
 
 	std::string reverseString();
 

CxxTestProps/inc/StringStatic.h

@@ -5,7 +5,7 @@
 // 'StrStatic' - String-Static, all methods are static.
 struct StrStatic
 {
-	constexpr static const char* struct_ = "StrStatic";
+	constexpr static std::string_view struct_ = "StrStatic";
 
 	static std::string reverseString();
 

CxxTestProps/inc/StringWrap.h

@@ -13,7 +13,7 @@ struct StrWrap
 // 'StrWrapA' - String-Wrapper, only constructors for testing.
 struct StrWrapA : public StrWrap
 {
-	constexpr static const char* struct_ = "StrWrapA";
+	constexpr static std::string_view struct_ = "StrWrapA";
 
 	StrWrapA();
 
@@ -32,7 +32,7 @@ struct StrWrapA : public StrWrap
 // 'StrWrapB' - String-Wrapper, only constructors for testing.
 struct StrWrapB : public StrWrap
 {
-	constexpr static const char* struct_ = "StrWrapB";
+	constexpr static std::string_view struct_ = "StrWrapB";
 	StrWrapB(std::string& pStr);
 	StrWrapB(const std::string& pStr);
 };
@@ -41,14 +41,14 @@ struct StrWrapB : public StrWrap
 // 'StrWrapC' - String-Wrapper, only constructors for testing.
 struct StrWrapC : public StrWrap
 {
-	constexpr static const char* struct_ = "StrWrapC";
+	constexpr static std::string_view struct_ = "StrWrapC";
 	StrWrapC(std::string& pStr);
 };
 
 
 // 'StrWrapD' - String-Wrapper, only constructors for testing.
 struct StrWrapD : public StrWrap
 {
-	constexpr static const char* struct_ = "StrWrapD";
+	constexpr static std::string_view struct_ = "StrWrapD";
 	StrWrapD(const std::string& pStr);
 };

CxxTestProps/src/StringConst.cpp

@@ -10,133 +10,133 @@ using namespace test_utils;
 
 std::string StrConst::reverseString() const
 {
-	return std::string(struct_) + REV_STR_VOID_RET + SUFFIX_void + SUFFIX_const;
+	return std::string(struct_).append(REV_STR_VOID_RET).append(SUFFIX_void).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(const char* pStr) const
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_const_char_ptr + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_const_char_ptr).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(std::string pStr) const
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(std::string& pStr) const
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_lvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_lvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(std::string&& pStr) const
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_rvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_rvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(const std::string& pStr) const
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_clvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_clvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(std::string* pStr) const
 {
 	std::string retStr = *pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_ptr + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_ptr).append(SUFFIX_const);
 }
 
 
 std::string StrConst::reverseString(const std::string* pStr) const
 {
 	std::string retStr = *pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_cptr + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_cptr).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrConstRefArg(const std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrRValueRefArg(std::string_view&& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_rvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_rvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrNonConstRefArg(std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadValCRef(std::string_view pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadValCRef(const std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadValRef(std::string_view pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadValRef(std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadRefAndCRef(std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref).append(SUFFIX_const);
 }
 
 
 std::string StrConst::revStrOverloadRefAndCRef(const std::string_view& pStr) const
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref + SUFFIX_const;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref).append(SUFFIX_const);
 }

CxxTestProps/src/StringConstOverload.cpp

@@ -10,11 +10,11 @@ using namespace test_utils;
 
 std::string StrConstOverload::reverseString()
 {
-	return std::string(struct_) + REV_STR_VOID_RET + SUFFIX_void;
+	return std::string(struct_).append(REV_STR_VOID_RET).append(SUFFIX_void);
 }
 
 
 std::string StrConstOverload::reverseString() const
 {
-	return std::string(struct_) + REV_STR_VOID_RET + SUFFIX_void + SUFFIX_const;
+	return std::string(struct_).append(REV_STR_VOID_RET).append(SUFFIX_void).append(SUFFIX_const);
 }

CxxTestProps/src/StringMute.cpp

@@ -10,133 +10,133 @@ using namespace test_utils;
 
 std::string StrMute::reverseString()
 {
-	return std::string(struct_) + REV_STR_VOID_RET + SUFFIX_void;
+	return std::string(struct_).append(REV_STR_VOID_RET).append(SUFFIX_void);
 }
 
 
 std::string StrMute::reverseString(const char* pStr)
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_const_char_ptr;
+	return std::string(struct_).append(retStr).append(SUFFIX_const_char_ptr);
 }
 
 
 std::string StrMute::reverseString(std::string pStr)
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string);
 }
 
 
 std::string StrMute::reverseString(std::string& pStr)
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_lvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_lvref);
 }
 
 
 std::string StrMute::reverseString(std::string&& pStr)
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_rvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_rvref);
 }
 
 
 std::string StrMute::reverseString(const std::string& pStr)
 {
 	std::string retStr = pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_clvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_clvref);
 }
 
 
 std::string StrMute::reverseString(std::string* pStr)
 {
 	std::string retStr = *pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_ptr;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_ptr);
 }
 
 
 std::string StrMute::reverseString(const std::string* pStr)
 {
 	std::string retStr = *pStr;
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_cptr;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_cptr);
 }
 
 
 std::string StrMute::revStrConstRefArg(const std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref);
 }
 
 
 std::string StrMute::revStrRValueRefArg(std::string_view&& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_rvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_rvref);
 }
 
 
 std::string StrMute::revStrNonConstRefArg(std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref);
 }
 
 
 std::string StrMute::revStrOverloadValCRef(std::string_view pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view);
 }
 
 
 std::string StrMute::revStrOverloadValCRef(const std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref);
 }
 
 
 std::string StrMute::revStrOverloadValRef(std::string_view pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view);
 }
 
 
 std::string StrMute::revStrOverloadValRef(std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref);
 }
 
 
 std::string StrMute::revStrOverloadRefAndCRef(std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_lvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_lvref);
 }
 
 
 std::string StrMute::revStrOverloadRefAndCRef(const std::string_view& pStr)
 {
 	std::string retStr(pStr);
 	std::reverse(retStr.begin(), retStr.end());
-	return std::string(struct_) + retStr + SUFFIX_std_string_view_clvref;
+	return std::string(struct_).append(retStr).append(SUFFIX_std_string_view_clvref);
 }