move headers to include directory

CMakeLists.txt

@@ -72,6 +72,7 @@ endif()
 
 # For both src and tests targets
 include_directories(
+  ${PROJECT_SOURCE_DIR}/include
   ${Boost_INCLUDE_DIRS}
   ${GTKMM_INCLUDE_DIRS}
   ${GTKSVMM_INCLUDE_DIRS}

src/autocomplete.cc

@@ -1,5 +1,5 @@
-#include "autocomplete.h"
-#include "selection_dialog.h"
+#include <autocomplete.h>
+#include <selection_dialog.h>
 
 Autocomplete::Autocomplete(Gtk::TextView *view, bool &interactive_completion, guint &last_keyval, bool strip_word)
     : view(view), interactive_completion(interactive_completion), strip_word(strip_word), state(State::IDLE) {

src/cmake.cc

@@ -1,10 +1,10 @@
-#include "cmake.h"
-#include "filesystem.h"
-#include "dialogs.h"
-#include "config.h"
-#include "terminal.h"
+#include <cmake.h>
+#include <filesystem.h>
+#include <dialogs.h>
+#include <config.h>
+#include <terminal.h>
 #include <regex>
-#include "compile_commands.h"
+#include <compile_commands.h>
 
 CMake::CMake(const boost::filesystem::path &path) {
   const auto find_cmake_project=[](const boost::filesystem::path &cmake_path) {

src/compile_commands.cc

@@ -1,5 +1,5 @@
-#include "compile_commands.h"
-#include "clangmm.h"
+#include <compile_commands.h>
+#include <clangmm.h>
 #include <boost/property_tree/json_parser.hpp>
 #include <regex>
 

src/config.cc

@@ -1,9 +1,9 @@
-#include "config.h"
+#include <config.h>
 #include <exception>
-#include "files.h"
+#include <files.h>
 #include <iostream>
-#include "filesystem.h"
-#include "terminal.h"
+#include <filesystem.h>
+#include <terminal.h>
 #include <algorithm>
 
 Config::Config() {

src/ctags.cc

@@ -1,8 +1,8 @@
-#include "ctags.h"
-#include "config.h"
-#include "terminal.h"
-#include "project_build.h"
-#include "filesystem.h"
+#include <ctags.h>
+#include <config.h>
+#include <terminal.h>
+#include <project_build.h>
+#include <filesystem.h>
 #include <iostream>
 #include <vector>
 #include <regex>

src/debug_lldb.cc

@@ -1,14 +1,14 @@
-#include "debug_lldb.h"
+#include <debug_lldb.h>
 #include <cstdio>
 #ifdef __APPLE__
 #include <cstdlib>
 #endif
 #include <boost/filesystem.hpp>
 #include <iostream>
-#include "terminal.h"
-#include "filesystem.h"
-#include "process.hpp"
-#include "config.h"
+#include <terminal.h>
+#include <filesystem.h>
+#include <process.hpp>
+#include <config.h>
 
 extern char **environ;
 

src/dialogs.cc

@@ -1,4 +1,4 @@
-#include "dialogs.h"
+#include <dialogs.h>
 #include <cmath>
 
 Dialog::Message::Message(const std::string &text): Gtk::Window(Gtk::WindowType::WINDOW_POPUP) {

src/dialogs_unix.cc

@@ -1,4 +1,4 @@
-#include "dialogs.h"
+#include <dialogs.h>
 
 std::string Dialog::open_folder(const boost::filesystem::path &path) {
   return gtk_dialog(path, "Open Folder",

src/dialogs_win.cc

@@ -1,6 +1,6 @@
-#include "dialogs.h"
-#include "singletons.h"
-#include "juci.h"
+#include <dialogs.h>
+#include <singletons.h>
+#include <juci.h>
 
 #undef NTDDI_VERSION
 #define NTDDI_VERSION NTDDI_VISTA

src/directories.cc

@@ -1,10 +1,10 @@
-#include "directories.h"
+#include <directories.h>
 #include <algorithm>
-#include "source.h"
-#include "terminal.h"
-#include "notebook.h"
-#include "filesystem.h"
-#include "entrybox.h"
+#include <source.h>
+#include <terminal.h>
+#include <notebook.h>
+#include <filesystem.h>
+#include <entrybox.h>
 
 bool Directories::TreeStore::row_drop_possible_vfunc(const Gtk::TreeModel::Path &path, const Gtk::SelectionData &selection_data) const {
   return true;

src/dispatcher.cc

@@ -1,4 +1,4 @@
-#include "dispatcher.h"
+#include <dispatcher.h>
 #include <vector>
 
 Dispatcher::Dispatcher() {

src/documentation_cppreference.cc

@@ -1,4 +1,4 @@
-#include "documentation_cppreference.h"
+#include <documentation_cppreference.h>
 #include <unordered_map>
 
 std::string Documentation::CppReference::get_url(const std::string &symbol) noexcept {

src/entrybox.cc

@@ -1,4 +1,4 @@
-#include "entrybox.h"
+#include <entrybox.h>
 
 std::unordered_map<std::string, std::vector<std::string> > EntryBox::entry_histories;
 

src/filesystem.cc

@@ -3,7 +3,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "filesystem.h"
+#include <filesystem.h>
 
 //Only use on small files
 std::string filesystem::read(const std::string &path) {

src/git.cc

@@ -1,4 +1,4 @@
-#include "git.h"
+#include <git.h>
 #include <cstring>
 
 bool Git::initialized=false;

src/info.cc

@@ -1,4 +1,4 @@
-#include "info.h"
+#include <info.h>
 
 Info::Info() {
   set_hexpand(false);

src/juci.cc

@@ -1,10 +1,10 @@
-#include "juci.h"
-#include "window.h"
-#include "notebook.h"
-#include "directories.h"
-#include "menu.h"
-#include "config.h"
-#include "terminal.h"
+#include <juci.h>
+#include <window.h>
+#include <notebook.h>
+#include <directories.h>
+#include <menu.h>
+#include <config.h>
+#include <terminal.h>
 #ifndef _WIN32
 #include <csignal>
 #endif

src/menu.cc

@@ -1,5 +1,5 @@
-#include "menu.h"
-#include "config.h"
+#include <menu.h>
+#include <config.h>
 #include <string>
 #include <iostream>
 

src/meson.cc

@@ -1,10 +1,10 @@
-#include "meson.h"
-#include "filesystem.h"
-#include "compile_commands.h"
+#include <meson.h>
+#include <filesystem.h>
+#include <compile_commands.h>
 #include <regex>
-#include "terminal.h"
-#include "dialogs.h"
-#include "config.h"
+#include <terminal.h>
+#include <dialogs.h>
+#include <config.h>
 
 Meson::Meson(const boost::filesystem::path &path) {
   const auto find_project=[](const boost::filesystem::path &file_path) {

src/notebook.cc

@@ -1,14 +1,14 @@
-#include "notebook.h"
-#include "config.h"
-#include "directories.h"
+#include <notebook.h>
+#include <config.h>
+#include <directories.h>
 #include <fstream>
 #include <regex>
-#include "project.h"
-#include "filesystem.h"
-#include "selection_dialog.h"
-#include "source_clang.h"
-#include "source_language_protocol.h"
-#include "gtksourceview-3.0/gtksourceview/gtksourcemap.h"
+#include <project.h>
+#include <filesystem.h>
+#include <selection_dialog.h>
+#include <source_clang.h>
+#include <source_language_protocol.h>
+#include <gtksourceview-3.0/gtksourceview/gtksourcemap.h>
 
 Notebook::TabLabel::TabLabel(const std::function<void()> &on_close) {
   set_can_focus(false);

src/project.cc

@@ -1,20 +1,20 @@
-#include "project.h"
-#include "config.h"
-#include "terminal.h"
-#include "filesystem.h"
-#include "directories.h"
+#include <project.h>
+#include <config.h>
+#include <terminal.h>
+#include <filesystem.h>
+#include <directories.h>
 #include <fstream>
-#include "menu.h"
-#include "notebook.h"
-#include "selection_dialog.h"
+#include <menu.h>
+#include <notebook.h>
+#include <selection_dialog.h>
 #ifdef JUCI_ENABLE_DEBUG
-#include "debug_lldb.h"
+#include <debug_lldb.h>
 #endif
-#include "info.h"
-#include "source_clang.h"
-#include "source_language_protocol.h"
-#include "usages_clang.h"
-#include "ctags.h"
+#include <info.h>
+#include <source_clang.h>
+#include <source_language_protocol.h>
+#include <usages_clang.h>
+#include <ctags.h>
 #include <future>
 
 boost::filesystem::path Project::debug_last_stop_file_path;

src/project_build.cc

@@ -1,6 +1,6 @@
-#include "project_build.h"
-#include "config.h"
-#include "filesystem.h"
+#include <project_build.h>
+#include <config.h>
+#include <filesystem.h>
 
 std::unique_ptr<Project::Build> Project::Build::create(const boost::filesystem::path &path) {
   auto search_path=boost::filesystem::is_directory(path)?path:path.parent_path();

src/selection_dialog.cc

@@ -1,4 +1,4 @@
-#include "selection_dialog.h"
+#include <selection_dialog.h>
 #include <algorithm>
 
 SelectionDialogBase::ListViewText::ListViewText(bool use_markup) : Gtk::TreeView(), use_markup(use_markup) {

src/source.cc

@@ -1,12 +1,12 @@
-#include "source.h"
-#include "config.h"
-#include "filesystem.h"
-#include "terminal.h"
-#include "info.h"
-#include "directories.h"
-#include "menu.h"
-#include "selection_dialog.h"
-#include "git.h"
+#include <source.h>
+#include <config.h>
+#include <filesystem.h>
+#include <terminal.h>
+#include <info.h>
+#include <directories.h>
+#include <menu.h>
+#include <selection_dialog.h>
+#include <git.h>
 #include <gtksourceview/gtksource.h>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/spirit/home/qi/char.hpp>

src/source_base.cc

@@ -1,8 +1,8 @@
-#include "source_base.h"
-#include "info.h"
-#include "terminal.h"
-#include "git.h"
-#include "config.h"
+#include <source_base.h>
+#include <info.h>
+#include <terminal.h>
+#include <git.h>
+#include <config.h>
 #include <fstream>
 
 Source::BaseView::BaseView(const boost::filesystem::path &file_path, const Glib::RefPtr<Gsv::Language> &language): Gsv::View(), file_path(file_path), language(language), status_diagnostics(0, 0, 0) {

src/source_clang.cc

@@ -1,18 +1,18 @@
-#include "source_clang.h"
-#include "config.h"
-#include "terminal.h"
-#include "project_build.h"
+#include <source_clang.h>
+#include <config.h>
+#include <terminal.h>
+#include <project_build.h>
 #ifdef JUCI_ENABLE_DEBUG
-#include "debug_lldb.h"
+#include <debug_lldb.h>
 #endif
-#include "info.h"
-#include "dialogs.h"
-#include "ctags.h"
-#include "selection_dialog.h"
-#include "filesystem.h"
-#include "compile_commands.h"
-#include "usages_clang.h"
-#include "documentation_cppreference.h"
+#include <info.h>
+#include <dialogs.h>
+#include <ctags.h>
+#include <selection_dialog.h>
+#include <filesystem.h>
+#include <compile_commands.h>
+#include <usages_clang.h>
+#include <documentation_cppreference.h>
 
 clangmm::Index Source::ClangViewParse::clang_index(0, 0);
 

src/source_diff.cc

@@ -1,8 +1,8 @@
-#include "source_diff.h"
-#include "config.h"
-#include "terminal.h"
-#include "filesystem.h"
-#include "info.h"
+#include <source_diff.h>
+#include <config.h>
+#include <terminal.h>
+#include <filesystem.h>
+#include <info.h>
 #include <boost/version.hpp>
 
 Source::DiffView::Renderer::Renderer() : Gsv::GutterRenderer() {

src/source_language_protocol.cc

@@ -1,13 +1,13 @@
-#include "source_language_protocol.h"
-#include "info.h"
-#include "selection_dialog.h"
-#include "terminal.h"
-#include "project.h"
-#include "filesystem.h"
+#include <source_language_protocol.h>
+#include <info.h>
+#include <selection_dialog.h>
+#include <terminal.h>
+#include <project.h>
+#include <filesystem.h>
 #ifdef JUCI_ENABLE_DEBUG
-#include "debug_lldb.h"
+#include <debug_lldb.h>
 #endif
-#include "menu.h"
+#include <menu.h>
 #include <regex>
 #include <future>
 #include <limits>

src/source_spellcheck.cc

@@ -1,7 +1,7 @@
-#include "source_spellcheck.h"
-#include "config.h"
-#include "info.h"
-#include "selection_dialog.h"
+#include <source_spellcheck.h>
+#include <config.h>
+#include <info.h>
+#include <selection_dialog.h>
 #include <iostream>
 
 AspellConfig* Source::SpellCheckView::spellcheck_config=nullptr;

src/terminal.cc

@@ -1,9 +1,9 @@
-#include "terminal.h"
-#include "config.h"
-#include "project.h"
-#include "info.h"
-#include "notebook.h"
-#include "filesystem.h"
+#include <terminal.h>
+#include <config.h>
+#include <project.h>
+#include <info.h>
+#include <notebook.h>
+#include <filesystem.h>
 #include <iostream>
 #include <regex>
 #include <thread>

src/tooltips.cc

@@ -1,5 +1,5 @@
-#include "tooltips.h"
-#include "selection_dialog.h"
+#include <tooltips.h>
+#include <selection_dialog.h>
 
 std::set<Tooltip*> Tooltips::shown_tooltips;
 Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle();

src/usages_clang.cc

@@ -1,8 +1,8 @@
-#include "usages_clang.h"
-#include "compile_commands.h"
-#include "config.h"
-#include "dialogs.h"
-#include "filesystem.h"
+#include <usages_clang.h>
+#include <compile_commands.h>
+#include <config.h>
+#include <dialogs.h>
+#include <filesystem.h>
 #include <chrono>
 #include <fstream>
 #include <regex>

src/window.cc

@@ -1,15 +1,15 @@
-#include "window.h"
-#include "config.h"
-#include "menu.h"
-#include "notebook.h"
-#include "directories.h"
-#include "dialogs.h"
-#include "filesystem.h"
-#include "project.h"
-#include "entrybox.h"
-#include "info.h"
-#include "selection_dialog.h"
-#include "terminal.h"
+#include <window.h>
+#include <config.h>
+#include <menu.h>
+#include <notebook.h>
+#include <directories.h>
+#include <dialogs.h>
+#include <filesystem.h>
+#include <project.h>
+#include <entrybox.h>
+#include <info.h>
+#include <selection_dialog.h>
+#include <terminal.h>
 
 Window::Window() {
   Gsv::init();

tests/CMakeLists.txt

@@ -2,7 +2,7 @@ add_compile_options(-fno-access-control)
 add_definitions(-DJUCI_BUILD_PATH="${CMAKE_BINARY_DIR}" -DJUCI_TESTS_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/libclangmm/src
   ${CMAKE_SOURCE_DIR}/tiny-process-library
 )