From 00915e3dc17db0246c2af138ebf199762cf00a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 28 Jan 2022 12:18:16 +0100 Subject: [PATCH] Make properties protected instead of private --- modbus/tools/generate-connection.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/modbus/tools/generate-connection.py b/modbus/tools/generate-connection.py index dda0863..6191388 100644 --- a/modbus/tools/generate-connection.py +++ b/modbus/tools/generate-connection.py @@ -991,22 +991,21 @@ def writeTcpHeaderFile(): writeLine(headerFile, 'protected:') writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers']) writeLine(headerFile) - - # Private members - writeLine(headerFile, 'private:') - writeLine(headerFile, ' quint16 m_slaveId = 1;') - writeLine(headerFile, ' QVector m_pendingInitReplies;') - writeLine(headerFile) writePrivatePropertyMembers(headerFile, registerJson['registers']) if 'blocks' in registerJson: for blockDefinition in registerJson['blocks']: writePrivatePropertyMembers(headerFile, blockDefinition['registers']) writeLine(headerFile) + + # Private members + writeLine(headerFile, 'private:') + writeLine(headerFile, ' quint16 m_slaveId = 1;') + writeLine(headerFile, ' QVector m_pendingInitReplies;') + writeLine(headerFile) writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile) - # End of class writeLine(headerFile) writeLine(headerFile, '};') @@ -1157,18 +1156,18 @@ def writeRtuHeaderFile(): writeLine(headerFile, 'protected:') writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) writeLine(headerFile) + writePrivatePropertyMembers(headerFile, registerJson['registers']) + if 'blocks' in registerJson: + for blockDefinition in registerJson['blocks']: + writePrivatePropertyMembers(headerFile, blockDefinition['registers']) + + writeLine(headerFile) # Private members writeLine(headerFile, 'private:') writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;') writeLine(headerFile, ' quint16 m_slaveId = 1;') writeLine(headerFile, ' QVector m_pendingInitReplies;') - writeLine(headerFile) - writePrivatePropertyMembers(headerFile, registerJson['registers']) - if 'blocks' in registerJson: - for blockDefinition in registerJson['blocks']: - writePrivatePropertyMembers(headerFile, blockDefinition['registers']) - writeLine(headerFile) writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile)