[gnome-builder] includes: fixup includes to use full paths
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] includes: fixup includes to use full paths
- Date: Tue, 3 Oct 2017 08:18:45 +0000 (UTC)
commit 6dedab95953792cd519f90705e0402d4ace30aef
Author: Christian Hergert <chergert redhat com>
Date: Tue Oct 3 01:14:36 2017 -0700
includes: fixup includes to use full paths
This uses the fixup-includes.py from my gnome-refactor-tools
project to cleanup our includes paths. This uses their full
path starting from src/libide/ consistently in libide.
src/libide/application/ide-application-actions.h | 2 +-
src/libide/application/ide-application-addin.c | 2 +-
src/libide/application/ide-application-addin.h | 2 +-
src/libide/application/ide-application-shortcuts.c | 2 +-
src/libide/application/ide-application-tests.h | 2 +-
src/libide/application/ide-application-tool.c | 2 +-
src/libide/buffers/ide-buffer-addin.c | 4 ++--
src/libide/buffers/ide-buffer-change-monitor.c | 4 ++--
src/libide/buildsystem/ide-build-log-private.h | 2 +-
src/libide/buildsystem/ide-build-pipeline-addin.h | 2 +-
src/libide/buildsystem/ide-build-stage-mkdirs.h | 2 +-
src/libide/buildsystem/ide-build-stage-private.h | 4 ++--
.../buildsystem/ide-build-system-discovery.c | 2 +-
src/libide/buildsystem/ide-build-target.c | 2 +-
src/libide/buildsystem/ide-build-utils.c | 2 +-
.../buildsystem/ide-configuration-provider.c | 4 ++--
src/libide/buildsystem/ide-environment-variable.c | 2 +-
src/libide/buildsystem/ide-environment.c | 4 ++--
src/libide/buildsystem/ide-environment.h | 2 +-
src/libide/buildui/ide-build-configuration-row.c | 2 +-
src/libide/buildui/ide-build-log-panel.c | 2 +-
src/libide/buildui/ide-build-perspective.c | 6 +++---
src/libide/buildui/ide-build-plugin.c | 4 ++--
src/libide/buildui/ide-build-tool.c | 2 +-
src/libide/buildui/ide-environment-editor-row.c | 2 +-
src/libide/buildui/ide-environment-editor.c | 4 ++--
src/libide/debugger/ide-debugger-actions.c | 2 +-
src/libide/debugger/ide-debugger-address-map.c | 2 +-
src/libide/debugger/ide-debugger-address-map.h | 2 +-
src/libide/debugger/ide-debugger-breakpoint.c | 4 ++--
src/libide/debugger/ide-debugger-breakpoint.h | 4 ++--
.../debugger/ide-debugger-breakpoints-view.c | 2 +-
.../debugger/ide-debugger-breakpoints-view.h | 2 +-
src/libide/debugger/ide-debugger-breakpoints.h | 4 ++--
src/libide/debugger/ide-debugger-controls.c | 2 +-
src/libide/debugger/ide-debugger-fallbacks.c | 4 ++--
src/libide/debugger/ide-debugger-frame.c | 2 +-
src/libide/debugger/ide-debugger-frame.h | 2 +-
src/libide/debugger/ide-debugger-instruction.c | 2 +-
src/libide/debugger/ide-debugger-instruction.h | 2 +-
src/libide/debugger/ide-debugger-libraries-view.c | 2 +-
src/libide/debugger/ide-debugger-libraries-view.h | 2 +-
src/libide/debugger/ide-debugger-library.c | 2 +-
src/libide/debugger/ide-debugger-library.h | 2 +-
src/libide/debugger/ide-debugger-locals-view.c | 2 +-
src/libide/debugger/ide-debugger-locals-view.h | 2 +-
src/libide/debugger/ide-debugger-private.h | 6 +++---
src/libide/debugger/ide-debugger-register.c | 2 +-
src/libide/debugger/ide-debugger-registers-view.c | 2 +-
src/libide/debugger/ide-debugger-registers-view.h | 2 +-
src/libide/debugger/ide-debugger-thread-group.c | 2 +-
src/libide/debugger/ide-debugger-thread.c | 2 +-
src/libide/debugger/ide-debugger-threads-view.c | 2 +-
src/libide/debugger/ide-debugger-threads-view.h | 2 +-
src/libide/debugger/ide-debugger-types.c | 2 +-
src/libide/debugger/ide-debugger-variable.c | 2 +-
src/libide/debugger/ide-debugger.c | 6 +++---
src/libide/devices/ide-device-manager.c | 6 +++---
src/libide/devices/ide-device-manager.h | 2 +-
src/libide/devices/ide-device-provider.c | 2 +-
src/libide/devices/ide-device-provider.h | 2 +-
src/libide/diagnostics/ide-diagnostic.h | 2 +-
src/libide/diagnostics/ide-diagnostics.c | 4 ++--
src/libide/diagnostics/ide-fixit.c | 4 ++--
src/libide/doap/ide-doap-person.c | 2 +-
src/libide/doap/ide-doap.c | 4 ++--
src/libide/doap/ide-doap.h | 2 +-
src/libide/doap/xml-reader.c | 2 +-
src/libide/documentation/ide-documentation-info.c | 4 ++--
src/libide/documentation/ide-documentation-info.h | 2 +-
.../documentation/ide-documentation-proposal.c | 2 +-
.../documentation/ide-documentation-provider.c | 2 +-
.../documentation/ide-documentation-provider.h | 2 +-
src/libide/documentation/ide-documentation.c | 6 +++---
src/libide/documentation/ide-documentation.h | 2 +-
.../editor/ide-editor-perspective-shortcuts.c | 2 +-
src/libide/editor/ide-editor-print-operation.c | 4 ++--
src/libide/editor/ide-editor-print-operation.h | 2 +-
src/libide/editor/ide-editor-view-settings.c | 2 +-
src/libide/editor/ide-editor-view-shortcuts.c | 2 +-
src/libide/editorconfig/editorconfig-glib.c | 2 +-
.../editorconfig/ide-editorconfig-file-settings.c | 2 +-
src/libide/files/ide-file-settings.c | 4 ++--
src/libide/files/ide-file-settings.h | 4 ++--
src/libide/formatting/ide-formatter-options.c | 2 +-
src/libide/genesis/ide-genesis-addin.c | 2 +-
src/libide/highlighting/ide-highlighter.c | 2 +-
src/libide/keybindings/ide-shortcuts-window.c | 2 +-
.../langserv/ide-langserv-symbol-node-private.h | 2 +-
.../langserv/ide-langserv-symbol-tree-private.h | 2 +-
src/libide/langserv/ide-langserv-symbol-tree.c | 6 +++---
src/libide/langserv/ide-langserv-util.c | 2 +-
src/libide/layout/ide-layout-grid-actions.c | 2 +-
src/libide/layout/ide-layout-grid-column-actions.c | 2 +-
src/libide/layout/ide-layout-grid-column.c | 6 +++---
src/libide/layout/ide-layout-grid-column.h | 2 +-
src/libide/layout/ide-layout-grid.h | 6 +++---
src/libide/layout/ide-layout-pane.c | 2 +-
src/libide/layout/ide-layout-private.h | 10 +++++-----
src/libide/layout/ide-layout-stack-actions.c | 4 ++--
src/libide/layout/ide-layout-stack-addin.c | 2 +-
src/libide/layout/ide-layout-stack-addin.h | 4 ++--
src/libide/layout/ide-layout-stack-shortcuts.c | 4 ++--
src/libide/layout/ide-layout-stack.c | 10 +++++-----
src/libide/layout/ide-layout-stack.h | 2 +-
src/libide/layout/ide-shortcut-label.c | 2 +-
src/libide/modelines/modeline-parser.c | 2 +-
src/libide/plugins/ide-extension-adapter.c | 4 ++--
src/libide/plugins/ide-extension-set-adapter.c | 4 ++--
src/libide/plugins/ide-extension-util.c | 2 +-
.../preferences/ide-preferences-language-row.c | 2 +-
src/libide/preferences/ide-preferences-window.c | 2 +-
src/libide/projects/ide-project-file.c | 2 +-
src/libide/projects/ide-project-files.h | 4 ++--
src/libide/projects/ide-project-info.c | 2 +-
src/libide/projects/ide-project-item.c | 2 +-
src/libide/projects/ide-project-miner.c | 2 +-
src/libide/projects/ide-project-miner.h | 2 +-
src/libide/projects/ide-project.h | 2 +-
src/libide/projects/ide-recent-projects.c | 4 ++--
src/libide/projects/ide-recent-projects.h | 2 +-
src/libide/runner/ide-run-manager-private.h | 2 +-
src/libide/runner/ide-runner-addin.c | 2 +-
src/libide/runner/ide-runner-addin.h | 2 +-
src/libide/runtimes/ide-runtime-provider.c | 4 ++--
src/libide/search/ide-search-engine.c | 6 +++---
src/libide/search/ide-search-provider.c | 2 +-
src/libide/search/ide-search-reducer.c | 4 ++--
src/libide/search/ide-search-result.c | 2 +-
.../snippets/ide-source-snippet-completion-item.c | 2 +-
.../snippets/ide-source-snippet-completion-item.h | 2 +-
src/libide/snippets/ide-source-snippet-context.c | 2 +-
src/libide/snippets/ide-source-snippet-parser.c | 8 ++++----
src/libide/snippets/ide-source-snippet-private.h | 2 +-
src/libide/snippets/ide-source-snippets-manager.c | 8 ++++----
src/libide/snippets/ide-source-snippets.c | 8 ++++----
src/libide/snippets/ide-source-snippets.h | 2 +-
src/libide/sourceview/ide-completion-item.c | 2 +-
src/libide/sourceview/ide-completion-provider.c | 2 +-
src/libide/sourceview/ide-completion-results.h | 2 +-
src/libide/sourceview/ide-completion-words.c | 4 ++--
src/libide/sourceview/ide-cursor.c | 6 +++---
src/libide/sourceview/ide-source-iter.c | 2 +-
src/libide/sourceview/ide-source-style-scheme.c | 2 +-
src/libide/sourceview/ide-source-view-capture.c | 2 +-
src/libide/sourceview/ide-source-view-capture.h | 2 +-
src/libide/sourceview/ide-source-view-mode.h | 2 +-
src/libide/sourceview/ide-source-view-movements.h | 2 +-
src/libide/sourceview/ide-source-view-private.h | 2 +-
src/libide/sourceview/ide-source-view-shortcuts.c | 2 +-
src/libide/sourceview/ide-text-util.c | 2 +-
src/libide/subprocess/ide-simple-subprocess.h | 2 +-
src/libide/symbols/ide-code-index-entries.c | 2 +-
src/libide/symbols/ide-code-index-entries.h | 4 ++--
src/libide/symbols/ide-code-index-entry.c | 2 +-
src/libide/symbols/ide-code-index-entry.h | 2 +-
src/libide/symbols/ide-code-indexer.c | 2 +-
src/libide/symbols/ide-code-indexer.h | 2 +-
src/libide/symbols/ide-symbol-node.c | 4 ++--
src/libide/symbols/ide-symbol-resolver.h | 2 +-
src/libide/symbols/ide-symbol-tree.c | 2 +-
src/libide/symbols/ide-symbol-tree.h | 2 +-
src/libide/symbols/ide-tags-builder.c | 2 +-
src/libide/template/ide-project-template.c | 2 +-
src/libide/template/ide-template-base.c | 2 +-
src/libide/template/ide-template-provider.c | 2 +-
src/libide/template/ide-template-provider.h | 2 +-
src/libide/transfers/ide-pkcon-transfer.h | 2 +-
src/libide/transfers/ide-transfer-row.h | 2 +-
src/libide/transfers/ide-transfers-progress-icon.c | 2 +-
src/libide/util/ide-async-helper.c | 2 +-
src/libide/util/ide-battery-monitor.c | 2 +-
src/libide/util/ide-cell-renderer-fancy.c | 2 +-
src/libide/util/ide-dnd.c | 2 +-
src/libide/util/ide-doc-seq.c | 2 +-
src/libide/util/ide-flatpak.c | 2 +-
src/libide/util/ide-glib.c | 2 +-
src/libide/util/ide-line-reader.c | 2 +-
src/libide/util/ide-posix.c | 2 +-
src/libide/util/ide-progress.c | 2 +-
src/libide/util/ide-ref-ptr.c | 2 +-
src/libide/util/ide-uri.c | 2 +-
src/libide/util/ide-window-settings.c | 2 +-
src/libide/vcs/ide-vcs-config.c | 2 +-
src/libide/vcs/ide-vcs-initializer.c | 2 +-
src/libide/vcs/ide-vcs-uri.c | 2 +-
src/libide/vcs/ide-vcs.h | 2 +-
src/libide/workbench/ide-perspective.c | 2 +-
src/libide/workbench/ide-workbench-header-bar.h | 2 +-
src/libide/workbench/ide-workbench-message.c | 2 +-
src/libide/workbench/ide-workbench-shortcuts.c | 2 +-
src/libide/workers/ide-worker.c | 2 +-
192 files changed, 259 insertions(+), 259 deletions(-)
---
diff --git a/src/libide/application/ide-application-actions.h
b/src/libide/application/ide-application-actions.h
index 10544a5..f09c8f1 100644
--- a/src/libide/application/ide-application-actions.h
+++ b/src/libide/application/ide-application-actions.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-application.h"
+#include "application/ide-application.h"
G_BEGIN_DECLS
diff --git a/src/libide/application/ide-application-addin.c b/src/libide/application/ide-application-addin.c
index d03d5f5..ac3f702 100644
--- a/src/libide/application/ide-application-addin.c
+++ b/src/libide/application/ide-application-addin.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-application-addin.h"
+#include "application/ide-application-addin.h"
G_DEFINE_INTERFACE (IdeApplicationAddin, ide_application_addin, G_TYPE_OBJECT)
diff --git a/src/libide/application/ide-application-addin.h b/src/libide/application/ide-application-addin.h
index 2a5be5c..4295cd4 100644
--- a/src/libide/application/ide-application-addin.h
+++ b/src/libide/application/ide-application-addin.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-application.h"
+#include "application/ide-application.h"
G_BEGIN_DECLS
diff --git a/src/libide/application/ide-application-shortcuts.c
b/src/libide/application/ide-application-shortcuts.c
index e368694..3c5cc77 100644
--- a/src/libide/application/ide-application-shortcuts.c
+++ b/src/libide/application/ide-application-shortcuts.c
@@ -23,7 +23,7 @@
#include <glib/gi18n.h>
#include <dazzle.h>
-#include "ide-application-private.h"
+#include "application/ide-application-private.h"
#define I_(s) (g_intern_static_string(s))
diff --git a/src/libide/application/ide-application-tests.h b/src/libide/application/ide-application-tests.h
index 15a12e4..7a1b8ef 100644
--- a/src/libide/application/ide-application-tests.h
+++ b/src/libide/application/ide-application-tests.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-application.h"
+#include "application/ide-application.h"
G_BEGIN_DECLS
diff --git a/src/libide/application/ide-application-tool.c b/src/libide/application/ide-application-tool.c
index 5811fa6..3890288 100644
--- a/src/libide/application/ide-application-tool.c
+++ b/src/libide/application/ide-application-tool.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-application-tool.h"
+#include "application/ide-application-tool.h"
G_DEFINE_INTERFACE (IdeApplicationTool, ide_application_tool, G_TYPE_OBJECT)
diff --git a/src/libide/buffers/ide-buffer-addin.c b/src/libide/buffers/ide-buffer-addin.c
index daaf141..caf67ed 100644
--- a/src/libide/buffers/ide-buffer-addin.c
+++ b/src/libide/buffers/ide-buffer-addin.c
@@ -20,8 +20,8 @@
#include <libpeas/peas.h>
-#include "ide-buffer-addin.h"
-#include "ide-buffer-private.h"
+#include "buffers/ide-buffer-addin.h"
+#include "buffers/ide-buffer-private.h"
/**
* SECTION:ide-buffer-addin
diff --git a/src/libide/buffers/ide-buffer-change-monitor.c b/src/libide/buffers/ide-buffer-change-monitor.c
index 552acc7..9c46925 100644
--- a/src/libide/buffers/ide-buffer-change-monitor.c
+++ b/src/libide/buffers/ide-buffer-change-monitor.c
@@ -18,8 +18,8 @@
#include <glib/gi18n.h>
-#include "ide-buffer.h"
-#include "ide-buffer-change-monitor.h"
+#include "buffers/ide-buffer.h"
+#include "buffers/ide-buffer-change-monitor.h"
G_DEFINE_TYPE (IdeBufferChangeMonitor, ide_buffer_change_monitor, IDE_TYPE_OBJECT)
diff --git a/src/libide/buildsystem/ide-build-log-private.h b/src/libide/buildsystem/ide-build-log-private.h
index 7e05a5a..3a7f3c4 100644
--- a/src/libide/buildsystem/ide-build-log-private.h
+++ b/src/libide/buildsystem/ide-build-log-private.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-build-log.h"
+#include "buildsystem/ide-build-log.h"
G_BEGIN_DECLS
diff --git a/src/libide/buildsystem/ide-build-pipeline-addin.h
b/src/libide/buildsystem/ide-build-pipeline-addin.h
index 00d8bef..8d8ece0 100644
--- a/src/libide/buildsystem/ide-build-pipeline-addin.h
+++ b/src/libide/buildsystem/ide-build-pipeline-addin.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-build-pipeline.h"
+#include "buildsystem/ide-build-pipeline.h"
G_BEGIN_DECLS
diff --git a/src/libide/buildsystem/ide-build-stage-mkdirs.h b/src/libide/buildsystem/ide-build-stage-mkdirs.h
index 73622dd..e3b35a3 100644
--- a/src/libide/buildsystem/ide-build-stage-mkdirs.h
+++ b/src/libide/buildsystem/ide-build-stage-mkdirs.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-build-stage.h"
+#include "buildsystem/ide-build-stage.h"
G_BEGIN_DECLS
diff --git a/src/libide/buildsystem/ide-build-stage-private.h
b/src/libide/buildsystem/ide-build-stage-private.h
index ad3dfa2..4edc9bc 100644
--- a/src/libide/buildsystem/ide-build-stage-private.h
+++ b/src/libide/buildsystem/ide-build-stage-private.h
@@ -18,8 +18,8 @@
#pragma once
-#include "ide-build-pipeline.h"
-#include "ide-build-stage.h"
+#include "buildsystem/ide-build-pipeline.h"
+#include "buildsystem/ide-build-stage.h"
G_BEGIN_DECLS
diff --git a/src/libide/buildsystem/ide-build-system-discovery.c
b/src/libide/buildsystem/ide-build-system-discovery.c
index a9e52b7..b234b93 100644
--- a/src/libide/buildsystem/ide-build-system-discovery.c
+++ b/src/libide/buildsystem/ide-build-system-discovery.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-build-system-discovery"
-#include "ide-build-system-discovery.h"
+#include "buildsystem/ide-build-system-discovery.h"
G_DEFINE_INTERFACE (IdeBuildSystemDiscovery, ide_build_system_discovery, G_TYPE_OBJECT)
diff --git a/src/libide/buildsystem/ide-build-target.c b/src/libide/buildsystem/ide-build-target.c
index cffc8fb..df12ca2 100644
--- a/src/libide/buildsystem/ide-build-target.c
+++ b/src/libide/buildsystem/ide-build-target.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-build-target"
-#include "ide-build-target.h"
+#include "buildsystem/ide-build-target.h"
G_DEFINE_INTERFACE (IdeBuildTarget, ide_build_target, IDE_TYPE_OBJECT)
diff --git a/src/libide/buildsystem/ide-build-utils.c b/src/libide/buildsystem/ide-build-utils.c
index 250d483..0771a1d 100644
--- a/src/libide/buildsystem/ide-build-utils.c
+++ b/src/libide/buildsystem/ide-build-utils.c
@@ -18,7 +18,7 @@
#include <ide.h>
-#include "ide-build-utils.h"
+#include "buildsystem/ide-build-utils.h"
static void
skip_color_codes_values (const gchar **cursor)
diff --git a/src/libide/buildsystem/ide-configuration-provider.c
b/src/libide/buildsystem/ide-configuration-provider.c
index 7ddded1..94eeb47 100644
--- a/src/libide/buildsystem/ide-configuration-provider.c
+++ b/src/libide/buildsystem/ide-configuration-provider.c
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-configuration-manager.h"
-#include "ide-configuration-provider.h"
+#include "buildsystem/ide-configuration-manager.h"
+#include "buildsystem/ide-configuration-provider.h"
G_DEFINE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, G_TYPE_OBJECT)
diff --git a/src/libide/buildsystem/ide-environment-variable.c
b/src/libide/buildsystem/ide-environment-variable.c
index 58d6da7..a01b396 100644
--- a/src/libide/buildsystem/ide-environment-variable.c
+++ b/src/libide/buildsystem/ide-environment-variable.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-environment-variable.h"
+#include "buildsystem/ide-environment-variable.h"
struct _IdeEnvironmentVariable
{
diff --git a/src/libide/buildsystem/ide-environment.c b/src/libide/buildsystem/ide-environment.c
index d2686b3..4f4e355 100644
--- a/src/libide/buildsystem/ide-environment.c
+++ b/src/libide/buildsystem/ide-environment.c
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-environment.h"
-#include "ide-environment-variable.h"
+#include "buildsystem/ide-environment.h"
+#include "buildsystem/ide-environment-variable.h"
struct _IdeEnvironment
{
diff --git a/src/libide/buildsystem/ide-environment.h b/src/libide/buildsystem/ide-environment.h
index d022656..db4d1be 100644
--- a/src/libide/buildsystem/ide-environment.h
+++ b/src/libide/buildsystem/ide-environment.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-environment-variable.h"
+#include "buildsystem/ide-environment-variable.h"
G_BEGIN_DECLS
diff --git a/src/libide/buildui/ide-build-configuration-row.c
b/src/libide/buildui/ide-build-configuration-row.c
index 860fb18..36f9bc7 100644
--- a/src/libide/buildui/ide-build-configuration-row.c
+++ b/src/libide/buildui/ide-build-configuration-row.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-build-configuration-row"
-#include "ide-build-configuration-row.h"
+#include "buildui/ide-build-configuration-row.h"
struct _IdeBuildConfigurationRow
{
diff --git a/src/libide/buildui/ide-build-log-panel.c b/src/libide/buildui/ide-build-log-panel.c
index f717246..850d5d2 100644
--- a/src/libide/buildui/ide-build-log-panel.c
+++ b/src/libide/buildui/ide-build-log-panel.c
@@ -22,7 +22,7 @@
#include <glib/gi18n.h>
#include <ide.h>
-#include "ide-build-log-panel.h"
+#include "buildui/ide-build-log-panel.h"
typedef struct _ColorCodeState
{
diff --git a/src/libide/buildui/ide-build-perspective.c b/src/libide/buildui/ide-build-perspective.c
index 3b10b9d..48ecae5 100644
--- a/src/libide/buildui/ide-build-perspective.c
+++ b/src/libide/buildui/ide-build-perspective.c
@@ -20,9 +20,9 @@
#include <glib/gi18n.h>
-#include "ide-build-configuration-row.h"
-#include "ide-build-configuration-view.h"
-#include "ide-build-perspective.h"
+#include "buildui/ide-build-configuration-row.h"
+#include "buildui/ide-build-configuration-view.h"
+#include "buildui/ide-build-perspective.h"
struct _IdeBuildPerspective
{
diff --git a/src/libide/buildui/ide-build-plugin.c b/src/libide/buildui/ide-build-plugin.c
index 44fe39f..925a71f 100644
--- a/src/libide/buildui/ide-build-plugin.c
+++ b/src/libide/buildui/ide-build-plugin.c
@@ -21,8 +21,8 @@
#include <libpeas/peas.h>
#include <ide.h>
-#include "ide-build-tool.h"
-#include "ide-build-workbench-addin.h"
+#include "buildui/ide-build-tool.h"
+#include "buildui/ide-build-workbench-addin.h"
void
ide_build_tool_register_types (PeasObjectModule *module)
diff --git a/src/libide/buildui/ide-build-tool.c b/src/libide/buildui/ide-build-tool.c
index a3c8681..92a6456 100644
--- a/src/libide/buildui/ide-build-tool.c
+++ b/src/libide/buildui/ide-build-tool.c
@@ -25,7 +25,7 @@
#include <glib/gi18n.h>
#include <ide.h>
-#include "ide-build-tool.h"
+#include "buildui/ide-build-tool.h"
struct _IdeBuildTool
{
diff --git a/src/libide/buildui/ide-environment-editor-row.c b/src/libide/buildui/ide-environment-editor-row.c
index 22bd5a6..1a85ad2 100644
--- a/src/libide/buildui/ide-environment-editor-row.c
+++ b/src/libide/buildui/ide-environment-editor-row.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-environment-editor-row"
-#include "ide-environment-editor-row.h"
+#include "buildui/ide-environment-editor-row.h"
struct _IdeEnvironmentEditorRow
{
diff --git a/src/libide/buildui/ide-environment-editor.c b/src/libide/buildui/ide-environment-editor.c
index c52a3e9..6ff33e9 100644
--- a/src/libide/buildui/ide-environment-editor.c
+++ b/src/libide/buildui/ide-environment-editor.c
@@ -20,8 +20,8 @@
#include <glib/gi18n.h>
-#include "ide-environment-editor.h"
-#include "ide-environment-editor-row.h"
+#include "buildui/ide-environment-editor.h"
+#include "buildui/ide-environment-editor-row.h"
struct _IdeEnvironmentEditor
{
diff --git a/src/libide/debugger/ide-debugger-actions.c b/src/libide/debugger/ide-debugger-actions.c
index 71fca2d..fb77977 100644
--- a/src/libide/debugger/ide-debugger-actions.c
+++ b/src/libide/debugger/ide-debugger-actions.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-actions"
-#include "ide-debugger-private.h"
+#include "debugger/ide-debugger-private.h"
typedef struct _IdeDebuggerActionEntry IdeDebuggerActionEntry;
diff --git a/src/libide/debugger/ide-debugger-address-map.c b/src/libide/debugger/ide-debugger-address-map.c
index 9a534f2..7fa09bb 100644
--- a/src/libide/debugger/ide-debugger-address-map.c
+++ b/src/libide/debugger/ide-debugger-address-map.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-address-map"
-#include "ide-debugger-address-map.h"
+#include "debugger/ide-debugger-address-map.h"
struct _IdeDebuggerAddressMap
{
diff --git a/src/libide/debugger/ide-debugger-address-map.h b/src/libide/debugger/ide-debugger-address-map.h
index bd96bab..b5fa3ed 100644
--- a/src/libide/debugger/ide-debugger-address-map.h
+++ b/src/libide/debugger/ide-debugger-address-map.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-breakpoint.c b/src/libide/debugger/ide-debugger-breakpoint.c
index 674abd9..200beb0 100644
--- a/src/libide/debugger/ide-debugger-breakpoint.c
+++ b/src/libide/debugger/ide-debugger-breakpoint.c
@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "ide-debugger-breakpoint"
-#include "ide-debugger-breakpoint.h"
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-breakpoint.h"
+#include "debugger/ide-debugger-types.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-breakpoint.h b/src/libide/debugger/ide-debugger-breakpoint.h
index 2863453..ef47af6 100644
--- a/src/libide/debugger/ide-debugger-breakpoint.h
+++ b/src/libide/debugger/ide-debugger-breakpoint.h
@@ -20,8 +20,8 @@
#include <glib-object.h>
-#include "ide-debugger-frame.h"
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-frame.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-breakpoints-view.c
b/src/libide/debugger/ide-debugger-breakpoints-view.c
index 6c7761e..fd9e0d7 100644
--- a/src/libide/debugger/ide-debugger-breakpoints-view.c
+++ b/src/libide/debugger/ide-debugger-breakpoints-view.c
@@ -20,7 +20,7 @@
#include <dazzle.h>
-#include "ide-debugger-breakpoints-view.h"
+#include "debugger/ide-debugger-breakpoints-view.h"
struct _IdeDebuggerBreakpointsView
{
diff --git a/src/libide/debugger/ide-debugger-breakpoints-view.h
b/src/libide/debugger/ide-debugger-breakpoints-view.h
index e01325a..4360162 100644
--- a/src/libide/debugger/ide-debugger-breakpoints-view.h
+++ b/src/libide/debugger/ide-debugger-breakpoints-view.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-debugger.h"
+#include "debugger/ide-debugger.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-breakpoints.h b/src/libide/debugger/ide-debugger-breakpoints.h
index 77d7e72..a749049 100644
--- a/src/libide/debugger/ide-debugger-breakpoints.h
+++ b/src/libide/debugger/ide-debugger-breakpoints.h
@@ -20,8 +20,8 @@
#include <glib-object.h>
-#include "ide-debugger-breakpoint.h"
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-breakpoint.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-controls.c b/src/libide/debugger/ide-debugger-controls.c
index 85abfed..a46690c 100644
--- a/src/libide/debugger/ide-debugger-controls.c
+++ b/src/libide/debugger/ide-debugger-controls.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-debugger-controls.h"
+#include "debugger/ide-debugger-controls.h"
struct _IdeDebuggerControls
{
diff --git a/src/libide/debugger/ide-debugger-fallbacks.c b/src/libide/debugger/ide-debugger-fallbacks.c
index 886eb0c..88178df 100644
--- a/src/libide/debugger/ide-debugger-fallbacks.c
+++ b/src/libide/debugger/ide-debugger-fallbacks.c
@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "ide-debugger-fallbacks"
-#include "ide-debugger.h"
-#include "ide-debugger-private.h"
+#include "debugger/ide-debugger.h"
+#include "debugger/ide-debugger-private.h"
void
_ide_debugger_real_list_frames_async (IdeDebugger *self,
diff --git a/src/libide/debugger/ide-debugger-frame.c b/src/libide/debugger/ide-debugger-frame.c
index 63d2e4e..0761533 100644
--- a/src/libide/debugger/ide-debugger-frame.c
+++ b/src/libide/debugger/ide-debugger-frame.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-debugger-frame.h"
+#include "debugger/ide-debugger-frame.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-frame.h b/src/libide/debugger/ide-debugger-frame.h
index 1199664..fd81ab1 100644
--- a/src/libide/debugger/ide-debugger-frame.h
+++ b/src/libide/debugger/ide-debugger-frame.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-instruction.c b/src/libide/debugger/ide-debugger-instruction.c
index babfd0b..b22124a 100644
--- a/src/libide/debugger/ide-debugger-instruction.c
+++ b/src/libide/debugger/ide-debugger-instruction.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-instruction"
-#include "ide-debugger-instruction.h"
+#include "debugger/ide-debugger-instruction.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-instruction.h b/src/libide/debugger/ide-debugger-instruction.h
index 9b06e6c..763bec6 100644
--- a/src/libide/debugger/ide-debugger-instruction.h
+++ b/src/libide/debugger/ide-debugger-instruction.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-libraries-view.c
b/src/libide/debugger/ide-debugger-libraries-view.c
index fa97e61..5752ab5 100644
--- a/src/libide/debugger/ide-debugger-libraries-view.c
+++ b/src/libide/debugger/ide-debugger-libraries-view.c
@@ -20,7 +20,7 @@
#include <dazzle.h>
-#include "ide-debugger-libraries-view.h"
+#include "debugger/ide-debugger-libraries-view.h"
struct _IdeDebuggerLibrariesView
{
diff --git a/src/libide/debugger/ide-debugger-libraries-view.h
b/src/libide/debugger/ide-debugger-libraries-view.h
index 7dadc07..edbb1a4 100644
--- a/src/libide/debugger/ide-debugger-libraries-view.h
+++ b/src/libide/debugger/ide-debugger-libraries-view.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-debugger.h"
+#include "debugger/ide-debugger.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-library.c b/src/libide/debugger/ide-debugger-library.c
index 2db2e0e..f27d57f 100644
--- a/src/libide/debugger/ide-debugger-library.c
+++ b/src/libide/debugger/ide-debugger-library.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-library"
-#include "ide-debugger-library.h"
+#include "debugger/ide-debugger-library.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-library.h b/src/libide/debugger/ide-debugger-library.h
index 772e9d7..9e9c5a7 100644
--- a/src/libide/debugger/ide-debugger-library.h
+++ b/src/libide/debugger/ide-debugger-library.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-locals-view.c b/src/libide/debugger/ide-debugger-locals-view.c
index d801e6d..4efebfa 100644
--- a/src/libide/debugger/ide-debugger-locals-view.c
+++ b/src/libide/debugger/ide-debugger-locals-view.c
@@ -21,7 +21,7 @@
#include <dazzle.h>
#include <glib/gi18n.h>
-#include "ide-debugger-locals-view.h"
+#include "debugger/ide-debugger-locals-view.h"
struct _IdeDebuggerLocalsView
{
diff --git a/src/libide/debugger/ide-debugger-locals-view.h b/src/libide/debugger/ide-debugger-locals-view.h
index 5427a97..91f9885 100644
--- a/src/libide/debugger/ide-debugger-locals-view.h
+++ b/src/libide/debugger/ide-debugger-locals-view.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-debugger.h"
+#include "debugger/ide-debugger.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-private.h b/src/libide/debugger/ide-debugger-private.h
index 4750ac1..e54c269 100644
--- a/src/libide/debugger/ide-debugger-private.h
+++ b/src/libide/debugger/ide-debugger-private.h
@@ -18,9 +18,9 @@
#pragma once
-#include "ide-debug-manager.h"
-#include "ide-debugger.h"
-#include "ide-debugger-breakpoints.h"
+#include "debugger/ide-debug-manager.h"
+#include "debugger/ide-debugger.h"
+#include "debugger/ide-debugger-breakpoints.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-register.c b/src/libide/debugger/ide-debugger-register.c
index c62c3b5..2496c79 100644
--- a/src/libide/debugger/ide-debugger-register.c
+++ b/src/libide/debugger/ide-debugger-register.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-register"
-#include "ide-debugger-register.h"
+#include "debugger/ide-debugger-register.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-registers-view.c
b/src/libide/debugger/ide-debugger-registers-view.c
index 8b51886..9943c92 100644
--- a/src/libide/debugger/ide-debugger-registers-view.c
+++ b/src/libide/debugger/ide-debugger-registers-view.c
@@ -20,7 +20,7 @@
#include <dazzle.h>
-#include "ide-debugger-registers-view.h"
+#include "debugger/ide-debugger-registers-view.h"
struct _IdeDebuggerRegistersView
{
diff --git a/src/libide/debugger/ide-debugger-registers-view.h
b/src/libide/debugger/ide-debugger-registers-view.h
index bb38c31..4c440c0 100644
--- a/src/libide/debugger/ide-debugger-registers-view.h
+++ b/src/libide/debugger/ide-debugger-registers-view.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-debugger.h"
+#include "debugger/ide-debugger.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-thread-group.c b/src/libide/debugger/ide-debugger-thread-group.c
index b2bd0ff..115b3ee 100644
--- a/src/libide/debugger/ide-debugger-thread-group.c
+++ b/src/libide/debugger/ide-debugger-thread-group.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-thread-group"
-#include "ide-debugger-thread-group.h"
+#include "debugger/ide-debugger-thread-group.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-thread.c b/src/libide/debugger/ide-debugger-thread.c
index 069dd4b..4f9928d 100644
--- a/src/libide/debugger/ide-debugger-thread.c
+++ b/src/libide/debugger/ide-debugger-thread.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-thread"
-#include "ide-debugger-thread.h"
+#include "debugger/ide-debugger-thread.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger-threads-view.c b/src/libide/debugger/ide-debugger-threads-view.c
index b991d1d..4805204 100644
--- a/src/libide/debugger/ide-debugger-threads-view.c
+++ b/src/libide/debugger/ide-debugger-threads-view.c
@@ -21,7 +21,7 @@
#include <dazzle.h>
#include <glib/gi18n.h>
-#include "ide-debugger-threads-view.h"
+#include "debugger/ide-debugger-threads-view.h"
struct _IdeDebuggerThreadsView
{
diff --git a/src/libide/debugger/ide-debugger-threads-view.h b/src/libide/debugger/ide-debugger-threads-view.h
index 668392a..124839f 100644
--- a/src/libide/debugger/ide-debugger-threads-view.h
+++ b/src/libide/debugger/ide-debugger-threads-view.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-debugger.h"
+#include "debugger/ide-debugger.h"
G_BEGIN_DECLS
diff --git a/src/libide/debugger/ide-debugger-types.c b/src/libide/debugger/ide-debugger-types.c
index f82068c..2b363bf 100644
--- a/src/libide/debugger/ide-debugger-types.c
+++ b/src/libide/debugger/ide-debugger-types.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-types"
-#include "ide-debugger-types.h"
+#include "debugger/ide-debugger-types.h"
GType
ide_debugger_stream_get_type (void)
diff --git a/src/libide/debugger/ide-debugger-variable.c b/src/libide/debugger/ide-debugger-variable.c
index 2bcafa5..a65b85e 100644
--- a/src/libide/debugger/ide-debugger-variable.c
+++ b/src/libide/debugger/ide-debugger-variable.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-debugger-variable"
-#include "ide-debugger-variable.h"
+#include "debugger/ide-debugger-variable.h"
typedef struct
{
diff --git a/src/libide/debugger/ide-debugger.c b/src/libide/debugger/ide-debugger.c
index 5a26067..afcbdc2 100644
--- a/src/libide/debugger/ide-debugger.c
+++ b/src/libide/debugger/ide-debugger.c
@@ -18,9 +18,9 @@
#define G_LOG_DOMAIN "ide-debugger"
-#include "ide-debugger.h"
-#include "ide-debugger-address-map.h"
-#include "ide-debugger-private.h"
+#include "debugger/ide-debugger.h"
+#include "debugger/ide-debugger-address-map.h"
+#include "debugger/ide-debugger-private.h"
/**
* SECTION:ide-debugger
diff --git a/src/libide/devices/ide-device-manager.c b/src/libide/devices/ide-device-manager.c
index 070f99a..13aec55 100644
--- a/src/libide/devices/ide-device-manager.c
+++ b/src/libide/devices/ide-device-manager.c
@@ -19,9 +19,9 @@
#include <glib/gi18n.h>
#include <libpeas/peas.h>
-#include "ide-device.h"
-#include "ide-device-manager.h"
-#include "ide-device-provider.h"
+#include "devices/ide-device.h"
+#include "devices/ide-device-manager.h"
+#include "devices/ide-device-provider.h"
#include "local/ide-local-device.h"
#include "plugins/ide-extension-util.h"
diff --git a/src/libide/devices/ide-device-manager.h b/src/libide/devices/ide-device-manager.h
index 63d1ccb..44d29e1 100644
--- a/src/libide/devices/ide-device-manager.h
+++ b/src/libide/devices/ide-device-manager.h
@@ -19,7 +19,7 @@
#pragma once
#include "ide-object.h"
-#include "ide-device-manager.h"
+#include "devices/ide-device-manager.h"
G_BEGIN_DECLS
diff --git a/src/libide/devices/ide-device-provider.c b/src/libide/devices/ide-device-provider.c
index a15a6b5..a845317 100644
--- a/src/libide/devices/ide-device-provider.c
+++ b/src/libide/devices/ide-device-provider.c
@@ -19,7 +19,7 @@
#include <glib/gi18n.h>
#include "ide-context.h"
-#include "ide-device-provider.h"
+#include "devices/ide-device-provider.h"
G_DEFINE_INTERFACE (IdeDeviceProvider, ide_device_provider, IDE_TYPE_OBJECT)
diff --git a/src/libide/devices/ide-device-provider.h b/src/libide/devices/ide-device-provider.h
index 63009ce..45c5c82 100644
--- a/src/libide/devices/ide-device-provider.h
+++ b/src/libide/devices/ide-device-provider.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-device.h"
+#include "devices/ide-device.h"
#include "ide-object.h"
G_BEGIN_DECLS
diff --git a/src/libide/diagnostics/ide-diagnostic.h b/src/libide/diagnostics/ide-diagnostic.h
index 5f98300..f8f6c8a 100644
--- a/src/libide/diagnostics/ide-diagnostic.h
+++ b/src/libide/diagnostics/ide-diagnostic.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-fixit.h"
+#include "diagnostics/ide-fixit.h"
#include "ide-types.h"
G_BEGIN_DECLS
diff --git a/src/libide/diagnostics/ide-diagnostics.c b/src/libide/diagnostics/ide-diagnostics.c
index f6df90e..a406f0a 100644
--- a/src/libide/diagnostics/ide-diagnostics.c
+++ b/src/libide/diagnostics/ide-diagnostics.c
@@ -20,8 +20,8 @@
#include "dazzle.h"
-#include "ide-diagnostic.h"
-#include "ide-diagnostics.h"
+#include "diagnostics/ide-diagnostic.h"
+#include "diagnostics/ide-diagnostics.h"
G_DEFINE_BOXED_TYPE (IdeDiagnostics, ide_diagnostics, ide_diagnostics_ref, ide_diagnostics_unref)
diff --git a/src/libide/diagnostics/ide-fixit.c b/src/libide/diagnostics/ide-fixit.c
index a639d06..a20b8a2 100644
--- a/src/libide/diagnostics/ide-fixit.c
+++ b/src/libide/diagnostics/ide-fixit.c
@@ -18,8 +18,8 @@
#include "dazzle.h"
-#include "ide-fixit.h"
-#include "ide-source-range.h"
+#include "diagnostics/ide-fixit.h"
+#include "diagnostics/ide-source-range.h"
G_DEFINE_BOXED_TYPE (IdeFixit, ide_fixit, ide_fixit_ref, ide_fixit_unref)
diff --git a/src/libide/doap/ide-doap-person.c b/src/libide/doap/ide-doap-person.c
index ca1d84d..0df4022 100644
--- a/src/libide/doap/ide-doap-person.c
+++ b/src/libide/doap/ide-doap-person.c
@@ -18,7 +18,7 @@
#include <glib/gi18n.h>
-#include "ide-doap-person.h"
+#include "doap/ide-doap-person.h"
struct _IdeDoapPerson
{
diff --git a/src/libide/doap/ide-doap.c b/src/libide/doap/ide-doap.c
index abae527..53dbe3a 100644
--- a/src/libide/doap/ide-doap.c
+++ b/src/libide/doap/ide-doap.c
@@ -20,9 +20,9 @@
#include <glib/gi18n.h>
-#include "ide-doap.h"
+#include "doap/ide-doap.h"
-#include "xml-reader.h"
+#include "doap/xml-reader.h"
/*
* TODO: We don't do any XMLNS checking or anything here.
diff --git a/src/libide/doap/ide-doap.h b/src/libide/doap/ide-doap.h
index d8f7369..34fd0b1 100644
--- a/src/libide/doap/ide-doap.h
+++ b/src/libide/doap/ide-doap.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-doap-person.h"
+#include "doap/ide-doap-person.h"
G_BEGIN_DECLS
diff --git a/src/libide/doap/xml-reader.c b/src/libide/doap/xml-reader.c
index 0498d07..9953079 100644
--- a/src/libide/doap/xml-reader.c
+++ b/src/libide/doap/xml-reader.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <libxml/xmlreader.h>
-#include "xml-reader.h"
+#include "doap/xml-reader.h"
#define XML_TO_CHAR(s) ((char *) (s))
#define CHAR_TO_XML(s) ((unsigned char *) (s))
diff --git a/src/libide/documentation/ide-documentation-info.c
b/src/libide/documentation/ide-documentation-info.c
index a432667..8b3456c 100644
--- a/src/libide/documentation/ide-documentation-info.c
+++ b/src/libide/documentation/ide-documentation-info.c
@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "ide-documentation-info"
-#include "ide-documentation-info.h"
-#include "ide-documentation-proposal.h"
+#include "documentation/ide-documentation-info.h"
+#include "documentation/ide-documentation-proposal.h"
struct _IdeDocumentationInfo
{
diff --git a/src/libide/documentation/ide-documentation-info.h
b/src/libide/documentation/ide-documentation-info.h
index 6a9d0fe..58ce86a 100644
--- a/src/libide/documentation/ide-documentation-info.h
+++ b/src/libide/documentation/ide-documentation-info.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-documentation-proposal.h"
+#include "documentation/ide-documentation-proposal.h"
G_BEGIN_DECLS
diff --git a/src/libide/documentation/ide-documentation-proposal.c
b/src/libide/documentation/ide-documentation-proposal.c
index 8b74c79..9f29012 100644
--- a/src/libide/documentation/ide-documentation-proposal.c
+++ b/src/libide/documentation/ide-documentation-proposal.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-documentation-proposal"
-#include "ide-documentation-proposal.h"
+#include "documentation/ide-documentation-proposal.h"
typedef struct
{
diff --git a/src/libide/documentation/ide-documentation-provider.c
b/src/libide/documentation/ide-documentation-provider.c
index 9132542..4703e30 100644
--- a/src/libide/documentation/ide-documentation-provider.c
+++ b/src/libide/documentation/ide-documentation-provider.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-documentation-provider"
-#include "ide-documentation-provider.h"
+#include "documentation/ide-documentation-provider.h"
G_DEFINE_INTERFACE (IdeDocumentationProvider, ide_documentation_provider, IDE_TYPE_OBJECT)
diff --git a/src/libide/documentation/ide-documentation-provider.h
b/src/libide/documentation/ide-documentation-provider.h
index 4f672ce..a8ec7a3 100644
--- a/src/libide/documentation/ide-documentation-provider.h
+++ b/src/libide/documentation/ide-documentation-provider.h
@@ -20,7 +20,7 @@
#include <gtksourceview/gtksource.h>
-#include "ide-documentation-info.h"
+#include "documentation/ide-documentation-info.h"
G_BEGIN_DECLS
diff --git a/src/libide/documentation/ide-documentation.c b/src/libide/documentation/ide-documentation.c
index 2798f91..6c9d188 100644
--- a/src/libide/documentation/ide-documentation.c
+++ b/src/libide/documentation/ide-documentation.c
@@ -19,9 +19,9 @@
#include <glib/gi18n.h>
#include <libpeas/peas.h>
-#include "ide-documentation.h"
-#include "ide-documentation-provider.h"
-#include "ide-documentation-proposal.h"
+#include "documentation/ide-documentation.h"
+#include "documentation/ide-documentation-provider.h"
+#include "documentation/ide-documentation-proposal.h"
struct _IdeDocumentation
{
diff --git a/src/libide/documentation/ide-documentation.h b/src/libide/documentation/ide-documentation.h
index c644903..7ffa929 100644
--- a/src/libide/documentation/ide-documentation.h
+++ b/src/libide/documentation/ide-documentation.h
@@ -20,7 +20,7 @@
#include <gtksourceview/gtksource.h>
-#include "ide-documentation-info.h"
+#include "documentation/ide-documentation-info.h"
G_BEGIN_DECLS
diff --git a/src/libide/editor/ide-editor-perspective-shortcuts.c
b/src/libide/editor/ide-editor-perspective-shortcuts.c
index 8b03a17..e84fc9c 100644
--- a/src/libide/editor/ide-editor-perspective-shortcuts.c
+++ b/src/libide/editor/ide-editor-perspective-shortcuts.c
@@ -23,7 +23,7 @@
#include <glib/gi18n.h>
#include <dazzle.h>
-#include "ide-editor-private.h"
+#include "editor/ide-editor-private.h"
#define I_(s) g_intern_static_string(s)
diff --git a/src/libide/editor/ide-editor-print-operation.c b/src/libide/editor/ide-editor-print-operation.c
index 47a995c..c81de54 100644
--- a/src/libide/editor/ide-editor-print-operation.c
+++ b/src/libide/editor/ide-editor-print-operation.c
@@ -21,8 +21,8 @@
#include <glib/gi18n.h>
#include <gtksourceview/gtksource.h>
-#include "ide-editor-print-operation.h"
-#include "ide-editor-view.h"
+#include "editor/ide-editor-print-operation.h"
+#include "editor/ide-editor-view.h"
struct _IdeEditorPrintOperation
{
diff --git a/src/libide/editor/ide-editor-print-operation.h b/src/libide/editor/ide-editor-print-operation.h
index 8d357ed..89f4d96 100644
--- a/src/libide/editor/ide-editor-print-operation.h
+++ b/src/libide/editor/ide-editor-print-operation.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-editor-view.h"
+#include "editor/ide-editor-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/editor/ide-editor-view-settings.c b/src/libide/editor/ide-editor-view-settings.c
index 86823c3..9709f36 100644
--- a/src/libide/editor/ide-editor-view-settings.c
+++ b/src/libide/editor/ide-editor-view-settings.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-editor-view-settings"
-#include "ide-editor-private.h"
+#include "editor/ide-editor-private.h"
#include <gtksourceview/gtksource.h>
diff --git a/src/libide/editor/ide-editor-view-shortcuts.c b/src/libide/editor/ide-editor-view-shortcuts.c
index 378240b..91102eb 100644
--- a/src/libide/editor/ide-editor-view-shortcuts.c
+++ b/src/libide/editor/ide-editor-view-shortcuts.c
@@ -21,7 +21,7 @@
#include <dazzle.h>
#include <glib/gi18n.h>
-#include "ide-editor-private.h"
+#include "editor/ide-editor-private.h"
#define I_(s) (g_intern_static_string(s))
diff --git a/src/libide/editorconfig/editorconfig-glib.c b/src/libide/editorconfig/editorconfig-glib.c
index 21ab567..6d6703c 100644
--- a/src/libide/editorconfig/editorconfig-glib.c
+++ b/src/libide/editorconfig/editorconfig-glib.c
@@ -18,7 +18,7 @@
#include <editorconfig/editorconfig.h>
-#include "editorconfig-glib.h"
+#include "editorconfig/editorconfig-glib.h"
static void
_g_value_free (gpointer data)
diff --git a/src/libide/editorconfig/ide-editorconfig-file-settings.c
b/src/libide/editorconfig/ide-editorconfig-file-settings.c
index c6879b1..75efaab 100644
--- a/src/libide/editorconfig/ide-editorconfig-file-settings.c
+++ b/src/libide/editorconfig/ide-editorconfig-file-settings.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "editorconfig"
-#include "editorconfig-glib.h"
+#include "editorconfig/editorconfig-glib.h"
#include <glib/gi18n.h>
#include "ide-debug.h"
diff --git a/src/libide/files/ide-file-settings.c b/src/libide/files/ide-file-settings.c
index 3c6cf42..c88a851 100644
--- a/src/libide/files/ide-file-settings.c
+++ b/src/libide/files/ide-file-settings.c
@@ -24,8 +24,8 @@
#include "dazzle.h"
#include "ide-enums.h"
-#include "ide-file.h"
-#include "ide-file-settings.h"
+#include "files/ide-file.h"
+#include "files/ide-file-settings.h"
/*
* WARNING: This file heavily uses XMACROS.
diff --git a/src/libide/files/ide-file-settings.h b/src/libide/files/ide-file-settings.h
index 11642b1..8c448b4 100644
--- a/src/libide/files/ide-file-settings.h
+++ b/src/libide/files/ide-file-settings.h
@@ -20,8 +20,8 @@
#include <gtksourceview/gtksource.h>
-#include "ide-file.h"
-#include "ide-indent-style.h"
+#include "files/ide-file.h"
+#include "files/ide-indent-style.h"
#include "ide-object.h"
G_BEGIN_DECLS
diff --git a/src/libide/formatting/ide-formatter-options.c b/src/libide/formatting/ide-formatter-options.c
index 838f071..76c8b0a 100644
--- a/src/libide/formatting/ide-formatter-options.c
+++ b/src/libide/formatting/ide-formatter-options.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-formatter-options"
-#include "ide-formatter-options.h"
+#include "formatting/ide-formatter-options.h"
struct _IdeFormatterOptions
{
diff --git a/src/libide/genesis/ide-genesis-addin.c b/src/libide/genesis/ide-genesis-addin.c
index ad101cc..8059b79 100644
--- a/src/libide/genesis/ide-genesis-addin.c
+++ b/src/libide/genesis/ide-genesis-addin.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-genesis-addin.h"
+#include "genesis/ide-genesis-addin.h"
G_DEFINE_INTERFACE (IdeGenesisAddin, ide_genesis_addin, G_TYPE_OBJECT)
diff --git a/src/libide/highlighting/ide-highlighter.c b/src/libide/highlighting/ide-highlighter.c
index 2f3a0e5..02de2df 100644
--- a/src/libide/highlighting/ide-highlighter.c
+++ b/src/libide/highlighting/ide-highlighter.c
@@ -19,7 +19,7 @@
#include <glib/gi18n.h>
#include "ide-context.h"
-#include "ide-highlighter.h"
+#include "highlighting/ide-highlighter.h"
G_DEFINE_INTERFACE (IdeHighlighter, ide_highlighter, IDE_TYPE_OBJECT)
diff --git a/src/libide/keybindings/ide-shortcuts-window.c b/src/libide/keybindings/ide-shortcuts-window.c
index dd78e74..2e3424e 100644
--- a/src/libide/keybindings/ide-shortcuts-window.c
+++ b/src/libide/keybindings/ide-shortcuts-window.c
@@ -18,7 +18,7 @@
#include <glib/gi18n.h>
-#include "ide-shortcuts-window.h"
+#include "keybindings/ide-shortcuts-window.h"
struct _IdeShortcutsWindow
{
diff --git a/src/libide/langserv/ide-langserv-symbol-node-private.h
b/src/libide/langserv/ide-langserv-symbol-node-private.h
index 477085c..a8d44cd 100644
--- a/src/libide/langserv/ide-langserv-symbol-node-private.h
+++ b/src/libide/langserv/ide-langserv-symbol-node-private.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-langserv-symbol-node.h"
+#include "langserv/ide-langserv-symbol-node.h"
G_BEGIN_DECLS
diff --git a/src/libide/langserv/ide-langserv-symbol-tree-private.h
b/src/libide/langserv/ide-langserv-symbol-tree-private.h
index 7eba448..c955fe6 100644
--- a/src/libide/langserv/ide-langserv-symbol-tree-private.h
+++ b/src/libide/langserv/ide-langserv-symbol-tree-private.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-langserv-symbol-tree.h"
+#include "langserv/ide-langserv-symbol-tree.h"
G_BEGIN_DECLS
diff --git a/src/libide/langserv/ide-langserv-symbol-tree.c b/src/libide/langserv/ide-langserv-symbol-tree.c
index 269d28c..e66bf67 100644
--- a/src/libide/langserv/ide-langserv-symbol-tree.c
+++ b/src/libide/langserv/ide-langserv-symbol-tree.c
@@ -18,9 +18,9 @@
#define G_LOG_DOMAIN "ide-langserv-symbol-tree"
-#include "ide-langserv-symbol-node.h"
-#include "ide-langserv-symbol-node-private.h"
-#include "ide-langserv-symbol-tree.h"
+#include "langserv/ide-langserv-symbol-node.h"
+#include "langserv/ide-langserv-symbol-node-private.h"
+#include "langserv/ide-langserv-symbol-tree.h"
typedef struct
{
diff --git a/src/libide/langserv/ide-langserv-util.c b/src/libide/langserv/ide-langserv-util.c
index 0c59b0c..f64a1f2 100644
--- a/src/libide/langserv/ide-langserv-util.c
+++ b/src/libide/langserv/ide-langserv-util.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-langserv-util.h"
+#include "langserv/ide-langserv-util.h"
IdeSymbolKind
ide_langserv_decode_symbol_kind (guint kind)
diff --git a/src/libide/layout/ide-layout-grid-actions.c b/src/libide/layout/ide-layout-grid-actions.c
index 7b25dbe..e455536 100644
--- a/src/libide/layout/ide-layout-grid-actions.c
+++ b/src/libide/layout/ide-layout-grid-actions.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-layout-grid"
-#include "ide-layout-grid.h"
+#include "layout/ide-layout-grid.h"
static void
ide_layout_grid_actions_focus_neighbor (GSimpleAction *action,
diff --git a/src/libide/layout/ide-layout-grid-column-actions.c
b/src/libide/layout/ide-layout-grid-column-actions.c
index d88249d..e9ec5fc 100644
--- a/src/libide/layout/ide-layout-grid-column-actions.c
+++ b/src/libide/layout/ide-layout-grid-column-actions.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-layout-grid-column-actions"
-#include "ide-layout-private.h"
+#include "layout/ide-layout-private.h"
static void
ide_layout_grid_column_actions_close (GSimpleAction *action,
diff --git a/src/libide/layout/ide-layout-grid-column.c b/src/libide/layout/ide-layout-grid-column.c
index 5181907..d993ddb 100644
--- a/src/libide/layout/ide-layout-grid-column.c
+++ b/src/libide/layout/ide-layout-grid-column.c
@@ -18,9 +18,9 @@
#define G_LOG_DOMAIN "ide-layout-grid-column"
-#include "ide-layout-grid-column.h"
-#include "ide-layout-private.h"
-#include "ide-layout-view.h"
+#include "layout/ide-layout-grid-column.h"
+#include "layout/ide-layout-private.h"
+#include "layout/ide-layout-view.h"
struct _IdeLayoutGridColumn
{
diff --git a/src/libide/layout/ide-layout-grid-column.h b/src/libide/layout/ide-layout-grid-column.h
index 79a883d..7ae0b01 100644
--- a/src/libide/layout/ide-layout-grid-column.h
+++ b/src/libide/layout/ide-layout-grid-column.h
@@ -20,7 +20,7 @@
#include <dazzle.h>
-#include "ide-layout-stack.h"
+#include "layout/ide-layout-stack.h"
G_BEGIN_DECLS
diff --git a/src/libide/layout/ide-layout-grid.h b/src/libide/layout/ide-layout-grid.h
index 17b4339..f4f5cde 100644
--- a/src/libide/layout/ide-layout-grid.h
+++ b/src/libide/layout/ide-layout-grid.h
@@ -20,9 +20,9 @@
#include <dazzle.h>
-#include "ide-layout-grid-column.h"
-#include "ide-layout-stack.h"
-#include "ide-layout-view.h"
+#include "layout/ide-layout-grid-column.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/layout/ide-layout-pane.c b/src/libide/layout/ide-layout-pane.c
index c3acd4b..3b1343a 100644
--- a/src/libide/layout/ide-layout-pane.c
+++ b/src/libide/layout/ide-layout-pane.c
@@ -20,7 +20,7 @@
#include "dazzle.h"
-#include "ide-layout-pane.h"
+#include "layout/ide-layout-pane.h"
#include "ide-macros.h"
typedef struct
diff --git a/src/libide/layout/ide-layout-private.h b/src/libide/layout/ide-layout-private.h
index b39bb05..15bcdba 100644
--- a/src/libide/layout/ide-layout-private.h
+++ b/src/libide/layout/ide-layout-private.h
@@ -20,11 +20,11 @@
#include <gtk/gtk.h>
-#include "ide-layout-grid.h"
-#include "ide-layout-grid-column.h"
-#include "ide-layout-stack.h"
-#include "ide-layout-stack-header.h"
-#include "ide-layout-view.h"
+#include "layout/ide-layout-grid.h"
+#include "layout/ide-layout-grid-column.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-stack-header.h"
+#include "layout/ide-layout-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/layout/ide-layout-stack-actions.c b/src/libide/layout/ide-layout-stack-actions.c
index c2be9a6..eaf0639 100644
--- a/src/libide/layout/ide-layout-stack-actions.c
+++ b/src/libide/layout/ide-layout-stack-actions.c
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-layout-stack.h"
-#include "ide-layout-private.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-private.h"
#include <ide.h>
diff --git a/src/libide/layout/ide-layout-stack-addin.c b/src/libide/layout/ide-layout-stack-addin.c
index 04bc83e..ff5b930 100644
--- a/src/libide/layout/ide-layout-stack-addin.c
+++ b/src/libide/layout/ide-layout-stack-addin.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-layout-stack-addin"
-#include "ide-layout-stack-addin.h"
+#include "layout/ide-layout-stack-addin.h"
G_DEFINE_INTERFACE (IdeLayoutStackAddin, ide_layout_stack_addin, G_TYPE_OBJECT)
diff --git a/src/libide/layout/ide-layout-stack-addin.h b/src/libide/layout/ide-layout-stack-addin.h
index 31e9a03..63de9a7 100644
--- a/src/libide/layout/ide-layout-stack-addin.h
+++ b/src/libide/layout/ide-layout-stack-addin.h
@@ -20,8 +20,8 @@
#include <gtk/gtk.h>
-#include "ide-layout-stack.h"
-#include "ide-layout-view.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/layout/ide-layout-stack-shortcuts.c b/src/libide/layout/ide-layout-stack-shortcuts.c
index 5326b8d..1a0b94b 100644
--- a/src/libide/layout/ide-layout-stack-shortcuts.c
+++ b/src/libide/layout/ide-layout-stack-shortcuts.c
@@ -20,8 +20,8 @@
#include <glib/gi18n.h>
-#include "ide-layout-stack.h"
-#include "ide-layout-private.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-private.h"
#define I_(s) g_intern_static_string(s)
diff --git a/src/libide/layout/ide-layout-stack.c b/src/libide/layout/ide-layout-stack.c
index 6899412..2defedf 100644
--- a/src/libide/layout/ide-layout-stack.c
+++ b/src/libide/layout/ide-layout-stack.c
@@ -22,11 +22,11 @@
#include <glib/gi18n.h>
#include <libpeas/peas.h>
-#include "ide-layout-stack.h"
-#include "ide-layout-stack-addin.h"
-#include "ide-layout-stack-header.h"
-#include "ide-layout-private.h"
-#include "ide-shortcut-label.h"
+#include "layout/ide-layout-stack.h"
+#include "layout/ide-layout-stack-addin.h"
+#include "layout/ide-layout-stack-header.h"
+#include "layout/ide-layout-private.h"
+#include "layout/ide-shortcut-label.h"
#define TRANSITION_DURATION 300
diff --git a/src/libide/layout/ide-layout-stack.h b/src/libide/layout/ide-layout-stack.h
index 7b2c105..8b197eb 100644
--- a/src/libide/layout/ide-layout-stack.h
+++ b/src/libide/layout/ide-layout-stack.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-layout-view.h"
+#include "layout/ide-layout-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/layout/ide-shortcut-label.c b/src/libide/layout/ide-shortcut-label.c
index df65ffe..bcd8a93 100644
--- a/src/libide/layout/ide-shortcut-label.c
+++ b/src/libide/layout/ide-shortcut-label.c
@@ -20,7 +20,7 @@
#include <dazzle.h>
-#include "ide-shortcut-label.h"
+#include "layout/ide-shortcut-label.h"
struct _IdeShortcutLabel
{
diff --git a/src/libide/modelines/modeline-parser.c b/src/libide/modelines/modeline-parser.c
index fe6e6b3..8653156 100644
--- a/src/libide/modelines/modeline-parser.c
+++ b/src/libide/modelines/modeline-parser.c
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <gtksourceview/gtksource.h>
-#include "modeline-parser.h"
+#include "modelines/modeline-parser.h"
#define MODELINES_LANGUAGE_MAPPINGS_FILE "/org/gnome/builder/modelines/language-mappings"
#define gedit_debug_message(ignored,fmt,...) g_debug(fmt,__VA_ARGS__)
diff --git a/src/libide/plugins/ide-extension-adapter.c b/src/libide/plugins/ide-extension-adapter.c
index 4f2f237..8368459 100644
--- a/src/libide/plugins/ide-extension-adapter.c
+++ b/src/libide/plugins/ide-extension-adapter.c
@@ -22,8 +22,8 @@
#include "dazzle.h"
-#include "ide-extension-adapter.h"
-#include "ide-extension-util.h"
+#include "plugins/ide-extension-adapter.h"
+#include "plugins/ide-extension-util.h"
#include "ide-macros.h"
struct _IdeExtensionAdapter
diff --git a/src/libide/plugins/ide-extension-set-adapter.c b/src/libide/plugins/ide-extension-set-adapter.c
index 18b4192..ddcfbf3 100644
--- a/src/libide/plugins/ide-extension-set-adapter.c
+++ b/src/libide/plugins/ide-extension-set-adapter.c
@@ -21,8 +21,8 @@
#include <glib/gi18n.h>
#include "ide-context.h"
-#include "ide-extension-set-adapter.h"
-#include "ide-extension-util.h"
+#include "plugins/ide-extension-set-adapter.h"
+#include "plugins/ide-extension-util.h"
#include "ide-macros.h"
struct _IdeExtensionSetAdapter
diff --git a/src/libide/plugins/ide-extension-util.c b/src/libide/plugins/ide-extension-util.c
index d06c74a..a834d97 100644
--- a/src/libide/plugins/ide-extension-util.c
+++ b/src/libide/plugins/ide-extension-util.c
@@ -22,7 +22,7 @@
#include <gobject/gvaluecollector.h>
#include <stdlib.h>
-#include "ide-extension-util.h"
+#include "plugins/ide-extension-util.h"
gboolean
ide_extension_util_can_use_plugin (PeasEngine *engine,
diff --git a/src/libide/preferences/ide-preferences-language-row.c
b/src/libide/preferences/ide-preferences-language-row.c
index 85bfee4..2125562 100644
--- a/src/libide/preferences/ide-preferences-language-row.c
+++ b/src/libide/preferences/ide-preferences-language-row.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-preferences-language-row"
-#include "ide-preferences-language-row.h"
+#include "preferences/ide-preferences-language-row.h"
struct _IdePreferencesLanguageRow
{
diff --git a/src/libide/preferences/ide-preferences-window.c b/src/libide/preferences/ide-preferences-window.c
index 03df883..7206ed6 100644
--- a/src/libide/preferences/ide-preferences-window.c
+++ b/src/libide/preferences/ide-preferences-window.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-preferences-window"
-#include "ide-preferences-window.h"
+#include "preferences/ide-preferences-window.h"
struct _IdePreferencesWindow
{
diff --git a/src/libide/projects/ide-project-file.c b/src/libide/projects/ide-project-file.c
index 73d5489..4a00a6a 100644
--- a/src/libide/projects/ide-project-file.c
+++ b/src/libide/projects/ide-project-file.c
@@ -18,7 +18,7 @@
#include <glib/gi18n.h>
-#include "ide-project-file.h"
+#include "projects/ide-project-file.h"
typedef struct
{
diff --git a/src/libide/projects/ide-project-files.h b/src/libide/projects/ide-project-files.h
index 86ec0cd..a8ac9a3 100644
--- a/src/libide/projects/ide-project-files.h
+++ b/src/libide/projects/ide-project-files.h
@@ -18,8 +18,8 @@
#pragma once
-#include "ide-project-file.h"
-#include "ide-project-item.h"
+#include "projects/ide-project-file.h"
+#include "projects/ide-project-item.h"
G_BEGIN_DECLS
diff --git a/src/libide/projects/ide-project-info.c b/src/libide/projects/ide-project-info.c
index a85456a..02ccdfa 100644
--- a/src/libide/projects/ide-project-info.c
+++ b/src/libide/projects/ide-project-info.c
@@ -26,7 +26,7 @@
#include <string.h>
#include "ide-macros.h"
-#include "ide-project-info.h"
+#include "projects/ide-project-info.h"
/**
* SECTION:ideprojectinfo:
diff --git a/src/libide/projects/ide-project-item.c b/src/libide/projects/ide-project-item.c
index 2b6ca02..11c8e3a 100644
--- a/src/libide/projects/ide-project-item.c
+++ b/src/libide/projects/ide-project-item.c
@@ -18,7 +18,7 @@
#include <glib/gi18n.h>
-#include "ide-project-item.h"
+#include "projects/ide-project-item.h"
typedef struct
{
diff --git a/src/libide/projects/ide-project-miner.c b/src/libide/projects/ide-project-miner.c
index dd238a7..c85a7c5 100644
--- a/src/libide/projects/ide-project-miner.c
+++ b/src/libide/projects/ide-project-miner.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-project-miner"
-#include "ide-project-miner.h"
+#include "projects/ide-project-miner.h"
G_DEFINE_INTERFACE (IdeProjectMiner, ide_project_miner, G_TYPE_OBJECT)
diff --git a/src/libide/projects/ide-project-miner.h b/src/libide/projects/ide-project-miner.h
index 0b4fddd..7a2ac34 100644
--- a/src/libide/projects/ide-project-miner.h
+++ b/src/libide/projects/ide-project-miner.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-project-info.h"
+#include "projects/ide-project-info.h"
G_BEGIN_DECLS
diff --git a/src/libide/projects/ide-project.h b/src/libide/projects/ide-project.h
index 7070795..6f1223a 100644
--- a/src/libide/projects/ide-project.h
+++ b/src/libide/projects/ide-project.h
@@ -19,7 +19,7 @@
#pragma once
#include "ide-object.h"
-#include "ide-project-files.h"
+#include "projects/ide-project-files.h"
G_BEGIN_DECLS
diff --git a/src/libide/projects/ide-recent-projects.c b/src/libide/projects/ide-recent-projects.c
index 2385915..795952c 100644
--- a/src/libide/projects/ide-recent-projects.c
+++ b/src/libide/projects/ide-recent-projects.c
@@ -21,8 +21,8 @@
#include <libpeas/peas.h>
#include "ide-global.h"
-#include "ide-project-miner.h"
-#include "ide-recent-projects.h"
+#include "projects/ide-project-miner.h"
+#include "projects/ide-recent-projects.h"
struct _IdeRecentProjects
{
diff --git a/src/libide/projects/ide-recent-projects.h b/src/libide/projects/ide-recent-projects.h
index 1c38fca..6df9040 100644
--- a/src/libide/projects/ide-recent-projects.h
+++ b/src/libide/projects/ide-recent-projects.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-project-info.h"
+#include "projects/ide-project-info.h"
G_BEGIN_DECLS
diff --git a/src/libide/runner/ide-run-manager-private.h b/src/libide/runner/ide-run-manager-private.h
index 52e20c1..bbf0f4c 100644
--- a/src/libide/runner/ide-run-manager-private.h
+++ b/src/libide/runner/ide-run-manager-private.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-run-manager.h"
+#include "runner/ide-run-manager.h"
G_BEGIN_DECLS
diff --git a/src/libide/runner/ide-runner-addin.c b/src/libide/runner/ide-runner-addin.c
index d2a455b..a921f4e 100644
--- a/src/libide/runner/ide-runner-addin.c
+++ b/src/libide/runner/ide-runner-addin.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-runner-addin"
-#include "ide-runner-addin.h"
+#include "runner/ide-runner-addin.h"
G_DEFINE_INTERFACE (IdeRunnerAddin, ide_runner_addin, G_TYPE_OBJECT)
diff --git a/src/libide/runner/ide-runner-addin.h b/src/libide/runner/ide-runner-addin.h
index fa3e1c4..d3b71ed 100644
--- a/src/libide/runner/ide-runner-addin.h
+++ b/src/libide/runner/ide-runner-addin.h
@@ -21,7 +21,7 @@
#include <gio/gio.h>
#include "ide-types.h"
-#include "ide-runner.h"
+#include "runner/ide-runner.h"
G_BEGIN_DECLS
diff --git a/src/libide/runtimes/ide-runtime-provider.c b/src/libide/runtimes/ide-runtime-provider.c
index 165401a..b3b9ae9 100644
--- a/src/libide/runtimes/ide-runtime-provider.c
+++ b/src/libide/runtimes/ide-runtime-provider.c
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-runtime-manager.h"
-#include "ide-runtime-provider.h"
+#include "runtimes/ide-runtime-manager.h"
+#include "runtimes/ide-runtime-provider.h"
G_DEFINE_INTERFACE (IdeRuntimeProvider, ide_runtime_provider, G_TYPE_OBJECT)
diff --git a/src/libide/search/ide-search-engine.c b/src/libide/search/ide-search-engine.c
index ba0fd85..d7712c6 100644
--- a/src/libide/search/ide-search-engine.c
+++ b/src/libide/search/ide-search-engine.c
@@ -20,9 +20,9 @@
#include <libpeas/peas.h>
-#include "ide-search-engine.h"
-#include "ide-search-provider.h"
-#include "ide-search-result.h"
+#include "search/ide-search-engine.h"
+#include "search/ide-search-provider.h"
+#include "search/ide-search-result.h"
#define DEFAULT_MAX_RESULTS 50
diff --git a/src/libide/search/ide-search-provider.c b/src/libide/search/ide-search-provider.c
index 0924e1c..751e4c3 100644
--- a/src/libide/search/ide-search-provider.c
+++ b/src/libide/search/ide-search-provider.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-search-provider"
-#include "ide-search-provider.h"
+#include "search/ide-search-provider.h"
G_DEFINE_INTERFACE (IdeSearchProvider, ide_search_provider, IDE_TYPE_OBJECT)
diff --git a/src/libide/search/ide-search-reducer.c b/src/libide/search/ide-search-reducer.c
index e4c6592..3d11a77 100644
--- a/src/libide/search/ide-search-reducer.c
+++ b/src/libide/search/ide-search-reducer.c
@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "ide-search-reducer"
-#include "ide-search-reducer.h"
-#include "ide-search-result.h"
+#include "search/ide-search-reducer.h"
+#include "search/ide-search-result.h"
#define DEFAULT_MAX_ITEMS 1000
diff --git a/src/libide/search/ide-search-result.c b/src/libide/search/ide-search-result.c
index ab8cfa8..4e18165 100644
--- a/src/libide/search/ide-search-result.c
+++ b/src/libide/search/ide-search-result.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-search-result"
-#include "ide-search-result.h"
+#include "search/ide-search-result.h"
typedef struct
{
diff --git a/src/libide/snippets/ide-source-snippet-completion-item.c
b/src/libide/snippets/ide-source-snippet-completion-item.c
index 663f979..f41a1ba 100644
--- a/src/libide/snippets/ide-source-snippet-completion-item.c
+++ b/src/libide/snippets/ide-source-snippet-completion-item.c
@@ -19,7 +19,7 @@
#include <gio/gio.h>
#include <glib/gi18n.h>
-#include "ide-source-snippet-completion-item.h"
+#include "snippets/ide-source-snippet-completion-item.h"
struct _IdeSourceSnippetCompletionItem
{
diff --git a/src/libide/snippets/ide-source-snippet-completion-item.h
b/src/libide/snippets/ide-source-snippet-completion-item.h
index 62a50f4..c052562 100644
--- a/src/libide/snippets/ide-source-snippet-completion-item.h
+++ b/src/libide/snippets/ide-source-snippet-completion-item.h
@@ -20,7 +20,7 @@
#include <gtksourceview/gtksource.h>
-#include "ide-source-snippet.h"
+#include "snippets/ide-source-snippet.h"
G_BEGIN_DECLS
diff --git a/src/libide/snippets/ide-source-snippet-context.c
b/src/libide/snippets/ide-source-snippet-context.c
index 56903c1..a947075 100644
--- a/src/libide/snippets/ide-source-snippet-context.c
+++ b/src/libide/snippets/ide-source-snippet-context.c
@@ -20,7 +20,7 @@
#include <glib/gi18n.h>
#include <stdlib.h>
-#include "ide-source-snippet-context.h"
+#include "snippets/ide-source-snippet-context.h"
/**
* SECTION:idesourcesnippetcontext:
diff --git a/src/libide/snippets/ide-source-snippet-parser.c b/src/libide/snippets/ide-source-snippet-parser.c
index 56dd812..38d3c6d 100644
--- a/src/libide/snippets/ide-source-snippet-parser.c
+++ b/src/libide/snippets/ide-source-snippet-parser.c
@@ -20,10 +20,10 @@
#include <glib/gi18n.h>
#include <stdlib.h>
-#include "ide-source-snippet.h"
-#include "ide-source-snippet-chunk.h"
-#include "ide-source-snippet-parser.h"
-#include "ide-source-snippet-private.h"
+#include "snippets/ide-source-snippet.h"
+#include "snippets/ide-source-snippet-chunk.h"
+#include "snippets/ide-source-snippet-parser.h"
+#include "snippets/ide-source-snippet-private.h"
struct _IdeSourceSnippetParser
{
diff --git a/src/libide/snippets/ide-source-snippet-private.h
b/src/libide/snippets/ide-source-snippet-private.h
index faed65b..c80e3e5 100644
--- a/src/libide/snippets/ide-source-snippet-private.h
+++ b/src/libide/snippets/ide-source-snippet-private.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-source-snippet.h"
+#include "snippets/ide-source-snippet.h"
G_BEGIN_DECLS
diff --git a/src/libide/snippets/ide-source-snippets-manager.c
b/src/libide/snippets/ide-source-snippets-manager.c
index 88e6cc6..eb230e4 100644
--- a/src/libide/snippets/ide-source-snippets-manager.c
+++ b/src/libide/snippets/ide-source-snippets-manager.c
@@ -21,10 +21,10 @@
#include <glib/gi18n.h>
#include "ide-global.h"
-#include "ide-source-snippets-manager.h"
-#include "ide-source-snippet-parser.h"
-#include "ide-source-snippets.h"
-#include "ide-source-snippet.h"
+#include "snippets/ide-source-snippets-manager.h"
+#include "snippets/ide-source-snippet-parser.h"
+#include "snippets/ide-source-snippets.h"
+#include "snippets/ide-source-snippet.h"
struct _IdeSourceSnippetsManager
{
diff --git a/src/libide/snippets/ide-source-snippets.c b/src/libide/snippets/ide-source-snippets.c
index 02351c4..bb253d1 100644
--- a/src/libide/snippets/ide-source-snippets.c
+++ b/src/libide/snippets/ide-source-snippets.c
@@ -20,10 +20,10 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "ide-source-snippet.h"
-#include "ide-source-snippet-chunk.h"
-#include "ide-source-snippet-parser.h"
-#include "ide-source-snippets.h"
+#include "snippets/ide-source-snippet.h"
+#include "snippets/ide-source-snippet-chunk.h"
+#include "snippets/ide-source-snippet-parser.h"
+#include "snippets/ide-source-snippets.h"
struct _IdeSourceSnippets
{
diff --git a/src/libide/snippets/ide-source-snippets.h b/src/libide/snippets/ide-source-snippets.h
index c14d302..d0d4597 100644
--- a/src/libide/snippets/ide-source-snippets.h
+++ b/src/libide/snippets/ide-source-snippets.h
@@ -20,7 +20,7 @@
#include <gio/gio.h>
-#include "ide-source-snippet.h"
+#include "snippets/ide-source-snippet.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-completion-item.c b/src/libide/sourceview/ide-completion-item.c
index 684f9a2..897022b 100644
--- a/src/libide/sourceview/ide-completion-item.c
+++ b/src/libide/sourceview/ide-completion-item.c
@@ -20,7 +20,7 @@
#include <string.h>
-#include "ide-completion-item.h"
+#include "sourceview/ide-completion-item.h"
G_DEFINE_ABSTRACT_TYPE (IdeCompletionItem, ide_completion_item, G_TYPE_OBJECT)
diff --git a/src/libide/sourceview/ide-completion-provider.c b/src/libide/sourceview/ide-completion-provider.c
index b0737e2..01520e8 100644
--- a/src/libide/sourceview/ide-completion-provider.c
+++ b/src/libide/sourceview/ide-completion-provider.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-completion-provider.h"
+#include "sourceview/ide-completion-provider.h"
#include "ide-context.h"
G_DEFINE_INTERFACE (IdeCompletionProvider, ide_completion_provider, GTK_SOURCE_TYPE_COMPLETION_PROVIDER)
diff --git a/src/libide/sourceview/ide-completion-results.h b/src/libide/sourceview/ide-completion-results.h
index 5e393c9..a1a7464 100644
--- a/src/libide/sourceview/ide-completion-results.h
+++ b/src/libide/sourceview/ide-completion-results.h
@@ -20,7 +20,7 @@
#include <gtksourceview/gtksource.h>
-#include "ide-completion-item.h"
+#include "sourceview/ide-completion-item.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-completion-words.c b/src/libide/sourceview/ide-completion-words.c
index 9ef2068..c63e24a 100644
--- a/src/libide/sourceview/ide-completion-words.c
+++ b/src/libide/sourceview/ide-completion-words.c
@@ -18,8 +18,8 @@
#define G_LOG_DOMAIN "ide-completion-words"
-#include "ide-completion-provider.h"
-#include "ide-completion-words.h"
+#include "sourceview/ide-completion-provider.h"
+#include "sourceview/ide-completion-words.h"
struct _IdeCompletionWords
{
diff --git a/src/libide/sourceview/ide-cursor.c b/src/libide/sourceview/ide-cursor.c
index 3672f4b..423f917 100644
--- a/src/libide/sourceview/ide-cursor.c
+++ b/src/libide/sourceview/ide-cursor.c
@@ -22,9 +22,9 @@
#include "ide-macros.h"
-#include "ide-source-view.h"
-#include "ide-cursor.h"
-#include "ide-text-util.h"
+#include "sourceview/ide-source-view.h"
+#include "sourceview/ide-cursor.h"
+#include "sourceview/ide-text-util.h"
struct _IdeCursor
{
diff --git a/src/libide/sourceview/ide-source-iter.c b/src/libide/sourceview/ide-source-iter.c
index e7b3e3c..8e864c2 100644
--- a/src/libide/sourceview/ide-source-iter.c
+++ b/src/libide/sourceview/ide-source-iter.c
@@ -36,7 +36,7 @@
* TODO: Once this is made public api, switch to using that instead of a copy.
*/
-#include "ide-source-iter.h"
+#include "sourceview/ide-source-iter.h"
/* Go to the end of the next or current "full word". A full word is a group of
* non-blank chars.
diff --git a/src/libide/sourceview/ide-source-style-scheme.c b/src/libide/sourceview/ide-source-style-scheme.c
index 19982eb..98637de 100644
--- a/src/libide/sourceview/ide-source-style-scheme.c
+++ b/src/libide/sourceview/ide-source-style-scheme.c
@@ -18,7 +18,7 @@
#include <string.h>
-#include "ide-source-style-scheme.h"
+#include "sourceview/ide-source-style-scheme.h"
gboolean
ide_source_style_scheme_apply_style (GtkSourceStyleScheme *style_scheme,
diff --git a/src/libide/sourceview/ide-source-view-capture.c b/src/libide/sourceview/ide-source-view-capture.c
index 49c934e..8ab3a3b 100644
--- a/src/libide/sourceview/ide-source-view-capture.c
+++ b/src/libide/sourceview/ide-source-view-capture.c
@@ -18,7 +18,7 @@
#include <glib/gi18n.h>
-#include "ide-source-view-capture.h"
+#include "sourceview/ide-source-view-capture.h"
typedef struct
{
diff --git a/src/libide/sourceview/ide-source-view-capture.h b/src/libide/sourceview/ide-source-view-capture.h
index a975ecd..a0be738 100644
--- a/src/libide/sourceview/ide-source-view-capture.h
+++ b/src/libide/sourceview/ide-source-view-capture.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-source-view.h"
+#include "sourceview/ide-source-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-source-view-mode.h b/src/libide/sourceview/ide-source-view-mode.h
index 3625bff..4862f30 100644
--- a/src/libide/sourceview/ide-source-view-mode.h
+++ b/src/libide/sourceview/ide-source-view-mode.h
@@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include "ide-types.h"
-#include "ide-source-view.h"
+#include "sourceview/ide-source-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-source-view-movements.h
b/src/libide/sourceview/ide-source-view-movements.h
index f44e768..848b059 100644
--- a/src/libide/sourceview/ide-source-view-movements.h
+++ b/src/libide/sourceview/ide-source-view-movements.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-source-view.h"
+#include "sourceview/ide-source-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-source-view-private.h b/src/libide/sourceview/ide-source-view-private.h
index 51cb45c..86779e3 100644
--- a/src/libide/sourceview/ide-source-view-private.h
+++ b/src/libide/sourceview/ide-source-view-private.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-source-view.h"
+#include "sourceview/ide-source-view.h"
G_BEGIN_DECLS
diff --git a/src/libide/sourceview/ide-source-view-shortcuts.c
b/src/libide/sourceview/ide-source-view-shortcuts.c
index eda613c..4dffb7d 100644
--- a/src/libide/sourceview/ide-source-view-shortcuts.c
+++ b/src/libide/sourceview/ide-source-view-shortcuts.c
@@ -22,7 +22,7 @@
#include <dazzle.h>
-#include "ide-source-view.h"
+#include "sourceview/ide-source-view.h"
/* static const DzlShortcutEntry source_view_shortcuts[] = { */
/* { NULL } */
diff --git a/src/libide/sourceview/ide-text-util.c b/src/libide/sourceview/ide-text-util.c
index 111decc..6bc398c 100644
--- a/src/libide/sourceview/ide-text-util.c
+++ b/src/libide/sourceview/ide-text-util.c
@@ -20,7 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-text-util.h"
+#include "sourceview/ide-text-util.h"
void
ide_text_util_delete_line (GtkTextView *text_view,
diff --git a/src/libide/subprocess/ide-simple-subprocess.h b/src/libide/subprocess/ide-simple-subprocess.h
index a58a733..e514921 100644
--- a/src/libide/subprocess/ide-simple-subprocess.h
+++ b/src/libide/subprocess/ide-simple-subprocess.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-subprocess.h"
+#include "subprocess/ide-subprocess.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-code-index-entries.c b/src/libide/symbols/ide-code-index-entries.c
index 351478a..5973554 100644
--- a/src/libide/symbols/ide-code-index-entries.c
+++ b/src/libide/symbols/ide-code-index-entries.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-code-index-entries"
-#include "ide-code-index-entries.h"
+#include "symbols/ide-code-index-entries.h"
G_DEFINE_INTERFACE (IdeCodeIndexEntries, ide_code_index_entries, G_TYPE_OBJECT)
diff --git a/src/libide/symbols/ide-code-index-entries.h b/src/libide/symbols/ide-code-index-entries.h
index 0d5767b..543e90c 100644
--- a/src/libide/symbols/ide-code-index-entries.h
+++ b/src/libide/symbols/ide-code-index-entries.h
@@ -19,8 +19,8 @@
#pragma once
#include "ide-object.h"
-#include "ide-symbol.h"
-#include "ide-code-index-entry.h"
+#include "symbols/ide-symbol.h"
+#include "symbols/ide-code-index-entry.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-code-index-entry.c b/src/libide/symbols/ide-code-index-entry.c
index 84340f8..17d9631 100644
--- a/src/libide/symbols/ide-code-index-entry.c
+++ b/src/libide/symbols/ide-code-index-entry.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-code-index-entry"
-#include "ide-code-index-entry.h"
+#include "symbols/ide-code-index-entry.h"
typedef struct
{
diff --git a/src/libide/symbols/ide-code-index-entry.h b/src/libide/symbols/ide-code-index-entry.h
index e7eabf9..630d9ec 100644
--- a/src/libide/symbols/ide-code-index-entry.h
+++ b/src/libide/symbols/ide-code-index-entry.h
@@ -19,7 +19,7 @@
#pragma once
#include "ide-object.h"
-#include "ide-symbol.h"
+#include "symbols/ide-symbol.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-code-indexer.c b/src/libide/symbols/ide-code-indexer.c
index 807cadf..e1d14c5 100644
--- a/src/libide/symbols/ide-code-indexer.c
+++ b/src/libide/symbols/ide-code-indexer.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-code-indexer"
-#include "ide-code-indexer.h"
+#include "symbols/ide-code-indexer.h"
G_DEFINE_INTERFACE (IdeCodeIndexer, ide_code_indexer, IDE_TYPE_OBJECT)
diff --git a/src/libide/symbols/ide-code-indexer.h b/src/libide/symbols/ide-code-indexer.h
index 609014c..2c1faf6 100644
--- a/src/libide/symbols/ide-code-indexer.h
+++ b/src/libide/symbols/ide-code-indexer.h
@@ -19,7 +19,7 @@
#pragma once
#include "ide-object.h"
-#include "ide-code-index-entries.h"
+#include "symbols/ide-code-index-entries.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-symbol-node.c b/src/libide/symbols/ide-symbol-node.c
index 47ec258..8835958 100644
--- a/src/libide/symbols/ide-symbol-node.c
+++ b/src/libide/symbols/ide-symbol-node.c
@@ -19,8 +19,8 @@
#include <glib/gi18n.h>
#include "ide-enums.h"
-#include "ide-symbol.h"
-#include "ide-symbol-node.h"
+#include "symbols/ide-symbol.h"
+#include "symbols/ide-symbol-node.h"
typedef struct
{
diff --git a/src/libide/symbols/ide-symbol-resolver.h b/src/libide/symbols/ide-symbol-resolver.h
index 6953ea9..beab795 100644
--- a/src/libide/symbols/ide-symbol-resolver.h
+++ b/src/libide/symbols/ide-symbol-resolver.h
@@ -19,7 +19,7 @@
#pragma once
#include "ide-object.h"
-#include "ide-symbol-tree.h"
+#include "symbols/ide-symbol-tree.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-symbol-tree.c b/src/libide/symbols/ide-symbol-tree.c
index a33bc2e..4805c57 100644
--- a/src/libide/symbols/ide-symbol-tree.c
+++ b/src/libide/symbols/ide-symbol-tree.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-symbol-tree.h"
+#include "symbols/ide-symbol-tree.h"
G_DEFINE_INTERFACE (IdeSymbolTree, ide_symbol_tree, G_TYPE_OBJECT)
diff --git a/src/libide/symbols/ide-symbol-tree.h b/src/libide/symbols/ide-symbol-tree.h
index e42a0be..eabfe6a 100644
--- a/src/libide/symbols/ide-symbol-tree.h
+++ b/src/libide/symbols/ide-symbol-tree.h
@@ -20,7 +20,7 @@
#include <glib-object.h>
-#include "ide-symbol-node.h"
+#include "symbols/ide-symbol-node.h"
G_BEGIN_DECLS
diff --git a/src/libide/symbols/ide-tags-builder.c b/src/libide/symbols/ide-tags-builder.c
index d6d47a3..cd2b359 100644
--- a/src/libide/symbols/ide-tags-builder.c
+++ b/src/libide/symbols/ide-tags-builder.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-tags-builder.h"
+#include "symbols/ide-tags-builder.h"
G_DEFINE_INTERFACE (IdeTagsBuilder, ide_tags_builder, G_TYPE_OBJECT)
diff --git a/src/libide/template/ide-project-template.c b/src/libide/template/ide-project-template.c
index 40fe8cc..6542758 100644
--- a/src/libide/template/ide-project-template.c
+++ b/src/libide/template/ide-project-template.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-project-template"
-#include "ide-project-template.h"
+#include "template/ide-project-template.h"
G_DEFINE_INTERFACE (IdeProjectTemplate, ide_project_template, G_TYPE_OBJECT)
diff --git a/src/libide/template/ide-template-base.c b/src/libide/template/ide-template-base.c
index b101038..6a61d38 100644
--- a/src/libide/template/ide-template-base.c
+++ b/src/libide/template/ide-template-base.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include <string.h>
-#include "ide-template-base.h"
+#include "template/ide-template-base.h"
#define TIMEOUT_INTERVAL_MSEC 17
#define TIMEOUT_DURATION_MSEC 2
diff --git a/src/libide/template/ide-template-provider.c b/src/libide/template/ide-template-provider.c
index 45357f7..17774e4 100644
--- a/src/libide/template/ide-template-provider.c
+++ b/src/libide/template/ide-template-provider.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-template-provider.h"
+#include "template/ide-template-provider.h"
G_DEFINE_INTERFACE (IdeTemplateProvider, ide_template_provider, G_TYPE_OBJECT)
diff --git a/src/libide/template/ide-template-provider.h b/src/libide/template/ide-template-provider.h
index c92e65b..39897fe 100644
--- a/src/libide/template/ide-template-provider.h
+++ b/src/libide/template/ide-template-provider.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-project-template.h"
+#include "template/ide-project-template.h"
G_BEGIN_DECLS
diff --git a/src/libide/transfers/ide-pkcon-transfer.h b/src/libide/transfers/ide-pkcon-transfer.h
index 98e3713..3f6dfcc 100644
--- a/src/libide/transfers/ide-pkcon-transfer.h
+++ b/src/libide/transfers/ide-pkcon-transfer.h
@@ -18,7 +18,7 @@
#pragma once
-#include "ide-transfer.h"
+#include "transfers/ide-transfer.h"
G_BEGIN_DECLS
diff --git a/src/libide/transfers/ide-transfer-row.h b/src/libide/transfers/ide-transfer-row.h
index f4ac61a..7b6543f 100644
--- a/src/libide/transfers/ide-transfer-row.h
+++ b/src/libide/transfers/ide-transfer-row.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-transfer.h"
+#include "transfers/ide-transfer.h"
G_BEGIN_DECLS
diff --git a/src/libide/transfers/ide-transfers-progress-icon.c
b/src/libide/transfers/ide-transfers-progress-icon.c
index 8216b6b..40a81b0 100644
--- a/src/libide/transfers/ide-transfers-progress-icon.c
+++ b/src/libide/transfers/ide-transfers-progress-icon.c
@@ -20,7 +20,7 @@
#define G_LOG_DOMAIN "ide-transfers-progress-icon"
-#include "ide-transfers-progress-icon.h"
+#include "transfers/ide-transfers-progress-icon.h"
struct _IdeTransfersProgressIcon
{
diff --git a/src/libide/util/ide-async-helper.c b/src/libide/util/ide-async-helper.c
index 52995d0..d731a8f 100644
--- a/src/libide/util/ide-async-helper.c
+++ b/src/libide/util/ide-async-helper.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-async-helper.h"
+#include "util/ide-async-helper.h"
static void
ide_async_helper_cb (GObject *object,
diff --git a/src/libide/util/ide-battery-monitor.c b/src/libide/util/ide-battery-monitor.c
index c45ff71..2438d98 100644
--- a/src/libide/util/ide-battery-monitor.c
+++ b/src/libide/util/ide-battery-monitor.c
@@ -18,7 +18,7 @@
#include <gio/gio.h>
-#include "ide-battery-monitor.h"
+#include "util/ide-battery-monitor.h"
#define CONSERVE_THRESHOLD 50.0
diff --git a/src/libide/util/ide-cell-renderer-fancy.c b/src/libide/util/ide-cell-renderer-fancy.c
index 0561af8..db930ea 100644
--- a/src/libide/util/ide-cell-renderer-fancy.c
+++ b/src/libide/util/ide-cell-renderer-fancy.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-cell-renderer-fancy"
-#include "ide-cell-renderer-fancy.h"
+#include "util/ide-cell-renderer-fancy.h"
#define TITLE_SPACING 3
diff --git a/src/libide/util/ide-dnd.c b/src/libide/util/ide-dnd.c
index 4165ada..26e7b8d 100644
--- a/src/libide/util/ide-dnd.c
+++ b/src/libide/util/ide-dnd.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-dnd.h"
+#include "util/ide-dnd.h"
/**
* ide_dnd_get_uri_list:
diff --git a/src/libide/util/ide-doc-seq.c b/src/libide/util/ide-doc-seq.c
index 8b16d92..f1be5ac 100644
--- a/src/libide/util/ide-doc-seq.c
+++ b/src/libide/util/ide-doc-seq.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-doc-seq.h"
+#include "util/ide-doc-seq.h"
static GHashTable *seq;
diff --git a/src/libide/util/ide-flatpak.c b/src/libide/util/ide-flatpak.c
index 8f33356..0e48c63 100644
--- a/src/libide/util/ide-flatpak.c
+++ b/src/libide/util/ide-flatpak.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-flatpak.h"
+#include "util/ide-flatpak.h"
/**
* ide_is_flatpak:
diff --git a/src/libide/util/ide-glib.c b/src/libide/util/ide-glib.c
index b206aa3..c5d1eaa 100644
--- a/src/libide/util/ide-glib.c
+++ b/src/libide/util/ide-glib.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include "ide-glib.h"
+#include "util/ide-glib.h"
typedef struct
{
diff --git a/src/libide/util/ide-line-reader.c b/src/libide/util/ide-line-reader.c
index 4fbf16f..c80273c 100644
--- a/src/libide/util/ide-line-reader.c
+++ b/src/libide/util/ide-line-reader.c
@@ -20,7 +20,7 @@
#include <string.h>
-#include "ide-line-reader.h"
+#include "util/ide-line-reader.h"
void
ide_line_reader_init (IdeLineReader *reader,
diff --git a/src/libide/util/ide-posix.c b/src/libide/util/ide-posix.c
index 3bbb495..ba96ebe 100644
--- a/src/libide/util/ide-posix.c
+++ b/src/libide/util/ide-posix.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <wordexp.h>
-#include "ide-posix.h"
+#include "util/ide-posix.h"
const gchar *
ide_get_system_type (void)
diff --git a/src/libide/util/ide-progress.c b/src/libide/util/ide-progress.c
index d072f64..e27b928 100644
--- a/src/libide/util/ide-progress.c
+++ b/src/libide/util/ide-progress.c
@@ -21,7 +21,7 @@
#include <glib/gi18n.h>
#include "ide-object.h"
-#include "ide-progress.h"
+#include "util/ide-progress.h"
struct _IdeProgress
{
diff --git a/src/libide/util/ide-ref-ptr.c b/src/libide/util/ide-ref-ptr.c
index b8f35c1..0cca82c 100644
--- a/src/libide/util/ide-ref-ptr.c
+++ b/src/libide/util/ide-ref-ptr.c
@@ -20,7 +20,7 @@
#include "dazzle.h"
-#include "ide-ref-ptr.h"
+#include "util/ide-ref-ptr.h"
G_DEFINE_BOXED_TYPE (IdeRefPtr, ide_ref_ptr, ide_ref_ptr_ref, ide_ref_ptr_unref)
diff --git a/src/libide/util/ide-uri.c b/src/libide/util/ide-uri.c
index f088e71..ef22c49 100644
--- a/src/libide/util/ide-uri.c
+++ b/src/libide/util/ide-uri.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
-#include "ide-uri.h"
+#include "util/ide-uri.h"
#if 0
# define GOTO(l) do { g_print ("%s():%d\n", G_STRFUNC, __LINE__); goto l; } while (0)
diff --git a/src/libide/util/ide-window-settings.c b/src/libide/util/ide-window-settings.c
index 54c6815..9d91681 100644
--- a/src/libide/util/ide-window-settings.c
+++ b/src/libide/util/ide-window-settings.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-window-settings.h"
+#include "util/ide-window-settings.h"
#define GB_WINDOW_MIN_WIDTH 1280
#define GB_WINDOW_MIN_HEIGHT 720
diff --git a/src/libide/vcs/ide-vcs-config.c b/src/libide/vcs/ide-vcs-config.c
index 8989406..21ab4d6 100644
--- a/src/libide/vcs/ide-vcs-config.c
+++ b/src/libide/vcs/ide-vcs-config.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-vcs-config.h"
+#include "vcs/ide-vcs-config.h"
G_DEFINE_INTERFACE (IdeVcsConfig, ide_vcs_config, G_TYPE_OBJECT)
diff --git a/src/libide/vcs/ide-vcs-initializer.c b/src/libide/vcs/ide-vcs-initializer.c
index 4a3d8f9..1665cd3 100644
--- a/src/libide/vcs/ide-vcs-initializer.c
+++ b/src/libide/vcs/ide-vcs-initializer.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-vcs-initializer.h"
+#include "vcs/ide-vcs-initializer.h"
G_DEFINE_INTERFACE (IdeVcsInitializer, ide_vcs_initializer, G_TYPE_OBJECT)
diff --git a/src/libide/vcs/ide-vcs-uri.c b/src/libide/vcs/ide-vcs-uri.c
index c9e018c..887002b 100644
--- a/src/libide/vcs/ide-vcs-uri.c
+++ b/src/libide/vcs/ide-vcs-uri.c
@@ -20,7 +20,7 @@
#include <string.h>
#include "ide-macros.h"
-#include "ide-vcs-uri.h"
+#include "vcs/ide-vcs-uri.h"
G_DEFINE_BOXED_TYPE (IdeVcsUri, ide_vcs_uri, ide_vcs_uri_ref, ide_vcs_uri_unref)
diff --git a/src/libide/vcs/ide-vcs.h b/src/libide/vcs/ide-vcs.h
index 51f6ebd..36c9aa0 100644
--- a/src/libide/vcs/ide-vcs.h
+++ b/src/libide/vcs/ide-vcs.h
@@ -21,7 +21,7 @@
#include <gio/gio.h>
#include "ide-object.h"
-#include "ide-vcs-config.h"
+#include "vcs/ide-vcs-config.h"
G_BEGIN_DECLS
diff --git a/src/libide/workbench/ide-perspective.c b/src/libide/workbench/ide-perspective.c
index 3452114..c70ed62 100644
--- a/src/libide/workbench/ide-perspective.c
+++ b/src/libide/workbench/ide-perspective.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-perspective.h"
+#include "workbench/ide-perspective.h"
G_DEFINE_INTERFACE (IdePerspective, ide_perspective, G_TYPE_OBJECT)
diff --git a/src/libide/workbench/ide-workbench-header-bar.h b/src/libide/workbench/ide-workbench-header-bar.h
index b2d8e9e..23bf676 100644
--- a/src/libide/workbench/ide-workbench-header-bar.h
+++ b/src/libide/workbench/ide-workbench-header-bar.h
@@ -20,7 +20,7 @@
#include <gtk/gtk.h>
-#include "ide-omni-bar.h"
+#include "workbench/ide-omni-bar.h"
G_BEGIN_DECLS
diff --git a/src/libide/workbench/ide-workbench-message.c b/src/libide/workbench/ide-workbench-message.c
index fb319c8..4d32d3c 100644
--- a/src/libide/workbench/ide-workbench-message.c
+++ b/src/libide/workbench/ide-workbench-message.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-workbench-message"
-#include "ide-workbench-message.h"
+#include "workbench/ide-workbench-message.h"
struct _IdeWorkbenchMessage
{
diff --git a/src/libide/workbench/ide-workbench-shortcuts.c b/src/libide/workbench/ide-workbench-shortcuts.c
index 78f2d79..7b258f2 100644
--- a/src/libide/workbench/ide-workbench-shortcuts.c
+++ b/src/libide/workbench/ide-workbench-shortcuts.c
@@ -23,7 +23,7 @@
#include <glib/gi18n.h>
#include <dazzle.h>
-#include "ide-workbench-private.h"
+#include "workbench/ide-workbench-private.h"
void
_ide_workbench_add_perspective_shortcut (IdeWorkbench *self,
diff --git a/src/libide/workers/ide-worker.c b/src/libide/workers/ide-worker.c
index 9c1be12..fa9fa15 100644
--- a/src/libide/workers/ide-worker.c
+++ b/src/libide/workers/ide-worker.c
@@ -18,7 +18,7 @@
#define G_LOG_DOMAIN "ide-worker"
-#include "ide-worker.h"
+#include "workers/ide-worker.h"
G_DEFINE_INTERFACE (IdeWorker, ide_worker, G_TYPE_OBJECT)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
