summaryrefslogtreecommitdiffstats
path: root/src/configimpl.l
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-03-11 22:05:13 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-03-18 20:57:40 (GMT)
commit0d05e79d67b5b808918541f429b06805207e8bdb (patch)
tree2ab5bbcc57e494bfef99421e99a84af0eb8d9797 /src/configimpl.l
parent3204a2206aa617b41c6da5999c3b826057d274f3 (diff)
downloadDoxygen-0d05e79d67b5b808918541f429b06805207e8bdb.zip
Doxygen-0d05e79d67b5b808918541f429b06805207e8bdb.tar.gz
Doxygen-0d05e79d67b5b808918541f429b06805207e8bdb.tar.bz2
Refactoring: Replaced QDir with Dir
- Dir is based on ghc::filesystem, a std::filesystem compatible implementation that does not require C++17.
Diffstat (limited to 'src/configimpl.l')
-rw-r--r--src/configimpl.l13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/configimpl.l b/src/configimpl.l
index d237714..2f1aefc 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -27,11 +27,11 @@
#include <stdarg.h>
#include <errno.h>
-#include <qdir.h>
-
#include <thread>
#include <algorithm>
+#include <qfile.h>
+
#include "regex.h"
#include "configimpl.h"
#include "version.h"
@@ -41,6 +41,7 @@
#include "lang_cfg.h"
#include "configoptions.h"
#include "fileinfo.h"
+#include "dir.h"
#define YY_NO_INPUT 1
#define YY_NO_UNISTD_H 1
@@ -1529,10 +1530,8 @@ void Config::checkAndCorrect()
StringVector stripFromPath = Config_getList(STRIP_FROM_PATH);
if (stripFromPath.empty()) // by default use the current path
{
- QString p = QDir::currentDirPath();
- if (p.at(p.length()-1)!='/')
- p.append('/');
- stripFromPath.push_back(p.utf8().str());
+ std::string p = Dir::currentDirPath()+"/";
+ stripFromPath.push_back(p);
}
else
{
@@ -1871,7 +1870,7 @@ void Config::checkAndCorrect()
if (inputSources.empty())
{
// use current dir as the default
- inputSources.push_back(QDir::currentDirPath().utf8().str());
+ inputSources.push_back(Dir::currentDirPath());
}
else
{