From 8acce1a9ee532ce88a7bacf444b18e031057b406 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 7 Mar 2014 16:30:20 -0800
Subject: [PATCH] Don't return a const std::string from GetData
It has zero benefit and forces an extra copy.
---
aegisub/src/ass_attachment.h | 2 +-
aegisub/src/ass_dialogue.h | 2 +-
aegisub/src/ass_entry.h | 2 +-
aegisub/src/ass_info.h | 2 +-
aegisub/src/ass_style.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aegisub/src/ass_attachment.h b/aegisub/src/ass_attachment.h
index ebbad86a6..ae1e02569 100644
--- a/aegisub/src/ass_attachment.h
+++ b/aegisub/src/ass_attachment.h
@@ -46,7 +46,7 @@ public:
/// @param raw If false, remove the SSA filename mangling
std::string GetFileName(bool raw=false) const;
- const std::string GetEntryData() const override { return entry_data; }
+ std::string GetEntryData() const override { return entry_data; }
AssEntryGroup Group() const override { return group; }
AssAttachment *Clone() const override { return new AssAttachment(*this); }
diff --git a/aegisub/src/ass_dialogue.h b/aegisub/src/ass_dialogue.h
index 780553ba8..03c2169b1 100644
--- a/aegisub/src/ass_dialogue.h
+++ b/aegisub/src/ass_dialogue.h
@@ -170,7 +170,7 @@ public:
/// Update the text of the line from parsed blocks
void UpdateText(boost::ptr_vector<AssDialogueBlock>& blocks);
- const std::string GetEntryData() const override { return GetData(false); }
+ std::string GetEntryData() const override { return GetData(false); }
/// Get the line as SSA rather than ASS
std::string GetSSAText() const override { return GetData(true); }
diff --git a/aegisub/src/ass_entry.h b/aegisub/src/ass_entry.h
index 466d44b9a..12105e634 100644
--- a/aegisub/src/ass_entry.h
+++ b/aegisub/src/ass_entry.h
@@ -60,7 +60,7 @@ public:
std::string const& GroupHeader(bool ssa=false) const;
/// @brief Get this line's raw entry data in ASS format
- virtual const std::string GetEntryData() const=0;
+ virtual std::string GetEntryData() const=0;
/// Get this line in SSA format
virtual std::string GetSSAText() const { return GetEntryData(); }
diff --git a/aegisub/src/ass_info.h b/aegisub/src/ass_info.h
index 07d3998df..ab001da2c 100644
--- a/aegisub/src/ass_info.h
+++ b/aegisub/src/ass_info.h
@@ -28,7 +28,7 @@ public:
AssInfo *Clone() const override { return new AssInfo(*this); }
AssEntryGroup Group() const override { return AssEntryGroup::INFO; }
- const std::string GetEntryData() const override { return key + ": " + value; }
+ std::string GetEntryData() const override { return key + ": " + value; }
std::string GetSSAText() const override { return boost::iequals(key, "scripttype: v4.00+") ? "ScriptType: v4.00" : GetEntryData(); }
std::string Key() const { return key; }
diff --git a/aegisub/src/ass_style.h b/aegisub/src/ass_style.h
index aaf2b15a5..b558176ff 100644
--- a/aegisub/src/ass_style.h
+++ b/aegisub/src/ass_style.h
@@ -77,7 +77,7 @@ public:
AssStyle();
AssStyle(std::string const& data, int version=1);
- const std::string GetEntryData() const override { return data; }
+ std::string GetEntryData() const override { return data; }
std::string GetSSAText() const override;
AssEntryGroup Group() const override { return AssEntryGroup::STYLE; }
AssStyle *Clone() const override { return new AssStyle(*this); }
--
GitLab