Merge pull request #4511 from FearlessTobi/port-1871

Port yuzu-emu/yuzu#1871: "yuzu/wait_tree: Pass QString by value and std::move in the initializer list for WaitTreeText"
This commit is contained in:
Weiyi Wang 2018-12-17 00:02:42 -05:00 committed by GitHub
commit 29548bbe86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View file

@ -61,7 +61,8 @@ std::vector<std::unique_ptr<WaitTreeThread>> WaitTreeItem::MakeThreadItemList()
return item_list; return item_list;
} }
WaitTreeText::WaitTreeText(const QString& t) : text(t) {} WaitTreeText::WaitTreeText(QString t) : text(std::move(t)) {}
WaitTreeText::~WaitTreeText() = default;
QString WaitTreeText::GetText() const { QString WaitTreeText::GetText() const {
return text; return text;

View file

@ -50,7 +50,9 @@ private:
class WaitTreeText : public WaitTreeItem { class WaitTreeText : public WaitTreeItem {
Q_OBJECT Q_OBJECT
public: public:
explicit WaitTreeText(const QString& text); explicit WaitTreeText(QString text);
~WaitTreeText() override;
QString GetText() const override; QString GetText() const override;
private: private: