Refactor: modernize configuration values

1 files changed, 15 insertions, 13 deletions

diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index 2e172ac..d020da0 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -208,21 +208,23 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
   QCString pumlType = "";
   QCString pumlOutDir = "";
 
-  QStrList &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH);
-  char *s=pumlIncludePathList.first();
-  if (s)
+  const StringVector &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH);
   {
-    pumlArgs += "-Dplantuml.include.path=\"";
-    pumlArgs += s;
-    s = pumlIncludePathList.next();
-  }
-  while (s)
-  {
-    pumlArgs += Portable::pathListSeparator();
-    pumlArgs += s;
-    s = pumlIncludePathList.next();
+    auto it = pumlIncludePathList.begin();
+    if (it!=pumlIncludePathList.end())
+    {
+      pumlArgs += "-Dplantuml.include.path=\"";
+      pumlArgs += it->c_str();
+      ++it;
+    }
+    while (it!=pumlIncludePathList.end())
+    {
+      pumlArgs += Portable::pathListSeparator();
+      pumlArgs += it->c_str();
+      ++it;
+    }
   }
-  if (pumlIncludePathList.first()) pumlArgs += "\" ";
+  if (!pumlIncludePathList.empty()) pumlArgs += "\" ";
   pumlArgs += "-Djava.awt.headless=true -jar \""+plantumlJarPath+"plantuml.jar\" ";
   if (!plantumlConfigFile.isEmpty())
   {