$OpenBSD: patch-src_utils_utils_files_cpp,v 1.1 2018/04/28 18:10:04 bcallah Exp $

clang6 fixes

Index: src/utils/utils_files.cpp
--- src/utils/utils_files.cpp.orig
+++ src/utils/utils_files.cpp
@@ -279,7 +279,7 @@ static void _CopyOldSaveFiles(const std::string &desti
     if(!pw)
         return;
 
-    std::string old_path = std::string(pw->pw_dir) + "/."APPSHORTNAME"/";
+    std::string old_path = std::string(pw->pw_dir) + "/." APPSHORTNAME "/";
     if(!DoesFileExist(old_path))
         return; // Nothing to do.
 #elif defined _WIN32
@@ -330,7 +330,7 @@ static void _CopyOldSettingsFile(const std::string &de
     if(!pw)
         return; // Nothing to do
 
-    std::string old_file = std::string(pw->pw_dir) + "/."APPSHORTNAME"/settings.lua";
+    std::string old_file = std::string(pw->pw_dir) + "/." APPSHORTNAME "/settings.lua";
     if(!DoesFileExist(old_file))
         return; // Nothing to do.
 
@@ -387,7 +387,7 @@ static const std::string _SetupUserDataPath()
     // $XDG_DATA_HOME/valyriatear/
     // equals to: ~/.local/share/valyriatear/ most of the time
     if (getenv("XDG_DATA_HOME")) {
-        std::string path = std::string(getenv("XDG_DATA_HOME")) + "/"APPSHORTNAME"/";
+        std::string path = std::string(getenv("XDG_DATA_HOME")) + "/" APPSHORTNAME "/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
         _CopyOldSaveFiles(path);
@@ -403,7 +403,7 @@ static const std::string _SetupUserDataPath()
         path += "/share/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
-        path += "/"APPSHORTNAME"/";
+        path += "/" APPSHORTNAME "/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
         _CopyOldSaveFiles(path);
@@ -448,7 +448,7 @@ static const std::string _SetupUserConfigPath()
     // $XDG_CONFIG_HOME/valyriatear/
     // equals to: ~/.config/valyriatear/ most of the time
     if (getenv("XDG_CONFIG_HOME")) {
-        std::string path = std::string(getenv("XDG_CONFIG_HOME")) + "/"APPSHORTNAME"/";
+        std::string path = std::string(getenv("XDG_CONFIG_HOME")) + "/" APPSHORTNAME "/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
         _CopyOldSettingsFile(path);
@@ -462,7 +462,7 @@ static const std::string _SetupUserConfigPath()
         std::string path = std::string(pw->pw_dir) + "/.config/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
-        path += "/"APPSHORTNAME"/";
+        path += "/" APPSHORTNAME "/";
         if(!DoesFileExist(path))
             MakeDirectory(path);
         _CopyOldSettingsFile(path);
