diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-02-16 09:31:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-21 15:12:52 (GMT) |
| commit | 71c5ae253cb5498da319e36bcf49869509b6603c (patch) | |
| tree | 6264707f70e33fb3e1f90f58a433957f4c169250 /Source/cmQtAutoGenerators.h | |
| parent | 5308f954c9ad13cfc6cc84f1f1255fb5faff48c6 (diff) | |
| download | CMake-71c5ae253cb5498da319e36bcf49869509b6603c.zip CMake-71c5ae253cb5498da319e36bcf49869509b6603c.tar.gz CMake-71c5ae253cb5498da319e36bcf49869509b6603c.tar.bz2 | |
Autogen: Loop based macro detection instead of code duplication
Diffstat (limited to 'Source/cmQtAutoGenerators.h')
| -rw-r--r-- | Source/cmQtAutoGenerators.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h index e6f9160..2842660 100644 --- a/Source/cmQtAutoGenerators.h +++ b/Source/cmQtAutoGenerators.h @@ -10,6 +10,7 @@ #include <map> #include <set> #include <string> +#include <utility> #include <vector> class cmMakefile; @@ -46,7 +47,8 @@ private: bool RunAutogen(); // - Content analysis - bool MocRequired(const std::string& text, std::string& macroName); + bool MocRequired(const std::string& text, + std::string* macroName = CM_NULLPTR); bool MocSkip(const std::string& absFilename) const; bool UicSkip(const std::string& absFilename) const; @@ -160,8 +162,8 @@ private: // - Utility cmFilePathChecksum fpathCheckSum; std::vector<std::string> HeaderExtensions; - cmsys::RegularExpression RegExpQObject; - cmsys::RegularExpression RegExpQGadget; + typedef std::pair<std::string, cmsys::RegularExpression> MacroFilter; + MacroFilter MacroFilters[2]; cmsys::RegularExpression RegExpMocInclude; cmsys::RegularExpression RegExpUicInclude; // - Flags |