Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

includemocs: include MOC file at the earliest possible opportunity if… #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions qt/includemocs/includemocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ def getMocInsertionLocation(filename, content):
match = headerIncludeRegex.search(content)
if match:
return match.end()

# If we did not find #include of a current file, then it would be sufficient to #include a MOC file after all
# includes. This can happen if header file has different name from source file, or path to a header is not relative
# (e.g. /path/to/header.h instead of header.h).
headerIncludeRegex = re.compile(r'#include ".*?\.h"\n')
match = headerIncludeRegex.search(content)
if match:
return match.start()

return 0


Expand Down