Use nullptr instead of 0 for pointers

[libs/core.git] / source / fs / windows / dir_location.cpp

diff --git a/source/fs/windows/dir_location.cpp b/source/fs/windows/dir_location.cpp
index ea542be3a75abcf87b68fec82edc83734bfa93a6..4f9b8f643b723b9317af370a84dbc8b7e6529b8e 100644 (file)
--- a/source/fs/windows/dir_location.cpp
+++ b/source/fs/windows/dir_location.cpp
@@ -1,4 +1,5 @@
 #include <shlobj.h>
+#include <msp/core/application.h>
 #include "dir.h"
 
 using namespace std;
@@ -9,17 +10,19 @@ namespace FS {
 Path get_home_dir()
 {
        char home[MAX_PATH];
-       if(SHGetFolderPath(0, CSIDL_PERSONAL, 0, 0, home)==S_OK)
+       if(SHGetFolderPath(nullptr, CSIDL_PERSONAL, nullptr, 0, home)==S_OK)
                return home;
        return ".";
 }
 
-Path get_user_data_dir(const string &appname)
+Path get_user_data_dir()
 {
+       const string &appname = Application::get_name();
        if(appname.empty())
-               throw invalid_argument("get_user_data_dir");
+               throw logic_error("no application name");
+
        char datadir[MAX_PATH];
-       if(SHGetFolderPath(0, CSIDL_LOCAL_APPDATA, 0, 0, datadir)==S_OK)
+       if(SHGetFolderPath(nullptr, CSIDL_LOCAL_APPDATA, nullptr, 0, datadir)==S_OK)
                return Path(datadir)/appname;
        return ".";
 }