Align spaces across project

CMakeLists.txt

@@ -6,7 +6,7 @@ project(QtProtobufProject VERSION ${QTPROTOBUF_PROJECT_VERSION} LANGUAGES CXX)
 include(GNUInstallDirs)
 
 find_package(Qt5 COMPONENTS Core Network Qml REQUIRED)
-if (Qt5Core_VERSION VERSION_LESS "5.12.3")
+if(Qt5Core_VERSION VERSION_LESS "5.12.3")
     # grpc target requires QT version not less than 5.12.3
     # earlier versions Http2DirectAttribute is broken: https://doc.qt.io/qt-5/whatsnew511.html
     #                                                  https://bugreports.qt.io/browse/QTBUG-74765
@@ -36,15 +36,15 @@ set(QTPROTOBUF_EXECUTABLE_INSTALL ${CMAKE_INSTALL_FULL_BINDIR}/${GENERATOR_TARGE
 set(QTPROTOBUF_EXECUTABLE $<TARGET_FILE:${GENERATOR_TARGET}>)
 
 if(UNIX)
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
       # using Clang
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-pessimizing-move -Wno-mismatched-tags -Wno-unused-private-field")
-    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
       # using GCC
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-error=deprecated-declarations")
     endif()
 elseif(WIN32)
-    if (${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
+    if(${CMAKE_CXX_COMPILER_ID} MATCHES "MSVC")
         set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "/WX /W4 /MD")
     else()
         message(WARNING "Only MSVC compilers family are supported for build")
@@ -105,7 +105,7 @@ endif()
 
 if(MAKE_TESTS)
     find_package(GTest)
-    if (NOT GTest_FOUND)
+    if(NOT GTest_FOUND)
         include(cmake/DownloadProject.cmake)
         download_project(PROJ                GTest
             GIT_REPOSITORY      https://github.com/google/googletest.git

examples/addressbookserver/main.cpp

@@ -49,7 +49,7 @@ public:
     ~AddressBookService() = default;
 
     void updateContacts() {
-        for(unsigned int i = 0; i < (m_clients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_clients.size() - 1); i++) {
             m_clients[i]->Write(m_contacts, nullptr);
         }
     }
@@ -86,7 +86,7 @@ public:
     ::grpc::Status makeCall(grpc::ServerContext *, const PhoneNumber *request, CallStatus *response) override
     {
         m_lastPhone = *request;
-        for(unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
             response->set_status(CallStatus::Active);
             PhoneNumber *phoneNumber = new PhoneNumber(*request);
             response->set_allocated_phonenumber(phoneNumber);
@@ -104,7 +104,7 @@ public:
 
         std::cout << "Call ended" << std::endl;
         m_lastCallStatus.set_status(CallStatus::Ended);
-        for(unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
             m_callClients[i]->Write(m_lastCallStatus, nullptr);
         }
 
@@ -112,7 +112,7 @@ public:
 
         std::cout << "Call ended" << std::endl;
         m_lastCallStatus.set_status(CallStatus::Inactive);
-        for(unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_callClients.size() - 1); i++) {
             m_callClients[i]->Write(m_lastCallStatus, nullptr);
         }
         return ::grpc::Status();

examples/simplechat/ChatView.qml

@@ -7,7 +7,7 @@ Rectangle {
     anchors.fill: parent
     color: "#303030"
     onVisibleChanged: {
-        if(visible) {
+        if (visible) {
             _inputField.forceActiveFocus()
         }
     }

examples/simplechat/main.qml

@@ -54,12 +54,12 @@ ApplicationWindow {
                 scEngine.login(_loginField.text, _passwordField.text)
             }
             onVisibleChanged: {
-                if(visible) {
+                if (visible) {
                     _loginField.forceActiveFocus()
                 }
             }
             Component.onCompleted: {
-                if(visible) {
+                if (visible) {
                     _loginField.forceActiveFocus()
                 }
             }

examples/simplechat/simplechatengine.cpp

@@ -54,7 +54,7 @@ public:
 SimpleChatEngine::SimpleChatEngine(QObject *parent) : QObject(parent), m_client(new SimpleChatClient)
   , m_clipBoard(QGuiApplication::clipboard())
 {
-    if(m_clipBoard) {
+    if (m_clipBoard) {
         connect(m_clipBoard, &QClipboard::dataChanged, this, &SimpleChatEngine::clipBoardContentTypeChanged);
     }
 }
@@ -80,7 +80,7 @@ void SimpleChatEngine::login(const QString &name, const QString &password)
 
     m_client->attachChannel(channel);
     m_client->subscribeMessageListUpdates(None());
-    QObject::connect(m_client, &SimpleChatClient::messageListUpdated, this, [this, name](const qtprotobuf::examples::ChatMessages &messages){
+    QObject::connect(m_client, &SimpleChatClient::messageListUpdated, this, [this, name](const qtprotobuf::examples::ChatMessages &messages) {
         if (m_userName != name) {
             m_userName = name;
             userNameChanged();
@@ -97,7 +97,7 @@ void SimpleChatEngine::sendMessage(const QString &content)
 
 qtprotobuf::examples::ChatMessage::ContentType SimpleChatEngine::clipBoardContentType() const
 {
-    if(m_clipBoard != nullptr) {
+    if (m_clipBoard != nullptr) {
         const QMimeData *mime = m_clipBoard->mimeData();
         if (mime != nullptr) {
             if (mime->hasImage() || mime->hasUrls()) {
@@ -112,27 +112,27 @@ qtprotobuf::examples::ChatMessage::ContentType SimpleChatEngine::clipBoardConten
 
 void SimpleChatEngine::sendImageFromClipboard()
 {
-    if(m_clipBoard == nullptr) {
+    if (m_clipBoard == nullptr) {
         return;
     }
 
     QByteArray imgData;
     const QMimeData *mime = m_clipBoard->mimeData();
     if (mime != nullptr) {
-        if(mime->hasImage()) {
+        if (mime->hasImage()) {
             QImage img = mime->imageData().value<QImage>();
             QBuffer buffer(&imgData);
             buffer.open(QIODevice::WriteOnly);
             img.save(&buffer, "PNG");
             buffer.close();
-        } else if(mime->hasUrls()) {
+        } else if (mime->hasUrls()) {
             QUrl imgUrl = mime->urls().first();
             if (!imgUrl.isLocalFile()) {
                 qWarning() << "Only supports transfer of local images";
                 return;
             }
             QImage img(imgUrl.toLocalFile());
-            if(img.isNull()) {
+            if (img.isNull()) {
                 qWarning() << "Invalid image format";
                 return;
             }
@@ -144,7 +144,7 @@ void SimpleChatEngine::sendImageFromClipboard()
         }
     }
 
-    if(imgData.isEmpty()) {
+    if (imgData.isEmpty()) {
         return;
     }
 

examples/simplechatserver/main.cpp

@@ -40,19 +40,19 @@ public:
     void loginUser(MessageListHandler *userHandler);
 
     void updateActiveUsers() {
-        for(unsigned int i = 0; i < (m_activeUserListClients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_activeUserListClients.size() - 1); i++) {
             m_activeUserListClients[i]->Write(m_usersOnline, nullptr);
         }
     }
 
     void updateMessages() {
-        for(unsigned int i = 0; i < (m_activeClients.size() - 1); i++) {
+        for (unsigned int i = 0; i < (m_activeClients.size() - 1); i++) {
             m_activeClients[i]->Write(m_messages, nullptr);
         }
     }
 
     bool checkUserCredentials(const std::string &name, const std::string &password) {
-        for(int i = 0; i < m_usersDatabase.users_size(); i++) {
+        for (int i = 0; i < m_usersDatabase.users_size(); i++) {
             if (m_usersDatabase.users(i).name() == name && m_usersDatabase.users(i).password() == password) {
                 return true;
             }

src/generator/classgeneratorbase.cpp

@@ -149,7 +149,7 @@ std::string ClassGeneratorBase::getTypeName(const FieldDescriptor *field, const
         namespaceTypeName = getNamespacesList(enumType, typeNamespace, mNamespacesColonDelimited);
         EnumVisibility visibility = getEnumVisibility(field, messageFor);
         if (visibility == LOCAL_ENUM) {
-            if(field->is_repeated()) {
+            if (field->is_repeated()) {
                 typeName = typeName.append(mClassName + "::" + enumType->name());
             } else {
                 typeName = typeName.append(enumType->name());

src/generator/protobufclassgenerator.cpp

@@ -193,7 +193,7 @@ void ProtobufClassGenerator::printInclude(const FieldDescriptor *field, std::set
         EnumVisibility enumVisibily = getEnumVisibility(field, mMessage);
         if (enumVisibily == GLOBAL_ENUM) {
             includeTemplate = Templates::GlobalEnumIncludeTemplate;
-        } else if (enumVisibily == NEIGHBOUR_ENUM){
+        } else if (enumVisibily == NEIGHBOUR_ENUM) {
             includeTemplate = Templates::InternalIncludeTemplate;
             std::string fullEnumName = field->enum_type()->full_name();
             std::vector<std::string> fullEnumNameParts;
@@ -330,7 +330,7 @@ void ProtobufClassGenerator::printMaps()
             std::string valueType = getTypeName(field->message_type()->field(1), mMessage);
             const char *mapTemplate = Templates::MapTypeUsingTemplate;
 
-            if(field->message_type()->field(1)->type() == FieldDescriptor::TYPE_MESSAGE) {
+            if (field->message_type()->field(1)->type() == FieldDescriptor::TYPE_MESSAGE) {
                 mapTemplate = Templates::MessageMapTypeUsingTemplate;
             }
 
@@ -424,7 +424,7 @@ void ProtobufClassGenerator::printProperties()
         auto field = mMessage->field(i);
         switch (field->type()) {
         case FieldDescriptor::TYPE_MESSAGE:
-            if(!field->is_map() && !field->is_repeated()) {
+            if (!field->is_map() && !field->is_repeated()) {
                 printField(field, Templates::SetterTemplateMessageType);
             }
             printField(field, Templates::SetterTemplateComplexType);

src/generator/templates.cpp

@@ -86,7 +86,7 @@ const char *Templates::EnumFieldTemplate = "$enumvalue$ = $value$,\n";
 const char *Templates::ProtoConstructorTemplate = "$classname$($parameter_list$QObject *parent = nullptr);\n";
 const char *Templates::ProtoConstructorDefinitionTemplate = "$classname$::$classname$($parameter_list$QObject *parent) : QObject(parent)";
 const char *Templates::ConstructorTemplate = "$classname$();\n";
-const char *Templates::ConstructorHeaderTemplate = "$classname$(){}\n";
+const char *Templates::ConstructorHeaderTemplate = "$classname$() {}\n";
 const char *Templates::CopyConstructorTemplate = "$classname$(const $classname$ &other) : QObject() {\n";
 const char *Templates::MoveConstructorTemplate = "$classname$($classname$ &&other) : QObject() {\n";
 const char *Templates::DeletedCopyConstructorTemplate = "$classname$(const $classname$ &) = delete;\n";
@@ -202,7 +202,7 @@ const char *Templates::ClientMethodDefinitionAsyncTemplate = "\nQtProtobuf::QGrp
 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"
+                                                              "    QObject::connect(reply, &QtProtobuf::QGrpcAsyncReply::finished, context, [reply, callback]() {\n"
                                                               "        callback(reply);\n"
                                                               "    });\n"
                                                               "}\n";

src/grpc/QtGrpcConfig.cmake.in

@@ -4,7 +4,7 @@ include(CMakeFindDependencyMacro)
 
 find_dependency(QtProtobufProject COMPONENTS QtProtobuf REQUIRED CONFIG)
 
-if (NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
+if(NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
     include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
 endif()
 

src/grpc/qabstractgrpcclient.cpp

@@ -77,7 +77,7 @@ QGrpcAsyncReply *QAbstractGrpcClient::call(const QString &method, const QByteArr
             reply->deleteLater();
         });
 
-        connect(reply, &QGrpcAsyncReply::finished, this, [reply](){
+        connect(reply, &QGrpcAsyncReply::finished, this, [reply]() {
             reply->deleteLater();
         });
 

src/grpc/qgrpcasyncreply.h

@@ -103,7 +103,7 @@ signals:
 protected:
     //! \private
     QGrpcAsyncReply(const std::shared_ptr<QAbstractGrpcChannel> &channel, QObject *parent = nullptr) : QObject(parent)
-    , m_channel(channel){}
+    , m_channel(channel) {}
     //! \private
     ~QGrpcAsyncReply();
 

src/grpc/qgrpchttp2channel.cpp

@@ -275,7 +275,7 @@ void QGrpcHttp2Channel::subscribe(const QString &method, const QString &service,
         }
     });
 
-    QObject::connect(client, &QAbstractGrpcClient::destroyed, networkReply, [networkReply, connection, this](){
+    QObject::connect(client, &QAbstractGrpcClient::destroyed, networkReply, [networkReply, connection, this]() {
         d->activeStreamReplies.erase(networkReply);
         QObject::disconnect(connection);
         QGrpcHttp2ChannelPrivate::abortNetworkReply(networkReply);

src/protobuf/QtProtobufConfig.cmake.in

@@ -1,6 +1,6 @@
 include("${CMAKE_CURRENT_LIST_DIR}/ProtobufLookup.cmake")
 
-if (NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
+if(NOT TARGET @TARGET@ AND NOT @TARGET@_BINARY_DIR)
     include("${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT@.cmake")
 endif()
 

src/protobuf/qprotobufselfcheckiterator.h

@@ -41,7 +41,7 @@ class Q_PROTOBUF_EXPORT QProtobufSelfcheckIterator
 public:
     QProtobufSelfcheckIterator(const QByteArray &container) : m_sizeLeft(container.size())
       , m_containerSize(container.size())
-      , m_it(container.begin()){}
+      , m_it(container.begin()) {}
 
     QProtobufSelfcheckIterator(const QProtobufSelfcheckIterator &other) : m_sizeLeft(other.m_sizeLeft)
       , m_containerSize(other.m_containerSize)

src/protobuf/qprotobufserializer.cpp

@@ -167,7 +167,7 @@ void QProtobufSerializer::deserializeMapPair(QVariant &key, QVariant &value, QPr
     QProtobufSelfcheckIterator last = it + count;
     while (it != last) {
         QProtobufSerializerPrivate::decodeHeader(it, mapIndex, type);
-        if(mapIndex == 1) {
+        if (mapIndex == 1) {
             QProtobufSerializerPrivate::deserializeMapField(key, it);
         } else {
             QProtobufSerializerPrivate::deserializeMapField(value, it);

src/protobuf/qprotobufserializer_p.h

@@ -434,7 +434,7 @@ public:
             [s](const QVariant &value, int &fieldIndex) {
                 return s(value.value<T>(), fieldIndex);
             },
-            [d](QProtobufSelfcheckIterator &it, QVariant & value){
+            [d](QProtobufSelfcheckIterator &it, QVariant & value) {
                 value = d(it);
             },
             type

src/protobuf/qqmllistpropertyconstructor.h

@@ -50,7 +50,7 @@ static T * qmllistpropertyAt(QQmlListProperty<T> *p, int index) {
 
 //! \private
 template<typename T>
-static void qmllistpropertyReset(QQmlListProperty<T> *p){
+static void qmllistpropertyReset(QQmlListProperty<T> *p) {
     reinterpret_cast<QList<QSharedPointer<T>> *>(p->data)->clear();
 }
 

src/protobuf/qtprotobuftypes.h

@@ -62,9 +62,9 @@ using QProtobufPropertyOrdering = std::unordered_map<int, int>;
  */
 template<typename T, int = 0>
 struct transparent {
-    transparent(T t = T()) : _t(t){}
+    transparent(T t = T()) : _t(t) {}
     T _t;
-    operator T &(){ return _t; }
+    operator T &() { return _t; }
     operator T() const { return _t; }
     transparent &operator =(const T &t) { _t = t; return *this; }
 

tests/test_grpc/clienttest.cpp

@@ -62,7 +62,7 @@ TEST_F(ClientTest, CheckMethodsGeneration)
     QPointer<SimpleStringMessage> result(new SimpleStringMessage);
     testClient.testMethod(request, result);
     testClient.testMethod(request);
-    testClient.testMethod(request, &testClient, [](QGrpcAsyncReply *){});
+    testClient.testMethod(request, &testClient, [](QGrpcAsyncReply *) {});
     delete result;
 }
 
@@ -131,12 +131,12 @@ TEST_F(ClientTest, StringEchoImmediateAsyncAbortTest)
     });
 
     QAbstractGrpcChannel::StatusCode asyncStatus = QAbstractGrpcChannel::StatusCode::Ok;
-    QObject::connect(reply, &QGrpcAsyncReply::error, reply, [&asyncStatus](QAbstractGrpcChannel::StatusCode code){
+    QObject::connect(reply, &QGrpcAsyncReply::error, reply, [&asyncStatus](QAbstractGrpcChannel::StatusCode code) {
         asyncStatus = code;
     });
 
     QAbstractGrpcChannel::StatusCode clientStatus = QAbstractGrpcChannel::StatusCode::Ok;
-    QObject::connect(&testClient, &TestServiceClient::error, reply, [&clientStatus](QAbstractGrpcChannel::StatusCode code, QString errMsg){
+    QObject::connect(&testClient, &TestServiceClient::error, reply, [&clientStatus](QAbstractGrpcChannel::StatusCode code, QString errMsg) {
         clientStatus = code;
         std::cerr << code << ":" << errMsg.toStdString();
     });
@@ -167,7 +167,7 @@ TEST_F(ClientTest, StringEchoDeferredAsyncAbortTest)
         result = reply->read<SimpleStringMessage>();
         waiter.quit();
     });
-    QObject::connect(reply, &QGrpcAsyncReply::error, reply, [&errorCalled](QAbstractGrpcChannel::StatusCode){
+    QObject::connect(reply, &QGrpcAsyncReply::error, reply, [&errorCalled](QAbstractGrpcChannel::StatusCode) {
         errorCalled = true;
     });
 

tests/test_grpc/echoserver/main.cpp

@@ -12,7 +12,7 @@ public:
     {
         std::cerr << "testMethod called" << std::endl << request->testfieldstring() << std::endl;
         response->set_testfieldstring(request->testfieldstring());
-        if(request->testfieldstring() == "sleep") {
+        if (request->testfieldstring() == "sleep") {
             std::this_thread::sleep_for(std::chrono::seconds(3));
         }
         return ::grpc::Status();

tests/test_grpc/secureechoserver/main.cpp

@@ -14,7 +14,7 @@ public:
     {
         std::cerr << "testMethod called" << std::endl << request->testfieldstring() << std::endl;
         response->set_testfieldstring(request->testfieldstring());
-        if(request->testfieldstring() == "sleep") {
+        if (request->testfieldstring() == "sleep") {
             std::this_thread::sleep_for(std::chrono::seconds(3));
         }
         return ::grpc::Status();