Merge pull request #1165 from serval2412/master

Fix some cppcheck reports (part3)
Fix cppcheck reports "Prefer prefix ++/-- operators for non-primitive types"