[Scummvm-git-logs] scummvm master -> 2458016d37d677103b3329c29d33434e21932182

[whiterandrek]

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:
2458016d37 PINK: removed usage of empty static const strings in methods


Commit: 2458016d37d677103b3329c29d33434e21932182
    https://github.com/scummvm/scummvm/commit/2458016d37d677103b3329c29d33434e21932182
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T21:33:27+03:00

Commit Message:
PINK: removed usage of empty static const strings in methods

Changed paths:
    engines/pink/objects/actors/actor.cpp
    engines/pink/objects/actors/actor.h
    engines/pink/objects/actors/supporting_actor.cpp
    engines/pink/objects/actors/supporting_actor.h


diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp
index 2b1a95eefd..3cfadd66e6 100644
--- a/engines/pink/objects/actors/actor.cpp
+++ b/engines/pink/objects/actors/actor.cpp
@@ -108,9 +108,8 @@ Action *Actor::findAction(const Common::String &name) {
 	return nullptr;
 }
 
-const Common::String &Actor::getLocation() const {
-	static const Common::String empty;
-	return empty;
+Common::String Actor::getLocation() const {
+	return Common::String();
 }
 
 void Actor::setAction(Action *newAction) {
@@ -138,9 +137,8 @@ InventoryMgr *Actor::getInventoryMgr() const {
 	return _page->getModule()->getInventoryMgr();
 }
 
-const Common::String &Actor::getPDALink() const {
-	static const Common::String empty;
-	return empty;
+Common::String Actor::getPDALink() const {
+	return Common::String();
 }
 
 } // End of namespace Pink
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
index 278bfdd9af..15ebcbedbd 100644
--- a/engines/pink/objects/actors/actor.h
+++ b/engines/pink/objects/actors/actor.h
@@ -79,9 +79,9 @@ public:
 
 	InventoryMgr *getInventoryMgr() const;
 
-	virtual const Common::String &getPDALink() const;
+	virtual Common::String getPDALink() const;
 
-	virtual const Common::String &getLocation() const;
+	virtual Common::String getLocation() const;
 
 	void setAction(const Common::String &name) { setAction(findAction(name)); }
 	void setAction(Action *newAction);
diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp
index 4d4726ef83..9f37877818 100644
--- a/engines/pink/objects/actors/supporting_actor.cpp
+++ b/engines/pink/objects/actors/supporting_actor.cpp
@@ -84,11 +84,11 @@ void SupportingActor::onUseClickMessage(InventoryItem *item, InventoryMgr *mgr)
 	_handlerMgr.onUseClickMessage(this, item, mgr);
 }
 
-const Common::String &SupportingActor::getLocation() const {
+Common::String SupportingActor::getLocation() const {
 	return _location;
 }
 
-const Common::String &SupportingActor::getPDALink() const {
+Common::String SupportingActor::getPDALink() const {
 	return _pdaLink;
 }
 
diff --git a/engines/pink/objects/actors/supporting_actor.h b/engines/pink/objects/actors/supporting_actor.h
index a1e0ffa778..dacd7dfba8 100644
--- a/engines/pink/objects/actors/supporting_actor.h
+++ b/engines/pink/objects/actors/supporting_actor.h
@@ -49,8 +49,8 @@ public:
 	void onLeftClickMessage() override;
 	void onUseClickMessage(InventoryItem *item, InventoryMgr *mgr) override;
 
-	const Common::String &getPDALink() const override;
-	const Common::String &getLocation() const override;
+	Common::String getPDALink() const override;
+	Common::String getLocation() const override;
 
 private:
 	HandlerMgr _handlerMgr;