qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-arrange and cleanup includes in the generated code 

Sort includes according to the common Qt rules:
 - internal header first, Qt header files next, system header file last
 - split includes to sections
 - use ascending order for each include section

Cleanup redundant and unused header files from the generated code.

Pick-to: 6.8
Task-number: QTBUG-123625
Task-number: QTBUG-123626
Change-Id: Ibecdecd4fb61e3b554746d623ed691be5ee6f57d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Alexey Edelev 2024-08-09 14:38:52 +02:00
parent d4e8ef8942
commit 286073b0e4
101 changed files with 478 additions and 365 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qtgrpcgen/grpctemplates.cpp
View File

@ -5,12 +5,6 @@
using namespace ::QtGrpc;
const char *GrpcTemplates::DefaultSystemIncludesTemplate()
{
return "\n"
"#include <memory>\n";
}
const char *GrpcTemplates::ChildClassDeclarationTemplate()
{
return "\nclass $export_macro$$classname$ : public $parent_class$\n"

2
src/tools/qtgrpcgen/grpctemplates.h
View File

@ -10,8 +10,6 @@ class GrpcTemplates
{
public:
// gRPC
static const char *DefaultSystemIncludesTemplate();
static const char *ChildClassDeclarationTemplate();
static const char *ClientQmlDeclarationTemplate();

64
src/tools/qtgrpcgen/qgrpcgenerator.cpp
View File

@ -24,14 +24,37 @@ using namespace ::google::protobuf;
using namespace ::google::protobuf::io;
using namespace ::google::protobuf::compiler;
static const std::set<std::string> externalQmlIncludes = {
"QtQml/qqmlengine.h", "QtQml/qjsengine.h", "QtQml/qjsvalue.h",
"QtGrpcQuick/qqmlgrpcfunctionalhandlers.h", "QtGrpcQuick/qtqmlgrpcstreamsender.h"
};
namespace {
static const std::set<std::string> externalIncludes = {"QtGrpc/qgrpcclientbase.h",
"QtGrpc/qgrpccallreply.h",
"QtGrpc/qgrpcstream.h"};
const utils::ExternalIncludesOrderedSet &externalQmlIncludes()
{
static const utils::ExternalIncludesOrderedSet externalQmlIncludes{
"QtQml/qqmlengine.h", "QtQml/qjsengine.h", "QtQml/qjsvalue.h",
"QtGrpcQuick/qqmlgrpcfunctionalhandlers.h", "QtGrpcQuick/qtqmlgrpcstreamsender.h"
};
return externalQmlIncludes;
}
const utils::ExternalIncludesOrderedSet &externalIncludes()
{
static const utils::ExternalIncludesOrderedSet externalIncludes{
"QtGrpc/qgrpcclientbase.h",
"QtGrpc/qgrpccallreply.h",
"QtGrpc/qgrpcstream.h",
};
return externalIncludes;
}
const std::set<std::string> &systemIncludes()
{
static const std::set<std::string> systemIncludes{
"memory",
};
return systemIncludes;
}
} // namespace
QGrpcGenerator::QGrpcGenerator() : GeneratorBase()
{}
@ -120,13 +143,9 @@ void QGrpcGenerator::GenerateQmlClientServices(
std::string headerGuard = common::headerGuardFromFilename(qmlBasename + ".h");
qmlHeaderPrinter->Print({ { "header_guard", headerGuard } },
CommonTemplates::PreambleTemplate());
qmlHeaderPrinter->Print({ { "include", realtivePath } },
CommonTemplates::InternalIncludeTemplate());
for (const auto &include : externalQmlIncludes) {
qmlHeaderPrinter->Print({ { "include", include } },
CommonTemplates::ExternalIncludeTemplate());
}
printIncludes(qmlHeaderPrinter.get(), { realtivePath }, externalQmlIncludes(), {});
qmlSourcePrinter->Print({ { "include", qmlRealtivePath } },
CommonTemplates::InternalIncludeTemplate());
@ -166,28 +185,18 @@ bool QGrpcGenerator::GenerateClientServices(const FileDescriptor *file,
const std::string headerGuard = common::headerGuardFromFilename(basename + ".h");
clientHeaderPrinter->Print({ { "header_guard", headerGuard } },
CommonTemplates::PreambleTemplate());
clientHeaderPrinter->Print(CommonTemplates::DefaultProtobufIncludesTemplate());
clientSourcePrinter->Print({ { "include", realtivePath } },
CommonTemplates::InternalIncludeTemplate());
for (const auto &include : externalIncludes) {
clientHeaderPrinter->Print({ { "include", include } },
CommonTemplates::ExternalIncludeTemplate());
}
clientHeaderPrinter->Print(GrpcTemplates::DefaultSystemIncludesTemplate());
clientHeaderPrinter->Print("\n");
std::set<std::string> internalIncludes = QGrpcGenerator::GetInternalIncludes(file);
if (!Options::instance().exportMacroFilename().empty()) {
std::string exportMacroFilename = Options::instance().exportMacroFilename();
internalIncludes.insert(utils::removeFileSuffix(exportMacroFilename));
}
for (const auto &include : internalIncludes) {
clientHeaderPrinter->Print({ { "include", include } },
CommonTemplates::InternalIncludeTemplate());
}
printIncludes(clientHeaderPrinter.get(), internalIncludes, externalIncludes(),
systemIncludes());
QGrpcGenerator::RunPrinter<ClientDeclarationPrinter>(file, clientHeaderPrinter);
QGrpcGenerator::RunPrinter<ClientDefinitionPrinter>(file, clientSourcePrinter);
clientHeaderPrinter->Print({ { "header_guard", headerGuard } },
@ -214,12 +223,9 @@ bool QGrpcGenerator::GenerateServerServices(const FileDescriptor *file,
serverHeaderPrinter->Print({ { "filename", filename + "_service" } },
CommonTemplates::PreambleTemplate());
serverHeaderPrinter->Print(CommonTemplates::DefaultProtobufIncludesTemplate());
if (Options::instance().hasQml())
serverHeaderPrinter->Print(CommonTemplates::QmlProtobufIncludesTemplate());
serverHeaderPrinter->Print(GrpcTemplates::DefaultSystemIncludesTemplate());
std::set<std::string> externalIncludes;
for (const auto &include : externalIncludes) {
serverHeaderPrinter->Print({ { "include", include } },

58
src/tools/qtprotobufgen/qprotobufgenerator.cpp
View File

@ -58,14 +58,11 @@ void QProtobufGenerator::GenerateSources(const FileDescriptor *file,
std::shared_ptr<Printer> registrationPrinter(new Printer(registrationStream.get(), '$'));
printDisclaimer(sourcePrinter.get());
sourcePrinter->Print({{"include", relativePath + CommonTemplates::ProtoFileSuffix()}},
CommonTemplates::InternalIncludeTemplate());
registrationPrinter->Print({{"include", "QtProtobuf/qprotobufregistration.h"}},
CommonTemplates::ExternalIncludeTemplate());
utils::ExternalIncludesOrderedSet externalIncludes{ "QtProtobuf/qprotobufregistration.h" };
std::set<std::string> internalIncludes{ relativePath + CommonTemplates::ProtoFileSuffix() };
registrationPrinter->Print({{"include", relativePath + CommonTemplates::ProtoFileSuffix()}},
CommonTemplates::InternalIncludeTemplate());
printIncludes(registrationPrinter.get(), internalIncludes, externalIncludes, {});
bool generateWellknownTimestamp = false;
common::iterateMessages(file, [&](const Descriptor *message) {
@ -74,16 +71,9 @@ void QProtobufGenerator::GenerateSources(const FileDescriptor *file,
return;
}
});
if (generateWellknownTimestamp) {
sourcePrinter->Print({ { "include", "QtCore/QTimeZone" } },
CommonTemplates::ExternalIncludeTemplate());
}
sourcePrinter->Print({{"include", "QtProtobuf/qprotobufregistration.h"}},
CommonTemplates::ExternalIncludeTemplate());
sourcePrinter->Print({{"include", "cmath"}},
CommonTemplates::ExternalIncludeTemplate());
if (generateWellknownTimestamp)
externalIncludes.insert("QtCore/QTimeZone");
printIncludes(sourcePrinter.get(), internalIncludes, externalIncludes, { "cmath" });
OpenFileNamespaces(file, sourcePrinter.get());
OpenFileNamespaces(file, registrationPrinter.get());
@ -123,8 +113,6 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
const std::string basename = utils::extractFileBasename(file->name()) +
CommonTemplates::ProtoFileSuffix();
std::string relativePath = common::generateRelativeFilePath(file, basename);
std::set<std::string> internalIncludes;
std::set<std::string> externalIncludes;
std::unique_ptr<io::ZeroCopyOutputStream> headerStream(generatorContext->Open(relativePath
+ ".h"));
@ -132,6 +120,10 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
printDisclaimer(headerPrinter.get());
std::set<std::string> internalIncludes;
utils::ExternalIncludesOrderedSet externalIncludes;
std::set<std::string> systemIncludes;
const std::string headerGuard = common::headerGuardFromFilename(basename + ".h");
headerPrinter->Print({{"header_guard", headerGuard}}, CommonTemplates::PreambleTemplate());
if (!Options::instance().exportMacroFilename().empty()) {
@ -139,9 +131,20 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
internalIncludes.insert(utils::removeFileSuffix(exportMacroFilename));
}
headerPrinter->Print(CommonTemplates::DefaultProtobufIncludesTemplate());
externalIncludes.insert("QtCore/qbytearray.h");
externalIncludes.insert("QtCore/qlist.h");
externalIncludes.insert("QtCore/qmetatype.h");
externalIncludes.insert("QtCore/qshareddata.h");
externalIncludes.insert("QtCore/qstring.h");
externalIncludes.insert("QtProtobuf/qprotobuflazymessagepointer.h");
externalIncludes.insert("QtProtobuf/qprotobufmessage.h");
externalIncludes.insert("QtProtobuf/qprotobufobject.h");
externalIncludes.insert("QtProtobuf/qtprotobuftypes.h");
if (Options::instance().hasQml()) {
headerPrinter->Print(CommonTemplates::QmlProtobufIncludesTemplate());
externalIncludes.insert("QtQml/qqmlregistration.h");
externalIncludes.insert("QtQml/qqmllist.h");
}
bool hasOneofFields = false;
@ -176,7 +179,7 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
externalIncludes.insert("QtProtobuf/qprotobufoneof.h");
if (hasOptionalFields)
externalIncludes.insert("optional");
systemIncludes.insert("optional");
for (const auto &qtTypeInclude: qtTypesSet) {
std::string qtTypeLower = qtTypeInclude;
@ -200,19 +203,8 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
+ CommonTemplates::ProtoFileSuffix());
}
externalIncludes.insert("QtCore/qbytearray.h");
externalIncludes.insert("QtCore/qstring.h");
printIncludes(headerPrinter.get(), internalIncludes, externalIncludes, systemIncludes);
for (const auto &include : externalIncludes) {
headerPrinter->Print({{"include", include}}, CommonTemplates::ExternalIncludeTemplate());
}
for (const auto &include : internalIncludes) {
headerPrinter->Print({{"include", include}}, CommonTemplates::InternalIncludeTemplate());
}
headerPrinter->Print(CommonTemplates::DefaultQtIncludesTemplate());
headerPrinter->PrintRaw("\n");
OpenFileNamespaces(file, headerPrinter.get());
for (int i = 0; i < file->enum_type_count(); ++i) {

19
src/tools/qtprotoccommon/commontemplates.cpp
View File

@ -66,22 +66,6 @@ const std::set<std::string_view> &CommonTemplates::ListOfCppExceptions()
return cppExceptions;
}
const char *CommonTemplates::DefaultProtobufIncludesTemplate()
{
return "#include <QtProtobuf/qprotobufobject.h>\n"
"#include <QtProtobuf/qprotobuflazymessagepointer.h>\n"
"#include <QtProtobuf/qtprotobuftypes.h>\n"
"\n";
}
const char *CommonTemplates::DefaultQtIncludesTemplate()
{
return "\n"
"#include <QtCore/qmetatype.h>\n"
"#include <QtCore/qlist.h>\n"
"#include <QtCore/qshareddata.h>\n";
}
const char *CommonTemplates::QmlProtobufIncludesTemplate()
{
return "#include <QtQml/qqmlregistration.h>\n"
@ -96,8 +80,7 @@ const char *CommonTemplates::DisclaimerTemplate()
const char *CommonTemplates::PreambleTemplate()
{
return "#ifndef $header_guard$\n"
"#define $header_guard$\n\n"
"#include <QtProtobuf/qprotobufmessage.h>\n";
"#define $header_guard$\n";
}
const char *CommonTemplates::FooterTemplate()

2
src/tools/qtprotoccommon/commontemplates.h
View File

@ -18,8 +18,6 @@ public:
static const std::vector<std::string> &ListOfQmlExceptions();
static const std::set<std::string_view> &ListOfCppExceptions();
static const char *ProtoSuffix();
static const char *DefaultProtobufIncludesTemplate();
static const char *DefaultQtIncludesTemplate();
static const char *QmlProtobufIncludesTemplate();
static const char *PreambleTemplate();
static const char *FooterTemplate();

30
src/tools/qtprotoccommon/generatorbase.cpp
View File

@ -97,3 +97,33 @@ void GeneratorBase::CloseFileNamespaces(
printer->PrintRaw("QT_END_NAMESPACE\n");
printer->Print("\n");
}
void GeneratorBase::printIncludes(google::protobuf::io::Printer *printer,
const std::set<std::string> &internal,
const utils::ExternalIncludesOrderedSet &external,
const std::set<std::string> &system)
{
if (!internal.empty())
printer->Print("\n");
for (const auto &header : internal)
printer->Print({ {"include", header } }, CommonTemplates::InternalIncludeTemplate());
std::string_view includeFirstPart;
for (const auto &header : external) {
const auto firstPartPos = header.find_first_of('/');
if (firstPartPos == std::string::npos) {
includeFirstPart = {};
printer->Print("\n");
} else if (std::string_view currentIncludeFirstPart(header.data(), firstPartPos);
currentIncludeFirstPart != includeFirstPart) {
includeFirstPart = currentIncludeFirstPart;
printer->Print("\n");
}
printer->Print({ {"include", header } }, CommonTemplates::ExternalIncludeTemplate());
}
if (!system.empty())
printer->Print("\n");
for (const auto &header : system)
printer->Print({ {"include", header } }, CommonTemplates::ExternalIncludeTemplate());
}

7
src/tools/qtprotoccommon/generatorbase.h
View File

@ -7,9 +7,10 @@
#include <google/protobuf/compiler/code_generator.h>
#include "qtprotocdefs.h"
#include "utils.h"
#include <map>
#include <string>
#include <functional>
namespace google::protobuf {
class FileDescriptor;
@ -51,6 +52,10 @@ public:
#endif
static void printDisclaimer(::google::protobuf::io::Printer *printer);
static void printIncludes(google::protobuf::io::Printer *printer,
const std::set<std::string> &internal,
const utils::ExternalIncludesOrderedSet &external,
const std::set<std::string> &system);
void OpenFileNamespaces(const ::google::protobuf::FileDescriptor *file,
google::protobuf::io::Printer *printer) const;
void CloseFileNamespaces(const ::google::protobuf::FileDescriptor *file,

15
src/tools/qtprotoccommon/utils.cpp
View File

@ -140,6 +140,21 @@ std::string &trim(std::string &s)
return s;
}
bool HeaderComparator::operator()(const std::string &lhs, const std::string &rhs) const
{
static constexpr std::string_view qtCorePrefix = "QtCore/";
bool lhsStartsWithQtCore = utils::startsWith(lhs, qtCorePrefix);
bool rhsStartsWithQtCore = utils::startsWith(rhs, qtCorePrefix);
if (lhsStartsWithQtCore && !rhsStartsWithQtCore)
return false;
if (!lhsStartsWithQtCore && rhsStartsWithQtCore)
return true;
return lhs < rhs;
}
// TODO C++20: use the std::string(_view) methods directly
template<typename T>
bool containsImpl(std::string_view s, T c)

7
src/tools/qtprotoccommon/utils.h
View File

@ -8,6 +8,7 @@
#include <string>
#include <vector>
#include <algorithm>
#include <set>
#ifdef QT_PROTOBUF_DEBUG_GENERATOR
# include <iostream>
@ -88,6 +89,12 @@ constexpr char toAsciiUpper(char ch) noexcept
return isAsciiLower(ch) ? ch - 'a' + 'A' : ch;
}
struct HeaderComparator
{
bool operator ()(const std::string &lhs, const std::string &rhs) const;
};
using ExternalIncludesOrderedSet = std::set<std::string, HeaderComparator>;
} // namespace utils
} // namespace qtprotoccommon
#endif // QTPROTOBUFGEN_UTILS_H

3
tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtgrpc/tests/testservice.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtgrpc::tests {

8
tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef TESTSERVICE_QPB_H
#define TESTSERVICE_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtgrpc::tests {
class SimpleStringMessage;

7
tests/auto/grpcgen/data/expected_result/folder/qtgrpc/tests/testservice_client.grpc.qpb.h
View File

@ -3,10 +3,7 @@
#ifndef TESTSERVICE_CLIENT_GRPC_QPB_H
#define TESTSERVICE_CLIENT_GRPC_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include "qtgrpc/tests/testservice.qpb.h"
#include <QtGrpc/qgrpccallreply.h>
#include <QtGrpc/qgrpcclientbase.h>
@ -14,8 +11,6 @@
#include <memory>
#include "qtgrpc/tests/testservice.qpb.h"
namespace qtgrpc::tests {
namespace TestService {

7
tests/auto/grpcgen/data/expected_result/no-options/testserivcenomessages_client.grpc.qpb.h
View File

@ -3,10 +3,7 @@
#ifndef TESTSERIVCENOMESSAGES_CLIENT_GRPC_QPB_H
#define TESTSERIVCENOMESSAGES_CLIENT_GRPC_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include "basicmessages.qpb.h"
#include <QtGrpc/qgrpccallreply.h>
#include <QtGrpc/qgrpcclientbase.h>
@ -14,8 +11,6 @@
#include <memory>
#include "basicmessages.qpb.h"
namespace qtgrpc::tests::nomessages {
namespace TestService {

7
tests/auto/grpcgen/data/expected_result/no-options/testservice_client.grpc.qpb.h
View File

@ -3,10 +3,7 @@
#ifndef TESTSERVICE_CLIENT_GRPC_QPB_H
#define TESTSERVICE_CLIENT_GRPC_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include "testservice.qpb.h"
#include <QtGrpc/qgrpccallreply.h>
#include <QtGrpc/qgrpcclientbase.h>
@ -14,8 +11,6 @@
#include <memory>
#include "testservice.qpb.h"
namespace qtgrpc::tests {
namespace TestService {

3
tests/auto/grpcgen/data/expected_result/qml/qmltestservice_client.grpc.qpb.h
View File

@ -3,10 +3,11 @@
#ifndef QMLTESTSERVICE_CLIENT_GRPC_QPB_H
#define QMLTESTSERVICE_CLIENT_GRPC_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include "testservice_client.grpc.qpb.h"
#include <QtGrpcQuick/qqmlgrpcfunctionalhandlers.h>
#include <QtGrpcQuick/qtqmlgrpcstreamsender.h>
#include <QtQml/qjsengine.h>
#include <QtQml/qjsvalue.h>
#include <QtQml/qqmlengine.h>

9
tests/auto/grpcgen/data/expected_result/separate/grpc/qtgrpc/tests/testservice_client.grpc.qpb.h
View File

@ -3,10 +3,8 @@
#ifndef TESTSERVICE_CLIENT_GRPC_QPB_H
#define TESTSERVICE_CLIENT_GRPC_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include "qtgrpc/tests/testservice.qpb.h"
#include "tst_qtgrpcgen_client_grpc_only_exports.qpb.h"
#include <QtGrpc/qgrpccallreply.h>
#include <QtGrpc/qgrpcclientbase.h>
@ -14,9 +12,6 @@
#include <memory>
#include "qtgrpc/tests/testservice.qpb.h"
#include "tst_qtgrpcgen_client_grpc_only_exports.qpb.h"
namespace qtgrpc::tests {
namespace TestService {

3
tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtgrpc/tests/testservice.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtgrpc::tests {

11
tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef TESTSERVICE_QPB_H
#define TESTSERVICE_QPB_H
#include "tst_qtgrpcgen_protobuf_only_exports.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtgrpcgen_protobuf_only_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtgrpc::tests {
class SimpleStringMessage;

4
tests/auto/grpcgen/data/expected_result/separate/protobuf/qtgrpc/tests/testservice_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtgrpc/tests/testservice.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtgrpc::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleStringMessage(qRegisterProtobufType<SimpleStringMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleIntMessage(qRegisterProtobufType<SimpleIntMessage>);

3
tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "annotation.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/comments/annotation.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef ANNOTATION_QPB_H
#define ANNOTATION_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class AnnotatedMessage1;

4
tests/auto/protobufgen/data/expected_result/comments/annotation_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "annotation.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarAnnotatedMessage1(qRegisterProtobufType<AnnotatedMessage1>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarAnnotatedMessage2(qRegisterProtobufType<AnnotatedMessage2>);

3
tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

11
tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef BASICMESSAGES_QPB_H
#define BASICMESSAGES_QPB_H
#include "tst_qtprotobufgen_custom_exports_gen_exports.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtprotobufgen_custom_exports_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/custom-exports/basicmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleBoolMessage(qRegisterProtobufType<SimpleBoolMessage>);

3
tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "extranamespace.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace MyTopLevelNamespace::qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef EXTRANAMESPACE_QPB_H
#define EXTRANAMESPACE_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace MyTopLevelNamespace::qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/extra-namespace/extranamespace_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "extranamespace.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace MyTopLevelNamespace::qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleStringMessage(qRegisterProtobufType<SimpleStringMessage>);

3
tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "fieldindexrange.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef FIELDINDEXRANGE_QPB_H
#define FIELDINDEXRANGE_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class FieldIndexTest1Message;

4
tests/auto/protobufgen/data/expected_result/fieldenum/fieldindexrange_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "fieldindexrange.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarFieldIndexTest1Message(qRegisterProtobufType<FieldIndexTest1Message>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarFieldIndexTest2Message(qRegisterProtobufType<FieldIndexTest2Message>);

3
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtprotobufnamespace/optional/tests/optional.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::optional::tests {

14
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional.qpb.h
View File

@ -3,21 +3,21 @@
#ifndef OPTIONAL_QPB_H
#define OPTIONAL_QPB_H
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <optional>
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
#include <optional>
namespace qtprotobufnamespace::optional::tests {
class TestStringMessage;

4
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/optional/tests/optional_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtprotobufnamespace/optional/tests/optional.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::optional::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarTestStringMessage(qRegisterProtobufType<TestStringMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOptionalMessage(qRegisterProtobufType<OptionalMessage>);

3
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtprotobufnamespace/tests/basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

11
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef BASICMESSAGES_QPB_H
#define BASICMESSAGES_QPB_H
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/basicmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtprotobufnamespace/tests/basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleBoolMessage(qRegisterProtobufType<SimpleBoolMessage>);

3
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtprotobufnamespace/tests/mapmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

19
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages.qpb.h
View File

@ -3,20 +3,19 @@
#ifndef MAPMESSAGES_QPB_H
#define MAPMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "basicmessages.qpb.h"
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class SimpleSInt32StringMapMessage;

4
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/mapmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtprotobufnamespace/tests/mapmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleSInt32StringMapMessage(qRegisterProtobufType<SimpleSInt32StringMapMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleSInt64StringMapMessage(qRegisterProtobufType<SimpleSInt64StringMapMessage>);

3
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtprotobufnamespace/tests/oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

21
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages.qpb.h
View File

@ -3,21 +3,20 @@
#ifndef ONEOFMESSAGES_QPB_H
#define ONEOFMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobuf/qprotobufoneof.h>
#include "basicmessages.qpb.h"
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class OneofSimpleMessage;

4
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/oneofmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtprotobufnamespace/tests/oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofSimpleMessage(qRegisterProtobufType<OneofSimpleMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofComplexMessage(qRegisterProtobufType<OneofComplexMessage>);

3
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "qtprotobufnamespace/tests/repeatedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

19
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages.qpb.h
View File

@ -3,20 +3,19 @@
#ifndef REPEATEDMESSAGES_QPB_H
#define REPEATEDMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "basicmessages.qpb.h"
#include "tst_qtprotobufgen_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class RepeatedStringMessage;

4
tests/auto/protobufgen/data/expected_result/folder/qtprotobufnamespace/tests/repeatedmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "qtprotobufnamespace/tests/repeatedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedStringMessage(qRegisterProtobufType<RepeatedStringMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedDoubleMessage(qRegisterProtobufType<RepeatedDoubleMessage>);

3
tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-exports/basicmessages.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef BASICMESSAGES_QPB_H
#define BASICMESSAGES_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/no-exports/basicmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleBoolMessage(qRegisterProtobufType<SimpleBoolMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "annotation.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-options/annotation.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef ANNOTATION_QPB_H
#define ANNOTATION_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class AnnotatedMessage1;

4
tests/auto/protobufgen/data/expected_result/no-options/annotation_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "annotation.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarAnnotatedMessage1(qRegisterProtobufType<AnnotatedMessage1>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarAnnotatedMessage2(qRegisterProtobufType<AnnotatedMessage2>);

3
tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "anymessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtproto::tests {

9
tests/auto/protobufgen/data/expected_result/no-options/anymessages.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef ANYMESSAGES_QPB_H
#define ANYMESSAGES_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobufWellKnownTypes/qprotobufanysupport.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtproto::tests {
class AnyMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/anymessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "anymessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtproto::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarAnyMessage(qRegisterProtobufType<AnyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedAnyMessage(qRegisterProtobufType<RepeatedAnyMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-options/basicmessages.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef BASICMESSAGES_QPB_H
#define BASICMESSAGES_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/basicmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleBoolMessage(qRegisterProtobufType<SimpleBoolMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "extranamespace.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-options/extranamespace.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef EXTRANAMESPACE_QPB_H
#define EXTRANAMESPACE_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/extranamespace_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "extranamespace.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleStringMessage(qRegisterProtobufType<SimpleStringMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "fieldindexrange.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef FIELDINDEXRANGE_QPB_H
#define FIELDINDEXRANGE_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class FieldIndexTest1Message;

4
tests/auto/protobufgen/data/expected_result/no-options/fieldindexrange_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "fieldindexrange.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarFieldIndexTest1Message(qRegisterProtobufType<FieldIndexTest1Message>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarFieldIndexTest2Message(qRegisterProtobufType<FieldIndexTest2Message>);

3
tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "mapmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

11
tests/auto/protobufgen/data/expected_result/no-options/mapmessages.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef MAPMESSAGES_QPB_H
#define MAPMESSAGES_QPB_H
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "basicmessages.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class SimpleSInt32StringMapMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/mapmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "mapmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleSInt32StringMapMessage(qRegisterProtobufType<SimpleSInt32StringMapMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleSInt64StringMapMessage(qRegisterProtobufType<SimpleSInt64StringMapMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

13
tests/auto/protobufgen/data/expected_result/no-options/oneofmessages.qpb.h
View File

@ -3,20 +3,19 @@
#ifndef ONEOFMESSAGES_QPB_H
#define ONEOFMESSAGES_QPB_H
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobuf/qprotobufoneof.h>
#include "basicmessages.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class OneofSimpleMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/oneofmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofSimpleMessage(qRegisterProtobufType<OneofSimpleMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofComplexMessage(qRegisterProtobufType<OneofComplexMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "optional.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::optional::tests {

11
tests/auto/protobufgen/data/expected_result/no-options/optional.qpb.h
View File

@ -3,20 +3,19 @@
#ifndef OPTIONAL_QPB_H
#define OPTIONAL_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <optional>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
#include <optional>
namespace qtprotobufnamespace::optional::tests {
class TestStringMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/optional_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "optional.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::optional::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarTestStringMessage(qRegisterProtobufType<TestStringMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOptionalMessage(qRegisterProtobufType<OptionalMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "repeatedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

11
tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages.qpb.h
View File

@ -3,19 +3,18 @@
#ifndef REPEATEDMESSAGES_QPB_H
#define REPEATEDMESSAGES_QPB_H
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "basicmessages.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class RepeatedStringMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/repeatedmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "repeatedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedStringMessage(qRegisterProtobufType<RepeatedStringMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedDoubleMessage(qRegisterProtobufType<RepeatedDoubleMessage>);

3
tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "repeatednonpackedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef REPEATEDNONPACKEDMESSAGES_QPB_H
#define REPEATEDNONPACKEDMESSAGES_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class RepeatedNonPackedIntMessage;

4
tests/auto/protobufgen/data/expected_result/no-options/repeatednonpackedmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "repeatednonpackedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedNonPackedIntMessage(qRegisterProtobufType<RepeatedNonPackedIntMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedNonPackedSIntMessage(qRegisterProtobufType<RepeatedNonPackedSIntMessage>);

3
tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "repeatednonpackedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

8
tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages.qpb.h
View File

@ -3,18 +3,16 @@
#ifndef REPEATEDNONPACKEDMESSAGES_QPB_H
#define REPEATEDNONPACKEDMESSAGES_QPB_H
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class RepeatedNonPackedIntMessage;

4
tests/auto/protobufgen/data/expected_result/packed/repeatednonpackedmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "repeatednonpackedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedNonPackedIntMessage(qRegisterProtobufType<RepeatedNonPackedIntMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedNonPackedSIntMessage(qRegisterProtobufType<RepeatedNonPackedSIntMessage>);

3
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "nopackage.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarTestEnumGadget(TestEnumGadget::registerTypes);

25
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage.qpb.h
View File

@ -3,23 +3,22 @@
#ifndef NOPACKAGE_QPB_H
#define NOPACKAGE_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "nopackageexternal.qpb.h"
#include "tst_qtprotobufgen_nopackage_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace TestEnumGadget {

4
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackage_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "nopackage.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleIntMessage(qRegisterProtobufType<SimpleIntMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarNoPackageExternalMessage(qRegisterProtobufType<NoPackageExternalMessage>);

3
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "nopackageexternal.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>

25
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal.qpb.h
View File

@ -3,22 +3,21 @@
#ifndef NOPACKAGEEXTERNAL_QPB_H
#define NOPACKAGEEXTERNAL_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtprotobufgen_nopackage_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
class SimpleIntMessageExt;
using SimpleIntMessageExtRepeated = QList<SimpleIntMessageExt>;

4
tests/auto/protobufgen/data/expected_result/qml-no-package/nopackageexternal_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "nopackageexternal.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleIntMessageExt(qRegisterProtobufType<SimpleIntMessageExt>);
static bool RegisterNopackageexternalProtobufTypes = [](){ qRegisterProtobufTypes(); return true; }();

3
tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

25
tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages.qpb.h
View File

@ -3,22 +3,21 @@
#ifndef BASICMESSAGES_QPB_H
#define BASICMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtprotobufgen_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class EmptyMessage;

4
tests/auto/protobufgen/data/expected_result/qmlgen/basicmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "basicmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarEmptyMessage(qRegisterProtobufType<EmptyMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleBoolMessage(qRegisterProtobufType<SimpleBoolMessage>);

3
tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "enummessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

25
tests/auto/protobufgen/data/expected_result/qmlgen/enummessages.qpb.h
View File

@ -3,22 +3,21 @@
#ifndef ENUMMESSAGES_QPB_H
#define ENUMMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "tst_qtprotobufgen_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {

4
tests/auto/protobufgen/data/expected_result/qmlgen/enummessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "enummessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarSimpleEnumMessage(qRegisterProtobufType<SimpleEnumMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarRepeatedEnumMessage(qRegisterProtobufType<RepeatedEnumMessage>);

3
tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

27
tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages.qpb.h
View File

@ -3,24 +3,23 @@
#ifndef ONEOFMESSAGES_QPB_H
#define ONEOFMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtProtobuf/qprotobufoneof.h>
#include "basicmessages.qpb.h"
#include "tst_qtprotobufgen_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobufoneof.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class OneofSimpleMessage;

4
tests/auto/protobufgen/data/expected_result/qmlgen/oneofmessages_protobuftyperegistrations.cpp
View File

@ -1,6 +1,8 @@
#include <QtProtobuf/qprotobufregistration.h>
#include "oneofmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
namespace qtprotobufnamespace::tests {
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofSimpleMessage(qRegisterProtobufType<OneofSimpleMessage>);
static QtProtobuf::ProtoTypeRegistrar ProtoTypeRegistrarOneofComplexMessage(qRegisterProtobufType<OneofComplexMessage>);

3
tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.cpp
View File

@ -1,7 +1,10 @@
/* This file is autogenerated. DO NOT CHANGE. All changes will be lost */
#include "repeatedmessages.qpb.h"
#include <QtProtobuf/qprotobufregistration.h>
#include <cmath>
namespace qtprotobufnamespace::tests {

25
tests/auto/protobufgen/data/expected_result/qmlgen/repeatedmessages.qpb.h
View File

@ -3,23 +3,22 @@
#ifndef REPEATEDMESSAGES_QPB_H
#define REPEATEDMESSAGES_QPB_H
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmlregistration.h>
#include <QtQml/qqmllist.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include "basicmessages.qpb.h"
#include "tst_qtprotobufgen_qml_gen_exports.qpb.h"
#include <QtCore/qmetatype.h>
#include <QtCore/qlist.h>
#include <QtCore/qshareddata.h>
#include <QtProtobuf/qprotobuflazymessagepointer.h>
#include <QtProtobuf/qprotobufmessage.h>
#include <QtProtobuf/qprotobufobject.h>
#include <QtProtobuf/qtprotobuftypes.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlregistration.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>
#include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
namespace qtprotobufnamespace::tests {
class RepeatedStringMessage;

Some files were not shown because too many files have changed in this diff Show More