Browse Source

Remove clang-format option

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
commit
51904924d2
  1. 2
      src/config.cc
  2. 3
      src/files.h

2
src/config.cc

@ -71,7 +71,7 @@ void MainConfig::retrieve_config() {
Singleton::Config::window()->default_size = {cfg.get<int>("default_window_size.width"), cfg.get<int>("default_window_size.height")}; Singleton::Config::window()->default_size = {cfg.get<int>("default_window_size.width"), cfg.get<int>("default_window_size.height")};
Singleton::Config::terminal()->make_command=cfg.get<std::string>("project.make_command"); Singleton::Config::terminal()->make_command=cfg.get<std::string>("project.make_command");
Singleton::Config::terminal()->cmake_command=cfg.get<std::string>("project.cmake_command"); Singleton::Config::terminal()->cmake_command=cfg.get<std::string>("project.cmake_command");
Singleton::Config::terminal()->clang_format_command=cfg.get<std::string>("project.clang_format_command"); Singleton::Config::terminal()->clang_format_command=cfg.get<std::string>("project.clang_format_command", "clang-format");
Singleton::Config::terminal()->history_size=cfg.get<int>("terminal_history_size"); Singleton::Config::terminal()->history_size=cfg.get<int>("terminal_history_size");
} }

3
src/files.h

@ -104,8 +104,7 @@ const std::string configjson =
#else #else
" \"cmake_command\": \"cmake\",\n" " \"cmake_command\": \"cmake\",\n"
#endif #endif
" \"make_command\": \"make\",\n" " \"make_command\": \"make\"\n"
" \"clang_format_command\": \"clang-format\"\n"
" },\n" " },\n"
" \"documentation_searches\": {\n" " \"documentation_searches\": {\n"
" \"clang\": {\n" " \"clang\": {\n"

Loading…
Cancel
Save