[gnome-builder] libide: remove ide-internal.h
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] libide: remove ide-internal.h
- Date: Sun, 24 Sep 2017 20:11:22 +0000 (UTC)
commit ee246d6750166ca3396916843f51ff157df225ff
Author: Christian Hergert <chergert redhat com>
Date: Sun Sep 24 13:10:17 2017 -0700
libide: remove ide-internal.h
Now that we're linking all the plugins that were using internal
API, we can drop this and avoid using _ide_* in the ABI linker
script.
src/libide/application/ide-application.c | 5 +-
src/libide/buffers/ide-buffer-manager.c | 2 +-
src/libide/buffers/ide-buffer.c | 1 -
src/libide/buffers/ide-unsaved-file.h | 4 +
src/libide/buffers/ide-unsaved-files.c | 1 -
.../ide-buildconfig-configuration-provider.c | 1 -
src/libide/buildsystem/ide-build-system.h | 2 +
src/libide/buildsystem/ide-configuration-manager.c | 1 -
src/libide/buildsystem/ide-configuration.c | 1 -
src/libide/buildsystem/ide-configuration.h | 192 ++++++++++----------
src/libide/buildui/ide-build-configuration-view.c | 6 +-
src/libide/diagnostics/ide-diagnostic.c | 2 -
src/libide/diagnostics/ide-fixit.c | 4 +-
src/libide/diagnostics/ide-fixit.h | 12 +-
.../editor/ide-editor-layout-stack-controls.c | 2 -
src/libide/editor/ide-editor-view.c | 1 -
src/libide/files/ide-file.h | 4 +
src/libide/highlighting/ide-highlight-engine.c | 2 +-
src/libide/highlighting/ide-highlighter.c | 1 -
src/libide/highlighting/ide-highlighter.h | 14 +-
src/libide/ide-context.c | 3 -
src/libide/ide-context.h | 2 +
src/libide/ide-internal.h | 81 --------
src/libide/ide-service.h | 7 +-
src/libide/ide.map | 1 -
src/libide/meson.build | 8 +-
src/libide/projects/ide-project.h | 2 +
src/libide/runtimes/ide-runtime-manager.h | 1 +
src/libide/sourceview/ide-source-view-capture.c | 1 -
src/libide/sourceview/ide-source-view-mode.h | 31 ++--
src/libide/sourceview/ide-source-view-movements.c | 1 -
src/libide/sourceview/ide-source-view.c | 2 +-
src/libide/sourceview/ide-source-view.h | 6 +
src/libide/threading/ide-thread-pool.h | 1 +
src/libide/util/ide-battery-monitor.h | 2 +
src/libide/util/ide-settings.c | 1 -
src/libide/util/ide-settings.h | 4 +
src/libide/workbench/ide-omni-bar.c | 1 -
src/plugins/clang/ide-clang-translation-unit.c | 3 +-
.../ide-gca-diagnostic-provider.c | 2 -
40 files changed, 179 insertions(+), 239 deletions(-)
---
diff --git a/src/libide/application/ide-application.c b/src/libide/application/ide-application.c
index 9206360..0524cd1 100644
--- a/src/libide/application/ide-application.c
+++ b/src/libide/application/ide-application.c
@@ -32,7 +32,6 @@
#include "ide-debug.h"
#include "ide-global.h"
-#include "ide-internal.h"
#include "ide-macros.h"
#include "ide-resources.h"
@@ -42,6 +41,8 @@
#include "application/ide-application-tests.h"
#include "application/ide-application-tool.h"
#include "modelines/modeline-parser.h"
+#include "threading/ide-thread-pool.h"
+#include "util/ide-battery-monitor.h"
#include "util/ide-flatpak.h"
#include "workbench/ide-workbench.h"
#include "workers/ide-worker.h"
@@ -449,6 +450,8 @@ ide_application_shutdown (GApplication *application)
dzl_directory_reaper_execute (reaper, NULL, NULL);
}
+
+ _ide_battery_monitor_shutdown ();
}
static void
diff --git a/src/libide/buffers/ide-buffer-manager.c b/src/libide/buffers/ide-buffer-manager.c
index 2245488..2bf17df 100644
--- a/src/libide/buffers/ide-buffer-manager.c
+++ b/src/libide/buffers/ide-buffer-manager.c
@@ -25,10 +25,10 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "ide-global.h"
-#include "ide-internal.h"
#include "buffers/ide-buffer-manager.h"
#include "buffers/ide-buffer.h"
+#include "buffers/ide-buffer-private.h"
#include "buffers/ide-unsaved-files.h"
#include "diagnostics/ide-diagnostics-manager.h"
#include "diagnostics/ide-source-location.h"
diff --git a/src/libide/buffers/ide-buffer.c b/src/libide/buffers/ide-buffer.c
index 5929f4b..dd0495d 100644
--- a/src/libide/buffers/ide-buffer.c
+++ b/src/libide/buffers/ide-buffer.c
@@ -23,7 +23,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "buffers/ide-buffer-addin.h"
#include "buffers/ide-buffer-change-monitor.h"
diff --git a/src/libide/buffers/ide-unsaved-file.h b/src/libide/buffers/ide-unsaved-file.h
index 39f5823..9627769 100644
--- a/src/libide/buffers/ide-unsaved-file.h
+++ b/src/libide/buffers/ide-unsaved-file.h
@@ -35,6 +35,10 @@ const gchar *ide_unsaved_file_get_temp_path (IdeUnsavedFile *self);
gboolean ide_unsaved_file_persist (IdeUnsavedFile *self,
GCancellable *cancellable,
GError **error);
+IdeUnsavedFile *_ide_unsaved_file_new (GFile *file,
+ GBytes *content,
+ const gchar *temp_path,
+ gint64 sequence) G_GNUC_INTERNAL;
G_DEFINE_AUTOPTR_CLEANUP_FUNC (IdeUnsavedFile, ide_unsaved_file_unref)
diff --git a/src/libide/buffers/ide-unsaved-files.c b/src/libide/buffers/ide-unsaved-files.c
index e3a6a6c..56d7ff4 100644
--- a/src/libide/buffers/ide-unsaved-files.c
+++ b/src/libide/buffers/ide-unsaved-files.c
@@ -27,7 +27,6 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "ide-global.h"
-#include "ide-internal.h"
#include "buffers/ide-unsaved-file.h"
#include "buffers/ide-unsaved-files.h"
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
index 4469e84..b49c6f8 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -22,7 +22,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "ide-macros.h"
#include "buildconfig/ide-buildconfig-configuration.h"
diff --git a/src/libide/buildsystem/ide-build-system.h b/src/libide/buildsystem/ide-build-system.h
index 0d24093..bc14d86 100644
--- a/src/libide/buildsystem/ide-build-system.h
+++ b/src/libide/buildsystem/ide-build-system.h
@@ -99,6 +99,8 @@ void ide_build_system_get_build_targets_async (IdeBuildSyst
GPtrArray *ide_build_system_get_build_targets_finish (IdeBuildSystem *self,
GAsyncResult *result,
GError **error);
+void _ide_build_system_set_project_file (IdeBuildSystem *self,
+ GFile *project_file)
G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/buildsystem/ide-configuration-manager.c
b/src/libide/buildsystem/ide-configuration-manager.c
index c2f9403..ef1571f 100644
--- a/src/libide/buildsystem/ide-configuration-manager.c
+++ b/src/libide/buildsystem/ide-configuration-manager.c
@@ -23,7 +23,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "ide-macros.h"
#include "buildsystem/ide-configuration-manager.h"
diff --git a/src/libide/buildsystem/ide-configuration.c b/src/libide/buildsystem/ide-configuration.c
index b331b48..c236ac5 100644
--- a/src/libide/buildsystem/ide-configuration.c
+++ b/src/libide/buildsystem/ide-configuration.c
@@ -22,7 +22,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "buildsystem/ide-configuration.h"
#include "buildsystem/ide-configuration-manager.h"
diff --git a/src/libide/buildsystem/ide-configuration.h b/src/libide/buildsystem/ide-configuration.h
index f8c27d3..a93f01c 100644
--- a/src/libide/buildsystem/ide-configuration.h
+++ b/src/libide/buildsystem/ide-configuration.h
@@ -65,100 +65,104 @@ struct _IdeConfigurationClass
gpointer _reserved16;
};
-IdeConfiguration *ide_configuration_new (IdeContext *context,
- const gchar *id,
- const gchar *device_id,
- const gchar *runtime_id);
-const gchar *ide_configuration_get_id (IdeConfiguration *self);
-const gchar *ide_configuration_get_runtime_id (IdeConfiguration *self);
-void ide_configuration_set_runtime_id (IdeConfiguration *self,
- const gchar *runtime_id);
-const gchar *ide_configuration_get_device_id (IdeConfiguration *self);
-void ide_configuration_set_device_id (IdeConfiguration *self,
- const gchar *device_id);
-IdeDevice *ide_configuration_get_device (IdeConfiguration *self);
-void ide_configuration_set_device (IdeConfiguration *self,
- IdeDevice *device);
-gboolean ide_configuration_get_dirty (IdeConfiguration *self);
-void ide_configuration_set_dirty (IdeConfiguration *self,
- gboolean dirty);
-const gchar *ide_configuration_get_display_name (IdeConfiguration *self);
-void ide_configuration_set_display_name (IdeConfiguration *self,
- const gchar *display_name);
-gboolean ide_configuration_get_ready (IdeConfiguration *self);
-IdeRuntime *ide_configuration_get_runtime (IdeConfiguration *self);
-void ide_configuration_set_runtime (IdeConfiguration *self,
- IdeRuntime *runtime);
-gchar **ide_configuration_get_environ (IdeConfiguration *self);
-const gchar *ide_configuration_getenv (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_setenv (IdeConfiguration *self,
- const gchar *key,
- const gchar *value);
-gboolean ide_configuration_get_debug (IdeConfiguration *self);
-void ide_configuration_set_debug (IdeConfiguration *self,
- gboolean debug);
-const gchar *ide_configuration_get_prefix (IdeConfiguration *self);
-void ide_configuration_set_prefix (IdeConfiguration *self,
- const gchar *prefix);
-const gchar *ide_configuration_get_config_opts (IdeConfiguration *self);
-void ide_configuration_set_config_opts (IdeConfiguration *self,
- const gchar *config_opts);
-const gchar *ide_configuration_get_run_opts (IdeConfiguration *self);
-void ide_configuration_set_run_opts (IdeConfiguration *self,
- const gchar *run_opts);
-const gchar * const *ide_configuration_get_build_commands (IdeConfiguration *self);
-void ide_configuration_set_build_commands (IdeConfiguration *self,
- const gchar *const *build_commands);
-const gchar * const *ide_configuration_get_post_install_commands (IdeConfiguration *self);
-void ide_configuration_set_post_install_commands (IdeConfiguration *self,
- const gchar *const
*post_install_commands);
-gint ide_configuration_get_parallelism (IdeConfiguration *self);
-void ide_configuration_set_parallelism (IdeConfiguration *self,
- gint parallelism);
-IdeEnvironment *ide_configuration_get_environment (IdeConfiguration *self);
-void ide_configuration_set_environment (IdeConfiguration *self,
- IdeEnvironment *environment);
-IdeConfiguration *ide_configuration_duplicate (IdeConfiguration *self);
-IdeConfiguration *ide_configuration_snapshot (IdeConfiguration *self);
-guint ide_configuration_get_sequence (IdeConfiguration *self);
-const gchar *ide_configuration_get_app_id (IdeConfiguration *self);
-void ide_configuration_set_app_id (IdeConfiguration *self,
- const gchar *app_id);
-gboolean ide_configuration_supports_device (IdeConfiguration *self,
- IdeDevice *device);
-gboolean ide_configuration_supports_runtime (IdeConfiguration *self,
- IdeRuntime *runtime);
-const gchar *ide_configuration_get_internal_string (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_string (IdeConfiguration *self,
- const gchar *key,
- const gchar *value);
-const gchar * const *ide_configuration_get_internal_strv (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_strv (IdeConfiguration *self,
- const gchar *key,
- const gchar *const *value);
-gboolean ide_configuration_get_internal_boolean (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_boolean (IdeConfiguration *self,
- const gchar *key,
- gboolean value);
-gint ide_configuration_get_internal_int (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_int (IdeConfiguration *self,
- const gchar *key,
- gint value);
-gint64 ide_configuration_get_internal_int64 (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_int64 (IdeConfiguration *self,
- const gchar *key,
- gint64 value);
-gpointer ide_configuration_get_internal_object (IdeConfiguration *self,
- const gchar *key);
-void ide_configuration_set_internal_object (IdeConfiguration *self,
- const gchar *key,
- gpointer instance);
+IdeConfiguration *ide_configuration_new (IdeContext *context,
+ const gchar *id,
+ const gchar *device_id,
+ const gchar *runtime_id);
+const gchar *ide_configuration_get_id (IdeConfiguration *self);
+const gchar *ide_configuration_get_runtime_id (IdeConfiguration *self);
+void ide_configuration_set_runtime_id (IdeConfiguration *self,
+ const gchar *runtime_id);
+const gchar *ide_configuration_get_device_id (IdeConfiguration *self);
+void ide_configuration_set_device_id (IdeConfiguration *self,
+ const gchar *device_id);
+IdeDevice *ide_configuration_get_device (IdeConfiguration *self);
+void ide_configuration_set_device (IdeConfiguration *self,
+ IdeDevice *device);
+gboolean ide_configuration_get_dirty (IdeConfiguration *self);
+void ide_configuration_set_dirty (IdeConfiguration *self,
+ gboolean dirty);
+const gchar *ide_configuration_get_display_name (IdeConfiguration *self);
+void ide_configuration_set_display_name (IdeConfiguration *self,
+ const gchar *display_name);
+gboolean ide_configuration_get_ready (IdeConfiguration *self);
+IdeRuntime *ide_configuration_get_runtime (IdeConfiguration *self);
+void ide_configuration_set_runtime (IdeConfiguration *self,
+ IdeRuntime *runtime);
+gchar **ide_configuration_get_environ (IdeConfiguration *self);
+const gchar *ide_configuration_getenv (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_setenv (IdeConfiguration *self,
+ const gchar *key,
+ const gchar *value);
+gboolean ide_configuration_get_debug (IdeConfiguration *self);
+void ide_configuration_set_debug (IdeConfiguration *self,
+ gboolean debug);
+const gchar *ide_configuration_get_prefix (IdeConfiguration *self);
+void ide_configuration_set_prefix (IdeConfiguration *self,
+ const gchar *prefix);
+const gchar *ide_configuration_get_config_opts (IdeConfiguration *self);
+void ide_configuration_set_config_opts (IdeConfiguration *self,
+ const gchar *config_opts);
+const gchar *ide_configuration_get_run_opts (IdeConfiguration *self);
+void ide_configuration_set_run_opts (IdeConfiguration *self,
+ const gchar *run_opts);
+const gchar * const *ide_configuration_get_build_commands (IdeConfiguration *self);
+void ide_configuration_set_build_commands (IdeConfiguration *self,
+ const gchar *const *build_commands);
+const gchar * const *ide_configuration_get_post_install_commands (IdeConfiguration *self);
+void ide_configuration_set_post_install_commands (IdeConfiguration *self,
+ const gchar *const
*post_install_commands);
+gint ide_configuration_get_parallelism (IdeConfiguration *self);
+void ide_configuration_set_parallelism (IdeConfiguration *self,
+ gint parallelism);
+IdeEnvironment *ide_configuration_get_environment (IdeConfiguration *self);
+void ide_configuration_set_environment (IdeConfiguration *self,
+ IdeEnvironment *environment);
+IdeConfiguration *ide_configuration_duplicate (IdeConfiguration *self);
+IdeConfiguration *ide_configuration_snapshot (IdeConfiguration *self);
+guint ide_configuration_get_sequence (IdeConfiguration *self);
+const gchar *ide_configuration_get_app_id (IdeConfiguration *self);
+void ide_configuration_set_app_id (IdeConfiguration *self,
+ const gchar *app_id);
+gboolean ide_configuration_supports_device (IdeConfiguration *self,
+ IdeDevice *device);
+gboolean ide_configuration_supports_runtime (IdeConfiguration *self,
+ IdeRuntime *runtime);
+const gchar *ide_configuration_get_internal_string (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_string (IdeConfiguration *self,
+ const gchar *key,
+ const gchar *value);
+const gchar * const *ide_configuration_get_internal_strv (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_strv (IdeConfiguration *self,
+ const gchar *key,
+ const gchar *const *value);
+gboolean ide_configuration_get_internal_boolean (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_boolean (IdeConfiguration *self,
+ const gchar *key,
+ gboolean value);
+gint ide_configuration_get_internal_int (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_int (IdeConfiguration *self,
+ const gchar *key,
+ gint value);
+gint64 ide_configuration_get_internal_int64 (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_int64 (IdeConfiguration *self,
+ const gchar *key,
+ gint64 value);
+gpointer ide_configuration_get_internal_object (IdeConfiguration *self,
+ const gchar *key);
+void ide_configuration_set_internal_object (IdeConfiguration *self,
+ const gchar *key,
+ gpointer instance);
+void _ide_configuration_set_prebuild (IdeConfiguration *self,
+ IdeBuildCommandQueue *prebuild)
G_GNUC_INTERNAL;
+void _ide_configuration_set_postbuild (IdeConfiguration *self,
+ IdeBuildCommandQueue *postbuild)
G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/buildui/ide-build-configuration-view.c
b/src/libide/buildui/ide-build-configuration-view.c
index 183e576..79bca52 100644
--- a/src/libide/buildui/ide-build-configuration-view.c
+++ b/src/libide/buildui/ide-build-configuration-view.c
@@ -21,10 +21,8 @@
#include <ide.h>
#include <string.h>
-#include "ide-build-configuration-view.h"
-
-#include "ide-environment-editor.h"
-#include "ide-internal.h"
+#include "buildui/ide-build-configuration-view.h"
+#include "buildui/ide-environment-editor.h"
struct _IdeBuildConfigurationView
{
diff --git a/src/libide/diagnostics/ide-diagnostic.c b/src/libide/diagnostics/ide-diagnostic.c
index 21cebe3..84889ab 100644
--- a/src/libide/diagnostics/ide-diagnostic.c
+++ b/src/libide/diagnostics/ide-diagnostic.c
@@ -20,8 +20,6 @@
#include "dazzle.h"
-#include "ide-internal.h"
-
#include "files/ide-file.h"
#include "diagnostics/ide-diagnostic.h"
#include "diagnostics/ide-source-location.h"
diff --git a/src/libide/diagnostics/ide-fixit.c b/src/libide/diagnostics/ide-fixit.c
index 467ab2f..a639d06 100644
--- a/src/libide/diagnostics/ide-fixit.c
+++ b/src/libide/diagnostics/ide-fixit.c
@@ -33,8 +33,8 @@ struct _IdeFixit
DZL_DEFINE_COUNTER (instances, "IdeFixit", "Instances", "Number of fixit instances")
IdeFixit *
-_ide_fixit_new (IdeSourceRange *source_range,
- const gchar *replacement_text)
+ide_fixit_new (IdeSourceRange *source_range,
+ const gchar *replacement_text)
{
IdeFixit *self;
diff --git a/src/libide/diagnostics/ide-fixit.h b/src/libide/diagnostics/ide-fixit.h
index 89b0204..d88fe11 100644
--- a/src/libide/diagnostics/ide-fixit.h
+++ b/src/libide/diagnostics/ide-fixit.h
@@ -25,12 +25,14 @@ G_BEGIN_DECLS
#define IDE_TYPE_FIXIT (ide_fixit_get_type())
+IdeFixit *ide_fixit_new (IdeSourceRange *source_range,
+ const gchar *replacement_text);
GType ide_fixit_get_type (void);
-IdeFixit *ide_fixit_ref (IdeFixit *self);
-void ide_fixit_unref (IdeFixit *self);
-void ide_fixit_apply (IdeFixit *self);
-const gchar *ide_fixit_get_text (IdeFixit *self);
-IdeSourceRange *ide_fixit_get_range (IdeFixit *self);
+IdeFixit *ide_fixit_ref (IdeFixit *self);
+void ide_fixit_unref (IdeFixit *self);
+void ide_fixit_apply (IdeFixit *self);
+const gchar *ide_fixit_get_text (IdeFixit *self);
+IdeSourceRange *ide_fixit_get_range (IdeFixit *self);
G_END_DECLS
diff --git a/src/libide/editor/ide-editor-layout-stack-controls.c
b/src/libide/editor/ide-editor-layout-stack-controls.c
index d3333f0..ba2d2b7 100644
--- a/src/libide/editor/ide-editor-layout-stack-controls.c
+++ b/src/libide/editor/ide-editor-layout-stack-controls.c
@@ -20,8 +20,6 @@
#include <glib/gi18n.h>
-#include "ide-internal.h"
-
#include "editor/ide-editor-layout-stack-controls.h"
#include "editor/ide-editor-private.h"
diff --git a/src/libide/editor/ide-editor-view.c b/src/libide/editor/ide-editor-view.c
index 0512cfa..0fa40dc 100644
--- a/src/libide/editor/ide-editor-view.c
+++ b/src/libide/editor/ide-editor-view.c
@@ -24,7 +24,6 @@
#include <libpeas/peas.h>
#include <pango/pangofc-fontmap.h>
-#include "ide-internal.h"
#include "ide-macros.h"
#include "editor/ide-editor-private.h"
diff --git a/src/libide/files/ide-file.h b/src/libide/files/ide-file.h
index cd9736a..cf0f62d 100644
--- a/src/libide/files/ide-file.h
+++ b/src/libide/files/ide-file.h
@@ -60,6 +60,10 @@ IdeFile *ide_file_find_other_finish (IdeFile *self,
GError **error);
gint ide_file_compare (const IdeFile *a,
const IdeFile *b);
+const gchar *_ide_file_get_content_type (IdeFile *self) G_GNUC_INTERNAL;
+void _ide_file_set_content_type (IdeFile *self,
+ const gchar *content_type) G_GNUC_INTERNAL;
+GtkSourceFile *_ide_file_get_source_file (IdeFile *self) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/highlighting/ide-highlight-engine.c b/src/libide/highlighting/ide-highlight-engine.c
index e55e152..7329315 100644
--- a/src/libide/highlighting/ide-highlight-engine.c
+++ b/src/libide/highlighting/ide-highlight-engine.c
@@ -22,8 +22,8 @@
#include <glib/gi18n.h>
#include <string.h>
+#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "ide-types.h"
#include "highlighting/ide-highlight-engine.h"
diff --git a/src/libide/highlighting/ide-highlighter.c b/src/libide/highlighting/ide-highlighter.c
index 300443d..2f3a0e5 100644
--- a/src/libide/highlighting/ide-highlighter.c
+++ b/src/libide/highlighting/ide-highlighter.c
@@ -20,7 +20,6 @@
#include "ide-context.h"
#include "ide-highlighter.h"
-#include "ide-internal.h"
G_DEFINE_INTERFACE (IdeHighlighter, ide_highlighter, IDE_TYPE_OBJECT)
diff --git a/src/libide/highlighting/ide-highlighter.h b/src/libide/highlighting/ide-highlighter.h
index 082fded..d4ddc3e 100644
--- a/src/libide/highlighting/ide-highlighter.h
+++ b/src/libide/highlighting/ide-highlighter.h
@@ -72,12 +72,14 @@ struct _IdeHighlighterInterface
void (*load) (IdeHighlighter *self);
};
-void ide_highlighter_load (IdeHighlighter *self);
-void ide_highlighter_update (IdeHighlighter *self,
- IdeHighlightCallback callback,
- const GtkTextIter *range_begin,
- const GtkTextIter *range_end,
- GtkTextIter *location);
+void ide_highlighter_load (IdeHighlighter *self);
+void ide_highlighter_update (IdeHighlighter *self,
+ IdeHighlightCallback callback,
+ const GtkTextIter *range_begin,
+ const GtkTextIter *range_end,
+ GtkTextIter *location);
+void _ide_highlighter_set_highlighter_engine (IdeHighlighter *self,
+ IdeHighlightEngine *highlight_engine) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/ide-context.c b/src/libide/ide-context.c
index 66d877e..bd6b675 100644
--- a/src/libide/ide-context.c
+++ b/src/libide/ide-context.c
@@ -24,7 +24,6 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "ide-global.h"
-#include "ide-internal.h"
#include "ide-pausable.h"
#include "ide-service.h"
@@ -546,8 +545,6 @@ ide_context_finalize (GObject *object)
DZL_COUNTER_DEC (instances);
- _ide_battery_monitor_shutdown ();
-
IDE_EXIT;
}
diff --git a/src/libide/ide-context.h b/src/libide/ide-context.h
index 3231640..e0edda7 100644
--- a/src/libide/ide-context.h
+++ b/src/libide/ide-context.h
@@ -87,6 +87,8 @@ void ide_context_release (IdeContext
void ide_context_warning (IdeContext *self,
const gchar *format,
...) G_GNUC_PRINTF (2, 3);
+GListModel *_ide_context_get_pausables (IdeContext *self) G_GNUC_INTERNAL;
+gboolean _ide_context_is_restoring (IdeContext *self) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/ide-service.h b/src/libide/ide-service.h
index efa7c81..82b26f2 100644
--- a/src/libide/ide-service.h
+++ b/src/libide/ide-service.h
@@ -37,9 +37,10 @@ struct _IdeServiceInterface
void (*stop) (IdeService *service);
};
-const gchar *ide_service_get_name (IdeService *self);
-void ide_service_start (IdeService *self);
-void ide_service_stop (IdeService *self);
+const gchar *ide_service_get_name (IdeService *self);
+void ide_service_start (IdeService *self);
+void ide_service_stop (IdeService *self);
+void _ide_service_emit_context_loaded (IdeService *self) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/ide.map b/src/libide/ide.map
index 770c78a..8173abb 100644
--- a/src/libide/ide.map
+++ b/src/libide/ide.map
@@ -1,7 +1,6 @@
{
global:
ide_*;
- _ide_*;
local:
*;
};
diff --git a/src/libide/meson.build b/src/libide/meson.build
index 1bfa0cc..cc93b06 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -142,10 +142,10 @@ libide_icons_resources = gnome.compile_resources('ide-icons-resources',
)
libide_generated_headers += [libide_icons_resources[1]]
-libide_sources = libide_private_sources + libide_generated_headers + libide_public_sources + [
- 'gconstructor.h',
- 'ide-internal.h',
-]
+libide_sources = ['gconstructor.h']
+libide_sources += libide_private_sources
+libide_sources += libide_generated_headers
+libide_sources += libide_public_sources
contrib_dir = join_paths(meson.source_root(), 'contrib/')
diff --git a/src/libide/projects/ide-project.h b/src/libide/projects/ide-project.h
index 61f4939..725714d 100644
--- a/src/libide/projects/ide-project.h
+++ b/src/libide/projects/ide-project.h
@@ -59,6 +59,8 @@ void ide_project_trash_file_async (IdeProject *self,
gboolean ide_project_trash_file_finish (IdeProject *self,
GAsyncResult *result,
GError **error);
+void _ide_project_set_name (IdeProject *project,
+ const gchar *name) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/runtimes/ide-runtime-manager.h b/src/libide/runtimes/ide-runtime-manager.h
index 40684e8..044f769 100644
--- a/src/libide/runtimes/ide-runtime-manager.h
+++ b/src/libide/runtimes/ide-runtime-manager.h
@@ -27,6 +27,7 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (IdeRuntimeManager, ide_runtime_manager, IDE, RUNTIME_MANAGER, IdeObject)
+void _ide_runtime_manager_unload (IdeRuntimeManager *self) G_GNUC_INTERNAL;
IdeRuntime *ide_runtime_manager_get_runtime (IdeRuntimeManager *self,
const gchar *id);
void ide_runtime_manager_add (IdeRuntimeManager *self,
diff --git a/src/libide/sourceview/ide-source-view-capture.c b/src/libide/sourceview/ide-source-view-capture.c
index d68a161..49c934e 100644
--- a/src/libide/sourceview/ide-source-view-capture.c
+++ b/src/libide/sourceview/ide-source-view-capture.c
@@ -18,7 +18,6 @@
#include <glib/gi18n.h>
-#include "ide-internal.h"
#include "ide-source-view-capture.h"
typedef struct
diff --git a/src/libide/sourceview/ide-source-view-mode.h b/src/libide/sourceview/ide-source-view-mode.h
index f93411d..c70658e 100644
--- a/src/libide/sourceview/ide-source-view-mode.h
+++ b/src/libide/sourceview/ide-source-view-mode.h
@@ -28,19 +28,24 @@ G_BEGIN_DECLS
#define IDE_TYPE_SOURCE_VIEW_MODE (ide_source_view_mode_get_type())
-G_DECLARE_FINAL_TYPE (IdeSourceViewMode, ide_source_view_mode,
- IDE, SOURCE_VIEW_MODE, GtkWidget)
-
-gboolean ide_source_view_mode_get_repeat_insert_with_count (IdeSourceViewMode *self);
-gboolean ide_source_view_mode_get_block_cursor (IdeSourceViewMode *self);
-gboolean ide_source_view_mode_get_suppress_unbound (IdeSourceViewMode *self);
-const gchar *ide_source_view_mode_get_name (IdeSourceViewMode *self);
-const gchar *ide_source_view_mode_get_default_mode (IdeSourceViewMode *self);
-const gchar *ide_source_view_mode_get_display_name (IdeSourceViewMode *self);
-gboolean ide_source_view_mode_get_keep_mark_on_char (IdeSourceViewMode *self);
-IdeSourceViewModeType ide_source_view_mode_get_mode_type (IdeSourceViewMode *self);
-void ide_source_view_mode_set_has_indenter (IdeSourceViewMode *self,
- gboolean has_indenter);
+G_DECLARE_FINAL_TYPE (IdeSourceViewMode, ide_source_view_mode, IDE, SOURCE_VIEW_MODE, GtkWidget)
+
+gboolean ide_source_view_mode_get_repeat_insert_with_count (IdeSourceViewMode *self);
+gboolean ide_source_view_mode_get_block_cursor (IdeSourceViewMode *self);
+gboolean ide_source_view_mode_get_suppress_unbound (IdeSourceViewMode *self);
+const gchar *ide_source_view_mode_get_name (IdeSourceViewMode *self);
+const gchar *ide_source_view_mode_get_default_mode (IdeSourceViewMode *self);
+const gchar *ide_source_view_mode_get_display_name (IdeSourceViewMode *self);
+gboolean ide_source_view_mode_get_keep_mark_on_char (IdeSourceViewMode *self);
+IdeSourceViewModeType ide_source_view_mode_get_mode_type (IdeSourceViewMode *self);
+void ide_source_view_mode_set_has_indenter (IdeSourceViewMode *self,
+ gboolean
has_indenter);
+IdeSourceViewMode *_ide_source_view_mode_new (GtkWidget *view,
+ const char *mode,
+ IdeSourceViewModeType type)
G_GNUC_INTERNAL;
+gboolean _ide_source_view_mode_do_event (IdeSourceViewMode *mode,
+ GdkEventKey *event,
+ gboolean *remove)
G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/sourceview/ide-source-view-movements.c
b/src/libide/sourceview/ide-source-view-movements.c
index 45150c1..fa5365e 100644
--- a/src/libide/sourceview/ide-source-view-movements.c
+++ b/src/libide/sourceview/ide-source-view-movements.c
@@ -23,7 +23,6 @@
#include "ide-enums.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "sourceview/ide-source-iter.h"
#include "sourceview/ide-source-view-movements.h"
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index 3d12ce4..0924c3c 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -25,11 +25,11 @@
#include "ide-context.h"
#include "ide-debug.h"
#include "ide-enums.h"
-#include "ide-internal.h"
#include "application/ide-application.h"
#include "buffers/ide-buffer-manager.h"
#include "buffers/ide-buffer.h"
+#include "buffers/ide-buffer-private.h"
#include "diagnostics/ide-diagnostic.h"
#include "diagnostics/ide-fixit.h"
#include "diagnostics/ide-source-location.h"
diff --git a/src/libide/sourceview/ide-source-view.h b/src/libide/sourceview/ide-source-view.h
index fdac57a..d654252 100644
--- a/src/libide/sourceview/ide-source-view.h
+++ b/src/libide/sourceview/ide-source-view.h
@@ -436,6 +436,12 @@ void ide_source_view_scroll_to_iter (IdeSource
gdouble yalign,
gboolean
animate_scroll);
void ide_source_view_scroll_to_insert (IdeSourceView *self);
+const gchar *_ide_source_view_get_mode_name (IdeSourceView *self)
G_GNUC_INTERNAL;
+void _ide_source_view_set_count (IdeSourceView *self,
+ gint count)
G_GNUC_INTERNAL;
+void _ide_source_view_set_modifier (IdeSourceView *self,
+ gunichar modifier)
G_GNUC_INTERNAL;
+GtkTextMark *_ide_source_view_get_scroll_mark (IdeSourceView *self)
G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/threading/ide-thread-pool.h b/src/libide/threading/ide-thread-pool.h
index c11b6aa..9f9ecf9 100644
--- a/src/libide/threading/ide-thread-pool.h
+++ b/src/libide/threading/ide-thread-pool.h
@@ -39,6 +39,7 @@ typedef enum
*/
typedef void (*IdeThreadFunc) (gpointer user_data);
+void _ide_thread_pool_init (gboolean is_worker) G_GNUC_INTERNAL;
void ide_thread_pool_push (IdeThreadPoolKind kind,
IdeThreadFunc func,
gpointer func_data);
diff --git a/src/libide/util/ide-battery-monitor.h b/src/libide/util/ide-battery-monitor.h
index 79b7822..36783c1 100644
--- a/src/libide/util/ide-battery-monitor.h
+++ b/src/libide/util/ide-battery-monitor.h
@@ -26,6 +26,8 @@ G_BEGIN_DECLS
gdouble ide_battery_monitor_get_energy_percentage (void);
gboolean ide_battery_monitor_get_on_battery (void);
gboolean ide_battery_monitor_get_should_conserve (void);
+void _ide_battery_monitor_init (void) G_GNUC_INTERNAL;
+void _ide_battery_monitor_shutdown (void) G_GNUC_INTERNAL;
G_END_DECLS
diff --git a/src/libide/util/ide-settings.c b/src/libide/util/ide-settings.c
index 48c5f66..1fb755a 100644
--- a/src/libide/util/ide-settings.c
+++ b/src/libide/util/ide-settings.c
@@ -24,7 +24,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "projects/ide-project.h"
#include "util/ide-settings.h"
diff --git a/src/libide/util/ide-settings.h b/src/libide/util/ide-settings.h
index 2ff422a..e37dceb 100644
--- a/src/libide/util/ide-settings.h
+++ b/src/libide/util/ide-settings.h
@@ -27,6 +27,10 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (IdeSettings, ide_settings, IDE, SETTINGS, IdeObject)
+IdeSettings *_ide_settings_new (IdeContext *context,
+ const gchar *schema_id,
+ const gchar *relative_path,
+ gboolean ignore_project_settings)
G_GNUC_INTERNAL;
const gchar *ide_settings_get_relative_path (IdeSettings *self);
const gchar *ide_settings_get_schema_id (IdeSettings *self);
gboolean ide_settings_get_ignore_project_settings (IdeSettings *self);
diff --git a/src/libide/workbench/ide-omni-bar.c b/src/libide/workbench/ide-omni-bar.c
index b594f0c..4d7dbbe 100644
--- a/src/libide/workbench/ide-omni-bar.c
+++ b/src/libide/workbench/ide-omni-bar.c
@@ -23,7 +23,6 @@
#include "ide-context.h"
#include "ide-debug.h"
-#include "ide-internal.h"
#include "buildsystem/ide-build-manager.h"
#include "buildsystem/ide-build-pipeline.h"
diff --git a/src/plugins/clang/ide-clang-translation-unit.c b/src/plugins/clang/ide-clang-translation-unit.c
index 6addc7e..3f6d69f 100644
--- a/src/plugins/clang/ide-clang-translation-unit.c
+++ b/src/plugins/clang/ide-clang-translation-unit.c
@@ -28,7 +28,6 @@
#include "ide-clang-private.h"
#include "ide-clang-symbol-tree.h"
#include "ide-clang-translation-unit.h"
-#include "ide-internal.h"
struct _IdeClangTranslationUnit
{
@@ -444,7 +443,7 @@ ide_clang_translation_unit_get_diagnostics_for_file (IdeClangTranslationUnit *se
cxstr = clang_getDiagnosticFixIt (cxdiag, j, &cxrange);
range = create_range (self, project, workpath, cxrange);
- fixit = _ide_fixit_new (range, clang_getCString (cxstr));
+ fixit = ide_fixit_new (range, clang_getCString (cxstr));
clang_disposeString (cxstr);
if (fixit != NULL)
diff --git a/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
b/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
index a38a9d6..80446ab 100644
--- a/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
+++ b/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
@@ -20,8 +20,6 @@
#include <glib/gi18n.h>
-#include "ide-internal.h"
-
#include "gca-diagnostics.h"
#include "ide-gca-diagnostic-provider.h"
#include "ide-gca-service.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
