From 098d32b37022702acd43cdbd2fba413975a45b11 Mon Sep 17 00:00:00 2001 From: Michael Winkelmann Date: Wed, 19 Aug 2020 19:11:13 +0200 Subject: [PATCH] QmlPuppet: Refactor ChangeLanguageCommand Change-Id: I31813d13da753ba742488943afea673540b3a3fa Reviewed-by: Marco Bubke --- .../qmlpuppet/commands/changelanguagecommand.cpp | 10 ---------- .../qmlpuppet/commands/changelanguagecommand.h | 16 +++++++++------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp b/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp index 2d6e0805630..fb023ce4455 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp +++ b/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.cpp @@ -29,16 +29,6 @@ namespace QmlDesigner { -QDataStream &operator<<(QDataStream &out, const ChangeLanguageCommand &command) -{ - return out << command.language; -} - -QDataStream &operator>>(QDataStream &in, ChangeLanguageCommand &command) -{ - return in >> command.language; -} - QDebug operator<<(QDebug debug, const ChangeLanguageCommand &command) { return debug.nospace() << "ChangeLanguageCommand(" << command.language << ")"; diff --git a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h index d3309c2f732..08bec40289a 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changelanguagecommand.h @@ -27,22 +27,24 @@ #include #include +#include namespace QmlDesigner { class ChangeLanguageCommand { public: - ChangeLanguageCommand() = default; - ChangeLanguageCommand(const QString &language) - : language(language) - {} + friend QDataStream &operator<<(QDataStream &out, const ChangeLanguageCommand &command) + { + return out << command.language; + } + friend QDataStream &operator>>(QDataStream &in, ChangeLanguageCommand &command) + { + return in >> command.language; + } - friend QDataStream &operator<<(QDataStream &out, const ChangeLanguageCommand &command); - friend QDataStream &operator>>(QDataStream &in, ChangeLanguageCommand &command); friend QDebug operator<<(QDebug debug, const ChangeLanguageCommand &command); -public: QString language; };