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

bluegr bluegr at gmail.com
Mon Mar 15 11:29:35 UTC 2021


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:
bedba56f24 GLK: Remove proxy ctors and copy assignment operator


Commit: bedba56f24ccb1eaa9381ab36c446bb0b00cfb0c
    https://github.com/scummvm/scummvm/commit/bedba56f24ccb1eaa9381ab36c446bb0b00cfb0c
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T13:29:32+02:00

Commit Message:
GLK: Remove proxy ctors and copy assignment operator

Changed paths:
    engines/glk/quest/string.h


diff --git a/engines/glk/quest/string.h b/engines/glk/quest/string.h
index bb92a595e7..b75b063086 100644
--- a/engines/glk/quest/string.h
+++ b/engines/glk/quest/string.h
@@ -39,14 +39,7 @@ typedef Common::HashMap<String, Common::Array<String>, Common::IgnoreCase_Hash,
 
 class String : public Common::String {
 public:
-	String() : Common::String() {}
-	String(const char *str) : Common::String(str) {}
-	String(const char *str, uint32 len) : Common::String(str, len) {}
-	String(const char *beginP, const char *endP) : Common::String(beginP, endP) {}
-	String(const String &str) : Common::String(str) {}
-	explicit String(char c) : Common::String(c) {}
-
-	String& operator=(const String &str) { this->Common::String::operator=(str); return *this; }
+	using Common::String::String;
 
 	char &operator[](int idx) {
 		assert(_str && idx >= 0 && idx < (int)_size);




More information about the Scummvm-git-logs mailing list