Move semantic should apply std::move on complex movable fields

src/generator/classgeneratorbase.cpp

@@ -107,7 +107,7 @@ void ClassGeneratorBase::printIncludes(const Descriptor *message)
             } else {
                 std::string stringInclude = properties["type"];
                 if (stringInclude == VariantList
-                     && existingIncludes.find(stringInclude) == std::end(existingIncludes)) {
+                        && existingIncludes.find(stringInclude) == std::end(existingIncludes)) {
                     mPrinter.Print(properties, ExternalIncludeTemplate);
                     existingIncludes.insert(stringInclude);
                 }
@@ -254,6 +254,21 @@ void ClassGeneratorBase::printCopyFunctionality(const ::google::protobuf::Descri
 
 }
 
+bool ClassGeneratorBase::isComplexType(const FieldDescriptor *field)
+{
+    if (field == nullptr)
+        return false;
+
+    if (field->type() == FieldDescriptor::TYPE_MESSAGE
+            || field->type() == FieldDescriptor::TYPE_GROUP
+            || field->type() == FieldDescriptor::TYPE_STRING
+            || field->type() == FieldDescriptor::TYPE_BYTES) {
+        return true;
+    }
+
+    return false;
+}
+
 void ClassGeneratorBase::printMoveSemantic(const ::google::protobuf::Descriptor *message)
 {
     mPrinter.Print({{"classname", mClassName}},
@@ -261,7 +276,11 @@ void ClassGeneratorBase::printMoveSemantic(const ::google::protobuf::Descriptor
 
     Indent();
     for (int i = 0; i < message->field_count(); i++) {
-        printField(message->field(i), CopyFieldTemplate);
+        if (isComplexType(message->field(i))) {
+            printField(message->field(i), MoveFieldTemplate);
+        } else {
+            printField(message->field(i), CopyFieldTemplate);
+        }
     }
     Outdent();
 
@@ -271,7 +290,11 @@ void ClassGeneratorBase::printMoveSemantic(const ::google::protobuf::Descriptor
 
     Indent();
     for (int i = 0; i < message->field_count(); i++) {
-        printField(message->field(i), CopyFieldTemplate);
+        if (isComplexType(message->field(i))) {
+            printField(message->field(i), MoveFieldTemplate);
+        } else {
+            printField(message->field(i), CopyFieldTemplate);
+        }
     }
     mPrinter.Print(AssignmentOperatorReturnTemplate);
     Outdent();

src/generator/classgeneratorbase.h

@@ -109,6 +109,8 @@ protected:
         mPrinter.Outdent();
         mPrinter.Outdent();
     }
+
+    bool isComplexType(const ::google::protobuf::FieldDescriptor *field);
 };
 
 }

src/generator/templates.h

@@ -56,6 +56,7 @@ static const char *ConstructorTemplate = "$classname$(QObject *parent = nullptr)
 static const char *CopyConstructorTemplate = "$classname$(const $classname$ &other) : QObject() {\n";
 static const char *MoveConstructorTemplate = "$classname$(const $classname$ &&other) : QObject() {\n";
 static const char *CopyFieldTemplate = "m_$property_name$ = other.m_$property_name$;\n";
+static const char *MoveFieldTemplate = "m_$property_name$ = std::move(other.m_$property_name$);\n";
 static const char *AssignmentOperatorTemplate = "$classname$ &operator =(const $classname$ &other) {\n";
 static const char *AssignmentOperatorReturnTemplate = "return *this;\n";
 static const char *MoveAssignmentOperatorTemplate = "$classname$ &operator =(const $classname$ &&other) {\n";