Refactoring: Replaced QFileInfo with FileInfo

- FileInfo is based on ghc::filesystem, a std::filesystem compatible
  implementation that does not require C++17.

Author: doxygen

src/CMakeLists.txt

@@ -256,6 +256,7 @@ add_library(doxymain STATIC
     emoji.cpp
     entry.cpp
     filedef.cpp
+    fileinfo.cpp
     fileparser.cpp
     formula.cpp
     ftvhelp.cpp

src/cite.cpp

@@ -23,9 +23,9 @@
 #include "resourcemgr.h"
 #include "util.h"
 #include "debug.h"
+#include "fileinfo.h"
 
 #include <qfile.h>
-#include <qfileinfo.h>
 #include <qdir.h>
 
 #include <map>
@@ -112,7 +112,7 @@ void CitationManager::insertCrossReferencesForBibFile(const QCString &bibFile)
   {
     return;
   }
-  QFileInfo fi(bibFile);
+  FileInfo fi(bibFile.str());
   if (!fi.exists())
   {
     err("bib file %s not found!\n",bibFile.data());
@@ -287,7 +287,7 @@ void CitationManager::generatePage()
   {
     QCString bibFile = bibdata.c_str();
     if (!bibFile.isEmpty() && bibFile.right(4)!=".bib") bibFile+=".bib";
-    QFileInfo fi(bibFile);
+    FileInfo fi(bibFile.str());
     if (fi.exists())
     {
       if (!bibFile.isEmpty())
@@ -317,55 +317,57 @@ void CitationManager::generatePage()
   QDir::setCurrent(oldDir);
 
   // 6. read back the file
-  f.setName(citeListFile);
-  if (!f.open(IO_ReadOnly))
-  {
-    err("could not open file %s for reading\n",citeListFile.data());
-  }
-
   QCString doc;
-  QFileInfo fi(citeListFile);
-  QCString input(fi.size()+1);
-  f.readBlock(input.rawData(),fi.size());
-  f.close();
-  input.at(fi.size())='\0';
-
-  bool insideBib=FALSE;
-  int pos=0,s;
-  //printf("input=[%s]\n",input.data());
-  while ((s=input.find('\n',pos))!=-1)
   {
-    QCString line = input.mid((uint)pos,(uint)(s-pos));
-    //printf("pos=%d s=%d line=[%s]\n",pos,s,line.data());
-    pos=s+1;
+    f.setName(citeListFile);
+    if (!f.open(IO_ReadOnly))
+    {
+      err("could not open file %s for reading\n",citeListFile.data());
+    }
+
+    FileInfo fi(citeListFile.str());
+    QCString input(fi.size()+1);
+    f.readBlock(input.rawData(),fi.size());
+    f.close();
+    input.at(fi.size())='\0';
 
-    if      (line.find("<!-- BEGIN BIBLIOGRAPHY")!=-1) insideBib=TRUE;
-    else if (line.find("<!-- END BIBLIOGRAPH")!=-1)    insideBib=FALSE;
-    // determine text to use at the location of the @cite command
-    if (insideBib && (i=line.find("name=\"CITEREF_"))!=-1)
+    bool insideBib=FALSE;
+    int pos=0,s;
+    //printf("input=[%s]\n",input.data());
+    while ((s=input.find('\n',pos))!=-1)
     {
-      int j=line.find("\">[");
-      int k=line.find("]</a>");
-      if (j!=-1 && k!=-1)
+      QCString line = input.mid((uint)pos,(uint)(s-pos));
+      //printf("pos=%d s=%d line=[%s]\n",pos,s,line.data());
+      pos=s+1;
+
+      if      (line.find("<!-- BEGIN BIBLIOGRAPHY")!=-1) insideBib=TRUE;
+      else if (line.find("<!-- END BIBLIOGRAPH")!=-1)    insideBib=FALSE;
+      // determine text to use at the location of the @cite command
+      if (insideBib && (i=line.find("name=\"CITEREF_"))!=-1)
       {
-        uint ui=(uint)i;
-        uint uj=(uint)j;
-        uint uk=(uint)k;
-        QCString label = line.mid(ui+14,uj-ui-14);
-        QCString number = line.mid(uj+2,uk-uj-1);
-        label = substitute(substitute(label,"&ndash;","--"),"&mdash;","---");
-        line = line.left(ui+14) + label + line.right(line.length()-uj);
-        auto it = p->entries.find(label.data());
-        //printf("label='%s' number='%s' => %p\n",label.data(),number.data(),it->second.get());
-        if (it!=p->entries.end())
+        int j=line.find("\">[");
+        int k=line.find("]</a>");
+        if (j!=-1 && k!=-1)
         {
-          it->second->setText(number);
+          uint ui=(uint)i;
+          uint uj=(uint)j;
+          uint uk=(uint)k;
+          QCString label = line.mid(ui+14,uj-ui-14);
+          QCString number = line.mid(uj+2,uk-uj-1);
+          label = substitute(substitute(label,"&ndash;","--"),"&mdash;","---");
+          line = line.left(ui+14) + label + line.right(line.length()-uj);
+          auto it = p->entries.find(label.data());
+          //printf("label='%s' number='%s' => %p\n",label.data(),number.data(),it->second.get());
+          if (it!=p->entries.end())
+          {
+            it->second->setText(number);
+          }
         }
       }
+      if (insideBib) doc+=line+"\n";
     }
-    if (insideBib) doc+=line+"\n";
+    //printf("doc=[%s]\n",doc.data());
   }
-  //printf("doc=[%s]\n",doc.data());
 
   // 7. add it as a page
   addRelatedPage(fileName(),theTranslator->trCiteReferences(),doc,fileName(),1,1);
@@ -382,7 +384,7 @@ void CitationManager::generatePage()
       QCString bibFile = bibdata.c_str();
       // Note: file can now have multiple dots
       if (!bibFile.isEmpty() && bibFile.right(4)!=".bib") bibFile+=".bib";
-      fi.setFile(bibFile);
+      FileInfo fi(bibFile.str());
       if (fi.exists())
       {
         if (!bibFile.isEmpty())
@@ -427,7 +429,7 @@ QCString CitationManager::latexBibFiles()
     QCString bibFile = bibdata.c_str();
     // Note: file can now have multiple dots
     if (!bibFile.isEmpty() && bibFile.right(4)!=".bib") bibFile+=".bib";
-    QFileInfo fi(bibFile);
+    FileInfo fi(bibFile.str());
     if (fi.exists())
     {
       if (!bibFile.isEmpty())

src/classdef.cpp

@@ -19,7 +19,6 @@
 #include <algorithm>
 
 #include <qfile.h>
-#include <qfileinfo.h>
 #include "classdef.h"
 #include "classlist.h"
 #include "entry.h"
@@ -50,6 +49,7 @@
 #include "membergroup.h"
 #include "definitionimpl.h"
 #include "symbolresolver.h"
+#include "fileinfo.h"
 
 //-----------------------------------------------------------------------------
 
@@ -1738,10 +1738,10 @@ void ClassDefImpl::writeIncludeFilesForSlice(OutputList &ol) const
       unsigned int length = 0;
       for (const auto &s : paths)
       {
-        QFileInfo info(s.c_str());
+        FileInfo info(s);
         if (info.exists())
         {
-          QCString prefix = info.absFilePath().utf8();
+          QCString prefix = info.absFilePath();
           if (prefix.at(prefix.length() - 1) != '/')
           {
             prefix += '/';

src/configimpl.l

@@ -27,7 +27,6 @@
 #include <stdarg.h>
 #include <errno.h>
 
-#include <qfileinfo.h>
 #include <qdir.h>
 
 #include <thread>
@@ -41,6 +40,7 @@
 
 #include "lang_cfg.h"
 #include "configoptions.h"
+#include "fileinfo.h"
 
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
@@ -766,7 +766,7 @@ static void processList()
 static FILE *tryPath(const char *path,const char *fileName)
 {
   QCString absName=(path ? (QCString)path+"/"+fileName : (QCString)fileName);
-  QFileInfo fi(absName);
+  FileInfo fi(absName.str());
   if (fi.exists() && fi.isFile())
   {
     FILE *f=Portable::fopen(absName,"r");
@@ -1327,7 +1327,7 @@ static QCString configFileToString(const char *name)
   }
   else // read from file
   {
-    QFileInfo fi(name);
+    FileInfo fi(name);
     if (!fi.exists() || !fi.isFile())
     {
       config_err("file '%s' not found\n",name);
@@ -1393,10 +1393,10 @@ static void cleanUpPaths(StringVector &str)
     std::replace(path.begin(),path.end(),'\\','/');
     if ((path[0]!='/' && (path.size()<=2 || path[1]!=':')) || path[path.size()-1]!='/')
     {
-      QFileInfo fi(path.c_str());
+      FileInfo fi(path);
       if (fi.exists() && fi.isDir())
       {
-        path = fi.absFilePath().utf8().str();
+        path = fi.absFilePath();
         if (path[path.size()-1]!='/') path+='/';
       }
     }
@@ -1551,7 +1551,7 @@ void Config::checkAndCorrect()
   QCString headerFile = Config_getString(HTML_HEADER);
   if (!headerFile.isEmpty())
   {
-    QFileInfo fi(headerFile);
+    FileInfo fi(headerFile.str());
     if (!fi.exists())
     {
       config_term("tag HTML_HEADER: header file '%s' "
@@ -1564,7 +1564,7 @@ void Config::checkAndCorrect()
   QCString footerFile = Config_getString(HTML_FOOTER);
   if (!footerFile.isEmpty())
   {
-    QFileInfo fi(footerFile);
+    FileInfo fi(footerFile.str());
     if (!fi.exists())
     {
       config_term("tag HTML_FOOTER: footer file '%s' "
@@ -1579,7 +1579,7 @@ void Config::checkAndCorrect()
     QCString mathJaxCodefile = Config_getString(MATHJAX_CODEFILE);
     if (!mathJaxCodefile.isEmpty())
     {
-      QFileInfo fi(mathJaxCodefile);
+      FileInfo fi(mathJaxCodefile.str());
       if (!fi.exists())
       {
         config_term("tag MATHJAX_CODEFILE file '%s' "
@@ -1599,7 +1599,7 @@ void Config::checkAndCorrect()
   QCString latexHeaderFile = Config_getString(LATEX_HEADER);
   if (!latexHeaderFile.isEmpty())
   {
-    QFileInfo fi(latexHeaderFile);
+    FileInfo fi(latexHeaderFile.str());
     if (!fi.exists())
     {
       config_term("tag LATEX_HEADER: header file '%s' "
@@ -1612,7 +1612,7 @@ void Config::checkAndCorrect()
   QCString latexFooterFile = Config_getString(LATEX_FOOTER);
   if (!latexFooterFile.isEmpty())
   {
-    QFileInfo fi(latexFooterFile);
+    FileInfo fi(latexFooterFile.str());
     if (!fi.exists())
     {
       config_term("tag LATEX_FOOTER: footer file '%s' "
@@ -1625,7 +1625,7 @@ void Config::checkAndCorrect()
   const StringVector &includePath = Config_getList(INCLUDE_PATH);
   for (const auto &s : includePath)
   {
-    QFileInfo fi(s.c_str());
+    FileInfo fi(s);
     if (!fi.exists()) warn_uncond("tag INCLUDE_PATH: include path '%s' "
                           "does not exist\n",s.c_str());
   }
@@ -1774,22 +1774,23 @@ void Config::checkAndCorrect()
   QCString dotPath = Config_getString(DOT_PATH);
   if (!dotPath.isEmpty())
   {
-    QFileInfo fi(dotPath);
+    FileInfo fi(dotPath.str());
     if (fi.exists() && fi.isFile()) // user specified path + exec
     {
-      dotPath=fi.dirPath(TRUE).utf8()+"/";
+      dotPath=fi.dirPath(TRUE)+"/";
     }
     else
     {
-      QFileInfo dp(dotPath+"/dot"+Portable::commandExtension());
+      QCString dotExe = dotPath+"/dot"+Portable::commandExtension();
+      FileInfo dp(dotExe.str());
       if (!dp.exists() || !dp.isFile())
       {
         warn_uncond("the dot tool could not be found at %s\n",dotPath.data());
         dotPath="";
       }
       else
       {
-        dotPath=dp.dirPath(TRUE).utf8()+"/";
+        dotPath=dp.dirPath(TRUE)+"/";
       }
     }
 #if defined(_WIN32) // convert slashes
@@ -1808,13 +1809,14 @@ void Config::checkAndCorrect()
   QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH);
   if (!plantumlJarPath.isEmpty())
   {
-    QFileInfo pu(plantumlJarPath);
+    FileInfo pu(plantumlJarPath.str());
     if (pu.exists() && pu.isDir()) // PLANTUML_JAR_PATH is directory
     {
-      QFileInfo jar(plantumlJarPath+Portable::pathSeparator()+"plantuml.jar");
+      QCString plantumlJar = plantumlJarPath+Portable::pathSeparator()+"plantuml.jar";
+      FileInfo jar(plantumlJar.str());
       if (jar.exists() && jar.isFile())
       {
-        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portable::pathSeparator();
+        plantumlJarPath = jar.dirPath(TRUE)+Portable::pathSeparator();
       }
       else
       {
@@ -1825,7 +1827,7 @@ void Config::checkAndCorrect()
     }
     else if (pu.exists() && pu.isFile() && plantumlJarPath.right(4)==".jar") // PLANTUML_JAR_PATH is file
     {
-      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portable::pathSeparator();
+      plantumlJarPath = pu.dirPath(TRUE)+Portable::pathSeparator();
     }
     else
     {
@@ -1841,15 +1843,16 @@ void Config::checkAndCorrect()
   QCString diaPath = Config_getString(DIA_PATH);
   if (!diaPath.isEmpty())
   {
-    QFileInfo dp(diaPath+"/dia"+Portable::commandExtension());
+    QCString diaExe = diaPath+"/dia"+Portable::commandExtension();
+    FileInfo dp(diaExe.str());
     if (!dp.exists() || !dp.isFile())
     {
       warn_uncond("dia could not be found at %s\n",diaPath.data());
       diaPath="";
     }
     else
     {
-      diaPath=dp.dirPath(TRUE).utf8()+"/";
+      diaPath=dp.dirPath(TRUE)+"/";
 #if defined(_WIN32) // convert slashes
       uint i=0,l=diaPath.length();
       for (i=0;i<l;i++) if (diaPath.at(i)=='/') diaPath.at(i)='\\';
@@ -1874,7 +1877,7 @@ void Config::checkAndCorrect()
   {
     for (const auto &s : inputSources)
     {
-      QFileInfo fi(s.c_str());
+      FileInfo fi(s.c_str());
       if (!fi.exists())
       {
         warn_uncond("tag INPUT: input source '%s' does not exist\n",s.c_str());