diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-31 14:52:27 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-08-31 14:52:27 (GMT) |
commit | abe1d57c583f5fa2f45f8c880e0e0c439b8c920e (patch) | |
tree | d85c12608e6b29b49fc472fef206b9bfe014b57b | |
parent | ab861c197c596f78c7aea4f45c0e1252de10fc1f (diff) | |
parent | bf35f16863f067286260ad4b68ec4c0ae7febdf1 (diff) | |
download | Doxygen-abe1d57c583f5fa2f45f8c880e0e0c439b8c920e.zip Doxygen-abe1d57c583f5fa2f45f8c880e0e0c439b8c920e.tar.gz Doxygen-abe1d57c583f5fa2f45f8c880e0e0c439b8c920e.tar.bz2 |
Merge branch 'feature/bug_extension' of https://github.com/albert-github/doxygen into albert-github-feature/bug_extension
Conflicts:
src/util.cpp
-rw-r--r-- | src/config.l | 66 | ||||
-rwxr-xr-x[-rw-r--r--] | src/util.cpp | 21 | ||||
-rwxr-xr-x[-rw-r--r--] | src/util.h | 1 |
3 files changed, 21 insertions, 67 deletions
diff --git a/src/config.l b/src/config.l index 2a16905..26e0283 100644 --- a/src/config.l +++ b/src/config.l @@ -1433,71 +1433,7 @@ void Config::check() } } - // add default pattern if needed - QStrList &filePatternList = Config_getList("FILE_PATTERNS"); - if (filePatternList.isEmpty()) - { - filePatternList.append("*.c"); - filePatternList.append("*.cc"); - filePatternList.append("*.cxx"); - filePatternList.append("*.cpp"); - filePatternList.append("*.c++"); - //filePatternList.append("*.d"); - filePatternList.append("*.java"); - filePatternList.append("*.ii"); - filePatternList.append("*.ixx"); - filePatternList.append("*.ipp"); - filePatternList.append("*.i++"); - filePatternList.append("*.inl"); - filePatternList.append("*.h"); - filePatternList.append("*.hh"); - filePatternList.append("*.hxx"); - filePatternList.append("*.hpp"); - filePatternList.append("*.h++"); - filePatternList.append("*.idl"); - filePatternList.append("*.odl"); - filePatternList.append("*.cs"); - filePatternList.append("*.php"); - filePatternList.append("*.php3"); - filePatternList.append("*.inc"); - filePatternList.append("*.m"); - filePatternList.append("*.mm"); - filePatternList.append("*.dox"); - filePatternList.append("*.py"); - filePatternList.append("*.f90"); - filePatternList.append("*.f"); - filePatternList.append("*.for"); - filePatternList.append("*.vhd"); - filePatternList.append("*.vhdl"); - filePatternList.append("*.tcl"); - filePatternList.append("*.md"); - filePatternList.append("*.markdown"); - if (portable_fileSystemIsCaseSensitive()) - { - // unix => case sensitive match => also include useful uppercase versions - filePatternList.append("*.C"); - filePatternList.append("*.CC"); - filePatternList.append("*.C++"); - filePatternList.append("*.II"); - filePatternList.append("*.I++"); - filePatternList.append("*.H"); - filePatternList.append("*.HH"); - filePatternList.append("*.H++"); - filePatternList.append("*.CS"); - filePatternList.append("*.PHP"); - filePatternList.append("*.PHP3"); - filePatternList.append("*.M"); - filePatternList.append("*.MM"); - filePatternList.append("*.PY"); - filePatternList.append("*.F90"); - filePatternList.append("*.F"); - filePatternList.append("*.VHD"); - filePatternList.append("*.VHDL"); - filePatternList.append("*.TCL"); - filePatternList.append("*.MD"); - filePatternList.append("*.MARKDOWN"); - } - } + initFilePattern(); // add default pattern if needed QStrList &examplePatternList = Config_getList("EXAMPLE_PATTERNS"); diff --git a/src/util.cpp b/src/util.cpp index 946e2af..1a94830 100644..100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -6939,6 +6939,7 @@ bool updateLanguageMapping(const QCString &extension,const QCString &language) void initDefaultExtensionMapping() { + // NOTE: when adding an extension, also add the extension in config.xml g_extLookup.setAutoDelete(TRUE); // extension parser id updateLanguageMapping(".dox", "c"); @@ -8505,5 +8506,21 @@ QCString getDotImageExtension(void) return imgExt; } - - +void initFilePattern(void) +{ + // add default pattern if needed + QStrList &filePatternList = Config_getList("FILE_PATTERNS"); + if (filePatternList.isEmpty()) + { + QDictIterator<int> it( g_extLookup ); + QCString pattern; + bool caseSens = portable_fileSystemIsCaseSensitive(); + for (;it.current();++it) + { + pattern = "*"; + pattern += it.currentKey(); + filePatternList.append(pattern.data()); + if (caseSens) filePatternList.append(pattern.upper().data()); + } + } +} diff --git a/src/util.h b/src/util.h index a1a1bba..acb3e92 100644..100755 --- a/src/util.h +++ b/src/util.h @@ -470,6 +470,7 @@ void convertProtectionLevel( ); bool mainPageHasTitle(); +void initFilePattern(void); #endif |