diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-25 19:21:37 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-25 19:21:37 (GMT) |
commit | 5970cae1c37dc07acb7fd495520e83f20171a821 (patch) | |
tree | 7054df5dad72ff0d1b1a97b2ffe17aa638fa9778 /src/util.cpp | |
parent | b294263f69f56feee519fb95d71e504ea7682c5e (diff) | |
download | Doxygen-5970cae1c37dc07acb7fd495520e83f20171a821.zip Doxygen-5970cae1c37dc07acb7fd495520e83f20171a821.tar.gz Doxygen-5970cae1c37dc07acb7fd495520e83f20171a821.tar.bz2 |
Minor fixes
Avoid code duplication by adding function addHtmlExtensionIfMissing() and
avoid member shadowing by using 'm_' prefix for member variables
Diffstat (limited to 'src/util.cpp')
-rw-r--r-- | src/util.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/util.cpp b/src/util.cpp index d68ff52..abcd910 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -7089,17 +7089,13 @@ bool checkExtension(const char *fName, const char *ext) return (QCString(fName).right(QCString(ext).length())==ext); } -bool hasExtension(const char *fName) +QCString addHtmlExtensionIfMissing(const char *fName) { - return !(QFileInfo(fName).extension(FALSE).isEmpty()); -} -bool hasExtension(QCString fName) -{ - return !(QFileInfo(fName).extension(FALSE).isEmpty()); -} -bool hasExtension(QString fName) -{ - return !(QFileInfo(fName).extension(FALSE).isEmpty()); + if (QFileInfo(fName).extension(FALSE).isEmpty()) + { + return QCString(fName)+Doxygen::htmlFileExtension; + } + return fName; } QCString stripExtensionGeneral(const char *fName, const char *ext) |