From 1e34b07cf4649ea960b8c3dc4ccca10f0a2483dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 28 Jan 2022 10:14:03 +0100 Subject: [PATCH] Make internal property read methods protected --- modbus/tools/generate-connection.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modbus/tools/generate-connection.py b/modbus/tools/generate-connection.py index 9c4e66f..81b7c2d 100644 --- a/modbus/tools/generate-connection.py +++ b/modbus/tools/generate-connection.py @@ -933,6 +933,11 @@ def writeTcpHeaderFile(): writePropertyChangedSignals(headerFile, blockDefinition['registers']) writeLine(headerFile) + # Protected members + writeLine(headerFile, 'protected:') + writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers']) + writeLine(headerFile) + # Private members writeLine(headerFile, 'private:') writeLine(headerFile, ' quint16 m_slaveId = 1;') @@ -944,8 +949,7 @@ def writeTcpHeaderFile(): writeLine(headerFile) writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile) - writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers']) - writeLine(headerFile) + # End of class writeLine(headerFile) @@ -995,7 +999,7 @@ def writeTcpSourceFile(): # Write block update method writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks']) - # Write property read method implementations + # Write internal protected property read method implementations writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers']) writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className)) @@ -1085,6 +1089,11 @@ def writeRtuHeaderFile(): writePropertyChangedSignals(headerFile, blockDefinition['registers']) writeLine(headerFile) + # Protected members + writeLine(headerFile, 'protected:') + writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) + writeLine(headerFile) + # Private members writeLine(headerFile, 'private:') writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;') @@ -1098,8 +1107,6 @@ def writeRtuHeaderFile(): writeLine(headerFile) writeLine(headerFile, ' void verifyInitFinished();') writeLine(headerFile) - writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers']) - writeLine(headerFile) # End of class writeLine(headerFile) @@ -1161,7 +1168,7 @@ def writeRtuSourceFile(): # Write block update method writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks']) - # Write property read method implementations + # Write internal protected property read method implementations writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers']) writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))