From 51904924d2b6caf43e310aa82fe09ea1278546b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Thu, 29 Oct 2015 17:34:12 +0100 Subject: [PATCH] Remove clang-format option --- src/config.cc | 2 +- src/files.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/config.cc b/src/config.cc index c4bef50..c424ba2 100644 --- a/src/config.cc +++ b/src/config.cc @@ -71,7 +71,7 @@ void MainConfig::retrieve_config() { Singleton::Config::window()->default_size = {cfg.get("default_window_size.width"), cfg.get("default_window_size.height")}; Singleton::Config::terminal()->make_command=cfg.get("project.make_command"); Singleton::Config::terminal()->cmake_command=cfg.get("project.cmake_command"); - Singleton::Config::terminal()->clang_format_command=cfg.get("project.clang_format_command"); + Singleton::Config::terminal()->clang_format_command=cfg.get("project.clang_format_command", "clang-format"); Singleton::Config::terminal()->history_size=cfg.get("terminal_history_size"); } diff --git a/src/files.h b/src/files.h index 0b3196e..5ddf8c2 100644 --- a/src/files.h +++ b/src/files.h @@ -104,8 +104,7 @@ const std::string configjson = #else " \"cmake_command\": \"cmake\",\n" #endif -" \"make_command\": \"make\",\n" -" \"clang_format_command\": \"clang-format\"\n" +" \"make_command\": \"make\"\n" " },\n" " \"documentation_searches\": {\n" " \"clang\": {\n"