Pārlūkot izejas kodu

Capitalize QtProtobuf namespace and naming

Alexey Edelev 5 gadi atpakaļ
vecāks
revīzija
0f2f871108
91 mainītis faili ar 294 papildinājumiem un 294 dzēšanām
  1. 3 3
      examples/addressbook/addressbookengine.cpp
  2. 1 1
      examples/addressbook/addressbookengine.h
  3. 1 1
      examples/addressbook/main.cpp
  4. 1 1
      examples/addressbook/qml/AddContactView.qml
  5. 1 1
      examples/addressbook/qml/CallPopup.qml
  6. 1 1
      examples/addressbook/qml/ContactDetails.qml
  7. 1 1
      examples/addressbook/qml/ContactList.qml
  8. 1 1
      examples/addressbook/qml/CountryCodesModel.qml
  9. 1 1
      examples/addressbook/qml/DropDownColumn.qml
  10. 1 1
      examples/addressbook/qml/FloatingRoundButton.qml
  11. 1 1
      examples/addressbook/qml/InputRow.qml
  12. 1 1
      examples/addressbook/qml/PhoneInput.qml
  13. 1 1
      examples/addressbook/qml/PrimaryText.qml
  14. 1 1
      examples/addressbook/qml/SecondaryText.qml
  15. 1 1
      examples/addressbook/qml/StackItem.qml
  16. 1 1
      examples/addressbook/qml/TextInputRow.qml
  17. 1 1
      examples/addressbook/qml/TextRow.qml
  18. 1 1
      examples/addressbook/qml/main.qml
  19. 1 1
      examples/simplechat/main.cpp
  20. 1 1
      examples/simplechat/main.qml
  21. 3 3
      examples/simplechat/simplechatengine.cpp
  22. 1 1
      examples/simplechat/simplechatengine.h
  23. 3 3
      src/generator/classgeneratorbase.cpp
  24. 3 3
      src/generator/classgeneratorbase.h
  25. 2 2
      src/generator/classsourcegeneratorbase.cpp
  26. 3 3
      src/generator/classsourcegeneratorbase.h
  27. 3 3
      src/generator/clientgenerator.cpp
  28. 3 3
      src/generator/clientgenerator.h
  29. 2 2
      src/generator/clientsourcegenerator.cpp
  30. 4 4
      src/generator/clientsourcegenerator.h
  31. 2 2
      src/generator/generator.cpp
  32. 3 3
      src/generator/generator.h
  33. 2 2
      src/generator/globalenumsgenerator.cpp
  34. 3 3
      src/generator/globalenumsgenerator.h
  35. 2 2
      src/generator/globalenumssourcegenerator.cpp
  36. 3 3
      src/generator/globalenumssourcegenerator.h
  37. 2 2
      src/generator/main.cpp
  38. 2 2
      src/generator/protobufclassgenerator.cpp
  39. 2 2
      src/generator/protobufclassgenerator.h
  40. 2 2
      src/generator/protobufsourcegenerator.cpp
  41. 3 3
      src/generator/protobufsourcegenerator.h
  42. 2 2
      src/generator/servergenerator.cpp
  43. 3 3
      src/generator/servergenerator.h
  44. 3 3
      src/generator/servicegeneratorbase.cpp
  45. 3 3
      src/generator/servicegeneratorbase.h
  46. 13 13
      src/generator/templates.cpp
  47. 3 3
      src/generator/templates.h
  48. 3 3
      src/generator/utils.h
  49. 1 1
      src/grpc/abstractcredentials.cpp
  50. 18 18
      src/grpc/abstractcredentials.h
  51. 1 1
      src/grpc/insecurecredentials.cpp
  52. 2 2
      src/grpc/insecurecredentials.h
  53. 1 1
      src/grpc/qabstractgrpcchannel.cpp
  54. 3 3
      src/grpc/qabstractgrpcchannel.h
  55. 3 3
      src/grpc/qabstractgrpcclient.cpp
  56. 2 2
      src/grpc/qabstractgrpcclient.h
  57. 2 2
      src/grpc/qgrpcasyncreply.cpp
  58. 2 2
      src/grpc/qgrpcasyncreply.h
  59. 4 4
      src/grpc/qgrpchttp2channel.cpp
  60. 3 3
      src/grpc/qgrpchttp2channel.h
  61. 1 1
      src/grpc/qtgrpcglobal.h
  62. 1 1
      src/grpc/sslcredentials.cpp
  63. 2 2
      src/grpc/sslcredentials.h
  64. 2 2
      src/protobuf/qabstractprotobufserializer.cpp
  65. 2 2
      src/protobuf/qabstractprotobufserializer.h
  66. 4 4
      src/protobuf/qprotobufobject.h
  67. 2 2
      src/protobuf/qprotobufregistrationhelper.h
  68. 2 2
      src/protobuf/qprotobufselfcheckiterator.h
  69. 2 2
      src/protobuf/qprotobufserializer.cpp
  70. 2 2
      src/protobuf/qprotobufserializer_p.h
  71. 2 2
      src/protobuf/qprotobufserializerregistry.cpp
  72. 2 2
      src/protobuf/qprotobufserializerregistry.h
  73. 2 2
      src/protobuf/qqmllistpropertyconstructor.h
  74. 3 3
      src/protobuf/qtprotobuf.cpp
  75. 1 1
      src/protobuf/qtprotobufglobal.h
  76. 1 1
      src/protobuf/qtprotobuflogging.cpp
  77. 1 1
      src/protobuf/qtprotobuflogging.h
  78. 56 56
      src/protobuf/qtprotobuftypes.h
  79. 1 1
      src/protobuf/quick/qtprotobufquick_global.h
  80. 1 1
      src/protobuf/quick/qtprotobufquickplugin.h
  81. 2 2
      tests/test_grpc/clienttest.cpp
  82. 3 3
      tests/test_grpc/sslclienttest.cpp
  83. 2 2
      tests/test_protobuf/converterstest.cpp
  84. 3 3
      tests/test_protobuf/deserializationtest.cpp
  85. 2 2
      tests/test_protobuf/deserializationtest.h
  86. 3 3
      tests/test_protobuf/serializationcomplexmessagemap.cpp
  87. 3 3
      tests/test_protobuf/serializationtest.cpp
  88. 2 2
      tests/test_protobuf/serializationtest.h
  89. 35 35
      tests/test_protobuf/simpletest.cpp
  90. 1 1
      tests/test_qml/main.cpp
  91. 1 1
      tests/test_qml/qml/tst_simple.qml

+ 3 - 3
examples/addressbook/addressbookengine.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -36,7 +36,7 @@
 
 using namespace qtprotobuf::examples;
 
-class AuthCredentials : public qtprotobuf::CallCredentials
+class AuthCredentials : public QtProtobuf::CallCredentials
 {
 public:
     AuthCredentials(const QString &userName, const QString &password) :
@@ -58,7 +58,7 @@ AddressBookEngine::AddressBookEngine() : QObject()
     conf.setProtocol(QSsl::TlsV1_2);
     conf.setAllowedNextProtocols({QSslConfiguration::ALPNProtocolHTTP2});
 
-    std::shared_ptr<qtprotobuf::QAbstractGrpcChannel> channel(new qtprotobuf::QGrpcHttp2Channel(QUrl("https://localhost:65001"), qtprotobuf::SslCredentials(conf) |
+    std::shared_ptr<QtProtobuf::QAbstractGrpcChannel> channel(new QtProtobuf::QGrpcHttp2Channel(QUrl("https://localhost:65001"), QtProtobuf::SslCredentials(conf) |
                                                                                       AuthCredentials("authorizedUser", QCryptographicHash::hash("test", QCryptographicHash::Md5).toHex())));
     m_client->attachChannel(channel);
     m_client->subscribeContactsUpdates(ListFrame());

+ 1 - 1
examples/addressbook/addressbookengine.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/main.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/AddContactView.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/CallPopup.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/ContactDetails.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/ContactList.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/CountryCodesModel.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/DropDownColumn.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/FloatingRoundButton.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/InputRow.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/PhoneInput.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/PrimaryText.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/SecondaryText.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/StackItem.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/TextInputRow.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/TextRow.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/addressbook/qml/main.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/simplechat/main.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
examples/simplechat/main.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 3 - 3
examples/simplechat/simplechatengine.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -43,7 +43,7 @@
 
 using namespace qtprotobuf::examples;
 
-class AuthCredentials : public qtprotobuf::CallCredentials
+class AuthCredentials : public QtProtobuf::CallCredentials
 {
 public:
     AuthCredentials(const QString &userName, const QString &password) :
@@ -75,7 +75,7 @@ void SimpleChatEngine::login(const QString &name, const QString &password)
     conf.setAllowedNextProtocols({QSslConfiguration::ALPNProtocolHTTP2});
 
     QUrl url("https://localhost:65002");
-    std::shared_ptr<qtprotobuf::QAbstractGrpcChannel> channel(new qtprotobuf::QGrpcHttp2Channel(url, qtprotobuf::SslCredentials(conf) |
+    std::shared_ptr<QtProtobuf::QAbstractGrpcChannel> channel(new QtProtobuf::QGrpcHttp2Channel(url, QtProtobuf::SslCredentials(conf) |
                                                                                       AuthCredentials(name, QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex())));
 
     m_client->attachChannel(channel);

+ 1 - 1
examples/simplechat/simplechatengine.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 3 - 3
src/generator/classgeneratorbase.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -33,7 +33,7 @@
 
 #include <set>
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;
@@ -128,7 +128,7 @@ std::string ClassGeneratorBase::getTypeName(const FieldDescriptor *field, const
 {
     assert(field != nullptr);
     std::string typeName;
-    std::string namespaceQtProtoDefinition("qtprotobuf::");
+    std::string namespaceQtProtoDefinition("QtProtobuf::");
 
     std::string namespaceTypeName;
     std::vector<std::string> typeNamespace;

+ 3 - 3
src/generator/classgeneratorbase.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -38,7 +38,7 @@ namespace io {
 class ZeroCopyOutputStream;
 }}}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 using PropertyMap = std::map<std::string, std::string>;
@@ -125,4 +125,4 @@ protected:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 2 - 2
src/generator/classsourcegeneratorbase.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 #include "templates.h"
 #include "utils.h"
 
-using namespace qtprotobuf::generator;
+using namespace QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;

+ 3 - 3
src/generator/classsourcegeneratorbase.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 #include <unordered_set>
 #include "classgeneratorbase.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ClassSourceGeneratorBase : public ClassGeneratorBase
@@ -46,5 +46,5 @@ protected:
 
 };
 
-} //namespace qtprotobuf
+} //namespace QtProtobuf
 } //namespace generator

+ 3 - 3
src/generator/clientgenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "templates.h"
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::compiler;
 
@@ -48,7 +48,7 @@ ClientGenerator::ClientGenerator(const ServiceDescriptor *service, std::unique_p
 
 void ClientGenerator::printClientClass()
 {
-    mPrinter.Print({{"classname", mClassName}, {"parent_class", "qtprotobuf::QAbstractGrpcClient"}}, Templates::ClassDefinitionTemplate);
+    mPrinter.Print({{"classname", mClassName}, {"parent_class", "QtProtobuf::QAbstractGrpcClient"}}, Templates::ClassDefinitionTemplate);
     mPrinter.Print(Templates::QObjectMacro);
 }
 

+ 3 - 3
src/generator/clientgenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -35,7 +35,7 @@ class ServiceDescriptor;
 class Message;
 }}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ClientGenerator : public ServiceGeneratorBase
@@ -65,4 +65,4 @@ private:
 
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 2 - 2
src/generator/clientsourcegenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 #include "utils.h"
 #include "templates.h"
 
-using namespace qtprotobuf::generator;
+using namespace QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::compiler;
 

+ 4 - 4
src/generator/clientsourcegenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include "classsourcegeneratorbase.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ClientSourceGenerator : public ClassSourceGeneratorBase
@@ -37,7 +37,7 @@ public:
                           std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> out);
     void run() override {
         printClassHeaderInclude();
-        printUsingNamespaces({"qtprotobuf", mNamespacesColonDelimited});
+        printUsingNamespaces({"QtProtobuf", mNamespacesColonDelimited});
         printConstructor();
         printMethods();
     }
@@ -48,5 +48,5 @@ protected:
     const ::google::protobuf::ServiceDescriptor *mService;
 };
 
-} //namespace qtprotobuf
+} //namespace QtProtobuf
 } //namespace generator

+ 2 - 2
src/generator/generator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -41,7 +41,7 @@
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/descriptor.h>
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::compiler;
 

+ 3 - 3
src/generator/generator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -35,7 +35,7 @@ namespace compiler {
 class GeneratorContext;
 }}}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class QtGenerator : public ::google::protobuf::compiler::CodeGenerator
@@ -53,4 +53,4 @@ class QtGenerator : public ::google::protobuf::compiler::CodeGenerator
 };
 
 } //namespace generator
-} // namespace qtprotobuf
+} // namespace QtProtobuf

+ 2 - 2
src/generator/globalenumsgenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include <google/protobuf/io/zero_copy_stream.h>
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;

+ 3 - 3
src/generator/globalenumsgenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -28,7 +28,7 @@
 #include "classgeneratorbase.h"
 #include "utils.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class GlobalEnumsGenerator : public ClassGeneratorBase
@@ -50,5 +50,5 @@ public:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf
 

+ 2 - 2
src/generator/globalenumssourcegenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include <google/protobuf/io/zero_copy_stream.h>
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;

+ 3 - 3
src/generator/globalenumssourcegenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -28,7 +28,7 @@
 #include "classgeneratorbase.h"
 #include "utils.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class GlobalEnumsSourceGenerator : public ClassGeneratorBase
@@ -45,5 +45,5 @@ public:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf
 

+ 2 - 2
src/generator/main.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,6 +29,6 @@
 
 int main(int argc, char *argv[])
 {
-    qtprotobuf::generator::QtGenerator generator;
+    QtProtobuf::generator::QtGenerator generator;
     return ::google::protobuf::compiler::PluginMain(argc, argv, &generator);
 }

+ 2 - 2
src/generator/protobufclassgenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;

+ 2 - 2
src/generator/protobufclassgenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -38,7 +38,7 @@ namespace io {
 class ZeroCopyOutputStream;
 }}}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 using PropertyMap = std::map<std::string, std::string>;

+ 2 - 2
src/generator/protobufsourcegenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -28,7 +28,7 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 
-using namespace qtprotobuf::generator;
+using namespace QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::io;
 using namespace ::google::protobuf::compiler;

+ 3 - 3
src/generator/protobufsourcegenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include "classsourcegeneratorbase.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ProtobufSourceGenerator : public ClassSourceGeneratorBase
@@ -51,5 +51,5 @@ public:
     }
 };
 
-} //namespace qtprotobuf
+} //namespace QtProtobuf
 } //namespace generator

+ 2 - 2
src/generator/servergenerator.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "templates.h"
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::compiler;
 

+ 3 - 3
src/generator/servergenerator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -35,7 +35,7 @@ class ServiceDescriptor;
 class Message;
 }}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ServerGenerator : public ServiceGeneratorBase
@@ -58,4 +58,4 @@ public:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 3 - 3
src/generator/servicegeneratorbase.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -36,10 +36,10 @@
 #include "utils.h"
 #include "templates.h"
 
-using namespace ::qtprotobuf::generator;
+using namespace ::QtProtobuf::generator;
 using namespace ::google::protobuf;
 using namespace ::google::protobuf::compiler;
-using namespace qtprotobuf::generator;
+using namespace QtProtobuf::generator;
 
 ServiceGeneratorBase::ServiceGeneratorBase(const ::google::protobuf::ServiceDescriptor *service,
                                            std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> out) :

+ 3 - 3
src/generator/servicegeneratorbase.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -35,7 +35,7 @@ class ServiceDescriptor;
 class Message;
 }}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class ServiceGeneratorBase : public ClassGeneratorBase
@@ -54,4 +54,4 @@ public:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 13 - 13
src/generator/templates.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -25,7 +25,7 @@
 
 #include "templates.h"
 
-using namespace qtprotobuf::generator;
+using namespace QtProtobuf::generator;
 
 const char *Templates::DefaultProtobufIncludesTemplate = "#include <QMetaType>\n"
                                                          "#include <QList>\n"
@@ -45,7 +45,7 @@ const char *Templates::InternalIncludeTemplate =  "#include \"$include$.h\"\n";
 const char *Templates::ExternalIncludeTemplate = "#include <$include$>\n";
 const char *Templates::GlobalEnumIncludeTemplate = "#include <globalenums.h>\n";
 
-const char *Templates::UsingQtProtobufNamespaceTemplate = "\nusing namespace qtprotobuf;\n";
+const char *Templates::UsingQtProtobufNamespaceTemplate = "\nusing namespace QtProtobuf;\n";
 const char *Templates::ComplexTypeRegistrationTemplate = "namespace $classname$Private {\n"
                                                          "void registerTypes()\n{\n"
                                                          "    qRegisterMetaType<$classname$>(\"$classname$\");\n"
@@ -118,7 +118,7 @@ const char *Templates::GetterContainerExtraTemplate = "$type$ &$property_name$()
                                         "}\n\n";
 
 const char *Templates::QmlListGetterTemplate = "QQmlListProperty<$type_nolist$> $property_name$_l() {\n"
-                                               "    return qtprotobuf::constructQmlListProperty<$type_nolist$>(this, &m_$property_name$);\n"
+                                               "    return QtProtobuf::constructQmlListProperty<$type_nolist$>(this, &m_$property_name$);\n"
                                                "}\n\n";
 
 const char *Templates::SetterTemplateMessageType = "void set$property_name_cap$_p($type$ *$property_name$) {\n"
@@ -150,7 +150,7 @@ const char *Templates::SetterTemplateSimpleType = "void set$property_name_cap$(c
 const char *Templates::SignalsBlockTemplate = "\nsignals:\n";
 const char *Templates::SignalTemplate = "void $property_name$Changed();\n";
 
-const char *Templates::FieldsOrderingContainerTemplate = "const qtprotobuf::QProtobufPropertyOrdering $type$::propertyOrdering = {";
+const char *Templates::FieldsOrderingContainerTemplate = "const QtProtobuf::QProtobufPropertyOrdering $type$::propertyOrdering = {";
 const char *Templates::FieldOrderTemplate = "{$field_number$, $property_number$}";
 
 const char *Templates::EnumTemplate = "$type$";
@@ -177,14 +177,14 @@ const char *Templates::RegisterQmlListPropertyMetaTypeTemplate = "qRegisterMetaT
 
 const char *Templates::QEnumTemplate = "Q_ENUM($type$)\n";
 
-const char *Templates::MapSerializationRegisterTemplate = "qtprotobuf::QProtobufSerializerRegistry::registerMap<$key_type$, $value_type$>();\n";
+const char *Templates::MapSerializationRegisterTemplate = "QtProtobuf::QProtobufSerializerRegistry::registerMap<$key_type$, $value_type$>();\n";
 
 const char *Templates::ClassDefinitionTemplate = "\nclass $classname$ : public $parent_class$\n"
                                                  "{\n";
 const char *Templates::QObjectMacro = "Q_OBJECT";
 const char *Templates::ClientMethodDeclarationSyncTemplate = "Q_INVOKABLE bool $method_name$(const $param_type$ &$param_name$, const QPointer<$return_type$> &$return_name$);\n";
-const char *Templates::ClientMethodDeclarationAsyncTemplate = "Q_INVOKABLE qtprotobuf::QGrpcAsyncReply *$method_name$(const $param_type$ &$param_name$);\n";
-const char *Templates::ClientMethodDeclarationAsync2Template = "Q_INVOKABLE void $method_name$(const $param_type$ &$param_name$, const QObject *context, const std::function<void(qtprotobuf::QGrpcAsyncReply *)> &callback);\n";
+const char *Templates::ClientMethodDeclarationAsyncTemplate = "Q_INVOKABLE QtProtobuf::QGrpcAsyncReply *$method_name$(const $param_type$ &$param_name$);\n";
+const char *Templates::ClientMethodDeclarationAsync2Template = "Q_INVOKABLE void $method_name$(const $param_type$ &$param_name$, const QObject *context, const std::function<void(QtProtobuf::QGrpcAsyncReply *)> &callback);\n";
 const char *Templates::ServerMethodDeclarationTemplate = "Q_INVOKABLE virtual $return_type$ $method_name$(const $param_type$ &$param_name$) = 0;\n";
 
 
@@ -195,20 +195,20 @@ const char *Templates::ClientMethodDefinitionSyncTemplate = "\nbool $classname$:
                                                             "{\n"
                                                             "    return call(\"$method_name$\", $param_name$, $return_name$);\n"
                                                             "}\n";
-const char *Templates::ClientMethodDefinitionAsyncTemplate = "\nqtprotobuf::QGrpcAsyncReply *$classname$::$method_name$(const $param_type$ &$param_name$)\n"
+const char *Templates::ClientMethodDefinitionAsyncTemplate = "\nQtProtobuf::QGrpcAsyncReply *$classname$::$method_name$(const $param_type$ &$param_name$)\n"
                                                              "{\n"
                                                              "    return call(\"$method_name$\", $param_name$);\n"
                                                              "}\n";
 const char *Templates::ClientMethodDefinitionAsync2Template = "\nvoid $classname$::$method_name$(const $param_type$ &$param_name$, const QObject *context, const std::function<void(QGrpcAsyncReply *)> &callback)\n"
                                                               "{\n"
-                                                              "    qtprotobuf::QGrpcAsyncReply *reply = call(\"$method_name$\", $param_name$);\n"
-                                                              "    QObject::connect(reply, &qtprotobuf::QGrpcAsyncReply::finished, context, [reply, callback](){\n"
+                                                              "    QtProtobuf::QGrpcAsyncReply *reply = call(\"$method_name$\", $param_name$);\n"
+                                                              "    QObject::connect(reply, &QtProtobuf::QGrpcAsyncReply::finished, context, [reply, callback](){\n"
                                                               "        callback(reply);\n"
                                                               "    });\n"
                                                               "}\n";
 
-const char *Templates::RegisterSerializersTemplate = "qtprotobuf::QProtobufSerializerRegistry::registerSerializers<$classname$>();\n";
-const char *Templates::RegistratorTemplate = "static qtprotobuf::QProtobufRegistrationHelper helper(registerTypes);\n";
+const char *Templates::RegisterSerializersTemplate = "QtProtobuf::QProtobufSerializerRegistry::registerSerializers<$classname$>();\n";
+const char *Templates::RegistratorTemplate = "static QtProtobuf::QProtobufRegistrationHelper helper(registerTypes);\n";
 const char *Templates::QmlRegisterTypeTemplate = "qmlRegisterType<$namespaces$::$classname$>(\"$package$\", 1, 0, \"$classname$\");\n";
 const char *Templates::QmlRegisterTypeUncreatableTemplate = "qmlRegisterUncreatableType<$namespaces$::$classname$>(\"$package$\", 1, 0, \"$classname$\", \"$namespaces$::$classname$ Could not be created from qml context\");\n";
 

+ 3 - 3
src/generator/templates.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Tatyana Borisova <tanusshhka@mail.ru>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,7 +29,7 @@
 #include <string>
 #include <google/protobuf/descriptor.h>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 
 class Templates {
@@ -137,4 +137,4 @@ public:
 };
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 3 - 3
src/generator/utils.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -36,7 +36,7 @@ namespace google { namespace protobuf {
 class FileDescriptor;
 }}
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace generator {
 class utils {
 public:
@@ -69,4 +69,4 @@ static void tolower(std::string &str) {
 using PackagesList = std::unordered_map<std::string/*package*/, std::list<const ::google::protobuf::FileDescriptor *>>;
 
 } //namespace generator
-} //namespace qtprotobuf
+} //namespace QtProtobuf

+ 1 - 1
src/grpc/abstractcredentials.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 18 - 18
src/grpc/abstractcredentials.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -33,7 +33,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
 *  \addtogroup QtGrpc
 *  \{
@@ -49,16 +49,16 @@ class Q_GRPC_EXPORT AbstractCredentials
 {
 public:
     template<typename Call, typename Channel,
-             typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value
-                                       && std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
+             typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value
+                                       && std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
     AbstractCredentials(const Call &call, const Channel &channel);
 
     template<typename Call,
-             typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value, int> = 0>
+             typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value, int> = 0>
     AbstractCredentials(const Call &call);
 
     template<typename Channel,
-             typename std::enable_if_t<std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
+             typename std::enable_if_t<std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
     AbstractCredentials(const Channel &channel);
 
     using CredentialMap = QHash<QLatin1String, QVariant>;
@@ -110,8 +110,8 @@ protected:
 
 //! \private
 template<typename Call, typename Channel,
-         typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value
-                                   && std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
+         typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value
+                                   && std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
 AbstractCredentials::AbstractCredentials(const Call &call, const Channel &channel)
 {
     mCallCredentials = call.mCallCredentials;
@@ -120,7 +120,7 @@ AbstractCredentials::AbstractCredentials(const Call &call, const Channel &channe
 
 //! \private
 template<typename Call,
-         typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value, int> = 0>
+         typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value, int> = 0>
 AbstractCredentials::AbstractCredentials(const Call &call)
 {
     mCallCredentials = call.mCallCredentials;
@@ -128,7 +128,7 @@ AbstractCredentials::AbstractCredentials(const Call &call)
 
 //! \private
 template<typename Channel,
-         typename std::enable_if_t<std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
+         typename std::enable_if_t<std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
 AbstractCredentials::AbstractCredentials(const Channel &channel)
 {
     mChannelCredentials = channel.mChannelCredentials;
@@ -137,18 +137,18 @@ AbstractCredentials::AbstractCredentials(const Channel &channel)
 
 //! \private
 template<typename Call, typename Channel,
-         typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value
-                                   && std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
-qtprotobuf::AbstractCredentials operator |(const Call &call, const Channel &channel)
+         typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value
+                                   && std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
+QtProtobuf::AbstractCredentials operator |(const Call &call, const Channel &channel)
 {
-    return qtprotobuf::AbstractCredentials(call, channel);
+    return QtProtobuf::AbstractCredentials(call, channel);
 }
 
 //! \private
 template<typename Call, typename Channel,
-         typename std::enable_if_t<std::is_base_of<qtprotobuf::CallCredentials, Call>::value
-                                   && std::is_base_of<qtprotobuf::ChannelCredentials, Channel>::value, int> = 0>
-qtprotobuf::AbstractCredentials operator |(const Channel &channel, const Call &call)
+         typename std::enable_if_t<std::is_base_of<QtProtobuf::CallCredentials, Call>::value
+                                   && std::is_base_of<QtProtobuf::ChannelCredentials, Channel>::value, int> = 0>
+QtProtobuf::AbstractCredentials operator |(const Channel &channel, const Call &call)
 {
-    return qtprotobuf::AbstractCredentials(call, channel);
+    return QtProtobuf::AbstractCredentials(call, channel);
 }

+ 1 - 1
src/grpc/insecurecredentials.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 2 - 2
src/grpc/insecurecredentials.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,7 +29,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
  * \ingroup QtGrpc
  * \brief The InsecureCredentials class

+ 1 - 1
src/grpc/qabstractgrpcchannel.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 3 - 3
src/grpc/qabstractgrpcchannel.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -31,7 +31,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 class QGrpcAsyncReply;
 class QAbstractGrpcClient;
@@ -91,7 +91,7 @@ public:
      *            QGrpcAsyncReply lifecycle is managed by QAbstractGrpcClient only.
      *            \see QGrpcAsyncReply for details
      */
-    virtual void call(const QString &method, const QString &service, const QByteArray &args, qtprotobuf::QGrpcAsyncReply *ret) = 0;
+    virtual void call(const QString &method, const QString &service, const QByteArray &args, QtProtobuf::QGrpcAsyncReply *ret) = 0;
 
     /*!
      * \brief Subscribes to server-side stream to receive updates for given \p method.

+ 3 - 3
src/grpc/qabstractgrpcclient.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include <QTimer>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 class QAbstractGrpcClientPrivate final {
 public:
     QAbstractGrpcClientPrivate(const QString &service) : service(service) {}
@@ -37,7 +37,7 @@ public:
 };
 }
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 QAbstractGrpcClient::QAbstractGrpcClient(const QString &service, QObject *parent) : QObject(parent)
   , d(new QAbstractGrpcClientPrivate(service))

+ 2 - 2
src/grpc/qabstractgrpcclient.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -39,7 +39,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 class QAbstractGrpcChannel;
 
 /*!

+ 2 - 2
src/grpc/qgrpcasyncreply.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -26,7 +26,7 @@
 #include "qgrpcasyncreply.h"
 #include <qtprotobuflogging.h>
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 QGrpcAsyncReply::~QGrpcAsyncReply()
 {

+ 2 - 2
src/grpc/qgrpcasyncreply.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -34,7 +34,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 /*!
  * \ingroup QtGrpc

+ 4 - 4
src/grpc/qgrpchttp2channel.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -41,7 +41,7 @@
 
 #include "qtprotobuflogging.h"
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 namespace  {
 
@@ -91,7 +91,7 @@ const char *GrpcStatusHeader = "grpc-status";
 const char *GrpcStatusMessage = "grpc-message";
 }
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 struct QGrpcHttp2ChannelPrivate {
     struct ExpectedData {
@@ -215,7 +215,7 @@ QAbstractGrpcChannel::StatusCode QGrpcHttp2Channel::call(const QString &method,
     return grpcStatus;
 }
 
-void QGrpcHttp2Channel::call(const QString &method, const QString &service, const QByteArray &args, qtprotobuf::QGrpcAsyncReply *reply)
+void QGrpcHttp2Channel::call(const QString &method, const QString &service, const QByteArray &args, QtProtobuf::QGrpcAsyncReply *reply)
 {
     QNetworkReply *networkReply = d->post(method, service, args);
 

+ 3 - 3
src/grpc/qgrpchttp2channel.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,7 +29,7 @@
 
 #include <QUrl>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 class AbstractCredentials;
 
@@ -44,7 +44,7 @@ public:
     ~QGrpcHttp2Channel();
 
     StatusCode call(const QString &method, const QString &service, const QByteArray &args, QByteArray &ret) override;
-    void call(const QString &method, const QString &service, const QByteArray &args, qtprotobuf::QGrpcAsyncReply *reply) override;
+    void call(const QString &method, const QString &service, const QByteArray &args, QtProtobuf::QGrpcAsyncReply *reply) override;
     void subscribe(const QString &method, const QString &service, const QByteArray &args, QAbstractGrpcClient *client, const std::function<void (const QByteArray &)> &handler) override;
 
 protected:

+ 1 - 1
src/grpc/qtgrpcglobal.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
src/grpc/sslcredentials.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 2 - 2
src/grpc/sslcredentials.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -31,7 +31,7 @@
 
 #include "qtgrpcglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
  * \ingroup QtGrpc
  * \brief The SslCredentials class

+ 2 - 2
src/protobuf/qabstractprotobufserializer.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,7 +29,7 @@
 
 #include "qabstractprotobufserializer.h"
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 QByteArray QAbstractProtobufSerializer::serializeObjectCommon(const QObject *object, const QProtobufPropertyOrdering &propertyOrdering, const QMetaObject &metaObject)
 {

+ 2 - 2
src/protobuf/qabstractprotobufserializer.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -38,7 +38,7 @@
 
 #include "qtprotobufglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
 *  \addtogroup QtProtobuf
 *  \{

+ 4 - 4
src/protobuf/qprotobufobject.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -40,8 +40,8 @@
 
 #define Q_DECLARE_PROTOBUF_SERIALIZERS(T)\
     public:\
-        QByteArray serialize() const { return qtprotobuf::QProtobufSerializerRegistry::serialize<T>(this); }\
-        void deserialize(const QByteArray &array) { qtprotobuf::QProtobufSerializerRegistry::deserialize<T>(this, array); }\
+        QByteArray serialize() const { return QtProtobuf::QProtobufSerializerRegistry::serialize<T>(this); }\
+        void deserialize(const QByteArray &array) { QtProtobuf::QProtobufSerializerRegistry::deserialize<T>(this, array); }\
     private:
 
 /*!
@@ -51,7 +51,7 @@
 
 #define Q_PROTOBUF_OBJECT\
     public:\
-        static const qtprotobuf::QProtobufPropertyOrdering propertyOrdering;\
+        static const QtProtobuf::QProtobufPropertyOrdering propertyOrdering;\
     private:
 
 /*! \} */

+ 2 - 2
src/protobuf/qprotobufregistrationhelper.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Viktor Kopp <vifactor@gmail.com>, Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -31,7 +31,7 @@
  * \private
  * This class might be replaced by manual registration calls, because of issues related to static initialization in C++
  */
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 class QProtobufRegistrationHelper {
 public:

+ 2 - 2
src/protobuf/qprotobufselfcheckiterator.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 
 #pragma once
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 /*!
  * \ingroup QtProtobuf

+ 2 - 2
src/protobuf/qprotobufserializer.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -29,7 +29,7 @@
 
 #include <QMetaProperty>
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 QProtobufSerializer::QProtobufSerializer()
 {

+ 2 - 2
src/protobuf/qprotobufserializer_p.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -31,7 +31,7 @@
 #include "qtprotobuflogging.h"
 #include "qabstractprotobufserializer.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 /*!
  * \private

+ 2 - 2
src/protobuf/qprotobufserializerregistry.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -25,7 +25,7 @@
 
 #include "qprotobufserializerregistry.h"
 
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 QAbstractProtobufSerializer::SerializerRegistry QProtobufSerializerRegistry::handlers = {};
 std::unique_ptr<QAbstractProtobufSerializer> QProtobufSerializerRegistry::basicSerializer = std::make_unique<QProtobufSerializer>();

+ 2 - 2
src/protobuf/qprotobufserializerregistry.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -37,7 +37,7 @@
 
 #include "qtprotobufglobal.h"
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
  * \ingroup QtProtobuf
  * \brief The QProtobufSerializerRegistry class provides api to register serializers of QObjects

+ 2 - 2
src/protobuf/qqmllistpropertyconstructor.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -28,7 +28,7 @@
 #include <QQmlListProperty>
 #include <QQmlEngine>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 //! \private
 template<typename T>
 static void qmllistpropertyAppend(QQmlListProperty<T> *p, T *v) {

+ 3 - 3
src/protobuf/qtprotobuf.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,9 +30,9 @@
 #include <type_traits>
 
 #define registerProtobufType(X) qRegisterMetaType<X>(# X);\
-                                qRegisterMetaType<X>("qtprotobuf::"# X);
+                                qRegisterMetaType<X>("QtProtobuf::"# X);
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 
 namespace  {
 

+ 1 - 1
src/protobuf/qtprotobufglobal.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
src/protobuf/qtprotobuflogging.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
src/protobuf/qtprotobuflogging.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 56 - 56
src/protobuf/qtprotobuftypes.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -30,7 +30,7 @@
 
 #include <unordered_map>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 /*!
 *  \addtogroup QtProtobuf
 *  \{
@@ -159,146 +159,146 @@ using sfixed32 = transparent<int32_t, 1>;
 using sfixed64 = transparent<int64_t, 1>;
 
 /*!
- * \brief alias for list of qtprotobuf::int32
+ * \brief alias for list of QtProtobuf::int32
  */
 using int32List = QList<int32>;
 
 /*!
- * \brief alias for list of qtprotobuf::int64
+ * \brief alias for list of QtProtobuf::int64
  */
 using int64List = QList<int64>;
 
 /*!
- * \brief alias for list of qtprotobuf::uint32
+ * \brief alias for list of QtProtobuf::uint32
  */
 using uint32List = QList<uint32>;
 
 /*!
- * \brief alias for list of qtprotobuf::uint64
+ * \brief alias for list of QtProtobuf::uint64
  */
 using uint64List = QList<uint64>;
 
 /*!
- * \brief alias for list of qtprotobuf::sint32
+ * \brief alias for list of QtProtobuf::sint32
  */
 using sint32List = QList<sint32>;
 
 /*!
- * \brief alias for list of qtprotobuf::sint64
+ * \brief alias for list of QtProtobuf::sint64
  */
 using sint64List = QList<sint64>;
 
 /*!
- * \brief alias for list of qtprotobuf::fixed32
+ * \brief alias for list of QtProtobuf::fixed32
  */
 using fixed32List = QList<fixed32>;
 
 /*!
- * \brief alias for list of qtprotobuf::fixed64
+ * \brief alias for list of QtProtobuf::fixed64
  */
 using fixed64List = QList<fixed64>;
 
 /*!
- * \brief alias for list of qtprotobuf::sfixed32
+ * \brief alias for list of QtProtobuf::sfixed32
  */
 using sfixed32List = QList<sfixed32>;
 
 /*!
- * \brief alias for list of qtprotobuf::sfixed64
+ * \brief alias for list of QtProtobuf::sfixed64
  */
 using sfixed64List = QList<sfixed64>;
 
 /*!
- * \brief alias for list of qtprotobuf::float
+ * \brief alias for list of QtProtobuf::float
  */
 using FloatList = QList<float>;
 
 /*!
- * \brief alias for list of qtprotobuf::double
+ * \brief alias for list of QtProtobuf::double
  */
 using DoubleList = QList<double>;
 
 /*! \} */
 }
 
-Q_DECLARE_METATYPE(qtprotobuf::int32)
-Q_DECLARE_METATYPE(qtprotobuf::int64)
-Q_DECLARE_METATYPE(qtprotobuf::sint32)
-Q_DECLARE_METATYPE(qtprotobuf::sint64)
-Q_DECLARE_METATYPE(qtprotobuf::uint32)
-Q_DECLARE_METATYPE(qtprotobuf::uint64)
-Q_DECLARE_METATYPE(qtprotobuf::fixed32)
-Q_DECLARE_METATYPE(qtprotobuf::fixed64)
-Q_DECLARE_METATYPE(qtprotobuf::sfixed32)
-Q_DECLARE_METATYPE(qtprotobuf::sfixed64)
-
-Q_DECLARE_METATYPE(qtprotobuf::int32List)
-Q_DECLARE_METATYPE(qtprotobuf::int64List)
-Q_DECLARE_METATYPE(qtprotobuf::sint32List)
-Q_DECLARE_METATYPE(qtprotobuf::sint64List)
-Q_DECLARE_METATYPE(qtprotobuf::uint32List)
-Q_DECLARE_METATYPE(qtprotobuf::uint64List)
-Q_DECLARE_METATYPE(qtprotobuf::fixed32List)
-Q_DECLARE_METATYPE(qtprotobuf::fixed64List)
-Q_DECLARE_METATYPE(qtprotobuf::sfixed32List)
-Q_DECLARE_METATYPE(qtprotobuf::sfixed64List)
-
-Q_DECLARE_METATYPE(qtprotobuf::FloatList)
-Q_DECLARE_METATYPE(qtprotobuf::DoubleList)
+Q_DECLARE_METATYPE(QtProtobuf::int32)
+Q_DECLARE_METATYPE(QtProtobuf::int64)
+Q_DECLARE_METATYPE(QtProtobuf::sint32)
+Q_DECLARE_METATYPE(QtProtobuf::sint64)
+Q_DECLARE_METATYPE(QtProtobuf::uint32)
+Q_DECLARE_METATYPE(QtProtobuf::uint64)
+Q_DECLARE_METATYPE(QtProtobuf::fixed32)
+Q_DECLARE_METATYPE(QtProtobuf::fixed64)
+Q_DECLARE_METATYPE(QtProtobuf::sfixed32)
+Q_DECLARE_METATYPE(QtProtobuf::sfixed64)
+
+Q_DECLARE_METATYPE(QtProtobuf::int32List)
+Q_DECLARE_METATYPE(QtProtobuf::int64List)
+Q_DECLARE_METATYPE(QtProtobuf::sint32List)
+Q_DECLARE_METATYPE(QtProtobuf::sint64List)
+Q_DECLARE_METATYPE(QtProtobuf::uint32List)
+Q_DECLARE_METATYPE(QtProtobuf::uint64List)
+Q_DECLARE_METATYPE(QtProtobuf::fixed32List)
+Q_DECLARE_METATYPE(QtProtobuf::fixed64List)
+Q_DECLARE_METATYPE(QtProtobuf::sfixed32List)
+Q_DECLARE_METATYPE(QtProtobuf::sfixed64List)
+
+Q_DECLARE_METATYPE(QtProtobuf::FloatList)
+Q_DECLARE_METATYPE(QtProtobuf::DoubleList)
 
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::int32> { typedef typename std::make_unsigned<decltype(qtprotobuf::int32::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::int32> { typedef typename std::make_unsigned<decltype(QtProtobuf::int32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::int64> { typedef typename std::make_unsigned<decltype(qtprotobuf::int64::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::int64> { typedef typename std::make_unsigned<decltype(QtProtobuf::int64::_t)>::type type; };
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::fixed32> { typedef typename std::make_unsigned<decltype(qtprotobuf::fixed32::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::fixed32> { typedef typename std::make_unsigned<decltype(QtProtobuf::fixed32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::fixed64> { typedef typename std::make_unsigned<decltype(qtprotobuf::fixed64::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::fixed64> { typedef typename std::make_unsigned<decltype(QtProtobuf::fixed64::_t)>::type type; };
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::sfixed32> { typedef typename std::make_unsigned<decltype(qtprotobuf::sfixed32::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::sfixed32> { typedef typename std::make_unsigned<decltype(QtProtobuf::sfixed32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_unsigned<qtprotobuf::sfixed64> { typedef typename std::make_unsigned<decltype(qtprotobuf::sfixed64::_t)>::type type; };
+struct std::make_unsigned<QtProtobuf::sfixed64> { typedef typename std::make_unsigned<decltype(QtProtobuf::sfixed64::_t)>::type type; };
 
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::int32> { typedef typename std::make_signed<decltype(qtprotobuf::int32::_t)>::type type; };
+struct std::make_signed<QtProtobuf::int32> { typedef typename std::make_signed<decltype(QtProtobuf::int32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::int64> { typedef typename std::make_signed<decltype(qtprotobuf::int64::_t)>::type type; };
+struct std::make_signed<QtProtobuf::int64> { typedef typename std::make_signed<decltype(QtProtobuf::int64::_t)>::type type; };
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::fixed32> { typedef typename std::make_signed<decltype(qtprotobuf::fixed32::_t)>::type type; };
+struct std::make_signed<QtProtobuf::fixed32> { typedef typename std::make_signed<decltype(QtProtobuf::fixed32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::fixed64> { typedef typename std::make_signed<decltype(qtprotobuf::fixed64::_t)>::type type; };
+struct std::make_signed<QtProtobuf::fixed64> { typedef typename std::make_signed<decltype(QtProtobuf::fixed64::_t)>::type type; };
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::sfixed32> { typedef typename std::make_signed<decltype(qtprotobuf::sfixed32::_t)>::type type; };
+struct std::make_signed<QtProtobuf::sfixed32> { typedef typename std::make_signed<decltype(QtProtobuf::sfixed32::_t)>::type type; };
 //! \private
 template<>
-struct std::make_signed<qtprotobuf::sfixed64> { typedef typename std::make_signed<decltype(qtprotobuf::sfixed64::_t)>::type type; };
+struct std::make_signed<QtProtobuf::sfixed64> { typedef typename std::make_signed<decltype(QtProtobuf::sfixed64::_t)>::type type; };
 
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::int32> : public is_signed<decltype(qtprotobuf::int32::_t)> {};
+struct std::is_signed<QtProtobuf::int32> : public is_signed<decltype(QtProtobuf::int32::_t)> {};
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::int64> : public is_signed<decltype(qtprotobuf::int64::_t)> {};
+struct std::is_signed<QtProtobuf::int64> : public is_signed<decltype(QtProtobuf::int64::_t)> {};
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::fixed32> : public is_signed<decltype(qtprotobuf::fixed32::_t)> {};
+struct std::is_signed<QtProtobuf::fixed32> : public is_signed<decltype(QtProtobuf::fixed32::_t)> {};
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::fixed64> : public is_signed<decltype(qtprotobuf::fixed64::_t)> {};
+struct std::is_signed<QtProtobuf::fixed64> : public is_signed<decltype(QtProtobuf::fixed64::_t)> {};
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::sfixed32> : public is_signed<decltype(qtprotobuf::sfixed32::_t)> {};
+struct std::is_signed<QtProtobuf::sfixed32> : public is_signed<decltype(QtProtobuf::sfixed32::_t)> {};
 //! \private
 template<>
-struct std::is_signed<qtprotobuf::sfixed64> : public is_signed<decltype(qtprotobuf::sfixed64::_t)> {};
+struct std::is_signed<QtProtobuf::sfixed64> : public is_signed<decltype(QtProtobuf::sfixed64::_t)> {};

+ 1 - 1
src/protobuf/quick/qtprotobufquick_global.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
src/protobuf/quick/qtprotobufquickplugin.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 2 - 2
tests/test_grpc/clienttest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -38,7 +38,7 @@
 #include <gtest/gtest.h>
 
 using namespace qtprotobufnamespace::tests;
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 class ClientTest : public ::testing::Test
 {

+ 3 - 3
tests/test_grpc/sslclienttest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -37,7 +37,7 @@
 #include <gtest/gtest.h>
 
 using namespace qtprotobufnamespace::tests;
-using namespace qtprotobuf;
+using namespace QtProtobuf;
 
 class ClientTest : public ::testing::Test
 {
@@ -62,7 +62,7 @@ TEST_F(ClientTest, IncorrectSecureCredentialsTest)
     //  conf.setCaCertificates({QSslCertificate(cert)});
 
     TestServiceClient testClient;
-    testClient.attachChannel(std::make_shared<qtprotobuf::QGrpcHttp2Channel>(QUrl("https://localhost:60051", QUrl::StrictMode), qtprotobuf::SslCredentials(conf)));
+    testClient.attachChannel(std::make_shared<QtProtobuf::QGrpcHttp2Channel>(QUrl("https://localhost:60051", QUrl::StrictMode), QtProtobuf::SslCredentials(conf)));
 
     std::unique_ptr<SimpleStringMessage> result = std::make_unique<SimpleStringMessage>();
     EXPECT_FALSE(testClient.testMethod(SimpleStringMessage{"Hello beach!"}, result.get()));

+ 2 - 2
tests/test_protobuf/converterstest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -28,7 +28,7 @@
 #include <QVariant>
 #include <qtprotobuftypes.h>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace tests {
 
 class CoverterTest : public ::testing::Test

+ 3 - 3
tests/test_protobuf/deserializationtest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -87,8 +87,8 @@
 #include "fieldindextest4message.h"
 
 using namespace qtprotobufnamespace::tests;
-using namespace qtprotobuf::tests;
-using namespace qtprotobuf;
+using namespace QtProtobuf::tests;
+using namespace QtProtobuf;
 
 TEST_F(DeserializationTest, FixedInt32MessageDeserializeTest)
 {

+ 2 - 2
tests/test_protobuf/deserializationtest.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include <gtest/gtest.h>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace tests {
 
 class DeserializationTest : public ::testing::Test

+ 3 - 3
tests/test_protobuf/serializationcomplexmessagemap.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -40,8 +40,8 @@
 #include "simplestringcomplexmessagemapmessage.h"
 
 using namespace qtprotobufnamespace::tests;
-using namespace qtprotobuf::tests;
-using namespace qtprotobuf;
+using namespace QtProtobuf::tests;
+using namespace QtProtobuf;
 
 //Complex map
 TEST_F(SerializationTest, SimpleFixed32ComplexMapSerializeTest)

+ 3 - 3
tests/test_protobuf/serializationtest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -77,8 +77,8 @@
 #include "fieldindextest4message.h"
 
 using namespace qtprotobufnamespace::tests;
-using namespace qtprotobuf::tests;
-using namespace qtprotobuf;
+using namespace QtProtobuf::tests;
+using namespace QtProtobuf;
 
 SerializationTest::SerializationTest()
 {

+ 2 - 2
tests/test_protobuf/serializationtest.h

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -27,7 +27,7 @@
 
 #include <gtest/gtest.h>
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace tests {
 
 class SerializationTest : public ::testing::Test

+ 35 - 35
tests/test_protobuf/simpletest.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>, Viktor Kopp <vifactor@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software
@@ -73,7 +73,7 @@
 
 using namespace qtprotobufnamespace::tests;
 
-namespace qtprotobuf {
+namespace QtProtobuf {
 namespace tests {
 
 class SimpleTest : public ::testing::Test
@@ -110,7 +110,7 @@ TEST_F(SimpleTest, SimpleBoolMessageTest)
 TEST_F(SimpleTest, SimpleIntMessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleIntMessage, int32>(1, "qtprotobuf::int32", propertyName);
+    assertMessagePropertyRegistered<SimpleIntMessage, int32>(1, "QtProtobuf::int32", propertyName);
 
     SimpleIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<int32>(1)));
@@ -121,7 +121,7 @@ TEST_F(SimpleTest, SimpleIntMessageTest)
 TEST_F(SimpleTest, SimpleSIntMessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleSIntMessage, sint32>(1, "qtprotobuf::sint32", propertyName);
+    assertMessagePropertyRegistered<SimpleSIntMessage, sint32>(1, "QtProtobuf::sint32", propertyName);
 
     SimpleSIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sint32>(1)));
@@ -132,7 +132,7 @@ TEST_F(SimpleTest, SimpleSIntMessageTest)
 TEST_F(SimpleTest, SimpleUIntMessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleUIntMessage, uint32>(1, "qtprotobuf::uint32", propertyName);
+    assertMessagePropertyRegistered<SimpleUIntMessage, uint32>(1, "QtProtobuf::uint32", propertyName);
 
     SimpleUIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<uint32>(1)));
@@ -143,7 +143,7 @@ TEST_F(SimpleTest, SimpleUIntMessageTest)
 TEST_F(SimpleTest, SimpleInt64MessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleInt64Message, int64>(1, "qtprotobuf::int64", propertyName);
+    assertMessagePropertyRegistered<SimpleInt64Message, int64>(1, "QtProtobuf::int64", propertyName);
 
     SimpleInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<int64>(1)));
@@ -154,7 +154,7 @@ TEST_F(SimpleTest, SimpleInt64MessageTest)
 TEST_F(SimpleTest, SimpleSInt64MessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleSInt64Message, sint64>(1, "qtprotobuf::sint64", propertyName);
+    assertMessagePropertyRegistered<SimpleSInt64Message, sint64>(1, "QtProtobuf::sint64", propertyName);
 
     SimpleSInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sint64>(1)));
@@ -165,7 +165,7 @@ TEST_F(SimpleTest, SimpleSInt64MessageTest)
 TEST_F(SimpleTest, SimpleUInt64MessageTest)
 {
     const char *propertyName = "testFieldInt";
-    assertMessagePropertyRegistered<SimpleUInt64Message, uint64>(1, "qtprotobuf::uint64", propertyName);
+    assertMessagePropertyRegistered<SimpleUInt64Message, uint64>(1, "QtProtobuf::uint64", propertyName);
 
     SimpleUInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<uint64>(1)));
@@ -176,7 +176,7 @@ TEST_F(SimpleTest, SimpleUInt64MessageTest)
 TEST_F(SimpleTest, SimpleFixedInt32MessageTest)
 {
     const char *propertyName = "testFieldFixedInt32";
-    assertMessagePropertyRegistered<SimpleFixedInt32Message, fixed32>(1, "qtprotobuf::fixed32", propertyName);
+    assertMessagePropertyRegistered<SimpleFixedInt32Message, fixed32>(1, "QtProtobuf::fixed32", propertyName);
 
     SimpleFixedInt32Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<fixed32>(1)));
@@ -187,7 +187,7 @@ TEST_F(SimpleTest, SimpleFixedInt32MessageTest)
 TEST_F(SimpleTest, SimpleFixedInt64MessageTest)
 {
     const char *propertyName = "testFieldFixedInt64";
-    assertMessagePropertyRegistered<SimpleFixedInt64Message, fixed64>(1, "qtprotobuf::fixed64", propertyName);
+    assertMessagePropertyRegistered<SimpleFixedInt64Message, fixed64>(1, "QtProtobuf::fixed64", propertyName);
 
     SimpleFixedInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<fixed64>(1)));
@@ -198,7 +198,7 @@ TEST_F(SimpleTest, SimpleFixedInt64MessageTest)
 TEST_F(SimpleTest, SimpleSFixedInt32MessageTest)
 {
     const char *propertyName = "testFieldFixedInt32";
-    assertMessagePropertyRegistered<SimpleSFixedInt32Message, sfixed32>(1, "qtprotobuf::sfixed32", propertyName);
+    assertMessagePropertyRegistered<SimpleSFixedInt32Message, sfixed32>(1, "QtProtobuf::sfixed32", propertyName);
 
     SimpleSFixedInt32Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sfixed32>(1)));
@@ -209,7 +209,7 @@ TEST_F(SimpleTest, SimpleSFixedInt32MessageTest)
 TEST_F(SimpleTest, SimpleSFixedInt64MessageTest)
 {
     const char *propertyName = "testFieldFixedInt64";
-    assertMessagePropertyRegistered<SimpleSFixedInt64Message, sfixed64>(1, "qtprotobuf::sfixed64", propertyName);
+    assertMessagePropertyRegistered<SimpleSFixedInt64Message, sfixed64>(1, "QtProtobuf::sfixed64", propertyName);
 
     SimpleSFixedInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sfixed64>(1)));
@@ -373,7 +373,7 @@ TEST_F(SimpleTest, SimpleExternalComplexMessageTest)
 {
     const char *propertyName = "localList";
     assertMessagePropertyRegistered<qtprotobufnamespace1::externaltests::SimpleExternalMessage, int32List>(
-                1, "qtprotobuf::int32List", propertyName);
+                1, "QtProtobuf::int32List", propertyName);
 
     qtprotobufnamespace1::externaltests::SimpleExternalMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<int32List>({1, 2, 3, 4, 5})));
@@ -416,7 +416,7 @@ TEST_F(SimpleTest, RepeatedStringMessageTest)
 TEST_F(SimpleTest, RepeatedIntMessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedIntMessage, int32List>(1, "qtprotobuf::int32List", propertyName);
+    assertMessagePropertyRegistered<RepeatedIntMessage, int32List>(1, "QtProtobuf::int32List", propertyName);
 
     RepeatedIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<int32List>({1, 2, 3, 4, 5})));
@@ -433,35 +433,35 @@ TEST_F(SimpleTest, RepeatedIntMessageTest)
 TEST_F(SimpleTest, RepeatedDoubleMessageTest)
 {
     const char *propertyName = "testRepeatedDouble";
-    assertMessagePropertyRegistered<RepeatedDoubleMessage, DoubleList>(1, "qtprotobuf::DoubleList", propertyName);
+    assertMessagePropertyRegistered<RepeatedDoubleMessage, DoubleList>(1, "QtProtobuf::DoubleList", propertyName);
 
     RepeatedDoubleMessage test;
-    ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<qtprotobuf::DoubleList>({1.0, 2.3, 3, 4.7, 5.9})));
-    ASSERT_TRUE(test.property(propertyName).value<qtprotobuf::DoubleList>() == qtprotobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
-    ASSERT_TRUE(test.testRepeatedDouble() == qtprotobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
+    ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<QtProtobuf::DoubleList>({1.0, 2.3, 3, 4.7, 5.9})));
+    ASSERT_TRUE(test.property(propertyName).value<QtProtobuf::DoubleList>() == QtProtobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
+    ASSERT_TRUE(test.testRepeatedDouble() == QtProtobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
 
     test.testRepeatedDouble().append(6.6);
-    ASSERT_TRUE(test.testRepeatedDouble() == qtprotobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9, 6.6}));
+    ASSERT_TRUE(test.testRepeatedDouble() == QtProtobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9, 6.6}));
 
     test.testRepeatedDouble().pop_back();
-    ASSERT_TRUE(test.testRepeatedDouble() == qtprotobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
+    ASSERT_TRUE(test.testRepeatedDouble() == QtProtobuf::DoubleList({1.0, 2.3, 3, 4.7, 5.9}));
 }
 
 TEST_F(SimpleTest, RepeatedFloatMessageTest)
 {
     const char *propertyName = "testRepeatedFloat";
-    assertMessagePropertyRegistered<RepeatedFloatMessage, FloatList>(1, "qtprotobuf::FloatList", propertyName);
+    assertMessagePropertyRegistered<RepeatedFloatMessage, FloatList>(1, "QtProtobuf::FloatList", propertyName);
 
     RepeatedFloatMessage test;
-    ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<qtprotobuf::FloatList>({1.0f, 2.3f, 3, 4.7f, 5.9f})));
-    ASSERT_TRUE(test.property(propertyName).value<qtprotobuf::FloatList>() == qtprotobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
-    ASSERT_TRUE(test.testRepeatedFloat() == qtprotobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
+    ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<QtProtobuf::FloatList>({1.0f, 2.3f, 3, 4.7f, 5.9f})));
+    ASSERT_TRUE(test.property(propertyName).value<QtProtobuf::FloatList>() == QtProtobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
+    ASSERT_TRUE(test.testRepeatedFloat() == QtProtobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
 
     test.testRepeatedFloat().append(6.6f);
-    ASSERT_TRUE(test.testRepeatedFloat() == qtprotobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f, 6.6f}));
+    ASSERT_TRUE(test.testRepeatedFloat() == QtProtobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f, 6.6f}));
 
     test.testRepeatedFloat().pop_back();
-    ASSERT_TRUE(test.testRepeatedFloat() == qtprotobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
+    ASSERT_TRUE(test.testRepeatedFloat() == QtProtobuf::FloatList({1.0f, 2.3f, 3, 4.7f, 5.9f}));
 }
 
 TEST_F(SimpleTest, RepeatedBytesMessageTest)
@@ -490,7 +490,7 @@ TEST_F(SimpleTest, RepeatedBytesMessageTest)
 TEST_F(SimpleTest, RepeatedSIntMessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedSIntMessage, sint32List>(1, "qtprotobuf::sint32List", propertyName);
+    assertMessagePropertyRegistered<RepeatedSIntMessage, sint32List>(1, "QtProtobuf::sint32List", propertyName);
 
     RepeatedSIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sint32List>({1, 2, 3, 4, 5})));
@@ -507,7 +507,7 @@ TEST_F(SimpleTest, RepeatedSIntMessageTest)
 TEST_F(SimpleTest, RepeatedUIntMessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedUIntMessage, uint32List>(1, "qtprotobuf::uint32List", propertyName);
+    assertMessagePropertyRegistered<RepeatedUIntMessage, uint32List>(1, "QtProtobuf::uint32List", propertyName);
 
     RepeatedUIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<uint32List>({1, 2, 3, 4, 5})));
@@ -524,7 +524,7 @@ TEST_F(SimpleTest, RepeatedUIntMessageTest)
 TEST_F(SimpleTest, RepeatedInt64MessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedInt64Message, int64List>(1, "qtprotobuf::int64List", propertyName);
+    assertMessagePropertyRegistered<RepeatedInt64Message, int64List>(1, "QtProtobuf::int64List", propertyName);
 
     RepeatedInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<int64List>({1, 2, 3, 4, 5})));
@@ -541,7 +541,7 @@ TEST_F(SimpleTest, RepeatedInt64MessageTest)
 TEST_F(SimpleTest, RepeatedSInt64MessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedSInt64Message, sint64List>(1, "qtprotobuf::sint64List", propertyName);
+    assertMessagePropertyRegistered<RepeatedSInt64Message, sint64List>(1, "QtProtobuf::sint64List", propertyName);
 
     RepeatedSInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sint64List>({1, 2, 3, 4, 5})));
@@ -558,7 +558,7 @@ TEST_F(SimpleTest, RepeatedSInt64MessageTest)
 TEST_F(SimpleTest, RepeatedUInt64MessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedUInt64Message, uint64List>(1, "qtprotobuf::uint64List", propertyName);
+    assertMessagePropertyRegistered<RepeatedUInt64Message, uint64List>(1, "QtProtobuf::uint64List", propertyName);
 
     RepeatedUInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<uint64List>({1, 2, 3, 4, 5})));
@@ -575,7 +575,7 @@ TEST_F(SimpleTest, RepeatedUInt64MessageTest)
 TEST_F(SimpleTest, RepeatedFixedIntMessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedFixedIntMessage, fixed32List>(1, "qtprotobuf::fixed32List", propertyName);
+    assertMessagePropertyRegistered<RepeatedFixedIntMessage, fixed32List>(1, "QtProtobuf::fixed32List", propertyName);
 
     RepeatedFixedIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<fixed32List>({1, 2, 3, 4, 5})));
@@ -592,7 +592,7 @@ TEST_F(SimpleTest, RepeatedFixedIntMessageTest)
 TEST_F(SimpleTest, RepeatedFixedInt64MessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedFixedInt64Message, fixed64List>(1, "qtprotobuf::fixed64List", propertyName);
+    assertMessagePropertyRegistered<RepeatedFixedInt64Message, fixed64List>(1, "QtProtobuf::fixed64List", propertyName);
 
     RepeatedFixedInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<fixed64List>({1, 2, 3, 4, 5})));
@@ -609,7 +609,7 @@ TEST_F(SimpleTest, RepeatedFixedInt64MessageTest)
 TEST_F(SimpleTest, RepeatedSFixedIntMessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedSFixedIntMessage, sfixed32List>(1, "qtprotobuf::sfixed32List", propertyName);
+    assertMessagePropertyRegistered<RepeatedSFixedIntMessage, sfixed32List>(1, "QtProtobuf::sfixed32List", propertyName);
 
     RepeatedSFixedIntMessage test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sfixed32List>({1, 2, 3, 4, 5})));
@@ -626,7 +626,7 @@ TEST_F(SimpleTest, RepeatedSFixedIntMessageTest)
 TEST_F(SimpleTest, RepeatedSFixedInt64MessageTest)
 {
     const char *propertyName = "testRepeatedInt";
-    assertMessagePropertyRegistered<RepeatedSFixedInt64Message, qtprotobuf::sfixed64List>(1, "qtprotobuf::sfixed64List", propertyName);
+    assertMessagePropertyRegistered<RepeatedSFixedInt64Message, QtProtobuf::sfixed64List>(1, "QtProtobuf::sfixed64List", propertyName);
 
     RepeatedSFixedInt64Message test;
     ASSERT_TRUE(test.setProperty(propertyName, QVariant::fromValue<sfixed64List>({1, 2, 3, 4, 5})));

+ 1 - 1
tests/test_qml/main.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software

+ 1 - 1
tests/test_qml/qml/tst_simple.qml

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2019 Alexey Edelev <semlanik@gmail.com>
  *
- * This file is part of qtprotobuf project https://git.semlanik.org/semlanik/qtprotobuf
+ * This file is part of QtProtobuf project https://git.semlanik.org/semlanik/qtprotobuf
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this
  * software and associated documentation files (the "Software"), to deal in the Software