diff --git a/CMakeLists.txt b/CMakeLists.txt index 27bac4a..6b0aaa1 100644 --- a/CMakeLists.txt +++ b/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} diff --git a/src/autocomplete.h b/include/autocomplete.h similarity index 100% rename from src/autocomplete.h rename to include/autocomplete.h diff --git a/src/cmake.h b/include/cmake.h similarity index 100% rename from src/cmake.h rename to include/cmake.h diff --git a/src/compile_commands.h b/include/compile_commands.h similarity index 100% rename from src/compile_commands.h rename to include/compile_commands.h diff --git a/src/config.h b/include/config.h similarity index 100% rename from src/config.h rename to include/config.h diff --git a/src/ctags.h b/include/ctags.h similarity index 100% rename from src/ctags.h rename to include/ctags.h diff --git a/src/debug_lldb.h b/include/debug_lldb.h similarity index 100% rename from src/debug_lldb.h rename to include/debug_lldb.h diff --git a/src/dialogs.h b/include/dialogs.h similarity index 100% rename from src/dialogs.h rename to include/dialogs.h diff --git a/src/directories.h b/include/directories.h similarity index 100% rename from src/directories.h rename to include/directories.h diff --git a/src/dispatcher.h b/include/dispatcher.h similarity index 100% rename from src/dispatcher.h rename to include/dispatcher.h diff --git a/src/documentation_cppreference.h b/include/documentation_cppreference.h similarity index 100% rename from src/documentation_cppreference.h rename to include/documentation_cppreference.h diff --git a/src/entrybox.h b/include/entrybox.h similarity index 100% rename from src/entrybox.h rename to include/entrybox.h diff --git a/src/files.h b/include/files.h similarity index 100% rename from src/files.h rename to include/files.h diff --git a/src/filesystem.h b/include/filesystem.h similarity index 100% rename from src/filesystem.h rename to include/filesystem.h diff --git a/src/git.h b/include/git.h similarity index 100% rename from src/git.h rename to include/git.h diff --git a/src/info.h b/include/info.h similarity index 100% rename from src/info.h rename to include/info.h diff --git a/src/juci.h b/include/juci.h similarity index 100% rename from src/juci.h rename to include/juci.h diff --git a/src/menu.h b/include/menu.h similarity index 100% rename from src/menu.h rename to include/menu.h diff --git a/src/meson.h b/include/meson.h similarity index 100% rename from src/meson.h rename to include/meson.h diff --git a/src/notebook.h b/include/notebook.h similarity index 100% rename from src/notebook.h rename to include/notebook.h diff --git a/src/project.h b/include/project.h similarity index 100% rename from src/project.h rename to include/project.h diff --git a/src/project_build.h b/include/project_build.h similarity index 100% rename from src/project_build.h rename to include/project_build.h diff --git a/src/selection_dialog.h b/include/selection_dialog.h similarity index 100% rename from src/selection_dialog.h rename to include/selection_dialog.h diff --git a/src/source.h b/include/source.h similarity index 100% rename from src/source.h rename to include/source.h diff --git a/src/source_base.h b/include/source_base.h similarity index 100% rename from src/source_base.h rename to include/source_base.h diff --git a/src/source_clang.h b/include/source_clang.h similarity index 100% rename from src/source_clang.h rename to include/source_clang.h diff --git a/src/source_diff.h b/include/source_diff.h similarity index 100% rename from src/source_diff.h rename to include/source_diff.h diff --git a/src/source_language_protocol.h b/include/source_language_protocol.h similarity index 100% rename from src/source_language_protocol.h rename to include/source_language_protocol.h diff --git a/src/source_spellcheck.h b/include/source_spellcheck.h similarity index 100% rename from src/source_spellcheck.h rename to include/source_spellcheck.h diff --git a/src/terminal.h b/include/terminal.h similarity index 100% rename from src/terminal.h rename to include/terminal.h diff --git a/src/tooltips.h b/include/tooltips.h similarity index 100% rename from src/tooltips.h rename to include/tooltips.h diff --git a/src/usages_clang.h b/include/usages_clang.h similarity index 100% rename from src/usages_clang.h rename to include/usages_clang.h diff --git a/src/window.h b/include/window.h similarity index 100% rename from src/window.h rename to include/window.h diff --git a/src/autocomplete.cc b/src/autocomplete.cc index 8d5b684..b37d7a8 100644 --- a/src/autocomplete.cc +++ b/src/autocomplete.cc @@ -1,5 +1,5 @@ -#include "autocomplete.h" -#include "selection_dialog.h" +#include +#include 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) { diff --git a/src/cmake.cc b/src/cmake.cc index 1d23a31..e69ee06 100644 --- a/src/cmake.cc +++ b/src/cmake.cc @@ -1,10 +1,10 @@ -#include "cmake.h" -#include "filesystem.h" -#include "dialogs.h" -#include "config.h" -#include "terminal.h" +#include +#include +#include +#include +#include #include -#include "compile_commands.h" +#include CMake::CMake(const boost::filesystem::path &path) { const auto find_cmake_project=[](const boost::filesystem::path &cmake_path) { diff --git a/src/compile_commands.cc b/src/compile_commands.cc index 27f946b..ee13670 100644 --- a/src/compile_commands.cc +++ b/src/compile_commands.cc @@ -1,5 +1,5 @@ -#include "compile_commands.h" -#include "clangmm.h" +#include +#include #include #include diff --git a/src/config.cc b/src/config.cc index 934b438..0a3c998 100644 --- a/src/config.cc +++ b/src/config.cc @@ -1,9 +1,9 @@ -#include "config.h" +#include #include -#include "files.h" +#include #include -#include "filesystem.h" -#include "terminal.h" +#include +#include #include Config::Config() { diff --git a/src/ctags.cc b/src/ctags.cc index 55b9fb4..6fed4c4 100644 --- a/src/ctags.cc +++ b/src/ctags.cc @@ -1,8 +1,8 @@ -#include "ctags.h" -#include "config.h" -#include "terminal.h" -#include "project_build.h" -#include "filesystem.h" +#include +#include +#include +#include +#include #include #include #include diff --git a/src/debug_lldb.cc b/src/debug_lldb.cc index 04a73e4..395dc3e 100644 --- a/src/debug_lldb.cc +++ b/src/debug_lldb.cc @@ -1,14 +1,14 @@ -#include "debug_lldb.h" +#include #include #ifdef __APPLE__ #include #endif #include #include -#include "terminal.h" -#include "filesystem.h" -#include "process.hpp" -#include "config.h" +#include +#include +#include +#include extern char **environ; diff --git a/src/dialogs.cc b/src/dialogs.cc index ab5bc55..8a2f359 100644 --- a/src/dialogs.cc +++ b/src/dialogs.cc @@ -1,4 +1,4 @@ -#include "dialogs.h" +#include #include Dialog::Message::Message(const std::string &text): Gtk::Window(Gtk::WindowType::WINDOW_POPUP) { diff --git a/src/dialogs_unix.cc b/src/dialogs_unix.cc index 2512ce8..5131df9 100644 --- a/src/dialogs_unix.cc +++ b/src/dialogs_unix.cc @@ -1,4 +1,4 @@ -#include "dialogs.h" +#include std::string Dialog::open_folder(const boost::filesystem::path &path) { return gtk_dialog(path, "Open Folder", diff --git a/src/dialogs_win.cc b/src/dialogs_win.cc index 72d1869..9ec5c6a 100644 --- a/src/dialogs_win.cc +++ b/src/dialogs_win.cc @@ -1,6 +1,6 @@ -#include "dialogs.h" -#include "singletons.h" -#include "juci.h" +#include +#include +#include #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_VISTA diff --git a/src/directories.cc b/src/directories.cc index bbc07b5..bf9a918 100644 --- a/src/directories.cc +++ b/src/directories.cc @@ -1,10 +1,10 @@ -#include "directories.h" +#include #include -#include "source.h" -#include "terminal.h" -#include "notebook.h" -#include "filesystem.h" -#include "entrybox.h" +#include +#include +#include +#include +#include bool Directories::TreeStore::row_drop_possible_vfunc(const Gtk::TreeModel::Path &path, const Gtk::SelectionData &selection_data) const { return true; diff --git a/src/dispatcher.cc b/src/dispatcher.cc index 5ad2d60..70a9b40 100644 --- a/src/dispatcher.cc +++ b/src/dispatcher.cc @@ -1,4 +1,4 @@ -#include "dispatcher.h" +#include #include Dispatcher::Dispatcher() { diff --git a/src/documentation_cppreference.cc b/src/documentation_cppreference.cc index fe132ea..b4537da 100644 --- a/src/documentation_cppreference.cc +++ b/src/documentation_cppreference.cc @@ -1,4 +1,4 @@ -#include "documentation_cppreference.h" +#include #include std::string Documentation::CppReference::get_url(const std::string &symbol) noexcept { diff --git a/src/entrybox.cc b/src/entrybox.cc index f29c5e0..a2e554f 100644 --- a/src/entrybox.cc +++ b/src/entrybox.cc @@ -1,4 +1,4 @@ -#include "entrybox.h" +#include std::unordered_map > EntryBox::entry_histories; diff --git a/src/filesystem.cc b/src/filesystem.cc index 98df6a8..8a87e1c 100644 --- a/src/filesystem.cc +++ b/src/filesystem.cc @@ -3,7 +3,7 @@ #include #include -#include "filesystem.h" +#include //Only use on small files std::string filesystem::read(const std::string &path) { diff --git a/src/git.cc b/src/git.cc index 99d2174..944018d 100644 --- a/src/git.cc +++ b/src/git.cc @@ -1,4 +1,4 @@ -#include "git.h" +#include #include bool Git::initialized=false; diff --git a/src/info.cc b/src/info.cc index 22029a7..6794a09 100644 --- a/src/info.cc +++ b/src/info.cc @@ -1,4 +1,4 @@ -#include "info.h" +#include Info::Info() { set_hexpand(false); diff --git a/src/juci.cc b/src/juci.cc index a0ad677..12bb11c 100644 --- a/src/juci.cc +++ b/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 +#include +#include +#include +#include +#include +#include #ifndef _WIN32 #include #endif diff --git a/src/menu.cc b/src/menu.cc index 8246d53..b435bb0 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -1,5 +1,5 @@ -#include "menu.h" -#include "config.h" +#include +#include #include #include diff --git a/src/meson.cc b/src/meson.cc index 45ab739..f416093 100644 --- a/src/meson.cc +++ b/src/meson.cc @@ -1,10 +1,10 @@ -#include "meson.h" -#include "filesystem.h" -#include "compile_commands.h" +#include +#include +#include #include -#include "terminal.h" -#include "dialogs.h" -#include "config.h" +#include +#include +#include Meson::Meson(const boost::filesystem::path &path) { const auto find_project=[](const boost::filesystem::path &file_path) { diff --git a/src/notebook.cc b/src/notebook.cc index 4c30b68..784696d 100644 --- a/src/notebook.cc +++ b/src/notebook.cc @@ -1,14 +1,14 @@ -#include "notebook.h" -#include "config.h" -#include "directories.h" +#include +#include +#include #include #include -#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 +#include +#include +#include +#include +#include Notebook::TabLabel::TabLabel(const std::function &on_close) { set_can_focus(false); diff --git a/src/project.cc b/src/project.cc index eea330f..db25f7d 100644 --- a/src/project.cc +++ b/src/project.cc @@ -1,20 +1,20 @@ -#include "project.h" -#include "config.h" -#include "terminal.h" -#include "filesystem.h" -#include "directories.h" +#include +#include +#include +#include +#include #include -#include "menu.h" -#include "notebook.h" -#include "selection_dialog.h" +#include +#include +#include #ifdef JUCI_ENABLE_DEBUG -#include "debug_lldb.h" +#include #endif -#include "info.h" -#include "source_clang.h" -#include "source_language_protocol.h" -#include "usages_clang.h" -#include "ctags.h" +#include +#include +#include +#include +#include #include boost::filesystem::path Project::debug_last_stop_file_path; diff --git a/src/project_build.cc b/src/project_build.cc index 5f313b3..eb7dd53 100644 --- a/src/project_build.cc +++ b/src/project_build.cc @@ -1,6 +1,6 @@ -#include "project_build.h" -#include "config.h" -#include "filesystem.h" +#include +#include +#include std::unique_ptr Project::Build::create(const boost::filesystem::path &path) { auto search_path=boost::filesystem::is_directory(path)?path:path.parent_path(); diff --git a/src/selection_dialog.cc b/src/selection_dialog.cc index aed3bda..33d1be5 100644 --- a/src/selection_dialog.cc +++ b/src/selection_dialog.cc @@ -1,4 +1,4 @@ -#include "selection_dialog.h" +#include #include SelectionDialogBase::ListViewText::ListViewText(bool use_markup) : Gtk::TreeView(), use_markup(use_markup) { diff --git a/src/source.cc b/src/source.cc index e47c961..48027d5 100644 --- a/src/source.cc +++ b/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 +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/source_base.cc b/src/source_base.cc index 25c293b..9877aed 100644 --- a/src/source_base.cc +++ b/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 +#include +#include +#include +#include #include Source::BaseView::BaseView(const boost::filesystem::path &file_path, const Glib::RefPtr &language): Gsv::View(), file_path(file_path), language(language), status_diagnostics(0, 0, 0) { diff --git a/src/source_clang.cc b/src/source_clang.cc index 1bff414..456f2d9 100644 --- a/src/source_clang.cc +++ b/src/source_clang.cc @@ -1,18 +1,18 @@ -#include "source_clang.h" -#include "config.h" -#include "terminal.h" -#include "project_build.h" +#include +#include +#include +#include #ifdef JUCI_ENABLE_DEBUG -#include "debug_lldb.h" +#include #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 +#include +#include +#include +#include +#include +#include +#include clangmm::Index Source::ClangViewParse::clang_index(0, 0); diff --git a/src/source_diff.cc b/src/source_diff.cc index df4df20..443e8b2 100644 --- a/src/source_diff.cc +++ b/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 +#include +#include +#include +#include #include Source::DiffView::Renderer::Renderer() : Gsv::GutterRenderer() { diff --git a/src/source_language_protocol.cc b/src/source_language_protocol.cc index 2064d29..5bb2d81 100644 --- a/src/source_language_protocol.cc +++ b/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 +#include +#include +#include +#include +#include #ifdef JUCI_ENABLE_DEBUG -#include "debug_lldb.h" +#include #endif -#include "menu.h" +#include #include #include #include diff --git a/src/source_spellcheck.cc b/src/source_spellcheck.cc index fea7248..06d8b17 100644 --- a/src/source_spellcheck.cc +++ b/src/source_spellcheck.cc @@ -1,7 +1,7 @@ -#include "source_spellcheck.h" -#include "config.h" -#include "info.h" -#include "selection_dialog.h" +#include +#include +#include +#include #include AspellConfig* Source::SpellCheckView::spellcheck_config=nullptr; diff --git a/src/terminal.cc b/src/terminal.cc index 3d885fb..30a0088 100644 --- a/src/terminal.cc +++ b/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 +#include +#include +#include +#include +#include #include #include #include diff --git a/src/tooltips.cc b/src/tooltips.cc index 841016c..b9efd7b 100644 --- a/src/tooltips.cc +++ b/src/tooltips.cc @@ -1,5 +1,5 @@ -#include "tooltips.h" -#include "selection_dialog.h" +#include +#include std::set Tooltips::shown_tooltips; Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle(); diff --git a/src/usages_clang.cc b/src/usages_clang.cc index fd50f37..9e685dd 100644 --- a/src/usages_clang.cc +++ b/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 +#include +#include +#include +#include #include #include #include diff --git a/src/window.cc b/src/window.cc index 62a6dc8..e4f8496 100644 --- a/src/window.cc +++ b/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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Window::Window() { Gsv::init(); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e873016..4a32404 100644 --- a/tests/CMakeLists.txt +++ b/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 )