소스 검색

Fix listmodels includes

Alexey Edelev 6 년 전
부모
커밋
e483415d88
2개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 7 4
      src/generator/classgeneratorbase.cpp
  2. 1 1
      src/generator/generator.cpp

+ 7 - 4
src/generator/classgeneratorbase.cpp

@@ -94,9 +94,12 @@ void ClassGeneratorBase::printIncludes(const Descriptor* message)
             } else {
                 continue;
             }
-            if (existingIncludes.find(newinclude) == std::end(existingIncludes)) {
-                mPrinter.Print(properties, includeTemplate);
-                existingIncludes.insert(newinclude);
+
+            if (!field->is_repeated()) {
+                if (existingIncludes.find(newinclude) == std::end(existingIncludes)) {
+                    mPrinter.Print(properties, includeTemplate);
+                    existingIncludes.insert(newinclude);
+                }
             }
         }
     }
@@ -198,7 +201,7 @@ std::string ClassGeneratorBase::getTypeName(const FieldDescriptor* field)
 void ClassGeneratorBase::printConstructor()
 {
     mPrinter.Print({{"classname", mClassName}},
-                   "    $classname$(QObject parent = nullptr) : QObject(parent)\n");
+                   "    $classname$(QObject *parent = nullptr) : QObject(parent)\n");
 
     //FIXME: Explicit default values are not allowed in proto3 seems
     //this function is useless

+ 1 - 1
src/generator/generator.cpp

@@ -71,7 +71,7 @@ public:
         printIncludes(mMessage);
 
         if (mExtractedModels.size() > 0) {
-            mPrinter.Print("\n#include <universallistmodel.h>\n");
+            mPrinter.Print("\n#include \"listmodels.h\"\n");
         }
 
         printNamespaces(mPackage);