Make internal property read methods protected
parent
9fcfa037e3
commit
1e34b07cf4
|
|
@ -933,6 +933,11 @@ def writeTcpHeaderFile():
|
||||||
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
|
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
|
|
||||||
|
# Protected members
|
||||||
|
writeLine(headerFile, 'protected:')
|
||||||
|
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
|
||||||
|
writeLine(headerFile)
|
||||||
|
|
||||||
# Private members
|
# Private members
|
||||||
writeLine(headerFile, 'private:')
|
writeLine(headerFile, 'private:')
|
||||||
writeLine(headerFile, ' quint16 m_slaveId = 1;')
|
writeLine(headerFile, ' quint16 m_slaveId = 1;')
|
||||||
|
|
@ -944,8 +949,7 @@ def writeTcpHeaderFile():
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
writeLine(headerFile, ' void verifyInitFinished();')
|
writeLine(headerFile, ' void verifyInitFinished();')
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
writeInternalPropertyReadMethodDeclarationsTcp(headerFile, registerJson['registers'])
|
|
||||||
writeLine(headerFile)
|
|
||||||
|
|
||||||
# End of class
|
# End of class
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
|
|
@ -995,7 +999,7 @@ def writeTcpSourceFile():
|
||||||
# Write block update method
|
# Write block update method
|
||||||
writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks'])
|
writeBlockUpdateMethodImplementationsTcp(sourceFile, className, registerJson['blocks'])
|
||||||
|
|
||||||
# Write property read method implementations
|
# Write internal protected property read method implementations
|
||||||
writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
|
writeInternalPropertyReadMethodImplementationsTcp(sourceFile, className, registerJson['registers'])
|
||||||
|
|
||||||
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))
|
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))
|
||||||
|
|
@ -1085,6 +1089,11 @@ def writeRtuHeaderFile():
|
||||||
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
|
writePropertyChangedSignals(headerFile, blockDefinition['registers'])
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
|
|
||||||
|
# Protected members
|
||||||
|
writeLine(headerFile, 'protected:')
|
||||||
|
writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers'])
|
||||||
|
writeLine(headerFile)
|
||||||
|
|
||||||
# Private members
|
# Private members
|
||||||
writeLine(headerFile, 'private:')
|
writeLine(headerFile, 'private:')
|
||||||
writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;')
|
writeLine(headerFile, ' ModbusRtuMaster *m_modbusRtuMaster = nullptr;')
|
||||||
|
|
@ -1098,8 +1107,6 @@ def writeRtuHeaderFile():
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
writeLine(headerFile, ' void verifyInitFinished();')
|
writeLine(headerFile, ' void verifyInitFinished();')
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
writeInternalPropertyReadMethodDeclarationsRtu(headerFile, registerJson['registers'])
|
|
||||||
writeLine(headerFile)
|
|
||||||
|
|
||||||
# End of class
|
# End of class
|
||||||
writeLine(headerFile)
|
writeLine(headerFile)
|
||||||
|
|
@ -1161,7 +1168,7 @@ def writeRtuSourceFile():
|
||||||
# Write block update method
|
# Write block update method
|
||||||
writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks'])
|
writeBlockUpdateMethodImplementationsRtu(sourceFile, className, registerJson['blocks'])
|
||||||
|
|
||||||
# Write property read method implementations
|
# Write internal protected property read method implementations
|
||||||
writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
|
writeInternalPropertyReadMethodImplementationsRtu(sourceFile, className, registerJson['registers'])
|
||||||
|
|
||||||
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))
|
writeLine(sourceFile, 'void %s::verifyInitFinished()' % (className))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue