Running formatter and small code clean up.

dpayne · Feb 1, 2016 · bc0104e · bc0104e
1 parent fe4081e
commit bc0104e
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/Domain/VisConstants.h b/src/Domain/VisConstants.h
@@ -48,14 +48,23 @@ static const uint32_t k_default_low_cutoff_frequency = 30;
 static const uint32_t k_default_high_cutoff_frequency = 22050;
 
 // config path defaults
+// XDG_CONFIG_HOME is usually "~/.config"
+static const char *k_xdg_config_home{std::getenv("XDG_CONFIG_HOME")};
+
 // http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-static const char* k_xdg_config_home{std::getenv("XDG_CONFIG_HOME")};
-static const std::string k_default_config_path_root{k_xdg_config_home != nullptr ?
-        std::string(k_xdg_config_home) + "/vis" : std::string(std::getenv("HOME")) + "/.config/vis"};
-static const std::string k_default_config_path = k_default_config_path_root + "/config";
-static const std::string k_colors_directory{k_default_config_path_root + "/colors/"};
+// use ${XDG_CONFIG_HOME}/vis/ as the default config directory
+static const std::string k_default_config_path_root{
+    (k_xdg_config_home != nullptr
+         ? std::string{k_xdg_config_home}
+         : std::string{std::getenv("HOME")} + "/.config") +
+    "/vis/"};
+static const std::string k_default_config_path =
+    k_default_config_path_root + "config";
+static const std::string k_colors_directory{k_default_config_path_root +
+                                            "colors/"};
+static const std::string k_default_log_path{k_default_config_path_root +
+                                            "vis.log"};
 static const std::string k_default_colors_path{"colors"};
-static const std::string k_default_log_path{k_default_config_path_root + "/vis.log"};
 
 // Default characters for visualizers
 static const wchar_t k_default_spectrum_character{k_space_wchar};