summaryrefslogtreecommitdiffstats
path: root/src/markdown.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-03-08 22:00:00 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-03-18 20:57:40 (GMT)
commit3204a2206aa617b41c6da5999c3b826057d274f3 (patch)
tree2dc4b6d3df48302889e3b868eaed9ea30d0b2b09 /src/markdown.cpp
parent781c3ec1556b711c74fc0d6ebb343569eb1491ab (diff)
downloadDoxygen-3204a2206aa617b41c6da5999c3b826057d274f3.zip
Doxygen-3204a2206aa617b41c6da5999c3b826057d274f3.tar.gz
Doxygen-3204a2206aa617b41c6da5999c3b826057d274f3.tar.bz2
Refactoring: Replaced QFileInfo with FileInfo
- FileInfo is based on ghc::filesystem, a std::filesystem compatible implementation that does not require C++17.
Diffstat (limited to 'src/markdown.cpp')
-rw-r--r--src/markdown.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/markdown.cpp b/src/markdown.cpp
index eaa9ef7..702f39b 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -32,7 +32,6 @@
*/
#include <stdio.h>
-#include <qfileinfo.h>
#include <unordered_map>
#include <functional>
@@ -50,6 +49,7 @@
#include "message.h"
#include "portable.h"
#include "regex.h"
+#include "fileinfo.h"
#if !defined(NDEBUG)
#define ENABLE_TRACING
@@ -1068,16 +1068,16 @@ int Markdown::processLink(const char *data,int,int size)
m_out.addStr("@ref ");
if (!(Portable::isAbsolutePath(link) || isURL(link)))
{
- QFileInfo forg(link);
+ FileInfo forg(link.str());
if (forg.exists() && forg.isReadable())
{
- link = forg.absFilePath().data();
+ link = forg.absFilePath();
}
else if (!(forg.exists() && forg.isReadable()))
{
- QFileInfo fi(m_fileName);
+ FileInfo fi(m_fileName.str());
QCString mdFile = m_fileName.left(m_fileName.length()-fi.fileName().length()) + link;
- QFileInfo fmd(mdFile);
+ FileInfo fmd(mdFile.str());
if (fmd.exists() && fmd.isReadable())
{
link = fmd.absFilePath().data();
@@ -2739,7 +2739,8 @@ QCString Markdown::process(const QCString &input, int &startNewlines)
QCString markdownFileNameToId(const QCString &fileName)
{
TRACE(fileName.data());
- QCString baseFn = stripFromPath(QFileInfo(fileName).absFilePath().utf8());
+ std::string absFileName = FileInfo(fileName.str()).absFilePath();
+ QCString baseFn = stripFromPath(absFileName.c_str());
int i = baseFn.findRev('.');
if (i!=-1) baseFn = baseFn.left(i);
QCString baseName = baseFn;
@@ -2787,7 +2788,7 @@ void MarkdownOutlineParser::parseInput(const char *fileName,
if (id.startsWith("autotoc_md")) id = "";
int indentLevel=title.isEmpty() ? 0 : -1;
markdown.setIndentLevel(indentLevel);
- QCString fn = QFileInfo(fileName).fileName().utf8();
+ QCString fn = FileInfo(fileName).fileName();
QCString titleFn = stripExtensionGeneral(fn,getFileNameExtension(fn));
QCString mdfileAsMainPage = Config_getString(USE_MDFILE_AS_MAINPAGE);
bool wasEmpty = id.isEmpty();
@@ -2796,8 +2797,8 @@ void MarkdownOutlineParser::parseInput(const char *fileName,
{
if (!mdfileAsMainPage.isEmpty() &&
(fn==mdfileAsMainPage || // name reference
- QFileInfo(fileName).absFilePath()==
- QFileInfo(mdfileAsMainPage).absFilePath()) // file reference with path
+ FileInfo(fileName).absFilePath()==
+ FileInfo(mdfileAsMainPage.str()).absFilePath()) // file reference with path
)
{
docs.prepend("@anchor " + id + "\\ilinebr ");