This reverts commit fc86b2a9.

def exec_getters_to_h(fstem, th, tc):

    for m in re.finditer(r'\n(\S+) (\w+)::([a-z]\w*)\(\) const\n{\n    (return m_\w+;)\n}\n+', tc):
        rtyp = m.group(1)
        clas = m.group(2)
        fctn = m.group(3)
        code = m.group(4)

        old = r'(\nclass '+clas+r'.*?\n    '+rtyp+' '+fctn+'\(\) const);'
        th2 = re.sub(old, r'\1 { '+code+' }', th, 1, re.DOTALL)
        if th2 != th:
            tc = tc.replace(m.group(0), '')
            th = th2

    return th, tc

tidy/performance-inefficient-vector-operation,performance-unnecessary-copy-initialization,*-move-const-arg