From 352ac919116aa49cdae48daa5d6861089ddd6055 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 8 Dec 2019 13:22:52 +0100
Subject: Renamed Portables to Portable

---
 src/cite.cpp       |  6 +++---
 src/config.xml     |  2 +-
 src/configimpl.l   | 16 ++++++++--------
 src/context.cpp    | 34 +++++++++++++++++-----------------
 src/definition.cpp | 16 ++++++++--------
 src/dia.cpp        | 18 +++++++++---------
 src/diagram.cpp    |  8 ++++----
 src/docparser.cpp  | 10 +++++-----
 src/doctokenizer.l |  2 +-
 src/dot.cpp        | 18 +++++++++---------
 src/dotrunner.cpp  | 14 +++++++-------
 src/doxygen.cpp    | 34 +++++++++++++++++-----------------
 src/filedef.cpp    |  4 ++--
 src/formula.cpp    | 32 ++++++++++++++++----------------
 src/htags.cpp      |  6 +++---
 src/message.cpp    |  2 +-
 src/msc.cpp        |  8 ++++----
 src/plantuml.cpp   | 16 ++++++++--------
 src/portable.cpp   | 52 ++++++++++++++++++++++++++--------------------------
 src/portable.h     |  2 +-
 src/pre.l          |  2 +-
 src/util.cpp       |  8 ++++----
 src/vhdldocgen.cpp |  4 ++--
 23 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index 40084b6..797881f 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -235,14 +235,14 @@ void CiteDict::generatePage() const
   // 5. run bib2xhtml perl script on the generated file which will insert the
   //    bibliography in citelist.doc
   int exitCode;
-  Portables::sysTimerStop();
-  if ((exitCode=Portables::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
+  Portable::sysTimerStop();
+  if ((exitCode=Portable::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
                          citeListFile+"\"")) != 0)
   {
     err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n",
         exitCode);
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
 
   QDir::setCurrent(oldDir);
 
diff --git a/src/config.xml b/src/config.xml
index fb0e01a..dfe22e2 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -953,7 +953,7 @@ Go to the <a href="commands.html">next</a> section or return to the
 ]]>
       </docs>
     </option>
-    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portables::fileSystemIsCaseSensitive()'>
+    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portable::fileSystemIsCaseSensitive()'>
       <docs>
 <![CDATA[
  If the \c CASE_SENSE_NAMES tag is set to \c NO then doxygen
diff --git a/src/configimpl.l b/src/configimpl.l
index 0da6e68..6987e59 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -603,7 +603,7 @@ static FILE *tryPath(const char *path,const char *fileName)
   QFileInfo fi(absName);
   if (fi.exists() && fi.isFile())
   {
-    FILE *f=Portables::fopen(absName,"r");
+    FILE *f=Portable::fopen(absName,"r");
     if (!f) config_err("could not open file %s for reading\n",absName.data());
     return f;
   }
@@ -619,7 +619,7 @@ static FILE *findFile(const char *fileName)
   {
     return 0;
   }
-  if (Portables::isAbsolutePath(fileName))
+  if (Portable::isAbsolutePath(fileName))
   {
     return tryPath(NULL, fileName);
   }
@@ -1012,7 +1012,7 @@ static void substEnvVarsInString(QCString &s)
   while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1)
   {
     //printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
-    QCString env=Portables::getenv(s.mid(i+2,l-3));
+    QCString env=Portable::getenv(s.mid(i+2,l-3));
     substEnvVarsInString(env); // recursively expand variables if needed.
     s = s.left(i)+env+s.right(s.length()-i-l);
     p=i+env.length(); // next time start at the end of the expanded string
@@ -1579,7 +1579,7 @@ void Config::checkAndCorrect()
     }
     else
     {
-      QFileInfo dp(dotPath+"/dot"+Portables::commandExtension());
+      QFileInfo dp(dotPath+"/dot"+Portable::commandExtension());
       if (!dp.exists() || !dp.isFile())
       {
 	warn_uncond("the dot tool could not be found at %s\n",dotPath.data());
@@ -1607,10 +1607,10 @@ void Config::checkAndCorrect()
     QFileInfo pu(plantumlJarPath);
     if (pu.exists() && pu.isDir()) // PLANTUML_JAR_PATH is directory
     {
-      QFileInfo jar(plantumlJarPath+Portables::pathSeparator()+"plantuml.jar");
+      QFileInfo jar(plantumlJarPath+Portable::pathSeparator()+"plantuml.jar");
       if (jar.exists() && jar.isFile())
       {
-        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portables::pathSeparator();
+        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portable::pathSeparator();
       }
       else
       {
@@ -1621,7 +1621,7 @@ void Config::checkAndCorrect()
     }
     else if (pu.exists() && pu.isFile() && plantumlJarPath.right(4)==".jar") // PLANTUML_JAR_PATH is file
     {
-      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portables::pathSeparator();
+      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portable::pathSeparator();
     }
     else
     {
@@ -1635,7 +1635,7 @@ void Config::checkAndCorrect()
   QCString &diaPath = Config_getString(DIA_PATH);
   if (!diaPath.isEmpty())
   {
-    QFileInfo dp(diaPath+"/dia"+Portables::commandExtension());
+    QFileInfo dp(diaPath+"/dia"+Portable::commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
       warn_uncond("dia could not be found at %s\n",diaPath.data());
diff --git a/src/context.cpp b/src/context.cpp
index 4c70a19..5ee89cd 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -1987,7 +1987,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2077,7 +2077,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2086,7 +2086,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -3123,7 +3123,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3175,7 +3175,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3184,7 +3184,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3613,7 +3613,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -3625,7 +3625,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -5026,7 +5026,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5035,7 +5035,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5098,7 +5098,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5107,7 +5107,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5368,7 +5368,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -5379,7 +5379,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -8461,7 +8461,7 @@ class InheritanceGraphContext::Private
                           /*GOF_BITMAP,
                           EOF_Html,*/
                           g_globals.outputDir,
-                          g_globals.outputDir+Portables::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
+                          g_globals.outputDir+Portable::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
                           m_id);
       }
       return TemplateVariant(result.data(),TRUE);
diff --git a/src/definition.cpp b/src/definition.cpp
index ee08e93..86f8789 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -744,12 +744,12 @@ class FilterCache
         // file already processed, get the results after filtering from the tmp file
         Debug::print(Debug::FilterOutput,0,"Reusing filter result for %s from %s at offset=%d size=%d\n",
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
-        f = Portables::fopen(Doxygen::filterDBFileName,"rb");
+        f = Portable::fopen(Doxygen::filterDBFileName,"rb");
         if (f)
         {
           bool success=TRUE;
           str.resize(item->fileSize+1);
-          if (Portables::fseek(f,item->filePos,SEEK_SET)==-1)
+          if (Portable::fseek(f,item->filePos,SEEK_SET)==-1)
           {
             err("Failed to seek to position %d in filter database file %s\n",(int)item->filePos,qPrint(Doxygen::filterDBFileName));
             success=FALSE;
@@ -780,8 +780,8 @@ class FilterCache
         // filter file
         QCString cmd=filter+" \""+fileName+"\"";
         Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-        f = Portables::popen(cmd,"r");
-        FILE *bf = Portables::fopen(Doxygen::filterDBFileName,"a+b");
+        f = Portable::popen(cmd,"r");
+        FILE *bf = Portable::fopen(Doxygen::filterDBFileName,"a+b");
         FilterCacheItem *item = new FilterCacheItem;
         item->filePos = m_endPos;
         if (bf==0)
@@ -790,7 +790,7 @@ class FilterCache
           err("Error opening filter database file %s\n",qPrint(Doxygen::filterDBFileName));
           str.addChar('\0');
           delete item;
-          Portables::pclose(f);
+          Portable::pclose(f);
           return FALSE;
         }
         // append the filtered output to the database file
@@ -806,7 +806,7 @@ class FilterCache
                 qPrint(Doxygen::filterDBFileName),bytesWritten,bytesRead);
             str.addChar('\0');
             delete item;
-            Portables::pclose(f);
+            Portable::pclose(f);
             fclose(bf);
             return FALSE;
           }
@@ -821,14 +821,14 @@ class FilterCache
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
         // update end of file position
         m_endPos += size;
-        Portables::pclose(f);
+        Portable::pclose(f);
         fclose(bf);
       }
       else // no filtering
       {
         // normal file
         //printf("getFileContents(%s): no filter\n",qPrint(fileName));
-        f = Portables::fopen(fileName,"r");
+        f = Portable::fopen(fileName,"r");
         while (!feof(f))
         {
           int bytesRead = fread(buf,1,blockSize,f);
diff --git a/src/dia.cpp b/src/dia.cpp
index 39ba2f8..4a00a17 100644
--- a/src/dia.cpp
+++ b/src/dia.cpp
@@ -29,7 +29,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,DiaOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=Portables::pathSeparator();
+  absOutFile+=Portable::pathSeparator();
   absOutFile+=outFile;
 
   // chdir to the output dir, so dot can find the font file.
@@ -37,7 +37,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
   // go to the html output directory (i.e. path)
   QDir::setCurrent(outDir);
   //printf("Going to dir %s\n",QDir::currentDirPath().data());
-  QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portables::commandExtension();
+  QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portable::commandExtension();
   QCString diaArgs;
   QCString extension;
   diaArgs+="-n ";
@@ -62,26 +62,26 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
 
   int exitCode;
   //printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile);
-  Portables::sysTimerStart();
-  if ((exitCode=Portables::system(diaExe,diaArgs,FALSE))!=0)
+  Portable::sysTimerStart();
+  if ((exitCode=Portable::system(diaExe,diaArgs,FALSE))!=0)
   {
     err("Problems running %s. Check your installation or look typos in you dia file %s\n",
         diaExe.data(),inFile);
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     goto error;
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) )
   {
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          outFile,outFile);
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 
 error:
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 09e74c7..e8dc83a 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1338,14 +1338,14 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                    epsBaseName.data(),epsBaseName.data());
     //printf("Converting eps using '%s'\n",epstopdfArgs.data());
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
        err("Problems running epstopdf. Check your TeX installation!\n");
-       Portables::sysTimerStop();
+       Portable::sysTimerStop();
        return;
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 }
 
diff --git a/src/docparser.cpp b/src/docparser.cpp
index cd71937..1e43993 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -369,12 +369,12 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type, bool
       epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"",
                            outputDir.data(), baseName.data(),
 			   outputDir.data(), baseName.data());
-      Portables::sysTimerStart();
-      if (Portables::system("epstopdf",epstopdfArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("epstopdf",epstopdfArgs)!=0)
       {
 	err("Problems running epstopdf. Check your TeX installation!\n");
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       return baseName;
     }
   }
@@ -1818,7 +1818,7 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children,
 
 static void readTextFileByName(const QCString &file,QCString &text)
 {
-  if (Portables::isAbsolutePath(file.data()))
+  if (Portable::isAbsolutePath(file.data()))
   {
     QFileInfo fi(file);
     if (fi.exists())
@@ -1831,7 +1831,7 @@ static void readTextFileByName(const QCString &file,QCString &text)
   char *s=examplePathList.first();
   while (s)
   {
-    QCString absFileName = QCString(s)+Portables::pathSeparator()+file;
+    QCString absFileName = QCString(s)+Portable::pathSeparator()+file;
     QFileInfo fi(absFileName);
     if (fi.exists())
     {
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index a320bc6..c45bc9e 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -674,7 +674,7 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 <St_Para,St_HtmlOnly,St_ManOnly,St_LatexOnly,St_RtfOnly,St_XmlOnly,St_DbOnly>"$("{ID}"("{ID}"))"   { /* environment variable */
                          QCString name = &yytext[2];
 			 name = name.left(name.length()-1);
-			 QCString value = Portables::getenv(name);
+			 QCString value = Portable::getenv(name);
 			 for (int i=value.length()-1;i>=0;i--) unput(value.at(i));
                        }
 <St_Para>{HTMLTAG}     { /* html tag */ 
diff --git a/src/dot.cpp b/src/dot.cpp
index 124870c..4e4c4bc 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -38,12 +38,12 @@ static QCString g_dotFontPath;
 static void setDotFontPath(const char *path)
 {
   ASSERT(g_dotFontPath.isEmpty());
-  g_dotFontPath = Portables::getenv("DOTFONTPATH");
+  g_dotFontPath = Portable::getenv("DOTFONTPATH");
   QCString newFontPath = Config_getString(DOT_FONTPATH);
   QCString spath = path;
   if (!newFontPath.isEmpty() && !spath.isEmpty())
   {
-    newFontPath.prepend(spath+Portables::pathListSeparator());
+    newFontPath.prepend(spath+Portable::pathListSeparator());
   }
   else if (newFontPath.isEmpty() && !spath.isEmpty())
   {
@@ -51,21 +51,21 @@ static void setDotFontPath(const char *path)
   }
   else
   {
-    Portables::unsetenv("DOTFONTPATH");
+    Portable::unsetenv("DOTFONTPATH");
     return;
   }
-  Portables::setenv("DOTFONTPATH",newFontPath);
+  Portable::setenv("DOTFONTPATH",newFontPath);
 }
 
 static void unsetDotFontPath()
 {
   if (g_dotFontPath.isEmpty())
   {
-    Portables::unsetenv("DOTFONTPATH");
+    Portable::unsetenv("DOTFONTPATH");
   }
   else
   {
-    Portables::setenv("DOTFONTPATH",g_dotFontPath);
+    Portable::setenv("DOTFONTPATH",g_dotFontPath);
   }
   g_dotFontPath="";
 }
@@ -183,7 +183,7 @@ bool DotManager::run() const
     setDotFontPath(Config_getString(DOCBOOK_OUTPUT));
     setPath=TRUE;
   }
-  Portables::sysTimerStart();
+  Portable::sysTimerStart();
   // fill work queue with dot operations
   DotRunner *dr;
   int prev=1;
@@ -211,7 +211,7 @@ bool DotManager::run() const
         msg("Running dot for graph %d/%d\n",prev,numDotRuns);
         prev++;
       }
-      Portables::sleep(100);
+      Portable::sleep(100);
     }
     while ((int)numDotRuns>=prev)
     {
@@ -229,7 +229,7 @@ bool DotManager::run() const
       m_workers.at(i)->wait();
     }
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   if (setPath)
   {
     unsetDotFontPath();
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp
index 07a5d3f..fbfeaca 100644
--- a/src/dotrunner.cpp
+++ b/src/dotrunner.cpp
@@ -34,7 +34,7 @@
 // support the PNG format, we need to check the result.
 static void checkPngResult(const char *imgName)
 {
-  FILE *f = Portables::fopen(imgName,"rb");
+  FILE *f = Portable::fopen(imgName,"rb");
   if (f)
   {
     char data[4];
@@ -115,7 +115,7 @@ bool DotRunner::readBoundingBox(const char *fileName,int *width,int *height,bool
 {
   const char *bb = isEps ? "%%PageBoundingBox:" : "/MediaBox [";
   int bblen = strlen(bb);
-  FILE *f = Portables::fopen(fileName,"rb");
+  FILE *f = Portable::fopen(fileName,"rb");
   if (!f) 
   {
     //printf("readBoundingBox: could not open %s\n",fileName);
@@ -191,14 +191,14 @@ bool DotRunner::run()
       dotArgs+=' ';
       dotArgs+=s->args.data();
     }
-    if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+    if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
   }
   else
   {
     for (li.toFirst();(s=li.current());++li)
     {
       dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-      if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+      if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
     }
   }
 
@@ -214,7 +214,7 @@ bool DotRunner::run()
       {
         if (!resetPDFSize(width,height,getBaseNameOfOutput(s->output.data()))) goto error;
         dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-        if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+        if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
       }
     }
 
@@ -228,14 +228,14 @@ bool DotRunner::run()
   if (m_cleanUp) 
   {
     //printf("removing dot file %s\n",m_file.data());
-    Portables::unlink(m_file.data());
+    Portable::unlink(m_file.data());
   }
 
   // create checksum file
   if (!m_md5Hash.isEmpty()) 
   {
     QCString md5Name = getBaseNameOfOutput(m_file.data()) + ".md5";
-    FILE *f = Portables::fopen(md5Name,"w");
+    FILE *f = Portable::fopen(md5Name,"w");
     if (f)
     {
       fwrite(m_md5Hash.data(),1,32,f); 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 30885f5..4c489d2 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10086,13 +10086,13 @@ class NullOutlineParser : public OutlineParserInterface
 void initDoxygen()
 {
   initResources();
-  const char *lang = Portables::getenv("LC_ALL");
-  if (lang) Portables::setenv("LANG",lang);
+  const char *lang = Portable::getenv("LC_ALL");
+  if (lang) Portable::setenv("LANG",lang);
   setlocale(LC_ALL,"");
   setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8
   setlocale(LC_NUMERIC,"C");
 
-  Portables::correct_path();
+  Portable::correct_path();
 
   Doxygen::runningTime.start();
   Doxygen::preprocessor = new Preprocessor();
@@ -11128,7 +11128,7 @@ void parseInput()
   signal(SIGINT, stopDoxygen);
 #endif
 
-  uint pid = Portables::pid();
+  uint pid = Portable::pid();
   Doxygen::objDBFileName.sprintf("doxygen_objdb_%d.tmp",pid);
   Doxygen::objDBFileName.prepend(outputDirectory+"/");
   Doxygen::entryDBFileName.sprintf("doxygen_entrydb_%d.tmp",pid);
@@ -11188,18 +11188,18 @@ void parseInput()
     QCString curFontPath = Config_getString(DOT_FONTPATH);
     if (curFontPath.isEmpty())
     {
-      Portables::getenv("DOTFONTPATH");
+      Portable::getenv("DOTFONTPATH");
       QCString newFontPath = ".";
       if (!curFontPath.isEmpty())
       {
-        newFontPath+=Portables::pathListSeparator();
+        newFontPath+=Portable::pathListSeparator();
         newFontPath+=curFontPath;
       }
-      Portables::setenv("DOTFONTPATH",newFontPath);
+      Portable::setenv("DOTFONTPATH",newFontPath);
     }
     else
     {
-      Portables::setenv("DOTFONTPATH",curFontPath);
+      Portable::setenv("DOTFONTPATH",curFontPath);
     }
   }
 
@@ -11824,7 +11824,7 @@ void generateOutput()
       {
         searchDataFile="searchdata.xml";
       }
-      if (!Portables::isAbsolutePath(searchDataFile))
+      if (!Portable::isAbsolutePath(searchDataFile))
       {
         searchDataFile.prepend(Config_getString(OUTPUT_DIRECTORY)+"/");
       }
@@ -11886,13 +11886,13 @@ void generateOutput()
     g_s.begin("Running html help compiler...\n");
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    Portables::setShortDir();
-    Portables::sysTimerStart();
-    if (Portables::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
+    Portable::setShortDir();
+    Portable::sysTimerStart();
+    if (Portable::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
     {
       err("failed to run html help compiler on index.hhp\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11907,12 +11907,12 @@ void generateOutput()
     QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data());
     QString const oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    Portables::sysTimerStart();
-    if (Portables::system(Config_getString(QHG_LOCATION), args.data(), FALSE))
+    Portable::sysTimerStart();
+    if (Portable::system(Config_getString(QHG_LOCATION), args.data(), FALSE))
     {
       err("failed to run qhelpgenerator on index.qhp\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11933,7 +11933,7 @@ void generateOutput()
   {
     msg("Total elapsed time: %.3f seconds\n(of which %.3f seconds waiting for external tools to finish)\n",
          ((double)Doxygen::runningTime.elapsed())/1000.0,
-         Portables::getSysElapsedTime()
+         Portable::getSysElapsedTime()
         );
     g_s.print();
   }
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 01cadb2..e028bab 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -2015,7 +2015,7 @@ void FileDefImpl::acquireFileVersion()
     msg("Version of %s : ",m_filePath.data());
     QCString cmd = vercmd+" \""+m_filePath+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=Portables::popen(cmd,"r");
+    FILE *f=Portable::popen(cmd,"r");
     if (!f)
     {
       err("could not execute %s\n",vercmd.data());
@@ -2024,7 +2024,7 @@ void FileDefImpl::acquireFileVersion()
     const int bufSize=1024;
     char buf[bufSize];
     int numRead = (int)fread(buf,1,bufSize-1,f);
-    Portables::pclose(f);
+    Portable::pclose(f);
     if (numRead>0 && numRead<bufSize)
     {
       buf[numRead]='\0';
diff --git a/src/formula.cpp b/src/formula.cpp
index 9224c56..c884eba 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -100,15 +100,15 @@ void FormulaList::generateBitmaps(const char *path)
     //printf("Running latex...\n");
     //system("latex _formulas.tex </dev/null >/dev/null");
     QCString latexCmd = "latex";
-    Portables::sysTimerStart();
-    if (Portables::system(latexCmd,"_formulas.tex")!=0)
+    Portable::sysTimerStart();
+    if (Portable::system(latexCmd,"_formulas.tex")!=0)
     {
       err("Problems running latex. Check your installation or look "
           "for typos in _formulas.tex and check _formulas.log!\n");
       formulaError=TRUE;
       //return;
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     //printf("Running dvips...\n");
     QListIterator<int> pli(pagesToGenerate);
     int *pagePtr;
@@ -125,27 +125,27 @@ void FormulaList::generateBitmaps(const char *path)
       // postscript file.
       sprintf(dviArgs,"-q -D 600 -n 1 -p %d -o %s_tmp.ps _formulas.dvi",
           pageIndex,formBase.data());
-      Portables::sysTimerStart();
-      if (Portables::system("dvips",dviArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("dvips",dviArgs)!=0)
       {
         err("Problems running dvips. Check your installation!\n");
-        Portables::sysTimerStop();
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       // run ps2epsi to convert to an encapsulated postscript file with
       // boundingbox (dvips with -E has some problems here).
       sprintf(psArgs,"%s_tmp.ps %s.eps",formBase.data(),formBase.data()); 
-      Portables::sysTimerStart();
-      if (Portables::system("ps2epsi",psArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("ps2epsi",psArgs)!=0)
       {
         err("Problems running ps2epsi. Check your installation!\n");
-        Portables::sysTimerStop();
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       // now we read the generated postscript file to extract the bounding box
       QFileInfo fi(formBase+".eps");
       if (fi.exists())
@@ -198,15 +198,15 @@ void FormulaList::generateBitmaps(const char *path)
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
                     formBase.data(),formBase.data()
              );
-      Portables::sysTimerStart();
-      if (Portables::system(Portables::ghostScriptCommand(),gsArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system(Portable::ghostScriptCommand(),gsArgs)!=0)
       {
-        err("Problem running ghostscript %s %s. Check your installation!\n",Portables::ghostScriptCommand(),gsArgs);
-        Portables::sysTimerStop();
+        err("Problem running ghostscript %s %s. Check your installation!\n",Portable::ghostScriptCommand(),gsArgs);
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       f.setName(formBase+".pnm");
       uint imageX=0,imageY=0;
       // we read the generated image again, to obtain the pixel data.
diff --git a/src/htags.cpp b/src/htags.cpp
index 56840e0..1a240b1 100644
--- a/src/htags.cpp
+++ b/src/htags.cpp
@@ -89,13 +89,13 @@ bool Htags::execute(const QCString &htmldir)
   QCString oldDir = QDir::currentDirPath().utf8();
   QDir::setCurrent(g_inputDir.absPath());
   //printf("CommandLine=[%s]\n",commandLine.data());
-  Portables::sysTimerStart();
-  bool result=Portables::system("htags",commandLine,FALSE)==0;
+  Portable::sysTimerStart();
+  bool result=Portable::system("htags",commandLine,FALSE)==0;
   if (!result)
   {
     err("Problems running %s. Check your installation\n", "htags");
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   QDir::setCurrent(oldDir);
   return result;
 }
diff --git a/src/message.cpp b/src/message.cpp
index 283ddfd..591267d 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -90,7 +90,7 @@ void initWarningFormat()
 
   if (!Config_getString(WARN_LOGFILE).isEmpty())
   {
-    warnFile = Portables::fopen(Config_getString(WARN_LOGFILE),"w");
+    warnFile = Portable::fopen(Config_getString(WARN_LOGFILE),"w");
   }
   if (!warnFile) // point it to something valid, because warn() relies on it
   {
diff --git a/src/msc.cpp b/src/msc.cpp
index 9b80c53..29c9334 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -95,7 +95,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,MscOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=Portables::pathSeparator();
+  absOutFile+=Portable::pathSeparator();
   absOutFile+=outFile;
 
   mscgen_format_t msc_format;
@@ -130,12 +130,12 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          absOutFile.data(),absOutFile.data());
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 
   Doxygen::indexList->addImageFile(imgName);
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index bad89e3..fa50f2d 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -210,7 +210,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
   }
   while (s)
   {
-    pumlArgs += Portables::pathListSeparator();
+    pumlArgs += Portable::pathListSeparator();
     pumlArgs += s;
     s = pumlIncludePathList.next(); 
   }
@@ -227,7 +227,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
     pumlArgs += "-graphvizdot \"";
     pumlArgs += dotPath;
     pumlArgs += "dot";
-    pumlArgs += Portables::commandExtension();
+    pumlArgs += Portable::commandExtension();
     pumlArgs += "\" ";
   }
   switch (format)
@@ -283,8 +283,8 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
       file.close();
       Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlContent",qPrint(pumlArguments));
 
-      Portables::sysTimerStart();
-      if ((exitCode=Portables::system(pumlExe,pumlArguments,TRUE))!=0)
+      Portable::sysTimerStart();
+      if ((exitCode=Portable::system(pumlExe,pumlArguments,TRUE))!=0)
       {
         err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
             plantumlJarPath.data(),exitCode);
@@ -294,7 +294,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
         Debug::print(Debug::Plantuml,0,"*** %s Remove %s file\n","PlantumlManager::runPlantumlContent",qPrint(puFileName));
         file.remove();
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
 
       if ( (format==PlantumlManager::PUML_EPS) && (Config_getBool(USE_PDFLATEX)) )
       {
@@ -309,12 +309,12 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
             const int maxCmdLine = 40960;
             QCString epstopdfArgs(maxCmdLine);
             epstopdfArgs.sprintf("\"%s%s.eps\" --outfile=\"%s%s.pdf\"",qPrint(pumlOutDir),qPrint(*nb),qPrint(pumlOutDir),qPrint(*nb));
-            Portables::sysTimerStart();
-            if ((exitCode=Portables::system("epstopdf",epstopdfArgs))!=0)
+            Portable::sysTimerStart();
+            if ((exitCode=Portable::system("epstopdf",epstopdfArgs))!=0)
             {
               err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode);
             }
-            Portables::sysTimerStop();
+            Portable::sysTimerStop();
           }
         }
       }
diff --git a/src/portable.cpp b/src/portable.cpp
index 99e54fd..1134351 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -37,7 +37,7 @@ static double  g_sysElapsedTime;
 static QTime   g_time;
 
 
-int Portables::system(const char *command,const char *args,bool commandHasConsole)
+int Portable::system(const char *command,const char *args,bool commandHasConsole)
 {
 
   if (command==0) return 1;
@@ -196,7 +196,7 @@ int Portables::system(const char *command,const char *args,bool commandHasConsol
 
 }
 
-unsigned int Portables::pid(void)
+unsigned int Portable::pid(void)
 {
   unsigned int pid;
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -240,7 +240,7 @@ void loadEnvironment()
 }
 #endif
 
-void Portables::setenv(const char *name,const char *value)
+void Portable::setenv(const char *name,const char *value)
 {
     if (value==0) value="";
 #if defined(_WIN32) && !defined(__CYGWIN__)
@@ -255,7 +255,7 @@ void Portables::setenv(const char *name,const char *value)
 #endif
 }
 
-void Portables::unsetenv(const char *variable)
+void Portable::unsetenv(const char *variable)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     SetEnvironmentVariable(variable,0);
@@ -276,7 +276,7 @@ void Portables::unsetenv(const char *variable)
 #endif
 }
 
-const char *Portables::getenv(const char *variable)
+const char *Portable::getenv(const char *variable)
 {  
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return ::getenv(variable);
@@ -297,7 +297,7 @@ const char *Portables::getenv(const char *variable)
 #endif
 }
 
-portable_off_t Portables::fseek(FILE *f,portable_off_t offset, int whence)
+portable_off_t Portable::fseek(FILE *f,portable_off_t offset, int whence)
 {
 #if defined(__MINGW32__)
   return fseeko64(f,offset,whence);
@@ -308,7 +308,7 @@ portable_off_t Portables::fseek(FILE *f,portable_off_t offset, int whence)
 #endif
 }
 
-portable_off_t Portables::ftell(FILE *f)
+portable_off_t Portable::ftell(FILE *f)
 {
 #if defined(__MINGW32__)
   return ftello64(f);  
@@ -319,7 +319,7 @@ portable_off_t Portables::ftell(FILE *f)
 #endif
 }
 
-FILE *Portables::fopen(const char *fileName,const char *mode)
+FILE *Portable::fopen(const char *fileName,const char *mode)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   QString fn(fileName);
@@ -330,7 +330,7 @@ FILE *Portables::fopen(const char *fileName,const char *mode)
 #endif
 }
 
-char  Portables::pathSeparator(void)
+char  Portable::pathSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return '\\';
@@ -339,7 +339,7 @@ char  Portables::pathSeparator(void)
 #endif
 }
 
-char  Portables::pathListSeparator(void)
+char  Portable::pathListSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return ';';
@@ -348,7 +348,7 @@ char  Portables::pathListSeparator(void)
 #endif
 }
 
-const char *Portables::ghostScriptCommand(void)
+const char *Portable::ghostScriptCommand(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return "gswin32c.exe";
@@ -357,7 +357,7 @@ const char *Portables::ghostScriptCommand(void)
 #endif
 }
 
-const char *Portables::commandExtension(void)
+const char *Portable::commandExtension(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return ".exe";
@@ -366,7 +366,7 @@ const char *Portables::commandExtension(void)
 #endif
 }
 
-bool Portables::fileSystemIsCaseSensitive(void)
+bool Portable::fileSystemIsCaseSensitive(void)
 {
 #if defined(_WIN32) || defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__) || defined(__CYGWIN__)
   return FALSE;
@@ -375,7 +375,7 @@ bool Portables::fileSystemIsCaseSensitive(void)
 #endif
 }
 
-FILE * Portables::popen(const char *name,const char *type)
+FILE * Portable::popen(const char *name,const char *type)
 {
   #if defined(_MSC_VER) || defined(__BORLANDC__)
   return ::_popen(name,type);
@@ -384,7 +384,7 @@ FILE * Portables::popen(const char *name,const char *type)
   #endif
 }
 
-int Portables::pclose(FILE *stream)
+int Portable::pclose(FILE *stream)
 {
   #if defined(_MSC_VER) || defined(__BORLANDC__)
   return ::_pclose(stream);
@@ -393,22 +393,22 @@ int Portables::pclose(FILE *stream)
   #endif
 }
 
-void Portables::sysTimerStart(void)
+void Portable::sysTimerStart(void)
 {
   g_time.start();
 }
 
-void Portables::sysTimerStop(void)
+void Portable::sysTimerStop(void)
 {
   g_sysElapsedTime+=((double)g_time.elapsed())/1000.0;
 }
 
-double Portables::getSysElapsedTime(void)
+double Portable::getSysElapsedTime(void)
 {
   return g_sysElapsedTime;
 }
 
-void Portables::sleep(int ms)
+void Portable::sleep(int ms)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   Sleep(ms);
@@ -417,7 +417,7 @@ void Portables::sleep(int ms)
 #endif
 }
 
-bool Portables::isAbsolutePath(const char *fileName)
+bool Portable::isAbsolutePath(const char *fileName)
 {
 # ifdef _WIN32
   if (isalpha (fileName [0]) && fileName[1] == ':')
@@ -439,17 +439,17 @@ bool Portables::isAbsolutePath(const char *fileName)
  *
  * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slashes.
  */
-void Portables::correct_path(void)
+void Portable::correct_path(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  const char *p = Portables::getenv("PATH");
+  const char *p = Portable::getenv("PATH");
   if (!p) return; // no path nothing to correct
   QCString result = substitute(p,'/','\\');
-  if (result!=p) Portables::setenv("PATH",result.data());
+  if (result!=p) Portable::setenv("PATH",result.data());
 #endif
 }
 
-void Portables::unlink(const char *fileName)
+void Portable::unlink(const char *fileName)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   _unlink(fileName);
@@ -458,7 +458,7 @@ void Portables::unlink(const char *fileName)
 #endif
 }
 
-void Portables::setShortDir(void)
+void Portable::setShortDir(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   long     length = 0;
@@ -474,4 +474,4 @@ void Portables::setShortDir(void)
   QDir::setCurrent(buffer);
   delete [] buffer;
 #endif
-}
\ No newline at end of file
+}
diff --git a/src/portable.h b/src/portable.h
index 7160d61..27b7052 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -17,7 +17,7 @@ typedef off_t portable_off_t;
  *  @brief Portable versions of functions that are platform dependent.
  */
 
-namespace Portables
+namespace Portable
 {
   int            system(const char *command,const char *args,bool commandHasConsole=true);
   unsigned int   pid(void);
diff --git a/src/pre.l b/src/pre.l
index e572f40..2a66146 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1826,7 +1826,7 @@ static FileState *findFile(yyscan_t yyscanner, const char *fileName,bool localIn
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   //printf("** findFile(%s,%d) state->yyFileName=%s\n",fileName,localInclude,state->yyFileName.data());
-  if (Portables::isAbsolutePath(fileName))
+  if (Portable::isAbsolutePath(fileName))
   {
     FileState *fs = checkAndOpenFile(yyscanner,fileName,alreadyIncluded);
     if (fs)
diff --git a/src/util.cpp b/src/util.cpp
index 92d5548..fe3c65f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2428,7 +2428,7 @@ static QCString getFilterFromList(const char *name,const QStrList &filterList,bo
     if (i_equals!=-1)
     {
       QCString filterPattern = fs.left(i_equals);
-      QRegExp fpat(filterPattern,Portables::fileSystemIsCaseSensitive(),TRUE); 
+      QRegExp fpat(filterPattern,Portable::fileSystemIsCaseSensitive(),TRUE); 
       if (fpat.match(name)!=-1) 
       {
         // found a match!
@@ -2589,7 +2589,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode)
 static QDateTime getCurrentDateTime()
 {
   QDateTime current = QDateTime::currentDateTime();
-  QCString sourceDateEpoch = Portables::getenv("SOURCE_DATE_EPOCH");
+  QCString sourceDateEpoch = Portable::getenv("SOURCE_DATE_EPOCH");
   if (!sourceDateEpoch.isEmpty())
   {
     bool ok;
@@ -8019,7 +8019,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
   {
     QCString cmd=filterName+" \""+fileName+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=Portables::popen(cmd,"r");
+    FILE *f=Portable::popen(cmd,"r");
     if (!f)
     {
       err("could not execute filter %s\n",filterName.data());
@@ -8033,7 +8033,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
       //printf(">>>>>>>>Reading %d bytes\n",numRead);
       inBuf.addArray(buf,numRead),size+=numRead;
     }
-    Portables::pclose(f);
+    Portable::pclose(f);
     inBuf.at(inBuf.curPos()) ='\0';
     Debug::print(Debug::FilterOutput, 0, "Filter output\n");
     Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",qPrint(inBuf));
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 4ee0151..66d8384 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -169,7 +169,7 @@ static void createSVG()
 
     QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-    if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+    if (Portable::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
     {
       err("could not create dot file");
     }
@@ -3796,7 +3796,7 @@ void FlowChart::createSVG()
 
   QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-  if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+  if (Portable::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
   {
     err("could not create dot file");
   }
-- 
cgit v0.12