Refactoring of portable.h and portable.cpp functions to be contained in a namespace

Fixing some memory issues caused by not correctly freed pointers

1 files changed, 8 insertions, 8 deletions

diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index ff4ebd3..bad89e3 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -210,7 +210,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
   }
   while (s)
   {
-    pumlArgs += portable_pathListSeparator();
+    pumlArgs += Portables::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 += portable_commandExtension();
+    pumlArgs += Portables::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));
 
-      portable_sysTimerStart();
-      if ((exitCode=portable_system(pumlExe,pumlArguments,TRUE))!=0)
+      Portables::sysTimerStart();
+      if ((exitCode=Portables::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();
       }
-      portable_sysTimerStop();
+      Portables::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));
-            portable_sysTimerStart();
-            if ((exitCode=portable_system("epstopdf",epstopdfArgs))!=0)
+            Portables::sysTimerStart();
+            if ((exitCode=Portables::system("epstopdf",epstopdfArgs))!=0)
             {
               err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode);
             }
-            portable_sysTimerStop();
+            Portables::sysTimerStop();
           }
         }
       }