[gnome-builder] util: use string utils from libdazzle
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] util: use string utils from libdazzle
- Date: Sun, 26 Nov 2017 23:45:54 +0000 (UTC)
commit 4e9c136329099eaf56e2e051dce3003ff29ddd84
Author: Christian Hergert <chergert redhat com>
Date: Sun Nov 26 15:44:01 2017 -0800
util: use string utils from libdazzle
We don't need to maintain these in multiple places anymore.
src/libide/application/ide-application-plugins.c | 2 +-
src/libide/application/ide-application.c | 2 +-
src/libide/buffers/ide-buffer.c | 2 +-
src/libide/buffers/ide-unsaved-files.c | 2 +-
.../ide-buildconfig-configuration-provider.c | 2 +-
src/libide/buildsystem/ide-build-pipeline.c | 8 +-
src/libide/buildsystem/ide-build-utils.c | 2 +-
src/libide/buildsystem/ide-compile-commands.c | 7 +-
.../editor/ide-editor-layout-stack-controls.c | 4 +-
src/libide/editor/ide-editor-properties.c | 2 +-
src/libide/greeter/ide-greeter-project-row.c | 2 +-
src/libide/ide-context.c | 2 +-
src/libide/ide-macros.h | 16 -----
src/libide/keybindings/ide-keybindings.c | 3 +-
src/libide/layout/ide-layout-stack-actions.c | 4 +-
src/libide/plugins/ide-extension-adapter.c | 6 +-
src/libide/plugins/ide-extension-set-adapter.c | 5 +-
src/libide/preferences/ide-preferences-builtin.c | 8 +-
src/libide/projects/ide-project-info.c | 7 +-
src/libide/runner/ide-runner.c | 3 +-
src/libide/runtimes/ide-runtime.c | 4 +-
src/libide/search/ide-search-entry.c | 2 +-
src/libide/snippets/ide-source-snippet.c | 2 +-
src/libide/sourceview/ide-source-view-movements.c | 8 +-
src/libide/sourceview/ide-source-view.c | 4 +-
src/libide/sourceview/ide-text-iter.c | 7 +-
src/libide/subprocess/ide-subprocess-launcher.c | 7 +-
src/libide/terminal/ide-terminal.c | 6 +-
src/libide/testing/ide-test-manager.c | 2 +-
src/libide/util/ide-settings.c | 4 +-
src/libide/vcs/ide-vcs-uri.c | 11 ++--
src/libide/workbench/ide-workbench-header-bar.c | 2 +-
src/libide/workbench/ide-workbench.c | 2 +-
.../autotools/ide-autotools-application-addin.c | 2 +-
src/plugins/autotools/ide-autotools-build-system.c | 2 +-
.../autotools/ide-autotools-pipeline-addin.c | 2 +-
src/plugins/autotools/ide-makecache.c | 8 +-
src/plugins/beautifier/gb-beautifier-config.c | 16 +++---
src/plugins/beautifier/gb-beautifier-helper.c | 2 +-
src/plugins/beautifier/gb-beautifier-process.c | 18 +++---
src/plugins/clang/ide-clang-completion-item.c | 2 +-
src/plugins/clang/ide-clang-symbol-node.c | 2 +-
src/plugins/clang/ide-clang-symbol-tree.c | 2 +-
src/plugins/cmake/gbp-cmake-build-system.c | 2 +-
src/plugins/cmake/gbp-cmake-pipeline-addin.c | 2 +-
.../gb-color-picker-document-monitor.c | 4 +-
.../color-picker/gb-color-picker-editor-addin.c | 2 +-
src/plugins/color-picker/gb-color-picker-helper.c | 2 +-
.../gb-color-picker-prefs-palette-row.c | 2 +-
src/plugins/color-picker/gb-color-picker-prefs.c | 2 +-
src/plugins/command-bar/gb-command-bar.c | 2 +-
src/plugins/command-bar/gb-vim.c | 8 +-
.../comment-code/gbp-comment-code-view-addin.c | 10 ++--
.../gbp-create-project-template-icon.c | 2 +-
.../create-project/gbp-create-project-widget.c | 10 ++--
src/plugins/ctags/ide-ctags-completion-item.c | 2 +-
src/plugins/ctags/ide-ctags-highlighter.c | 2 +-
src/plugins/ctags/ide-ctags-index.c | 2 +-
src/plugins/ctags/ide-ctags-util.c | 14 ++--
.../devhelp/gbp-devhelp-editor-view-addin.c | 2 +-
.../gbp-documentation-card-view-addin.c | 4 +-
.../flatpak/gbp-flatpak-build-system-discovery.c | 4 +-
src/plugins/flatpak/gbp-flatpak-clone-widget.c | 2 +-
.../flatpak/gbp-flatpak-configuration-provider.c | 18 +++---
src/plugins/flatpak/gbp-flatpak-configuration.c | 18 +++---
src/plugins/flatpak/gbp-flatpak-download-stage.c | 2 +-
src/plugins/flatpak/gbp-flatpak-pipeline-addin.c | 2 +-
src/plugins/flatpak/gbp-flatpak-runtime.c | 14 ++--
src/plugins/git/ide-git-clone-widget.c | 2 +-
src/plugins/meson/gbp-meson-build-system.c | 2 +-
.../meson/gbp-meson-build-target-provider.c | 4 +-
src/plugins/meson/gbp-meson-pipeline-addin.c | 2 +-
src/plugins/notification/ide-notification-addin.c | 2 +-
src/plugins/project-tree/gb-new-file-popover.c | 6 +-
src/plugins/project-tree/gb-project-tree.c | 2 +-
src/plugins/project-tree/gb-rename-file-popover.c | 4 +-
src/plugins/recent/gbp-recent-project-row.c | 2 +-
src/plugins/spellcheck/gbp-spell-dict.c | 6 +-
src/plugins/spellcheck/gbp-spell-navigator.c | 2 +-
src/plugins/spellcheck/gbp-spell-widget-actions.c | 2 +-
src/plugins/spellcheck/gbp-spell-widget.c | 24 ++++----
src/plugins/symbol-tree/gbp-symbol-menu-button.c | 4 +-
src/plugins/todo/gbp-todo-model.c | 2 +-
.../xml-pack/ide-xml-completion-attributes.c | 6 +-
src/plugins/xml-pack/ide-xml-completion-provider.c | 13 ++--
src/plugins/xml-pack/ide-xml-completion-values.c | 6 +-
src/plugins/xml-pack/ide-xml-hash-table.c | 4 +-
src/plugins/xml-pack/ide-xml-parser-ui.c | 56 ++++++++++---------
src/plugins/xml-pack/ide-xml-parser.c | 12 ++--
src/plugins/xml-pack/ide-xml-position.c | 6 +-
src/plugins/xml-pack/ide-xml-rng-define.c | 6 +-
src/plugins/xml-pack/ide-xml-rng-parser.c | 60 ++++++++++----------
src/plugins/xml-pack/ide-xml-stack.c | 2 +-
src/plugins/xml-pack/ide-xml-symbol-node.c | 8 +-
src/plugins/xml-pack/ide-xml-tree-builder-utils.c | 4 +-
95 files changed, 293 insertions(+), 296 deletions(-)
---
diff --git a/src/libide/application/ide-application-plugins.c
b/src/libide/application/ide-application-plugins.c
index 5a377fb..2292b3b 100644
--- a/src/libide/application/ide-application-plugins.c
+++ b/src/libide/application/ide-application-plugins.c
@@ -184,7 +184,7 @@ ide_application_plugins_enabled_changed (IdeApplication *self,
gboolean enabled;
g_assert (IDE_IS_APPLICATION (self));
- g_assert (ide_str_equal0 (key, "enabled"));
+ g_assert (dzl_str_equal0 (key, "enabled"));
g_assert (G_IS_SETTINGS (settings));
enabled = g_settings_get_boolean (settings, key);
diff --git a/src/libide/application/ide-application.c b/src/libide/application/ide-application.c
index 2bc42f0..c21c8f4 100644
--- a/src/libide/application/ide-application.c
+++ b/src/libide/application/ide-application.c
@@ -845,7 +845,7 @@ ide_application_show_projects_window (IdeApplication *self)
name = ide_workbench_get_visible_perspective_name (IDE_WORKBENCH (window));
- if (ide_str_equal0 ("greeter", name))
+ if (dzl_str_equal0 ("greeter", name))
{
gtk_window_present (windows->data);
return;
diff --git a/src/libide/buffers/ide-buffer.c b/src/libide/buffers/ide-buffer.c
index 996a347..4c664f4 100644
--- a/src/libide/buffers/ide-buffer.c
+++ b/src/libide/buffers/ide-buffer.c
@@ -694,7 +694,7 @@ ide_buffer_do_modeline (IdeBuffer *self)
if (old_lang != NULL)
old_id = gtk_source_language_get_id (old_lang);
- if (old_id == NULL || !ide_str_equal0 (old_id, new_id))
+ if (old_id == NULL || !dzl_str_equal0 (old_id, new_id))
_ide_file_set_content_type (ifile, content_type);
}
diff --git a/src/libide/buffers/ide-unsaved-files.c b/src/libide/buffers/ide-unsaved-files.c
index fedb8de..4b8c1b1 100644
--- a/src/libide/buffers/ide-unsaved-files.c
+++ b/src/libide/buffers/ide-unsaved-files.c
@@ -375,7 +375,7 @@ ide_unsaved_files_restore_worker (GTask *task,
line[line_len] = '\0';
- if (ide_str_empty0 (line))
+ if (dzl_str_empty0 (line))
continue;
file = g_file_new_for_uri (line);
diff --git a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
index a0996ac..fe6ac44 100644
--- a/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/libide/buildconfig/ide-buildconfig-configuration-provider.c
@@ -200,7 +200,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
key = ide_environment_variable_get_key (var);
value = ide_environment_variable_get_value (var);
- if (!ide_str_empty0 (key))
+ if (!dzl_str_empty0 (key))
g_key_file_set_string (self->key_file, group_environ, key, value ?: "");
}
}
diff --git a/src/libide/buildsystem/ide-build-pipeline.c b/src/libide/buildsystem/ide-build-pipeline.c
index e7d6dbd..8ebaf15 100644
--- a/src/libide/buildsystem/ide-build-pipeline.c
+++ b/src/libide/buildsystem/ide-build-pipeline.c
@@ -545,7 +545,7 @@ ide_build_pipeline_log_observer (IdeBuildLogStream stream,
{
gssize len;
- enterdir += IDE_LITERAL_LENGTH (ENTERING_DIRECTORY_BEGIN);
+ enterdir += DZL_LITERAL_LENGTH (ENTERING_DIRECTORY_BEGIN);
/* Translate to relative paths for out-of-tree builds */
if (g_str_has_prefix (enterdir, self->builddir))
@@ -555,7 +555,7 @@ ide_build_pipeline_log_observer (IdeBuildLogStream stream,
enterdir++;
}
- len = strlen (enterdir) - IDE_LITERAL_LENGTH (ENTERING_DIRECTORY_END);
+ len = strlen (enterdir) - DZL_LITERAL_LENGTH (ENTERING_DIRECTORY_END);
if (len > 0)
{
@@ -2524,7 +2524,7 @@ ide_build_pipeline_get_message (IdeBuildPipeline *self)
{
const gchar *name = ide_build_stage_get_name (self->current_stage);
- if (!ide_str_empty0 (name))
+ if (!dzl_str_empty0 (name))
return g_strdup (name);
}
@@ -3037,7 +3037,7 @@ _ide_build_pipeline_set_message (IdeBuildPipeline *self,
message += strlen ("jhbuild:");
}
- if (!ide_str_equal0 (message, self->message))
+ if (!dzl_str_equal0 (message, self->message))
{
g_free (self->message);
self->message = g_strdup (message);
diff --git a/src/libide/buildsystem/ide-build-utils.c b/src/libide/buildsystem/ide-build-utils.c
index 7954217..869c1ae 100644
--- a/src/libide/buildsystem/ide-build-utils.c
+++ b/src/libide/buildsystem/ide-build-utils.c
@@ -57,7 +57,7 @@ find_color_code (const gchar *txt,
{
const gchar *cursor = txt;
- g_assert (!ide_str_empty0 (txt));
+ g_assert (!dzl_str_empty0 (txt));
g_assert (start_offset != NULL);
g_assert (end_offset != NULL);
diff --git a/src/libide/buildsystem/ide-compile-commands.c b/src/libide/buildsystem/ide-compile-commands.c
index 61a2543..f7d6572 100644
--- a/src/libide/buildsystem/ide-compile-commands.c
+++ b/src/libide/buildsystem/ide-compile-commands.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-compile-commands"
+#include <dazzle.h>
#include <json-glib/json-glib.h>
#include <string.h>
@@ -506,12 +507,12 @@ ide_compile_commands_filter_c (IdeCompileCommands *self,
default:
if (g_str_has_prefix (param, "-std=") ||
- ide_str_equal0 (param, "-pthread") ||
+ dzl_str_equal0 (param, "-pthread") ||
g_str_has_prefix (param, "-isystem"))
{
g_ptr_array_add (ar, g_strdup (param));
}
- else if (next != NULL && ide_str_equal0 (param, "-include"))
+ else if (next != NULL && dzl_str_equal0 (param, "-include"))
{
g_ptr_array_add (ar, g_strdup (param));
g_ptr_array_add (ar, ide_compile_commands_resolve (self, info, next));
@@ -652,7 +653,7 @@ ide_compile_commands_lookup (IdeCompileCommands *self,
* document we stored information about each of the Vala files in a special
* list for exactly this purpose.
*/
- if (ide_str_equal0 (dot, ".vala") && self->vala_info != NULL)
+ if (dzl_str_equal0 (dot, ".vala") && self->vala_info != NULL)
{
for (guint i = 0; i < self->vala_info->len; i++)
{
diff --git a/src/libide/editor/ide-editor-layout-stack-controls.c
b/src/libide/editor/ide-editor-layout-stack-controls.c
index a360f96..008c913 100644
--- a/src/libide/editor/ide-editor-layout-stack-controls.c
+++ b/src/libide/editor/ide-editor-layout-stack-controls.c
@@ -94,7 +94,7 @@ goto_line_activate (IdeEditorLayoutStackControls *self,
if (self->view == NULL)
return;
- if (!ide_str_empty0 (text))
+ if (!dzl_str_empty0 (text))
{
value = g_ascii_strtoll (text, NULL, 10);
@@ -153,7 +153,7 @@ goto_line_changed (IdeEditorLayoutStackControls *self,
gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (self->view->buffer), &begin, &end);
- if (!ide_str_empty0 (text))
+ if (!dzl_str_empty0 (text))
{
gint64 value;
diff --git a/src/libide/editor/ide-editor-properties.c b/src/libide/editor/ide-editor-properties.c
index e304c28..4790b83 100644
--- a/src/libide/editor/ide-editor-properties.c
+++ b/src/libide/editor/ide-editor-properties.c
@@ -267,7 +267,7 @@ ide_editor_properties_entry_changed (IdeEditorProperties *self,
text = gtk_entry_get_text (GTK_ENTRY (entry));
/* Clear any previous filter */
- if (ide_str_empty0 (text))
+ if (dzl_str_empty0 (text))
{
gtk_tree_view_set_model (self->tree_view, GTK_TREE_MODEL (self->languages));
return;
diff --git a/src/libide/greeter/ide-greeter-project-row.c b/src/libide/greeter/ide-greeter-project-row.c
index 9617482..d3d4921 100644
--- a/src/libide/greeter/ide-greeter-project-row.c
+++ b/src/libide/greeter/ide-greeter-project-row.c
@@ -166,7 +166,7 @@ ide_greeter_project_row_add_tags (IdeGreeterProjectRow *self,
}
build_system_name = ide_project_info_get_build_system_name (project_info);
- if (!ide_str_empty0 (build_system_name))
+ if (!dzl_str_empty0 (build_system_name))
{
GtkWidget *pill;
diff --git a/src/libide/ide-context.c b/src/libide/ide-context.c
index b4b56ae..bfb6f68 100644
--- a/src/libide/ide-context.c
+++ b/src/libide/ide-context.c
@@ -842,7 +842,7 @@ ide_context_load_doap_worker (GTask *task,
filename = g_file_info_get_name (file_info);
- if (!ide_str_empty0 (filename) && g_str_has_suffix (filename, ".doap"))
+ if (!dzl_str_empty0 (filename) && g_str_has_suffix (filename, ".doap"))
{
g_autoptr(GFile) file = NULL;
g_autoptr(IdeDoap) doap = NULL;
diff --git a/src/libide/ide-macros.h b/src/libide/ide-macros.h
index 93fa5a1..ca59e5b 100644
--- a/src/libide/ide-macros.h
+++ b/src/libide/ide-macros.h
@@ -23,26 +23,10 @@
G_BEGIN_DECLS
-/* strlen() generally gets hoisted out automatically */
-#define IDE_LITERAL_LENGTH(s) (strlen(s))
-
#if __GNUC__ >= 7
# define IDE_FALLTHROUGH __attribute__((fallthrough))
#else
# define IDE_FALLTHROUGH
#endif
-static inline gboolean
-ide_str_empty0 (const gchar *str)
-{
- return (str == NULL) || (str[0] == '\0');
-}
-
-static inline gboolean
-ide_str_equal0 (gconstpointer a,
- gconstpointer b)
-{
- return (g_strcmp0 ((const gchar *)a, (const gchar *)b) == 0);
-}
-
G_END_DECLS
diff --git a/src/libide/keybindings/ide-keybindings.c b/src/libide/keybindings/ide-keybindings.c
index 887dbdc..a0367bd 100644
--- a/src/libide/keybindings/ide-keybindings.c
+++ b/src/libide/keybindings/ide-keybindings.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-keybindings"
+#include <dazzle.h>
#include <glib/gi18n.h>
#include <libpeas/peas.h>
@@ -202,7 +203,7 @@ ide_keybindings_set_mode (IdeKeybindings *self,
{
g_return_if_fail (IDE_IS_KEYBINDINGS (self));
- if (!ide_str_equal0 (self->mode, mode))
+ if (!dzl_str_equal0 (self->mode, mode))
{
g_free (self->mode);
self->mode = g_strdup (mode);
diff --git a/src/libide/layout/ide-layout-stack-actions.c b/src/libide/layout/ide-layout-stack-actions.c
index 312039a..e4e0fd1 100644
--- a/src/libide/layout/ide-layout-stack-actions.c
+++ b/src/libide/layout/ide-layout-stack-actions.c
@@ -143,7 +143,7 @@ ide_layout_stack_actions_open_in_new_frame (GSimpleAction *action,
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
filepath = g_variant_get_string (variant, NULL);
- if (!ide_str_empty0 (filepath))
+ if (!dzl_str_empty0 (filepath))
{
IdeContext *context;
IdeBufferManager *buffer_manager;
@@ -235,7 +235,7 @@ ide_layout_stack_actions_split_view (GSimpleAction *action,
}
filepath = g_variant_get_string (variant, NULL);
- if (!ide_str_empty0 (filepath))
+ if (!dzl_str_empty0 (filepath))
{
IdeContext *context;
IdeBufferManager *buffer_manager;
diff --git a/src/libide/plugins/ide-extension-adapter.c b/src/libide/plugins/ide-extension-adapter.c
index 066d3e5..bccdcec 100644
--- a/src/libide/plugins/ide-extension-adapter.c
+++ b/src/libide/plugins/ide-extension-adapter.c
@@ -294,7 +294,7 @@ ide_extension_adapter__changed_disabled (IdeExtensionAdapter *self,
g_assert (IDE_IS_EXTENSION_ADAPTER (self));
g_assert (G_IS_SETTINGS (settings));
- if (ide_str_equal0 (changed_key, "disabled"))
+ if (dzl_str_equal0 (changed_key, "disabled"))
ide_extension_adapter_queue_reload (self);
}
@@ -463,7 +463,7 @@ ide_extension_adapter_set_key (IdeExtensionAdapter *self,
{
g_return_if_fail (IDE_IS_EXTENSION_ADAPTER (self));
- if (!ide_str_equal0 (self->key, key))
+ if (!dzl_str_equal0 (self->key, key))
{
g_free (self->key);
self->key = g_strdup (key);
@@ -486,7 +486,7 @@ ide_extension_adapter_set_value (IdeExtensionAdapter *self,
{
g_return_if_fail (IDE_IS_EXTENSION_ADAPTER (self));
- if (!ide_str_equal0 (self->value, value))
+ if (!dzl_str_equal0 (self->value, value))
{
g_free (self->value);
self->value = g_strdup (value);
diff --git a/src/libide/plugins/ide-extension-set-adapter.c b/src/libide/plugins/ide-extension-set-adapter.c
index cf422d3..72f50a3 100644
--- a/src/libide/plugins/ide-extension-set-adapter.c
+++ b/src/libide/plugins/ide-extension-set-adapter.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-extension-set-adapter"
+#include <dazzle.h>
#include <glib/gi18n.h>
#include "ide-context.h"
@@ -499,7 +500,7 @@ ide_extension_set_adapter_set_key (IdeExtensionSetAdapter *self,
{
g_return_if_fail (IDE_IS_EXTENSION_SET_ADAPTER (self));
- if (!ide_str_equal0 (self->key, key))
+ if (!dzl_str_equal0 (self->key, key))
{
g_free (self->key);
self->key = g_strdup (key);
@@ -522,7 +523,7 @@ ide_extension_set_adapter_set_value (IdeExtensionSetAdapter *self,
{
g_return_if_fail (IDE_IS_EXTENSION_SET_ADAPTER (self));
- if (!ide_str_equal0 (self->value, value))
+ if (!dzl_str_equal0 (self->value, value))
{
g_free (self->value);
self->value = g_strdup (value);
diff --git a/src/libide/preferences/ide-preferences-builtin.c
b/src/libide/preferences/ide-preferences-builtin.c
index 4083ad6..996165e 100644
--- a/src/libide/preferences/ide-preferences-builtin.c
+++ b/src/libide/preferences/ide-preferences-builtin.c
@@ -226,7 +226,7 @@ language_search_changed (GtkSearchEntry *search,
text = gtk_entry_get_text (GTK_ENTRY (search));
- if (!ide_str_empty0 (text))
+ if (!dzl_str_empty0 (text))
{
g_autofree gchar *folded = g_utf8_casefold (text, -1);
@@ -282,7 +282,7 @@ ide_preferences_builtin_register_languages (DzlPreferences *preferences)
const gchar *name;
const gchar *section;
- if (ide_str_equal0 (language_ids [i], "def"))
+ if (dzl_str_equal0 (language_ids [i], "def"))
continue;
language = gtk_source_language_manager_get_language (manager, language_ids [i]);
@@ -484,7 +484,7 @@ vcs_configs_foreach_cb (PeasExtensionSet *set,
g_value_unset (&value);
fullname = g_object_new (DZL_TYPE_PREFERENCES_ENTRY,
- "text", ide_str_empty0 (author_name) ? "" : author_name,
+ "text", dzl_str_empty0 (author_name) ? "" : author_name,
"title", "Author",
"visible", TRUE,
NULL);
@@ -496,7 +496,7 @@ vcs_configs_foreach_cb (PeasExtensionSet *set,
0);
email = g_object_new (DZL_TYPE_PREFERENCES_ENTRY,
- "text", ide_str_empty0 (author_email) ? "" : author_email,
+ "text", dzl_str_empty0 (author_email) ? "" : author_email,
"title", "Email",
"visible", TRUE,
NULL);
diff --git a/src/libide/projects/ide-project-info.c b/src/libide/projects/ide-project-info.c
index 23979ee..c95553d 100644
--- a/src/libide/projects/ide-project-info.c
+++ b/src/libide/projects/ide-project-info.c
@@ -22,6 +22,7 @@
#define G_LOG_DOMAIN "ide-project-info"
+#include <dazzle.h>
#include <glib/gi18n.h>
#include <string.h>
@@ -208,7 +209,7 @@ ide_project_info_set_build_system_name (IdeProjectInfo *self,
{
g_return_if_fail (IDE_IS_PROJECT_INFO (self));
- if (!ide_str_equal0 (self->build_system_name, build_system_name))
+ if (!dzl_str_equal0 (self->build_system_name, build_system_name))
{
g_free (self->build_system_name);
self->build_system_name = g_strdup (build_system_name);
@@ -230,7 +231,7 @@ ide_project_info_set_description (IdeProjectInfo *self,
{
g_return_if_fail (IDE_IS_PROJECT_INFO (self));
- if (!ide_str_equal0 (self->description, description))
+ if (!dzl_str_equal0 (self->description, description))
{
g_free (self->description);
self->description = g_strdup (description);
@@ -252,7 +253,7 @@ ide_project_info_set_name (IdeProjectInfo *self,
{
g_return_if_fail (IDE_IS_PROJECT_INFO (self));
- if (!ide_str_equal0 (self->name, name))
+ if (!dzl_str_equal0 (self->name, name))
{
g_free (self->name);
self->name = g_strdup (name);
diff --git a/src/libide/runner/ide-runner.c b/src/libide/runner/ide-runner.c
index 994a0f8..7a11b1d 100644
--- a/src/libide/runner/ide-runner.c
+++ b/src/libide/runner/ide-runner.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-runner"
+#include <dazzle.h>
#include <errno.h>
#include <glib/gi18n.h>
#include <libpeas/peas.h>
@@ -1365,7 +1366,7 @@ ide_runner_set_cwd (IdeRunner *self,
g_return_if_fail (IDE_IS_RUNNER (self));
- if (!ide_str_equal0 (priv->cwd, cwd))
+ if (!dzl_str_equal0 (priv->cwd, cwd))
{
g_free (priv->cwd);
priv->cwd = g_strdup (cwd);
diff --git a/src/libide/runtimes/ide-runtime.c b/src/libide/runtimes/ide-runtime.c
index 53ae27f..afffb1c 100644
--- a/src/libide/runtimes/ide-runtime.c
+++ b/src/libide/runtimes/ide-runtime.c
@@ -18,6 +18,8 @@
#define G_LOG_DOMAIN "ide-runtime"
+#include <dazzle.h>
+
#include "ide-context.h"
#include "ide-debug.h"
@@ -179,7 +181,7 @@ ide_runtime_real_create_runner (IdeRuntime *self,
runner = ide_runner_new (context);
g_assert (IDE_IS_RUNNER (runner));
- if (ide_str_equal0 (priv->id, "host"))
+ if (dzl_str_equal0 (priv->id, "host"))
ide_runner_set_run_on_host (runner, TRUE);
if (build_target != NULL)
diff --git a/src/libide/search/ide-search-entry.c b/src/libide/search/ide-search-entry.c
index 4de30e3..43c77cc 100644
--- a/src/libide/search/ide-search-entry.c
+++ b/src/libide/search/ide-search-entry.c
@@ -101,7 +101,7 @@ ide_search_entry_changed (IdeSearchEntry *self)
typed_text = dzl_suggestion_entry_get_typed_text (DZL_SUGGESTION_ENTRY (self));
- if (ide_str_empty0 (typed_text))
+ if (dzl_str_empty0 (typed_text))
{
dzl_suggestion_entry_set_model (DZL_SUGGESTION_ENTRY (self), NULL);
return;
diff --git a/src/libide/snippets/ide-source-snippet.c b/src/libide/snippets/ide-source-snippet.c
index 0763af5..3fe849f 100644
--- a/src/libide/snippets/ide-source-snippet.c
+++ b/src/libide/snippets/ide-source-snippet.c
@@ -835,7 +835,7 @@ ide_source_snippet_rewrite_updated_chunks (IdeSourceSnippet *self)
text = ide_source_snippet_chunk_get_text (chunk);
real_text = ide_source_snippet_get_nth_text (self, i);
- if (!ide_str_equal0 (text, real_text))
+ if (!dzl_str_equal0 (text, real_text))
ide_source_snippet_replace_chunk_text (self, i, text);
}
}
diff --git a/src/libide/sourceview/ide-source-view-movements.c
b/src/libide/sourceview/ide-source-view-movements.c
index 1b45ff1..f578462 100644
--- a/src/libide/sourceview/ide-source-view-movements.c
+++ b/src/libide/sourceview/ide-source-view-movements.c
@@ -2607,7 +2607,7 @@ find_html_tag (GtkTextIter *iter,
}
name = get_html_tag_name (&cursor);
- if (ide_str_empty0 (name))
+ if (dzl_str_empty0 (name))
{
g_free (name);
tag->kind = HTML_TAG_KIND_ERROR;
@@ -2687,7 +2687,7 @@ find_non_matching_html_tag_at_left (GtkTextIter *cursor,
last_closing_tag = g_queue_peek_head (stack);
if (last_closing_tag != NULL)
{
- if (ide_str_equal0 (tag->name, last_closing_tag->name))
+ if (dzl_str_equal0 (tag->name, last_closing_tag->name))
{
g_queue_pop_head (stack);
free_html_tag (last_closing_tag);
@@ -2745,7 +2745,7 @@ find_non_matching_html_tag_at_right (GtkTextIter *cursor,
{
while ((last_closing_tag = g_queue_pop_head (stack)))
{
- gboolean is_names_equal = ide_str_equal0 (tag->name, last_closing_tag->name);
+ gboolean is_names_equal = dzl_str_equal0 (tag->name, last_closing_tag->name);
free_html_tag (last_closing_tag);
if (is_names_equal)
@@ -2796,7 +2796,7 @@ get_html_element (GtkTextIter cursor_left,
{
while ((left_tag = find_non_matching_html_tag_at_left (&cursor_left, block_cursor)))
{
- if (!ide_str_equal0 (left_tag->name, right_tag->name))
+ if (!dzl_str_equal0 (left_tag->name, right_tag->name))
{
cursor_left = left_tag->begin;
free_html_tag (left_tag);
diff --git a/src/libide/sourceview/ide-source-view.c b/src/libide/sourceview/ide-source-view.c
index 00522d3..489166d 100644
--- a/src/libide/sourceview/ide-source-view.c
+++ b/src/libide/sourceview/ide-source-view.c
@@ -3822,7 +3822,7 @@ ide_source_view_real_push_snippet (IdeSourceView *self,
ide_vcs_config_get_config (vcs_config, IDE_VCS_CONFIG_FULL_NAME, &value);
- if (!ide_str_empty0 (g_value_get_string (&value)))
+ if (!dzl_str_empty0 (g_value_get_string (&value)))
{
ide_source_snippet_context_add_shared_variable (context, "author", g_value_get_string
(&value));
ide_source_snippet_context_add_shared_variable (context, "fullname", g_value_get_string
(&value));
@@ -3833,7 +3833,7 @@ ide_source_view_real_push_snippet (IdeSourceView *self,
ide_vcs_config_get_config (vcs_config, IDE_VCS_CONFIG_EMAIL, &value);
- if (!ide_str_empty0 (g_value_get_string (&value)))
+ if (!dzl_str_empty0 (g_value_get_string (&value)))
ide_source_snippet_context_add_shared_variable (context, "email", g_value_get_string
(&value));
g_value_unset (&value);
diff --git a/src/libide/sourceview/ide-text-iter.c b/src/libide/sourceview/ide-text-iter.c
index 84f5cae..01fb0f5 100644
--- a/src/libide/sourceview/ide-text-iter.c
+++ b/src/libide/sourceview/ide-text-iter.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-text-iter"
+#include <dazzle.h>
#include <string.h>
#include <gtk/gtk.h>
@@ -711,7 +712,7 @@ _ide_text_iter_in_string (GtkTextIter *iter,
GtkTextIter end_iter;
gboolean ret = FALSE;
- g_return_val_if_fail (!ide_str_empty0 (str), FALSE);
+ g_return_val_if_fail (!dzl_str_empty0 (str), FALSE);
len = g_utf8_strlen (str, -1);
cursor_offset = gtk_text_iter_get_offset (iter);
@@ -797,7 +798,7 @@ _ide_text_iter_find_chars_backward (GtkTextIter *iter,
const gchar *str_limit;
GtkTextIter base_cursor;
- g_return_val_if_fail (!ide_str_empty0 (str), FALSE);
+ g_return_val_if_fail (!dzl_str_empty0 (str), FALSE);
if (!gtk_text_iter_backward_char (iter))
return FALSE;
@@ -870,7 +871,7 @@ _ide_text_iter_find_chars_forward (GtkTextIter *iter,
gint str_char_len;
gint real_limit_offset;
- g_return_val_if_fail (!ide_str_empty0 (str), FALSE);
+ g_return_val_if_fail (!dzl_str_empty0 (str), FALSE);
if (limit == NULL)
{
diff --git a/src/libide/subprocess/ide-subprocess-launcher.c b/src/libide/subprocess/ide-subprocess-launcher.c
index 15b7013..38e5393 100644
--- a/src/libide/subprocess/ide-subprocess-launcher.c
+++ b/src/libide/subprocess/ide-subprocess-launcher.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "ide-subprocess-launcher"
+#include <dazzle.h>
#include <fcntl.h>
#include <errno.h>
#include <signal.h>
@@ -705,10 +706,10 @@ ide_subprocess_launcher_set_cwd (IdeSubprocessLauncher *self,
g_return_if_fail (IDE_IS_SUBPROCESS_LAUNCHER (self));
- if (ide_str_empty0 (cwd))
+ if (dzl_str_empty0 (cwd))
cwd = ".";
- if (!ide_str_equal0 (priv->cwd, cwd))
+ if (!dzl_str_equal0 (priv->cwd, cwd))
{
g_free (priv->cwd);
priv->cwd = g_strdup (cwd);
@@ -747,7 +748,7 @@ ide_subprocess_launcher_overlay_environment (IdeSubprocessLauncher *self,
key = ide_environment_variable_get_key (var);
value = ide_environment_variable_get_value (var);
- if (!ide_str_empty0 (key))
+ if (!dzl_str_empty0 (key))
ide_subprocess_launcher_setenv (self, key, value ?: "", TRUE);
}
}
diff --git a/src/libide/terminal/ide-terminal.c b/src/libide/terminal/ide-terminal.c
index b5432b1..2d835ba 100644
--- a/src/libide/terminal/ide-terminal.c
+++ b/src/libide/terminal/ide-terminal.c
@@ -268,7 +268,7 @@ ide_terminal_copy_link_address (IdeTerminal *self)
g_assert (IDE_IS_TERMINAL (self));
g_assert (priv->url != NULL);
- if (ide_str_empty0 (priv->url))
+ if (dzl_str_empty0 (priv->url))
return FALSE;
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (self), GDK_SELECTION_CLIPBOARD),
@@ -287,7 +287,7 @@ ide_terminal_open_link (IdeTerminal *self)
g_assert (IDE_IS_TERMINAL (self));
g_assert (priv->url != NULL);
- if (ide_str_empty0 (priv->url))
+ if (dzl_str_empty0 (priv->url))
return FALSE;
if (NULL != (app = GTK_APPLICATION (g_application_get_default ())) &&
@@ -480,7 +480,7 @@ ide_terminal_init (IdeTerminal *self)
const gchar *pattern = url_regexes[i];
gint tag;
- regex = vte_regex_new_for_match (pattern, IDE_LITERAL_LENGTH (pattern),
+ regex = vte_regex_new_for_match (pattern, DZL_LITERAL_LENGTH (pattern),
VTE_REGEX_FLAGS_DEFAULT | BUILDER_PCRE2_MULTILINE,
NULL);
tag = vte_terminal_match_add_regex (VTE_TERMINAL (self), regex, 0);
diff --git a/src/libide/testing/ide-test-manager.c b/src/libide/testing/ide-test-manager.c
index f153585..84764ae 100644
--- a/src/libide/testing/ide-test-manager.c
+++ b/src/libide/testing/ide-test-manager.c
@@ -181,7 +181,7 @@ ide_test_manager_locate_group (IdeTestManager *self,
IDE_TEST_COLUMN_GROUP, &row_group,
-1);
- if (ide_str_equal0 (row_group, group))
+ if (dzl_str_equal0 (row_group, group))
return;
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->tests_store), iter));
diff --git a/src/libide/util/ide-settings.c b/src/libide/util/ide-settings.c
index a0549d3..c3f831f 100644
--- a/src/libide/util/ide-settings.c
+++ b/src/libide/util/ide-settings.c
@@ -95,7 +95,7 @@ ide_settings_set_relative_path (IdeSettings *self,
if (*relative_path == '/')
relative_path++;
- if (!ide_str_equal0 (relative_path, self->relative_path))
+ if (!dzl_str_equal0 (relative_path, self->relative_path))
{
g_free (self->relative_path);
self->relative_path = g_strdup (relative_path);
@@ -110,7 +110,7 @@ ide_settings_set_schema_id (IdeSettings *self,
g_assert (IDE_IS_SETTINGS (self));
g_assert (schema_id != NULL);
- if (!ide_str_equal0 (schema_id, self->schema_id))
+ if (!dzl_str_equal0 (schema_id, self->schema_id))
{
g_free (self->schema_id);
self->schema_id = g_strdup (schema_id);
diff --git a/src/libide/vcs/ide-vcs-uri.c b/src/libide/vcs/ide-vcs-uri.c
index 893d7ae..92454c5 100644
--- a/src/libide/vcs/ide-vcs-uri.c
+++ b/src/libide/vcs/ide-vcs-uri.c
@@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <dazzle.h>
#include <stdlib.h>
#include <string.h>
@@ -150,7 +151,7 @@ ide_vcs_uri_parse (IdeVcsUri *self,
g_free (tmp);
}
- if (!ide_str_empty0 (portstr) && g_ascii_isdigit (portstr [1]))
+ if (!dzl_str_empty0 (portstr) && g_ascii_isdigit (portstr [1]))
port = CLAMP (atoi (&portstr [1]), 1, G_MAXINT16);
ide_vcs_uri_set_scheme (self, scheme);
@@ -306,7 +307,7 @@ ide_vcs_uri_set_scheme (IdeVcsUri *self,
{
g_return_if_fail (self);
- if (ide_str_empty0 (scheme))
+ if (dzl_str_empty0 (scheme))
scheme = NULL;
if (scheme != self->scheme)
@@ -330,7 +331,7 @@ ide_vcs_uri_set_user (IdeVcsUri *self,
{
g_return_if_fail (self);
- if (ide_str_empty0 (user))
+ if (dzl_str_empty0 (user))
user = NULL;
if (user != self->user)
@@ -354,7 +355,7 @@ ide_vcs_uri_set_host (IdeVcsUri *self,
{
g_return_if_fail (self);
- if (ide_str_empty0 (host))
+ if (dzl_str_empty0 (host))
host = NULL;
if (host != self->host)
@@ -384,7 +385,7 @@ ide_vcs_uri_set_path (IdeVcsUri *self,
{
g_return_if_fail (self);
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
path = NULL;
if (path != self->path)
diff --git a/src/libide/workbench/ide-workbench-header-bar.c b/src/libide/workbench/ide-workbench-header-bar.c
index f39d04d..b934b80 100644
--- a/src/libide/workbench/ide-workbench-header-bar.c
+++ b/src/libide/workbench/ide-workbench-header-bar.c
@@ -218,7 +218,7 @@ ide_workbench_header_bar_add_child (GtkBuildable *buildable,
g_return_if_fail (GTK_IS_BUILDER (builder));
g_return_if_fail (GTK_IS_WIDGET (object));
- if (ide_str_equal0 (type, "primary"))
+ if (dzl_str_equal0 (type, "primary"))
{
ide_workbench_header_bar_add_primary (self, GTK_WIDGET (object));
return;
diff --git a/src/libide/workbench/ide-workbench.c b/src/libide/workbench/ide-workbench.c
index d9356e3..9c8a3fa 100644
--- a/src/libide/workbench/ide-workbench.c
+++ b/src/libide/workbench/ide-workbench.c
@@ -880,7 +880,7 @@ ide_workbench_set_visible_perspective (IdeWorkbench *self,
current_id = gtk_stack_get_visible_child_name (self->perspectives_stack);
id = ide_perspective_get_id (perspective);
- if (!ide_str_equal0 (current_id, id))
+ if (!dzl_str_equal0 (current_id, id))
gtk_stack_set_visible_child_name (self->perspectives_stack, id);
titlebar = gtk_stack_get_child_by_name (self->header_stack, id);
diff --git a/src/plugins/autotools/ide-autotools-application-addin.c
b/src/plugins/autotools/ide-autotools-application-addin.c
index 432c241..1b0cc8c 100644
--- a/src/plugins/autotools/ide-autotools-application-addin.c
+++ b/src/plugins/autotools/ide-autotools-application-addin.c
@@ -69,7 +69,7 @@ ide_autotools_application_addin_load (IdeApplicationAddin *addin,
{
gint64 time_at;
- suffix += IDE_LITERAL_LENGTH (".tmp-");
+ suffix += DZL_LITERAL_LENGTH (".tmp-");
time_at = g_ascii_strtoll (suffix, NULL, 10);
if (time_at == G_MININT64 || time_at == G_MAXINT64)
diff --git a/src/plugins/autotools/ide-autotools-build-system.c
b/src/plugins/autotools/ide-autotools-build-system.c
index 23b9626..13d24cd 100644
--- a/src/plugins/autotools/ide-autotools-build-system.c
+++ b/src/plugins/autotools/ide-autotools-build-system.c
@@ -214,7 +214,7 @@ looks_like_makefile (IdeBuffer *buffer)
lang_id = gtk_source_language_get_id (language);
- if (ide_str_equal0 (lang_id, "automake") || ide_str_equal0 (lang_id, "makefile"))
+ if (dzl_str_equal0 (lang_id, "automake") || dzl_str_equal0 (lang_id, "makefile"))
return TRUE;
}
diff --git a/src/plugins/autotools/ide-autotools-pipeline-addin.c
b/src/plugins/autotools/ide-autotools-pipeline-addin.c
index ef99c58..166f1a9 100644
--- a/src/plugins/autotools/ide-autotools-pipeline-addin.c
+++ b/src/plugins/autotools/ide-autotools-pipeline-addin.c
@@ -206,7 +206,7 @@ register_configure_stage (IdeAutotoolsPipelineAddin *self,
ide_subprocess_launcher_push_argv (launcher, prefix_arg);
}
- if (!ide_str_empty0 (config_opts))
+ if (!dzl_str_empty0 (config_opts))
{
g_auto(GStrv) argv = NULL;
gint argc = 0;
diff --git a/src/plugins/autotools/ide-makecache.c b/src/plugins/autotools/ide-makecache.c
index c1dff70..33984b5 100644
--- a/src/plugins/autotools/ide-makecache.c
+++ b/src/plugins/autotools/ide-makecache.c
@@ -365,8 +365,8 @@ ide_makecache_parse_c_cxx_include (IdeMakecache *self,
part1 = dummy;
}
- g_assert (!ide_str_empty0 (part1));
- g_assert (!ide_str_empty0 (part2));
+ g_assert (!dzl_str_empty0 (part1));
+ g_assert (!dzl_str_empty0 (part2));
/*
* If the path is relative, then we need to adjust it to be relative to the
@@ -1431,7 +1431,7 @@ find_install_dir (const gchar *key,
const gchar *path = NULL;
if (g_str_has_prefix (key, "nodist_"))
- key += IDE_LITERAL_LENGTH ("nodist_");
+ key += DZL_LITERAL_LENGTH ("nodist_");
parts = g_strsplit (key, "_", 2);
dirkey = parts[0];
@@ -1657,7 +1657,7 @@ ide_makecache_get_build_targets_worker (GTask *task,
if (parts[1])
g_strstrip (parts [1]);
- if (ide_str_empty0 (parts[0]) || ide_str_empty0 (parts[1]))
+ if (dzl_str_empty0 (parts[0]) || dzl_str_empty0 (parts[1]))
continue;
key = parts [0];
diff --git a/src/plugins/beautifier/gb-beautifier-config.c b/src/plugins/beautifier/gb-beautifier-config.c
index a9967eb..8cdb382 100644
--- a/src/plugins/beautifier/gb-beautifier-config.c
+++ b/src/plugins/beautifier/gb-beautifier-config.c
@@ -77,8 +77,8 @@ gb_beautifier_config_check_duplicates (GbBeautifierEditorAddin *self,
{
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
g_assert (entries != NULL);
- g_assert (!ide_str_empty0 (lang_id));
- g_assert (!ide_str_empty0 (display_name));
+ g_assert (!dzl_str_empty0 (lang_id));
+ g_assert (!dzl_str_empty0 (display_name));
for (guint i = 0; i < entries->len; ++i)
{
@@ -103,7 +103,7 @@ gb_beautifier_map_check_duplicates (GbBeautifierEditorAddin *self,
{
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
g_assert (map != NULL);
- g_assert (!ide_str_empty0 (lang_id));
+ g_assert (!dzl_str_empty0 (lang_id));
for (guint i = 0; i < map->len; ++i)
{
@@ -139,9 +139,9 @@ add_entries_from_config_ini_file (GbBeautifierEditorAddin *self,
GError *error = NULL;
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
- g_assert (!ide_str_empty0 (base_path));
- g_assert (!ide_str_empty0 (lang_id));
- g_assert (!ide_str_empty0 (real_lang_id));
+ g_assert (!dzl_str_empty0 (base_path));
+ g_assert (!dzl_str_empty0 (lang_id));
+ g_assert (!dzl_str_empty0 (real_lang_id));
g_assert (entries != NULL);
*has_default = FALSE;
@@ -311,7 +311,7 @@ add_entries_from_base_path (GbBeautifierEditorAddin *self,
gboolean ret_has_default = FALSE;
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
- g_assert (!ide_str_empty0 (base_path));
+ g_assert (!dzl_str_empty0 (base_path));
g_assert (entries != NULL);
g_assert (map != NULL);
@@ -389,7 +389,7 @@ gb_beautifier_config_get_map (GbBeautifierEditorAddin *self,
GError *error = NULL;
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
- g_assert (!ide_str_empty0 (path));
+ g_assert (!dzl_str_empty0 (path));
map = g_array_new (TRUE, TRUE, sizeof (GbBeautifierMapEntry));
g_array_set_clear_func (map, map_entry_clear_func);
diff --git a/src/plugins/beautifier/gb-beautifier-helper.c b/src/plugins/beautifier/gb-beautifier-helper.c
index cf4f365..c6334f3 100644
--- a/src/plugins/beautifier/gb-beautifier-helper.c
+++ b/src/plugins/beautifier/gb-beautifier-helper.c
@@ -82,7 +82,7 @@ gb_beautifier_helper_create_tmp_file_async (GbBeautifierEditorAddin *self,
g_autoptr(GError) error = NULL;
g_assert (GB_IS_BEAUTIFIER_EDITOR_ADDIN (self));
- g_assert (!ide_str_empty0 (text));
+ g_assert (!dzl_str_empty0 (text));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
g_assert (callback != NULL);
diff --git a/src/plugins/beautifier/gb-beautifier-process.c b/src/plugins/beautifier/gb-beautifier-process.c
index 887a793..85a6a09 100644
--- a/src/plugins/beautifier/gb-beautifier-process.c
+++ b/src/plugins/beautifier/gb-beautifier-process.c
@@ -88,8 +88,8 @@ match_and_replace (const gchar *str,
gchar *needle;
gsize head_len;
- g_assert (!ide_str_empty0 (str));
- g_assert (!ide_str_empty0 (pattern));
+ g_assert (!dzl_str_empty0 (str));
+ g_assert (!dzl_str_empty0 (pattern));
if (NULL != (needle = g_strstr_len (str, -1, pattern)))
{
@@ -158,8 +158,8 @@ gb_beautifier_process_create_generic (GbBeautifierEditorAddin *self,
src_path = g_file_get_path (state->src_file);
- g_assert (!ide_str_empty0 (src_path));
- g_assert (!ide_str_empty0 (state->lang_id));
+ g_assert (!dzl_str_empty0 (src_path));
+ g_assert (!dzl_str_empty0 (state->lang_id));
command_args_expand (self, state->command_args, state);
subprocess = g_subprocess_newv ((const gchar * const *)state->command_args->pdata,
@@ -190,9 +190,9 @@ gb_beautifier_process_create_for_clang_format (GbBeautifierEditorAddin *self,
config_path = g_file_get_path (state->config_file);
src_path = g_file_get_path (state->src_file);
- g_assert (!ide_str_empty0 (config_path));
- g_assert (!ide_str_empty0 (src_path));
- g_assert (!ide_str_empty0 (state->lang_id));
+ g_assert (!dzl_str_empty0 (config_path));
+ g_assert (!dzl_str_empty0 (src_path));
+ g_assert (!dzl_str_empty0 (state->lang_id));
if (NULL == (tmp_workdir = g_dir_make_tmp ("gnome-builder-beautify-XXXXXX", error)))
return NULL;
@@ -270,7 +270,7 @@ process_communicate_utf8_cb (GObject *object,
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (state->source_view));
completion = gtk_source_view_get_completion (GTK_SOURCE_VIEW (state->source_view));
- if (!ide_str_empty0 (stdout_str))
+ if (!dzl_str_empty0 (stdout_str))
{
gtk_source_completion_block_interactive (completion);
gtk_text_buffer_begin_user_action (buffer);
@@ -299,7 +299,7 @@ process_communicate_utf8_cb (GObject *object,
status = g_subprocess_get_exit_status (process);
if (status != 0 &&
stderr_str != NULL &&
- !ide_str_empty0 (stderr_str))
+ !dzl_str_empty0 (stderr_str))
{
g_warning ("beautify plugin stderr:\n%s", stderr_str);
}
diff --git a/src/plugins/clang/ide-clang-completion-item.c b/src/plugins/clang/ide-clang-completion-item.c
index f50446d..ff6a645 100644
--- a/src/plugins/clang/ide-clang-completion-item.c
+++ b/src/plugins/clang/ide-clang-completion-item.c
@@ -173,7 +173,7 @@ ide_clang_completion_item_lazy_init (IdeClangCompletionItem *self)
break;
case CXCompletionChunk_Informative:
- if (ide_str_equal0 (text, "const "))
+ if (dzl_str_equal0 (text, "const "))
g_string_append (markup, text);
break;
diff --git a/src/plugins/clang/ide-clang-symbol-node.c b/src/plugins/clang/ide-clang-symbol-node.c
index cc1c7ae..d10bbe9 100644
--- a/src/plugins/clang/ide-clang-symbol-node.c
+++ b/src/plugins/clang/ide-clang-symbol-node.c
@@ -146,7 +146,7 @@ _ide_clang_symbol_node_new (IdeContext *context,
"context", context,
"kind", kind,
"flags", flags,
- "name", ide_str_empty0 (name) ? _("anonymous") : name,
+ "name", dzl_str_empty0 (name) ? _("anonymous") : name,
NULL);
self->cursor = cursor;
diff --git a/src/plugins/clang/ide-clang-symbol-tree.c b/src/plugins/clang/ide-clang-symbol-tree.c
index 087711e..bfb77ef 100644
--- a/src/plugins/clang/ide-clang-symbol-tree.c
+++ b/src/plugins/clang/ide-clang-symbol-tree.c
@@ -114,7 +114,7 @@ cursor_is_recognized (TraversalState *state,
cxloc = clang_getCursorLocation (cursor);
clang_getFileLocation (cxloc, &file, NULL, NULL, NULL);
filename = clang_getFileName (file);
- ret = ide_str_equal0 (clang_getCString (filename), state->path);
+ ret = dzl_str_equal0 (clang_getCString (filename), state->path);
clang_disposeString (filename);
break;
diff --git a/src/plugins/cmake/gbp-cmake-build-system.c b/src/plugins/cmake/gbp-cmake-build-system.c
index c38107f..f5a4e67 100644
--- a/src/plugins/cmake/gbp-cmake-build-system.c
+++ b/src/plugins/cmake/gbp-cmake-build-system.c
@@ -576,7 +576,7 @@ gbp_cmake_build_system_init_worker (GTask *task,
name = g_file_get_basename (project_file);
- if (ide_str_equal0 (name, "CMakeLists.txt"))
+ if (dzl_str_equal0 (name, "CMakeLists.txt"))
{
g_task_return_pointer (task, g_object_ref (project_file), g_object_unref);
IDE_EXIT;
diff --git a/src/plugins/cmake/gbp-cmake-pipeline-addin.c b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
index 9e8ff01..2516eda 100644
--- a/src/plugins/cmake/gbp-cmake-pipeline-addin.c
+++ b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
@@ -140,7 +140,7 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
ide_subprocess_launcher_push_argv (configure_launcher, "-DCMAKE_BUILD_TYPE=RelWithDebInfo");
ide_subprocess_launcher_push_argv (configure_launcher, prefix_option);
- if (!ide_str_empty0 (config_opts))
+ if (!dzl_str_empty0 (config_opts))
{
g_auto(GStrv) argv = NULL;
gint argc;
diff --git a/src/plugins/color-picker/gb-color-picker-document-monitor.c
b/src/plugins/color-picker/gb-color-picker-document-monitor.c
index 7ab295b..289eb30 100644
--- a/src/plugins/color-picker/gb-color-picker-document-monitor.c
+++ b/src/plugins/color-picker/gb-color-picker-document-monitor.c
@@ -127,7 +127,7 @@ collect_tag_names (GtkTextTag *tag,
g_assert (taglist != NULL);
g_object_get (G_OBJECT (tag), "name", &name, NULL);
- if (!ide_str_empty0 (name) && g_str_has_prefix (name, COLOR_TAG_PREFIX))
+ if (!dzl_str_empty0 (name) && g_str_has_prefix (name, COLOR_TAG_PREFIX))
g_ptr_array_add (taglist, g_steal_pointer (&name));
}
@@ -332,7 +332,7 @@ remove_tag_cb (GbColorPickerDocumentMonitor *self,
tag_table = gtk_text_buffer_get_tag_table (GTK_TEXT_BUFFER (self->buffer));
g_object_get (G_OBJECT (tag), "name", &name, NULL);
- if (!ide_str_empty0 (name) &&
+ if (!dzl_str_empty0 (name) &&
g_str_has_prefix (name, COLOR_TAG_PREFIX) &&
gtk_text_tag_table_lookup (tag_table, name))
gtk_text_tag_table_remove (tag_table, tag);
diff --git a/src/plugins/color-picker/gb-color-picker-editor-addin.c
b/src/plugins/color-picker/gb-color-picker-editor-addin.c
index 9e5138d..da4fce9 100644
--- a/src/plugins/color-picker/gb-color-picker-editor-addin.c
+++ b/src/plugins/color-picker/gb-color-picker-editor-addin.c
@@ -93,7 +93,7 @@ gb_color_picker_editor_addin_add_palette (GbColorPickerEditorAddin *self,
g_assert (GB_IS_COLOR_PICKER_EDITOR_ADDIN (self));
g_assert (GSTYLE_PALETTE_WIDGET (palette_widget));
- g_assert (!ide_str_empty0 (uri));
+ g_assert (!dzl_str_empty0 (uri));
file = g_file_new_for_uri (uri);
palette = gstyle_palette_new_from_file (file, NULL, &error);
diff --git a/src/plugins/color-picker/gb-color-picker-helper.c
b/src/plugins/color-picker/gb-color-picker-helper.c
index 21200b2..24292f6 100644
--- a/src/plugins/color-picker/gb-color-picker-helper.c
+++ b/src/plugins/color-picker/gb-color-picker-helper.c
@@ -170,7 +170,7 @@ gb_color_picker_helper_get_tag_at_iter (GtkTextIter *cursor,
{
tag = tags->data;
g_object_get (G_OBJECT (tag), "name", &name, NULL);
- if (!ide_str_empty0 (name) && g_str_has_prefix (name, COLOR_TAG_PREFIX))
+ if (!dzl_str_empty0 (name) && g_str_has_prefix (name, COLOR_TAG_PREFIX))
{
*begin = *cursor;
*end = *cursor;
diff --git a/src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
b/src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
index 4081b99..e7178d6 100644
--- a/src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
+++ b/src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
@@ -279,7 +279,7 @@ gb_color_picker_prefs_palette_row_set_palette_name (GbColorPickerPrefsPaletteRow
g_assert (GB_IS_COLOR_PICKER_PREFS_PALETTE_ROW (self));
- if (ide_str_empty0 (new_text))
+ if (dzl_str_empty0 (new_text))
{
gtk_label_set_text (self->palette_name, "No name");
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_PALETTE_NAME]);
diff --git a/src/plugins/color-picker/gb-color-picker-prefs.c
b/src/plugins/color-picker/gb-color-picker-prefs.c
index e6986ec..6dfc5a3 100644
--- a/src/plugins/color-picker/gb-color-picker-prefs.c
+++ b/src/plugins/color-picker/gb-color-picker-prefs.c
@@ -127,7 +127,7 @@ string_to_variant (const gchar *str)
GVariant *variant;
g_autoptr(GError) error = NULL;
- g_assert (!ide_str_empty0 (str));
+ g_assert (!dzl_str_empty0 (str));
variant = g_variant_parse (NULL, str, NULL, NULL, &error);
if (variant == NULL)
diff --git a/src/plugins/command-bar/gb-command-bar.c b/src/plugins/command-bar/gb-command-bar.c
index 33b8c00..47e70ec 100644
--- a/src/plugins/command-bar/gb-command-bar.c
+++ b/src/plugins/command-bar/gb-command-bar.c
@@ -251,7 +251,7 @@ gb_command_bar_on_entry_activate (GbCommandBar *self,
gtk_widget_hide (GTK_WIDGET (self->completion_scroller));
- if (!ide_str_empty0 (text))
+ if (!dzl_str_empty0 (text))
{
GbCommandResult *result = NULL;
GbCommand *command = NULL;
diff --git a/src/plugins/command-bar/gb-vim.c b/src/plugins/command-bar/gb-vim.c
index 921d3db..21eb39b 100644
--- a/src/plugins/command-bar/gb-vim.c
+++ b/src/plugins/command-bar/gb-vim.c
@@ -447,7 +447,7 @@ gb_vim_command_edit (GtkWidget *active_widget,
g_assert (GTK_IS_WIDGET (active_widget));
- if (ide_str_empty0 (options))
+ if (dzl_str_empty0 (options))
{
dzl_gtk_widget_action (GTK_WIDGET (active_widget), "win", "open-with-dialog", NULL);
return TRUE;
@@ -485,7 +485,7 @@ gb_vim_command_tabe (GtkWidget *active_widget,
{
g_assert (GTK_IS_WIDGET (active_widget));
- if (!ide_str_empty0 (options))
+ if (!dzl_str_empty0 (options))
return gb_vim_command_edit (active_widget, command, options, error);
dzl_gtk_widget_action (GTK_WIDGET (active_widget), "editor", "new-file", NULL);
@@ -639,7 +639,7 @@ gb_vim_command_split (GtkWidget *active_widget,
if (!IDE_IS_LAYOUT_VIEW (active_widget))
return gb_vim_set_no_view_error (error);
- if (ide_str_empty0 (options))
+ if (dzl_str_empty0 (options))
{
variant = g_variant_new_string ("");
dzl_gtk_widget_action (GTK_WIDGET (active_widget), "layoutstack", "split-view", variant);
@@ -663,7 +663,7 @@ gb_vim_command_vsplit (GtkWidget *active_widget,
if (!IDE_IS_LAYOUT_VIEW (active_widget))
return gb_vim_set_no_view_error (error);
- if (ide_str_empty0 (options))
+ if (dzl_str_empty0 (options))
{
variant = g_variant_new_string ("");
dzl_gtk_widget_action (GTK_WIDGET (active_widget), "layoutstack", "open-in-new-frame", variant);
diff --git a/src/plugins/comment-code/gbp-comment-code-view-addin.c
b/src/plugins/comment-code/gbp-comment-code-view-addin.c
index 9f38a98..8102bcf 100644
--- a/src/plugins/comment-code/gbp-comment-code-view-addin.c
+++ b/src/plugins/comment-code/gbp-comment-code-view-addin.c
@@ -151,8 +151,8 @@ gbp_comment_code_view_addin_comment_line (GtkTextBuffer *buffer,
gboolean res;
g_assert (GTK_IS_TEXT_BUFFER (buffer));
- g_assert (!ide_str_empty0 (start_tag));
- g_assert ((is_block_tag && !ide_str_empty0 (end_tag)) || !is_block_tag);
+ g_assert (!dzl_str_empty0 (start_tag));
+ g_assert ((is_block_tag && !dzl_str_empty0 (end_tag)) || !is_block_tag);
g_assert (line >= 0 && line < gtk_text_buffer_get_line_count(buffer));
if (!is_line_commentable (buffer, line, start_tag))
@@ -207,8 +207,8 @@ gbp_comment_code_view_addin_uncomment_line (GtkTextBuffer *buffer,
gboolean res;
g_assert (GTK_IS_TEXT_BUFFER (buffer));
- g_assert (!ide_str_empty0 (start_tag));
- g_assert ((is_block_tag && !ide_str_empty0 (end_tag)) || !is_block_tag);
+ g_assert (!dzl_str_empty0 (start_tag));
+ g_assert ((is_block_tag && !dzl_str_empty0 (end_tag)) || !is_block_tag);
g_assert (line >= 0 && line < gtk_text_buffer_get_line_count(buffer));
if (!is_line_uncommentable (buffer, line, start_tag, &tag_begin, &tag_end))
@@ -296,7 +296,7 @@ gbp_comment_code_view_addin_comment_action (GSimpleAction *action,
if (!editable || lang == NULL)
return;
- if (ide_str_equal0 (gtk_source_language_get_id(lang), "c"))
+ if (dzl_str_equal0 (gtk_source_language_get_id(lang), "c"))
{
start_tag = gtk_source_language_get_metadata (lang, "block-comment-start");
end_tag = gtk_source_language_get_metadata (lang, "block-comment-end");
diff --git a/src/plugins/create-project/gbp-create-project-template-icon.c
b/src/plugins/create-project/gbp-create-project-template-icon.c
index a8157d1..314c3a6 100644
--- a/src/plugins/create-project/gbp-create-project-template-icon.c
+++ b/src/plugins/create-project/gbp-create-project-template-icon.c
@@ -80,7 +80,7 @@ gbp_create_project_template_icon_set_property (GObject *object,
"icon-name", icon_name,
NULL);
gtk_label_set_text (self->template_name, name);
- if (!ide_str_empty0 (description))
+ if (!dzl_str_empty0 (description))
gtk_widget_set_tooltip_text (GTK_WIDGET (self), description);
break;
diff --git a/src/plugins/create-project/gbp-create-project-widget.c
b/src/plugins/create-project/gbp-create-project-widget.c
index 3de8fab..17d430f 100644
--- a/src/plugins/create-project/gbp-create-project-widget.c
+++ b/src/plugins/create-project/gbp-create-project-widget.c
@@ -166,7 +166,7 @@ gbp_create_project_widget_name_changed (GbpCreateProjectWidget *self,
text = gtk_entry_get_text (entry);
project_name = g_strstrip (g_strdup (text));
- if (ide_str_empty0 (project_name) || !validate_name (project_name))
+ if (dzl_str_empty0 (project_name) || !validate_name (project_name))
{
g_object_set (self->project_name_entry,
"secondary-icon-name", "dialog-warning-symbolic",
@@ -208,7 +208,7 @@ update_language_sensitivity (GtkWidget *widget,
language = dzl_radio_box_get_active_id (self->project_language_chooser);
- if (ide_str_empty0 (language))
+ if (dzl_str_empty0 (language))
goto apply;
template_icon = GBP_CREATE_PROJECT_TEMPLATE_ICON (gtk_bin_get_child (GTK_BIN (widget)));
@@ -378,12 +378,12 @@ gbp_create_project_widget_is_ready (GbpCreateProjectWidget *self)
text = gtk_entry_get_text (self->project_name_entry);
project_name = g_strstrip (g_strdup (text));
- if (ide_str_empty0 (project_name) || !validate_name (project_name))
+ if (dzl_str_empty0 (project_name) || !validate_name (project_name))
return FALSE;
language = dzl_radio_box_get_active_id (self->project_language_chooser);
- if (ide_str_empty0 (language))
+ if (dzl_str_empty0 (language))
return FALSE;
selected_template = gtk_flow_box_get_selected_children (self->project_template_chooser);
@@ -688,7 +688,7 @@ gbp_create_project_widget_create_async (GbpCreateProjectWidget *self,
}
}
- if (G_VALUE_HOLDS_STRING (&str) && !ide_str_empty0 (g_value_get_string (&str)))
+ if (G_VALUE_HOLDS_STRING (&str) && !dzl_str_empty0 (g_value_get_string (&str)))
author_name = g_value_get_string (&str);
else
author_name = g_get_real_name ();
diff --git a/src/plugins/ctags/ide-ctags-completion-item.c b/src/plugins/ctags/ide-ctags-completion-item.c
index 089be4e..fbfaff9 100644
--- a/src/plugins/ctags/ide-ctags-completion-item.c
+++ b/src/plugins/ctags/ide-ctags-completion-item.c
@@ -74,7 +74,7 @@ ide_ctags_completion_item_match (IdeCompletionItem *item,
if (ide_completion_item_fuzzy_match (self->entry->name, casefold, &item->priority))
{
- if (!ide_str_equal0 (self->entry->name, query))
+ if (!dzl_str_equal0 (self->entry->name, query))
return TRUE;
}
diff --git a/src/plugins/ctags/ide-ctags-highlighter.c b/src/plugins/ctags/ide-ctags-highlighter.c
index 5fb31b6..e01e374 100644
--- a/src/plugins/ctags/ide-ctags-highlighter.c
+++ b/src/plugins/ctags/ide-ctags-highlighter.c
@@ -118,7 +118,7 @@ get_tag (IdeCtagsHighlighter *self,
continue;
for (j = 0; j < n_entries; j++)
- if (ide_str_equal0 (entries[j].path, file_path))
+ if (dzl_str_equal0 (entries[j].path, file_path))
return get_tag_from_kind (entries[j].kind);
return get_tag_from_kind (entries[0].kind);
diff --git a/src/plugins/ctags/ide-ctags-index.c b/src/plugins/ctags/ide-ctags-index.c
index 07c3220..8cdd39d 100644
--- a/src/plugins/ctags/ide-ctags-index.c
+++ b/src/plugins/ctags/ide-ctags-index.c
@@ -289,7 +289,7 @@ ide_ctags_index_set_path_root (IdeCtagsIndex *self,
{
g_return_if_fail (IDE_IS_CTAGS_INDEX (self));
- if (!ide_str_equal0 (self->path_root, path_root))
+ if (!dzl_str_equal0 (self->path_root, path_root))
{
g_free (self->path_root);
self->path_root = g_strdup (path_root);
diff --git a/src/plugins/ctags/ide-ctags-util.c b/src/plugins/ctags/ide-ctags-util.c
index 1f47d5c..293e008 100644
--- a/src/plugins/ctags/ide-ctags-util.c
+++ b/src/plugins/ctags/ide-ctags-util.c
@@ -33,17 +33,17 @@ ide_ctags_get_allowed_suffixes (const gchar *lang_id)
if (lang_id == NULL)
return NULL;
- if (ide_str_equal0 (lang_id, "c") || ide_str_equal0 (lang_id, "chdr") || ide_str_equal0 (lang_id, "cpp"))
+ if (dzl_str_equal0 (lang_id, "c") || dzl_str_equal0 (lang_id, "chdr") || dzl_str_equal0 (lang_id, "cpp"))
return c_languages;
- else if (ide_str_equal0 (lang_id, "vala"))
+ else if (dzl_str_equal0 (lang_id, "vala"))
return vala_languages;
- else if (ide_str_equal0 (lang_id, "python"))
+ else if (dzl_str_equal0 (lang_id, "python"))
return python_languages;
- else if (ide_str_equal0 (lang_id, "js"))
+ else if (dzl_str_equal0 (lang_id, "js"))
return js_languages;
- else if (ide_str_equal0 (lang_id, "html"))
+ else if (dzl_str_equal0 (lang_id, "html"))
return html_languages;
- else if (ide_str_equal0 (lang_id, "ruby"))
+ else if (dzl_str_equal0 (lang_id, "ruby"))
return ruby_languages;
else
return NULL;
@@ -59,7 +59,7 @@ ide_ctags_is_allowed (const IdeCtagsIndexEntry *entry,
gsize i;
for (i = 0; allowed [i]; i++)
- if (ide_str_equal0 (dotptr, allowed [i]))
+ if (dzl_str_equal0 (dotptr, allowed [i]))
return TRUE;
}
diff --git a/src/plugins/devhelp/gbp-devhelp-editor-view-addin.c
b/src/plugins/devhelp/gbp-devhelp-editor-view-addin.c
index 11a882f..9a87674 100644
--- a/src/plugins/devhelp/gbp-devhelp-editor-view-addin.c
+++ b/src/plugins/devhelp/gbp-devhelp-editor-view-addin.c
@@ -35,7 +35,7 @@ documentation_requested_cb (GbpDevhelpEditorViewAddin *self,
g_assert (GBP_IS_DEVHELP_EDITOR_VIEW_ADDIN (self));
g_assert (IDE_IS_SOURCE_VIEW (source_view));
- if (!ide_str_empty0 (word))
+ if (!dzl_str_empty0 (word))
dzl_gtk_widget_action (GTK_WIDGET (source_view), "devhelp", "search",
g_variant_new_string (word));
}
diff --git a/src/plugins/documentation-card/gbp-documentation-card-view-addin.c
b/src/plugins/documentation-card/gbp-documentation-card-view-addin.c
index e02fd65..b87de68 100644
--- a/src/plugins/documentation-card/gbp-documentation-card-view-addin.c
+++ b/src/plugins/documentation-card/gbp-documentation-card-view-addin.c
@@ -86,7 +86,7 @@ documentation_requested_cb (GbpDocumentationCardViewAddin *self,
if (lang == NULL)
return;
- if (ide_str_equal0 (gtk_source_language_get_id (lang), "c"))
+ if (dzl_str_equal0 (gtk_source_language_get_id (lang), "c"))
doc_context = IDE_DOCUMENTATION_CONTEXT_CARD_C;
if (g_strcmp0 (word, self->previous_text) != 0)
@@ -188,7 +188,7 @@ search_document_cb (gpointer data)
if (lang == NULL)
return G_SOURCE_REMOVE;
- if (ide_str_equal0 (gtk_source_language_get_id (lang), "c"))
+ if (dzl_str_equal0 (gtk_source_language_get_id (lang), "c"))
doc_context = IDE_DOCUMENTATION_CONTEXT_CARD_C;
else
return G_SOURCE_REMOVE;
diff --git a/src/plugins/flatpak/gbp-flatpak-build-system-discovery.c
b/src/plugins/flatpak/gbp-flatpak-build-system-discovery.c
index ead652d..8a9cc01 100644
--- a/src/plugins/flatpak/gbp-flatpak-build-system-discovery.c
+++ b/src/plugins/flatpak/gbp-flatpak-build-system-discovery.c
@@ -183,9 +183,9 @@ gbp_flatpak_build_system_discovery_discover (IdeBuildSystemDiscovery *discovery
{
gchar *ret;
- if (ide_str_equal0 (buildsystem, "cmake-ninja"))
+ if (dzl_str_equal0 (buildsystem, "cmake-ninja"))
buildsystem = "cmake";
- else if (ide_str_equal0 (buildsystem, "simple"))
+ else if (dzl_str_equal0 (buildsystem, "simple"))
buildsystem = "directory";
ret = g_strdup (buildsystem);
diff --git a/src/plugins/flatpak/gbp-flatpak-clone-widget.c b/src/plugins/flatpak/gbp-flatpak-clone-widget.c
index 2fedcee..9108263 100644
--- a/src/plugins/flatpak/gbp-flatpak-clone-widget.c
+++ b/src/plugins/flatpak/gbp-flatpak-clone-widget.c
@@ -621,7 +621,7 @@ gbp_flatpak_clone_widget_clone_async (GbpFlatpakCloneWidget *self,
settings = g_settings_new ("org.gnome.builder");
path = g_settings_get_string (settings, "projects-directory");
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
path = g_build_filename (g_get_home_dir (), "Projects", NULL);
if (!g_path_is_absolute (path))
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
index 2c3804c..d1a6fff 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -153,7 +153,7 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
}
new_config_opts_string = g_strdup (ide_configuration_get_config_opts (IDE_CONFIGURATION
(configuration)));
- if (!ide_str_empty0 (new_config_opts_string))
+ if (!dzl_str_empty0 (new_config_opts_string))
new_config_opts = g_strsplit (g_strstrip (new_config_opts_string), " ", 0);
new_environ = ide_configuration_get_environ (IDE_CONFIGURATION (configuration));
@@ -211,7 +211,7 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
}
/* Replace the runtime with the user-chosen one */
- if (!ide_str_empty0 (new_runtime_name))
+ if (!dzl_str_empty0 (new_runtime_name))
{
g_autoptr(GMatchInfo) match_info = NULL;
@@ -232,7 +232,7 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
}
/* Replace the runtime version with the user-chosen one */
- if (!ide_str_empty0 (new_runtime_version))
+ if (!dzl_str_empty0 (new_runtime_version))
{
g_autoptr(GMatchInfo) match_info = NULL;
@@ -296,7 +296,7 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
/* We're at the closing curly brace for build-options */
guint num_env;
num_env = g_strv_length (new_environ);
- if (num_env > 0 || !ide_str_empty0 (new_prefix))
+ if (num_env > 0 || !dzl_str_empty0 (new_prefix))
{
g_autofree gchar *cflags_line = NULL;
g_autofree gchar *cxxflags_line = NULL;
@@ -342,7 +342,7 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
{
gchar *line_ending;
- line_ending = (!ide_str_empty0 (new_prefix) || cxxflags_line != NULL ||
env_lines != NULL) ? "," : "";
+ line_ending = (!dzl_str_empty0 (new_prefix) || cxxflags_line != NULL ||
env_lines != NULL) ? "," : "";
g_ptr_array_add (new_lines, g_strdup_printf ("%s%s", cflags_line,
line_ending));
}
@@ -350,11 +350,11 @@ gbp_flatpak_configuration_provider_save_worker (GTask *task,
{
gchar *line_ending;
- line_ending = (!ide_str_empty0 (new_prefix) || env_lines != NULL) ? "," : "";
+ line_ending = (!dzl_str_empty0 (new_prefix) || env_lines != NULL) ? "," : "";
g_ptr_array_add (new_lines, g_strdup_printf ("%s%s", cxxflags_line,
line_ending));
}
- if (!ide_str_empty0 (new_prefix))
+ if (!dzl_str_empty0 (new_prefix))
{
gchar *line_ending;
@@ -659,7 +659,7 @@ contains_id (GPtrArray *ar,
g_assert (IDE_IS_CONFIGURATION (configuration));
- if (ide_str_equal0 (id, ide_configuration_get_id (configuration)))
+ if (dzl_str_equal0 (id, ide_configuration_get_id (configuration)))
return TRUE;
}
@@ -674,7 +674,7 @@ get_manifest_id (const gchar *path,
g_autofree gchar *hash = NULL;
gsize manifest_data_len = 0;
- g_assert (!ide_str_empty0 (path));
+ g_assert (!dzl_str_empty0 (path));
if (g_file_get_contents (path, &manifest_data, &manifest_data_len, NULL))
{
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration.c b/src/plugins/flatpak/gbp-flatpak-configuration.c
index 6565da0..f780aec 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration.c
@@ -63,7 +63,7 @@ gbp_flatpak_configuration_new (IdeContext *context,
const gchar *display_name)
{
g_assert (IDE_IS_CONTEXT (context));
- g_assert (!ide_str_empty0 (id));
+ g_assert (!dzl_str_empty0 (id));
return g_object_new (GBP_TYPE_FLATPAK_CONFIGURATION,
"context", context,
@@ -104,7 +104,7 @@ guess_primary_module (JsonNode *modules_node,
JsonNode *module;
JsonNode *parent;
- g_return_val_if_fail (!ide_str_empty0 (project_dir_name), NULL);
+ g_return_val_if_fail (!dzl_str_empty0 (project_dir_name), NULL);
g_return_val_if_fail (JSON_NODE_HOLDS_ARRAY (modules_node), NULL);
/* TODO: Support module strings that refer to other files? */
@@ -132,7 +132,7 @@ guess_primary_module (JsonNode *modules_node,
module_name = json_object_get_string_member (obj, "name");
- if (ide_str_equal0 (module_name, project_dir_name))
+ if (dzl_str_equal0 (module_name, project_dir_name))
return module;
/* Only look at submodules if this is the last item */
@@ -186,7 +186,7 @@ get_strv_from_member (JsonObject *obj,
{
const gchar *arg = json_array_get_string_element (ar, i);
- if (!ide_str_empty0 (arg))
+ if (!dzl_str_empty0 (arg))
g_ptr_array_add (finish_args, g_strdup (arg));
}
@@ -335,7 +335,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
{
const gchar *env_name = (gchar *)l->data;
const gchar *env_value = json_object_get_string_member (env_vars, env_name);
- if (!ide_str_empty0 (env_name) && !ide_str_empty0 (env_value))
+ if (!dzl_str_empty0 (env_name) && !dzl_str_empty0 (env_value))
ide_environment_setenv (environment, env_name, env_value);
}
}
@@ -343,7 +343,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
ide_configuration_set_environment (IDE_CONFIGURATION (self), environment);
}
- if (ide_str_empty0 (prefix))
+ if (dzl_str_empty0 (prefix))
prefix = "/app";
ide_configuration_set_prefix (IDE_CONFIGURATION (self), prefix);
@@ -352,7 +352,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
if (JSON_NODE_HOLDS_VALUE (runtime_version_node))
branch = json_node_get_string (runtime_version_node);
- if (ide_str_empty0 (branch))
+ if (dzl_str_empty0 (branch))
branch = "master";
gbp_flatpak_configuration_set_branch (self, branch);
@@ -418,7 +418,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
for (guint i = 0; i < json_array_get_length (build_commands_array); i++)
{
const gchar *arg = json_array_get_string_element (build_commands_array, i);
- if (!ide_str_empty0 (arg))
+ if (!dzl_str_empty0 (arg))
g_ptr_array_add (build_commands, g_strdup (arg));
}
g_ptr_array_add (build_commands, NULL);
@@ -436,7 +436,7 @@ gbp_flatpak_configuration_load_from_file (GbpFlatpakConfiguration *self,
for (guint i = 0; i < json_array_get_length (post_install_commands_array); i++)
{
const gchar *arg = json_array_get_string_element (post_install_commands_array, i);
- if (!ide_str_empty0 (arg))
+ if (!dzl_str_empty0 (arg))
g_ptr_array_add (post_install_commands, g_strdup (arg));
}
g_ptr_array_add (post_install_commands, NULL);
diff --git a/src/plugins/flatpak/gbp-flatpak-download-stage.c
b/src/plugins/flatpak/gbp-flatpak-download-stage.c
index 478f98b..b4eeeb4 100644
--- a/src/plugins/flatpak/gbp-flatpak-download-stage.c
+++ b/src/plugins/flatpak/gbp-flatpak-download-stage.c
@@ -88,7 +88,7 @@ gbp_flatpak_download_stage_query (IdeBuildStage *stage,
ide_subprocess_launcher_push_argv (launcher, "flatpak-builder");
ide_subprocess_launcher_push_argv (launcher, "--ccache");
ide_subprocess_launcher_push_argv (launcher, "--force-clean");
- if (!ide_str_empty0 (self->state_dir))
+ if (!dzl_str_empty0 (self->state_dir))
{
ide_subprocess_launcher_push_argv (launcher, "--state-dir");
ide_subprocess_launcher_push_argv (launcher, self->state_dir);
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index 7924f64..68c3337 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -216,7 +216,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin *self,
* If we got here by using a non-flatpak configuration, then there is a
* chance we don't have a valid app-id.
*/
- if (ide_str_empty0 (app_id))
+ if (dzl_str_empty0 (app_id))
app_id = "com.example.App";
if (platform == NULL && sdk == NULL)
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.c b/src/plugins/flatpak/gbp-flatpak-runtime.c
index 4ad6bbf..97536c2 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.c
@@ -192,7 +192,7 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime *runtime,
ccache_dir = g_build_filename (project_path, ".flatpak-builder", "ccache", NULL);
ide_subprocess_launcher_setenv (ret, "CCACHE_DIR", ccache_dir, FALSE);
- if (!ide_str_empty0 (project_path))
+ if (!dzl_str_empty0 (project_path))
{
g_autofree gchar *filesystem_option_src = NULL;
g_autofree gchar *filesystem_option_build = NULL;
@@ -245,7 +245,7 @@ get_binary_name (GbpFlatpakRuntime *self,
const gchar *command;
command = gbp_flatpak_configuration_get_command (GBP_FLATPAK_CONFIGURATION (config));
- if (!ide_str_empty0 (command))
+ if (!dzl_str_empty0 (command))
return g_strdup (command);
}
@@ -254,7 +254,7 @@ get_binary_name (GbpFlatpakRuntime *self,
g_autofree gchar *build_target_name = NULL;
build_target_name = ide_build_target_get_name (build_target);
- if (!ide_str_empty0 (build_target_name))
+ if (!dzl_str_empty0 (build_target_name))
return g_steal_pointer (&build_target_name);
}
@@ -396,7 +396,7 @@ gbp_flatpak_runtime_translate_file (IdeRuntime *runtime,
translated = g_build_filename (runtime_dir,
"source",
- path + IDE_LITERAL_LENGTH ("/run/build-runtime/"),
+ path + DZL_LITERAL_LENGTH ("/run/build-runtime/"),
NULL);
return g_file_new_for_path (translated);
}
@@ -412,7 +412,7 @@ gbp_flatpak_runtime_translate_file (IdeRuntime *runtime,
g_autofree gchar *translated = NULL;
translated = g_build_filename (debug_dir,
- path + IDE_LITERAL_LENGTH ("/usr/lib/debug/"),
+ path + DZL_LITERAL_LENGTH ("/usr/lib/debug/"),
NULL);
return g_file_new_for_path (translated);
}
@@ -422,7 +422,7 @@ gbp_flatpak_runtime_translate_file (IdeRuntime *runtime,
return g_object_ref (self->deploy_dir_files);
if (g_str_has_prefix (path, "/usr/"))
- return g_file_get_child (self->deploy_dir_files, path + IDE_LITERAL_LENGTH ("/usr/"));
+ return g_file_get_child (self->deploy_dir_files, path + DZL_LITERAL_LENGTH ("/usr/"));
build_dir = get_staging_directory (self);
app_files_path = g_build_filename (build_dir, "files", NULL);
@@ -435,7 +435,7 @@ gbp_flatpak_runtime_translate_file (IdeRuntime *runtime,
g_autofree gchar *translated = NULL;
translated = g_build_filename (app_files_path,
- path + IDE_LITERAL_LENGTH ("/app/"),
+ path + DZL_LITERAL_LENGTH ("/app/"),
NULL);
return g_file_new_for_path (translated);
}
diff --git a/src/plugins/git/ide-git-clone-widget.c b/src/plugins/git/ide-git-clone-widget.c
index d1ed9db..4c8de66 100644
--- a/src/plugins/git/ide-git-clone-widget.c
+++ b/src/plugins/git/ide-git-clone-widget.c
@@ -238,7 +238,7 @@ ide_git_clone_widget_init (IdeGitCloneWidget *self)
settings = g_settings_new ("org.gnome.builder");
path = g_settings_get_string (settings, "projects-directory");
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
path = g_build_filename (g_get_home_dir (), "Projects", NULL);
if (!g_path_is_absolute (path))
diff --git a/src/plugins/meson/gbp-meson-build-system.c b/src/plugins/meson/gbp-meson-build-system.c
index 216c470..f676fe0 100644
--- a/src/plugins/meson/gbp-meson-build-system.c
+++ b/src/plugins/meson/gbp-meson-build-system.c
@@ -573,7 +573,7 @@ gbp_meson_build_system_init_worker (GTask *task,
name = g_file_get_basename (project_file);
- if (ide_str_equal0 (name, "meson.build"))
+ if (dzl_str_equal0 (name, "meson.build"))
{
g_task_return_pointer (task, g_object_ref (project_file), g_object_unref);
IDE_EXIT;
diff --git a/src/plugins/meson/gbp-meson-build-target-provider.c
b/src/plugins/meson/gbp-meson-build-target-provider.c
index 8c81659..4a29921 100644
--- a/src/plugins/meson/gbp-meson-build-target-provider.c
+++ b/src/plugins/meson/gbp-meson-build-target-provider.c
@@ -245,13 +245,13 @@ gbp_meson_build_target_provider_communicate_cb (GObject *object,
target = gbp_meson_build_target_new (context, dir, base);
- found_bindir |= ide_str_equal0 (name_of_dir, "bin");
+ found_bindir |= dzl_str_equal0 (name_of_dir, "bin");
/*
* Until Builder supports selecting a target to run, we need to prefer
* bindir targets over other targets.
*/
- if (ide_str_equal0 (name_of_dir, "bin") && ide_str_equal0 (type, "executable"))
+ if (dzl_str_equal0 (name_of_dir, "bin") && dzl_str_equal0 (type, "executable"))
g_ptr_array_insert (ret, 0, g_steal_pointer (&target));
else
g_ptr_array_add (ret, g_steal_pointer (&target));
diff --git a/src/plugins/meson/gbp-meson-pipeline-addin.c b/src/plugins/meson/gbp-meson-pipeline-addin.c
index 0a8636a..7372d75 100644
--- a/src/plugins/meson/gbp-meson-pipeline-addin.c
+++ b/src/plugins/meson/gbp-meson-pipeline-addin.c
@@ -119,7 +119,7 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
ide_subprocess_launcher_push_argv (config_launcher, "--prefix");
ide_subprocess_launcher_push_argv (config_launcher, prefix);
- if (!ide_str_empty0 (config_opts))
+ if (!dzl_str_empty0 (config_opts))
{
g_auto(GStrv) argv = NULL;
gint argc;
diff --git a/src/plugins/notification/ide-notification-addin.c
b/src/plugins/notification/ide-notification-addin.c
index ec26d1f..4d100f3 100644
--- a/src/plugins/notification/ide-notification-addin.c
+++ b/src/plugins/notification/ide-notification-addin.c
@@ -48,7 +48,7 @@ should_supress_message (IdeNotificationAddin *self,
g_assert (message != NULL);
if (self->last_msg_body == NULL ||
- !ide_str_equal0 (self->last_msg_body, message) ||
+ !dzl_str_equal0 (self->last_msg_body, message) ||
self->last_time + GRACE_PERIOD_USEC < g_get_monotonic_time ())
{
g_free (self->last_msg_body);
diff --git a/src/plugins/project-tree/gb-new-file-popover.c b/src/plugins/project-tree/gb-new-file-popover.c
index 0635360..d22f51b 100644
--- a/src/plugins/project-tree/gb-new-file-popover.c
+++ b/src/plugins/project-tree/gb-new-file-popover.c
@@ -66,7 +66,7 @@ gb_new_file_popover__button_clicked (GbNewFilePopover *self,
return;
path = gtk_entry_get_text (self->entry);
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
return;
file = g_file_get_child (self->directory, path);
@@ -151,7 +151,7 @@ gb_new_file_popover_check_exists (GbNewFilePopover *self,
if (directory == NULL)
return;
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
return;
child = g_file_get_child (directory, path);
@@ -179,7 +179,7 @@ gb_new_file_popover__entry_changed (GbNewFilePopover *self,
text = gtk_entry_get_text (entry);
- gtk_widget_set_sensitive (GTK_WIDGET (self->button), !ide_str_empty0 (text));
+ gtk_widget_set_sensitive (GTK_WIDGET (self->button), !dzl_str_empty0 (text));
gb_new_file_popover_check_exists (self, self->directory, text);
}
diff --git a/src/plugins/project-tree/gb-project-tree.c b/src/plugins/project-tree/gb-project-tree.c
index 97e39f4..91b2c06 100644
--- a/src/plugins/project-tree/gb-project-tree.c
+++ b/src/plugins/project-tree/gb-project-tree.c
@@ -389,7 +389,7 @@ find_child_node (DzlTree *tree,
item_name = gb_project_file_get_display_name (GB_PROJECT_FILE (item));
- return ide_str_equal0 (item_name, name);
+ return dzl_str_equal0 (item_name, name);
}
return FALSE;
diff --git a/src/plugins/project-tree/gb-rename-file-popover.c
b/src/plugins/project-tree/gb-rename-file-popover.c
index 44a1f75..45e5176 100644
--- a/src/plugins/project-tree/gb-rename-file-popover.c
+++ b/src/plugins/project-tree/gb-rename-file-popover.c
@@ -161,7 +161,7 @@ gb_rename_file_popover__entry_changed (GbRenameFilePopover *self,
gtk_label_set_label (self->message, NULL);
text = gtk_entry_get_text (entry);
- if (ide_str_empty0 (text))
+ if (dzl_str_empty0 (text))
return;
if (self->cancellable)
@@ -226,7 +226,7 @@ gb_rename_file_popover__button_clicked (GbRenameFilePopover *self,
g_assert (G_IS_FILE (self->file));
path = gtk_entry_get_text (self->entry);
- if (ide_str_empty0 (path))
+ if (dzl_str_empty0 (path))
return;
parent = g_file_get_parent (self->file);
diff --git a/src/plugins/recent/gbp-recent-project-row.c b/src/plugins/recent/gbp-recent-project-row.c
index 174ca4d..310f17e 100644
--- a/src/plugins/recent/gbp-recent-project-row.c
+++ b/src/plugins/recent/gbp-recent-project-row.c
@@ -165,7 +165,7 @@ gbp_recent_project_row_add_tags (GbpRecentProjectRow *self,
}
build_system_name = ide_project_info_get_build_system_name (project_info);
- if (!ide_str_empty0 (build_system_name))
+ if (!dzl_str_empty0 (build_system_name))
{
GtkWidget *pill;
diff --git a/src/plugins/spellcheck/gbp-spell-dict.c b/src/plugins/spellcheck/gbp-spell-dict.c
index e6c5c9c..6a11af4 100644
--- a/src/plugins/spellcheck/gbp-spell-dict.c
+++ b/src/plugins/spellcheck/gbp-spell-dict.c
@@ -175,7 +175,7 @@ gbp_spell_dict_personal_contains (GbpSpellDict *self,
{
g_assert (GBP_IS_SPELL_DICT (self));
- if (self->words != NULL && !ide_str_empty0 (word))
+ if (self->words != NULL && !dzl_str_empty0 (word))
return g_hash_table_contains (self->words, word);
return FALSE;
@@ -186,7 +186,7 @@ gbp_spell_dict_add_word_to_personal (GbpSpellDict *self,
const gchar *word)
{
g_assert (GBP_IS_SPELL_DICT (self));
- g_assert (!ide_str_empty0 (word));
+ g_assert (!dzl_str_empty0 (word));
if (self->dict != NULL)
{
@@ -209,7 +209,7 @@ gbp_spell_dict_remove_word_from_personal (GbpSpellDict *self,
const gchar *word)
{
g_assert (GBP_IS_SPELL_DICT (self));
- g_assert (!ide_str_empty0 (word));
+ g_assert (!dzl_str_empty0 (word));
if (self->dict != NULL)
{
diff --git a/src/plugins/spellcheck/gbp-spell-navigator.c b/src/plugins/spellcheck/gbp-spell-navigator.c
index 64c494b..f5897e6 100644
--- a/src/plugins/spellcheck/gbp-spell-navigator.c
+++ b/src/plugins/spellcheck/gbp-spell-navigator.c
@@ -254,7 +254,7 @@ gbp_spell_navigator_get_count (GbpSpellNavigator *self,
{
g_assert (GBP_IS_SPELL_NAVIGATOR (self));
- if (self->words_count == NULL || ide_str_empty0 (word))
+ if (self->words_count == NULL || dzl_str_empty0 (word))
return 0;
else
return GPOINTER_TO_UINT (g_hash_table_lookup (self->words_count, word));
diff --git a/src/plugins/spellcheck/gbp-spell-widget-actions.c
b/src/plugins/spellcheck/gbp-spell-widget-actions.c
index 69c224c..8260d96 100644
--- a/src/plugins/spellcheck/gbp-spell-widget-actions.c
+++ b/src/plugins/spellcheck/gbp-spell-widget-actions.c
@@ -80,7 +80,7 @@ gbp_spell_widget_actions_ignore_all (GSimpleAction *action,
checker = gbp_spell_editor_view_addin_get_checker (self->editor_view_addin);
word = gtk_label_get_text (self->word_label);
- if (!ide_str_empty0 (word))
+ if (!dzl_str_empty0 (word))
{
gspell_checker_add_word_to_session (checker, word, -1);
_gbp_spell_widget_move_next_word (self);
diff --git a/src/plugins/spellcheck/gbp-spell-widget.c b/src/plugins/spellcheck/gbp-spell-widget.c
index f95a8f8..0d1f7ca 100644
--- a/src/plugins/spellcheck/gbp-spell-widget.c
+++ b/src/plugins/spellcheck/gbp-spell-widget.c
@@ -77,7 +77,7 @@ create_suggestion_row (GbpSpellWidget *self,
const gchar *word)
{
g_assert (GBP_IS_SPELL_WIDGET (self));
- g_assert (!ide_str_empty0 (word));
+ g_assert (!dzl_str_empty0 (word));
return g_object_new (GTK_TYPE_LABEL,
"label", word,
@@ -102,7 +102,7 @@ fill_suggestions_box (GbpSpellWidget *self,
clear_suggestions_box (self);
- if (ide_str_empty0 (word))
+ if (dzl_str_empty0 (word))
{
gtk_widget_set_sensitive (GTK_WIDGET (self->suggestions_box), FALSE);
return;
@@ -196,7 +196,7 @@ _gbp_spell_widget_move_next_word (GbpSpellWidget *self)
fill_suggestions_box (self, word, &first_result);
- if (!ide_str_empty0 (first_result))
+ if (!dzl_str_empty0 (first_result))
{
row = gtk_list_box_get_row_at_index (self->suggestions_box, 0);
gtk_list_box_select_row (self->suggestions_box, row);
@@ -236,7 +236,7 @@ check_word_timeout_cb (GbpSpellWidget *self)
word = gtk_entry_get_text (self->word_entry);
- if (!ide_str_empty0 (word))
+ if (!dzl_str_empty0 (word))
{
/* FIXME: suggestions can give a multiple-words suggestion
* that failed to the checkword test, ex: auto tools
@@ -292,7 +292,7 @@ gbp_spell_widget__word_entry_changed_cb (GbpSpellWidget *self,
_gbp_spell_widget_update_actions (self);
word = gtk_entry_get_text (self->word_entry);
- if (ide_str_empty0 (word) && self->spellchecking_status == TRUE)
+ if (dzl_str_empty0 (word) && self->spellchecking_status == TRUE)
{
word = gtk_label_get_text (self->word_label);
gtk_entry_set_text (GTK_ENTRY (self->dict_word_entry), word);
@@ -420,7 +420,7 @@ dict_check_word_timeout_cb (GbpSpellWidget *self)
self->dict_check_word_state = CHECK_WORD_CHECKING;
word = gtk_entry_get_text (GTK_ENTRY (self->dict_word_entry));
- if (!ide_str_empty0 (word))
+ if (!dzl_str_empty0 (word))
{
if (gbp_spell_dict_personal_contains (self->dict, word))
gtk_widget_set_tooltip_text (self->dict_word_entry, _("This word is already in the personal
dictionary"));
@@ -566,7 +566,7 @@ dict_create_word_row (GbpSpellWidget *self,
GtkStyleContext *style_context;
g_assert (GBP_IS_SPELL_WIDGET (self));
- g_assert (!ide_str_empty0 (word));
+ g_assert (!dzl_str_empty0 (word));
label = g_object_new (GTK_TYPE_LABEL,
"label", word,
@@ -618,7 +618,7 @@ gbp_spell_widget__add_button_clicked_cb (GbpSpellWidget *self,
word = gtk_entry_get_text (GTK_ENTRY (self->dict_word_entry));
/* TODO: check if word already in dict */
- if (check_dict_available (self) && !ide_str_empty0 (word))
+ if (check_dict_available (self) && !dzl_str_empty0 (word))
{
if (!gbp_spell_dict_add_word_to_personal (self->dict, word))
return;
@@ -701,7 +701,7 @@ gbp_spell_widget__language_notify_cb (GbpSpellWidget *self,
{
gspell_checker_set_language (checker, spell_language);
fill_suggestions_box (self, word, &first_result);
- if (!ide_str_empty0 (first_result))
+ if (!dzl_str_empty0 (first_result))
{
row = gtk_list_box_get_row_at_index (self->suggestions_box, 0);
gtk_list_box_select_row (self->suggestions_box, row);
@@ -768,7 +768,7 @@ gbp_spell_widget__populate_popup_cb (GbpSpellWidget *self,
checker = gbp_spell_editor_view_addin_get_checker (self->editor_view_addin);
text = gtk_entry_get_text (entry);
- if (!self->is_word_entry_valid && !ide_str_empty0 (text))
+ if (!self->is_word_entry_valid && !dzl_str_empty0 (text))
suggestions = gspell_checker_get_suggestions (checker, text, -1);
if (suggestions == NULL)
@@ -1152,10 +1152,10 @@ _gbp_spell_widget_change (GbpSpellWidget *self,
g_assert (GSPELL_IS_CHECKER (checker));
word = gtk_label_get_text (self->word_label);
- g_assert (!ide_str_empty0 (word));
+ g_assert (!dzl_str_empty0 (word));
change_to = g_strdup (gtk_entry_get_text (self->word_entry));
- g_assert (!ide_str_empty0 (change_to));
+ g_assert (!dzl_str_empty0 (change_to));
navigator = gbp_spell_editor_view_addin_get_navigator (self->editor_view_addin);
g_assert (navigator != NULL);
diff --git a/src/plugins/symbol-tree/gbp-symbol-menu-button.c
b/src/plugins/symbol-tree/gbp-symbol-menu-button.c
index a0f074a..0a4dbd6 100644
--- a/src/plugins/symbol-tree/gbp-symbol-menu-button.c
+++ b/src/plugins/symbol-tree/gbp-symbol-menu-button.c
@@ -71,7 +71,7 @@ gbp_symbol_menu_button_search_changed (GbpSymbolMenuButton *self,
text = gtk_entry_get_text (GTK_ENTRY (search_entry));
- if (ide_str_empty0 (text))
+ if (dzl_str_empty0 (text))
dzl_tree_set_filter (self->tree, NULL, NULL, NULL);
else
dzl_tree_set_filter (self->tree,
@@ -274,7 +274,7 @@ gbp_symbol_menu_button_set_symbol (GbpSymbolMenuButton *self,
title = ide_symbol_get_name (symbol);
}
- if (ide_str_empty0 (title))
+ if (dzl_str_empty0 (title))
{
title = _("Select Symbol…");
icon_name = NULL;
diff --git a/src/plugins/todo/gbp-todo-model.c b/src/plugins/todo/gbp-todo-model.c
index 4ecf86e..7a7ed50 100644
--- a/src/plugins/todo/gbp-todo-model.c
+++ b/src/plugins/todo/gbp-todo-model.c
@@ -417,7 +417,7 @@ gbp_todo_model_mine_worker (GTask *task,
continue;
}
- if (ide_str_empty0 (line))
+ if (dzl_str_empty0 (line))
continue;
/* Try to match the first line */
diff --git a/src/plugins/xml-pack/ide-xml-completion-attributes.c
b/src/plugins/xml-pack/ide-xml-completion-attributes.c
index fbdb48f..ec72cc7 100644
--- a/src/plugins/xml-pack/ide-xml-completion-attributes.c
+++ b/src/plugins/xml-pack/ide-xml-completion-attributes.c
@@ -43,7 +43,7 @@ match_item_new (IdeXmlRngDefine *define,
{
MatchItem *item;
- g_assert (!ide_str_empty0 (attr_name));
+ g_assert (!dzl_str_empty0 (attr_name));
item = g_slice_new0 (MatchItem);
@@ -131,7 +131,7 @@ process_attribute (MatchingState *state)
match_children = match_children_new ();
name = (gchar *)state->define->name;
/* XXX: we skip element without a name for now */
- if (ide_str_empty0 (name))
+ if (dzl_str_empty0 (name))
return match_children;
item = match_item_new (state->define, name, state->define->pos, state->is_optional);
@@ -400,7 +400,7 @@ compare_attribute_names (gpointer a,
attr_name = (const gchar *)a;
match = (MatchItem *)b;
- return ide_str_equal0 (match->name, attr_name);
+ return dzl_str_equal0 (match->name, attr_name);
}
static gint
diff --git a/src/plugins/xml-pack/ide-xml-completion-provider.c
b/src/plugins/xml-pack/ide-xml-completion-provider.c
index 29023f1..b2b45ee 100644
--- a/src/plugins/xml-pack/ide-xml-completion-provider.c
+++ b/src/plugins/xml-pack/ide-xml-completion-provider.c
@@ -18,6 +18,7 @@
#define G_LOG_DOMAIN "xml-completion"
+#include <dazzle.h>
#include <libpeas/peas.h>
#include "ide-xml-completion-provider.h"
@@ -375,7 +376,7 @@ completion_item_new (const gchar *label,
{
CompletionItem *item;
- g_assert (!ide_str_empty0 (label));
+ g_assert (!dzl_str_empty0 (label));
g_assert (define != NULL);
item = g_slice_new0 (CompletionItem);
@@ -504,7 +505,7 @@ is_define_equal_node (IdeXmlRngDefine *define,
g_assert (define != NULL);
g_assert (IDE_IS_XML_SYMBOL_NODE (node));
- return ide_str_equal0 (ide_xml_symbol_node_get_element_name (node), define->name);
+ return dzl_str_equal0 (ide_xml_symbol_node_get_element_name (node), define->name);
}
static gboolean
@@ -517,7 +518,7 @@ is_element_matching (MatchingState *state)
g_assert (state->define->type == IDE_XML_RNG_DEFINE_ELEMENT);
/* XXX: we skip element without a name for now */
- if (ide_str_empty0 ((gchar *)state->define->name))
+ if (dzl_str_empty0 ((gchar *)state->define->name))
return FALSE;
if (state->children->len == 0)
@@ -529,7 +530,7 @@ is_element_matching (MatchingState *state)
if (state->candidate_node == node)
{
name = (gchar *)state->define->name;
- if (ide_str_empty0 (state->prefix) || g_str_has_prefix ((gchar *)state->define->name, state->prefix))
+ if (dzl_str_empty0 (state->prefix) || g_str_has_prefix ((gchar *)state->define->name, state->prefix))
{
state->candidate_node = NULL;
state->retry = TRUE;
@@ -848,7 +849,7 @@ get_values_proposals (IdeXmlPosition *position,
GList *results = NULL;
node = ide_xml_position_get_child_node (position);
- g_assert (!ide_str_empty0 (position->detail_name));
+ g_assert (!dzl_str_empty0 (position->detail_name));
if (NULL != (attributes = ide_xml_completion_attributes_get_matches (define, node, FALSE)))
{
@@ -863,7 +864,7 @@ get_values_proposals (IdeXmlPosition *position,
for (gint j = 0; j < attributes->len; ++j)
{
match_item = g_ptr_array_index (attributes, j);
- if (ide_str_equal0 (detail_name, match_item->name))
+ if (dzl_str_equal0 (detail_name, match_item->name))
{
attr_define = match_item->define;
break;
diff --git a/src/plugins/xml-pack/ide-xml-completion-values.c
b/src/plugins/xml-pack/ide-xml-completion-values.c
index 7413335..f3c6b3b 100644
--- a/src/plugins/xml-pack/ide-xml-completion-values.c
+++ b/src/plugins/xml-pack/ide-xml-completion-values.c
@@ -37,7 +37,7 @@ value_match_item_new (const gchar *value)
{
ValueMatchItem *item;
- g_assert (!ide_str_empty0 (value));
+ g_assert (!dzl_str_empty0 (value));
item = g_slice_new0 (ValueMatchItem);
item->name = g_strdup (value);
@@ -121,8 +121,8 @@ process_value (MatchingState *state)
value = (gchar *)state->define->name;
- if (!ide_str_empty0 (value) &&
- (ide_str_empty0 (state->prefix) || g_str_has_prefix (value, state->prefix)))
+ if (!dzl_str_empty0 (value) &&
+ (dzl_str_empty0 (state->prefix) || g_str_has_prefix (value, state->prefix)))
{
match_values = match_values_new ();
item = value_match_item_new (value);
diff --git a/src/plugins/xml-pack/ide-xml-hash-table.c b/src/plugins/xml-pack/ide-xml-hash-table.c
index dc1d3bb..2934208 100644
--- a/src/plugins/xml-pack/ide-xml-hash-table.c
+++ b/src/plugins/xml-pack/ide-xml-hash-table.c
@@ -102,7 +102,7 @@ ide_xml_hash_table_add (IdeXmlHashTable *self,
GPtrArray *array;
g_return_val_if_fail (self != NULL, FALSE);
- g_return_val_if_fail (!ide_str_empty0 (name), FALSE);
+ g_return_val_if_fail (!dzl_str_empty0 (name), FALSE);
g_return_val_if_fail (data != NULL, FALSE);
if (NULL == (array = g_hash_table_lookup (self->table, name)))
@@ -124,7 +124,7 @@ ide_xml_hash_table_lookup (IdeXmlHashTable *self,
const gchar *name)
{
g_return_val_if_fail (self != NULL, NULL);
- g_return_val_if_fail (!ide_str_empty0 (name), NULL);
+ g_return_val_if_fail (!dzl_str_empty0 (name), NULL);
return g_hash_table_lookup (self->table, name);
}
diff --git a/src/plugins/xml-pack/ide-xml-parser-ui.c b/src/plugins/xml-pack/ide-xml-parser-ui.c
index 7092515..9c5d906 100644
--- a/src/plugins/xml-pack/ide-xml-parser-ui.c
+++ b/src/plugins/xml-pack/ide-xml-parser-ui.c
@@ -16,14 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ide-xml-parser.h"
+#define G_LOG_DOMAIN "ide-xml-parser-ui"
+
+#include <dazzle.h>
+
#include "ide-xml-parser-ui.h"
+#include "ide-xml-parser.h"
#include "ide-xml-sax.h"
#include "ide-xml-stack.h"
#include "ide-xml-tree-builder-utils-private.h"
-#include "ide-xml-parser-ui.h"
-
static const gchar *
get_attribute (const guchar **list,
const gchar *name,
@@ -32,7 +34,7 @@ get_attribute (const guchar **list,
const gchar *value = NULL;
value = list_get_attribute (list, name);
- return ide_str_empty0 (value) ? ((replacement != NULL) ? replacement : NULL) : value;
+ return dzl_str_empty0 (value) ? ((replacement != NULL) ? replacement : NULL) : value;
}
static void
@@ -59,10 +61,10 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
string = g_string_new (NULL);
parent_name = ide_xml_symbol_node_get_element_name (state->parent_node);
- if (ide_str_equal0 (name, "property"))
+ if (dzl_str_equal0 (name, "property"))
{
- if (ide_str_equal0 (parent_name, "object") ||
- ide_str_equal0 (parent_name, "template"))
+ if (dzl_str_equal0 (parent_name, "object") ||
+ dzl_str_equal0 (parent_name, "template"))
{
value = get_attribute (attributes, "name", NULL);
node = ide_xml_symbol_node_new (value, NULL, "property", IDE_SYMBOL_UI_PROPERTY);
@@ -70,11 +72,11 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
state->build_state = BUILD_STATE_GET_CONTENT;
}
}
- else if (ide_str_equal0 (name, "attribute"))
+ else if (dzl_str_equal0 (name, "attribute"))
{
- if (ide_str_equal0 (parent_name, "section") ||
- ide_str_equal0 (parent_name, "submenu") ||
- ide_str_equal0 (parent_name, "item"))
+ if (dzl_str_equal0 (parent_name, "section") ||
+ dzl_str_equal0 (parent_name, "submenu") ||
+ dzl_str_equal0 (parent_name, "item"))
{
value = get_attribute (attributes, "name", NULL);
node = ide_xml_symbol_node_new (value, NULL, "attribute", IDE_SYMBOL_UI_MENU_ATTRIBUTE);
@@ -82,13 +84,13 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
state->build_state = BUILD_STATE_GET_CONTENT;
}
}
- else if (ide_str_equal0 (name, "class") && ide_str_equal0 (parent_name, "style"))
+ else if (dzl_str_equal0 (name, "class") && dzl_str_equal0 (parent_name, "style"))
{
value = get_attribute (attributes, "name", NULL);
node = ide_xml_symbol_node_new (value, NULL, "class", IDE_SYMBOL_UI_STYLE_CLASS);
is_internal = TRUE;
}
- else if (ide_str_equal0 (name, "child"))
+ else if (dzl_str_equal0 (name, "child"))
{
g_string_append (string, "child");
@@ -109,7 +111,7 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, "child", IDE_SYMBOL_UI_CHILD);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "object"))
+ else if (dzl_str_equal0 (name, "object"))
{
value = get_attribute (attributes, "class", "?");
label = ide_xml_parser_get_color_tag (self, "class", COLOR_TAG_CLASS, TRUE, TRUE, TRUE);
@@ -127,7 +129,7 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, "object", IDE_SYMBOL_UI_OBJECT);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "template"))
+ else if (dzl_str_equal0 (name, "template"))
{
value = get_attribute (attributes, "class", "?");
label = ide_xml_parser_get_color_tag (self, "class", COLOR_TAG_CLASS, TRUE, TRUE, TRUE);
@@ -143,15 +145,15 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, (const gchar *)name, IDE_SYMBOL_UI_TEMPLATE);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "packing"))
+ else if (dzl_str_equal0 (name, "packing"))
{
node = ide_xml_symbol_node_new ("packing", NULL, "packing", IDE_SYMBOL_UI_PACKING);
}
- else if (ide_str_equal0 (name, "style"))
+ else if (dzl_str_equal0 (name, "style"))
{
node = ide_xml_symbol_node_new ("style", NULL, "style", IDE_SYMBOL_UI_STYLE);
}
- else if (ide_str_equal0 (name, "menu"))
+ else if (dzl_str_equal0 (name, "menu"))
{
value = get_attribute (attributes, "id", "?");
label = ide_xml_parser_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
@@ -161,7 +163,7 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, "menu", IDE_SYMBOL_UI_MENU);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "submenu"))
+ else if (dzl_str_equal0 (name, "submenu"))
{
value = get_attribute (attributes, "id", "?");
label = ide_xml_parser_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
@@ -171,7 +173,7 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, "submenu", IDE_SYMBOL_UI_SUBMENU);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "section"))
+ else if (dzl_str_equal0 (name, "section"))
{
value = get_attribute (attributes, "id", "?");
label = ide_xml_parser_get_color_tag (self, "id", COLOR_TAG_ID, TRUE, TRUE, TRUE);
@@ -181,7 +183,7 @@ ide_xml_parser_ui_start_element_sax_cb (ParserState *state,
node = ide_xml_symbol_node_new (string->str, NULL, "section", IDE_SYMBOL_UI_SECTION);
g_object_set (node, "use-markup", TRUE, NULL);
}
- else if (ide_str_equal0 (name, "item"))
+ else if (dzl_str_equal0 (name, "item"))
{
node = ide_xml_symbol_node_new ("item", NULL, "item", IDE_SYMBOL_UI_ITEM);
}
@@ -204,7 +206,7 @@ get_menu_attribute_value (IdeXmlSymbolNode *node,
{
child = IDE_XML_SYMBOL_NODE (ide_xml_symbol_node_get_nth_internal_child (node, i));
if (ide_symbol_node_get_kind (IDE_SYMBOL_NODE (child)) == IDE_SYMBOL_UI_MENU_ATTRIBUTE &&
- ide_str_equal0 (ide_symbol_node_get_name (IDE_SYMBOL_NODE (child)), name))
+ dzl_str_equal0 (ide_symbol_node_get_name (IDE_SYMBOL_NODE (child)), name))
{
return ide_xml_symbol_node_get_value (child);
}
@@ -235,7 +237,7 @@ node_post_processing_collect_style_classes (IdeXmlParser *self,
if (ide_symbol_node_get_kind (IDE_SYMBOL_NODE (child)) == IDE_SYMBOL_UI_STYLE_CLASS)
{
name = ide_symbol_node_get_name (IDE_SYMBOL_NODE (child));
- if (ide_str_empty0 (name))
+ if (dzl_str_empty0 (name))
continue;
class_tag = ide_xml_parser_get_color_tag (self, name, COLOR_TAG_STYLE_CLASS, TRUE, TRUE, TRUE);
@@ -303,11 +305,11 @@ ide_xml_parser_ui_post_processing (IdeXmlParser *self,
element_name = ide_xml_symbol_node_get_element_name (node);
- if (ide_str_equal0 (element_name, "style"))
+ if (dzl_str_equal0 (element_name, "style"))
node_post_processing_collect_style_classes (self, node);
- else if (ide_str_equal0 (element_name, "item") ||
- ide_str_equal0 (element_name, "submenu") ||
- ide_str_equal0 (element_name, "section"))
+ else if (dzl_str_equal0 (element_name, "item") ||
+ dzl_str_equal0 (element_name, "submenu") ||
+ dzl_str_equal0 (element_name, "section"))
node_post_processing_add_label (self, node);
}
diff --git a/src/plugins/xml-pack/ide-xml-parser.c b/src/plugins/xml-pack/ide-xml-parser.c
index 8247a7a..11fe16a 100644
--- a/src/plugins/xml-pack/ide-xml-parser.c
+++ b/src/plugins/xml-pack/ide-xml-parser.c
@@ -182,7 +182,7 @@ ide_xml_parser_state_processing (IdeXmlParser *self,
{
erroneous_element_name = ide_xml_symbol_node_get_element_name (state->parent_node);
/* TODO: we need better node comparaison (ns) here */
- if (!ide_str_equal0 (erroneous_element_name, element_name))
+ if (!dzl_str_equal0 (erroneous_element_name, element_name))
{
if (ide_xml_stack_is_empty (self->stack))
goto error;
@@ -225,7 +225,7 @@ ide_xml_parser_state_processing (IdeXmlParser *self,
goto error;
popped_node = ide_xml_stack_pop (self->stack, &popped_element_name, &parent_node, &depth);
- if (ide_str_equal0 (popped_element_name, element_name))
+ if (dzl_str_equal0 (popped_element_name, element_name))
{
ide_xml_symbol_node_set_end_tag_location (popped_node,
start_line, start_line_offset,
@@ -483,9 +483,9 @@ ide_xml_parser_processing_instruction_sax_cb (ParserState *state,
if (NULL != (extension = strrchr (schema_url, '.')))
{
++extension;
- if (ide_str_equal0 (extension, "rng"))
+ if (dzl_str_equal0 (extension, "rng"))
kind = SCHEMA_KIND_RNG;
- else if (ide_str_equal0 (extension, "xsd"))
+ else if (dzl_str_equal0 (extension, "xsd"))
kind = SCHEMA_KIND_XML_SCHEMA;
else
goto fail;
@@ -663,7 +663,7 @@ ide_xml_parser_get_color_tag (IdeXmlParser *self,
g_assert (IDE_IS_XML_PARSER (self));
g_assert (self->color_tags != NULL);
- g_assert (!ide_str_empty0 (str));
+ g_assert (!dzl_str_empty0 (str));
tag = &g_array_index (self->color_tags, ColorTag, id);
return g_strdup_printf ("%s<span foreground=\"%s\" background=\"%s\">%s%s%s</span>%s",
@@ -751,7 +751,7 @@ editor_settings_changed_cb (IdeXmlParser *self,
{
g_assert (IDE_IS_XML_PARSER (self));
- if (ide_str_equal0 (key, "style-scheme-name"))
+ if (dzl_str_equal0 (key, "style-scheme-name"))
init_color_tags (self);
}
diff --git a/src/plugins/xml-pack/ide-xml-position.c b/src/plugins/xml-pack/ide-xml-position.c
index 3f0975a..01c6fbb 100644
--- a/src/plugins/xml-pack/ide-xml-position.c
+++ b/src/plugins/xml-pack/ide-xml-position.c
@@ -38,13 +38,13 @@ ide_xml_position_new (IdeXmlSymbolNode *node,
self->node = (IDE_IS_XML_SYMBOL_NODE (node)) ? g_object_ref (node) : NULL;
- if (!ide_str_empty0 (prefix))
+ if (!dzl_str_empty0 (prefix))
self->prefix = g_strdup (prefix);
- if (!ide_str_empty0 (detail_name))
+ if (!dzl_str_empty0 (detail_name))
self->detail_name = g_strdup (detail_name);
- if (!ide_str_empty0 (detail_value))
+ if (!dzl_str_empty0 (detail_value))
self->detail_value = g_strdup (detail_value);
self->kind = kind;
diff --git a/src/plugins/xml-pack/ide-xml-rng-define.c b/src/plugins/xml-pack/ide-xml-rng-define.c
index 82fa2ff..1c62171 100644
--- a/src/plugins/xml-pack/ide-xml-rng-define.c
+++ b/src/plugins/xml-pack/ide-xml-rng-define.c
@@ -245,12 +245,12 @@ ide_xml_rng_define_is_nameclass_match (IdeXmlRngDefine *define,
name = ide_xml_symbol_node_get_element_name (node);
namespace = ide_xml_symbol_node_get_namespace (node);
- if (define->name != NULL && !ide_str_equal0 (name, define->name))
+ if (define->name != NULL && !dzl_str_equal0 (name, define->name))
return FALSE;
- if (!ide_str_empty0 ((const gchar *)define->ns))
+ if (!dzl_str_empty0 ((const gchar *)define->ns))
{
- if (namespace == NULL || !ide_str_equal0 (define->ns, namespace))
+ if (namespace == NULL || !dzl_str_equal0 (define->ns, namespace))
return FALSE;
}
else if (namespace != NULL && (define->name != NULL || define->ns != NULL))
diff --git a/src/plugins/xml-pack/ide-xml-rng-parser.c b/src/plugins/xml-pack/ide-xml-rng-parser.c
index 7a7028f..65ec3db 100644
--- a/src/plugins/xml-pack/ide-xml-rng-parser.c
+++ b/src/plugins/xml-pack/ide-xml-rng-parser.c
@@ -161,8 +161,8 @@ is_valid_rng_node (xmlNode *node,
return (node != NULL &&
node->ns != NULL &&
node->type == XML_ELEMENT_NODE &&
- ide_str_equal0 (node->name, name) &&
- ide_str_equal0 (node->ns->href, xmlRelaxNGNs));
+ dzl_str_equal0 (node->name, name) &&
+ dzl_str_equal0 (node->ns->href, xmlRelaxNGNs));
}
static inline gboolean
@@ -220,7 +220,7 @@ static gint
compare_href_func (XmlDocument *xml_doc,
gchar *href)
{
- return !ide_str_equal0 (href, xml_doc->href);
+ return !dzl_str_equal0 (href, xml_doc->href);
}
static XmlDocument *
@@ -283,7 +283,7 @@ ide_xml_remove_redefine (IdeXmlRngParser *self,
if (name_tmp != NULL)
{
- if (ide_str_equal0 (name, name_tmp))
+ if (dzl_str_equal0 (name, name_tmp))
remove_node (node);
}
}
@@ -293,7 +293,7 @@ ide_xml_remove_redefine (IdeXmlRngParser *self,
if (inc_doc != NULL &&
inc_doc->doc != NULL &&
inc_doc->doc->children != NULL &&
- ide_str_equal0 (inc_doc->doc->children->name, "grammar"))
+ dzl_str_equal0 (inc_doc->doc->children->name, "grammar"))
{
inc_root = xmlDocGetRootElement (inc_doc->doc);
ide_xml_remove_redefine (self, inc_root->children, name);
@@ -316,7 +316,7 @@ load_include (IdeXmlRngParser *self,
g_assert (IDE_IS_XML_RNG_PARSER (self));
g_assert (node != NULL);
- g_assert (!ide_str_empty0 (url));
+ g_assert (!dzl_str_empty0 (url));
if (NULL != (xml_include_docs_stack_lookup (self, url)) ||
NULL == (ns = get_node_closest_ns (node)) ||
@@ -375,7 +375,7 @@ load_externalref (IdeXmlRngParser *self,
g_assert (IDE_IS_XML_RNG_PARSER (self));
g_assert (node != NULL);
- g_assert (!ide_str_empty0 (url));
+ g_assert (!dzl_str_empty0 (url));
if (NULL != (xml_externalref_docs_stack_lookup (self, url)) ||
NULL == (ns = get_node_closest_ns (node)) ||
@@ -424,14 +424,14 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
if (current->type == XML_ELEMENT_NODE)
{
- if (current->ns == NULL || !ide_str_equal0 (current->ns->href, xmlRelaxNGNs))
+ if (current->ns == NULL || !dzl_str_equal0 (current->ns->href, xmlRelaxNGNs))
{
delete = current;
goto next_node;
}
else
{
- if (ide_str_equal0 (current->name, "externalRef"))
+ if (dzl_str_equal0 (current->name, "externalRef"))
{
if (NULL == (href_url = build_url (root->doc, current)) ||
NULL == (ext_doc = load_externalref (self, current, (const gchar *)href_url)))
@@ -442,7 +442,7 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
current->psvi = ext_doc;
}
- else if (ide_str_equal0 (current->name, "include"))
+ else if (dzl_str_equal0 (current->name, "include"))
{
if (NULL == (href_url = build_url (root->doc, current)) ||
NULL == (ext_doc = load_include (self, current, (const gchar *)href_url)))
@@ -453,8 +453,8 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
current->psvi = ext_doc;
}
- else if (ide_str_equal0 (current->name, "element") ||
- ide_str_equal0 (current->name, "attribute"))
+ else if (dzl_str_equal0 (current->name, "element") ||
+ dzl_str_equal0 (current->name, "attribute"))
{
xmlNode *text_node;
xmlNode *doc_node;
@@ -477,13 +477,13 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
xmlUnsetProp (current, (const guchar *)"name");
if (NULL != (ns = xmlGetProp (current, NS_PROP)))
xmlSetProp (text_node, NS_PROP, ns);
- else if (ide_str_equal0 (current->name, "attribute"))
+ else if (dzl_str_equal0 (current->name, "attribute"))
xmlSetProp (text_node, NS_PROP, (const guchar *)"");
}
}
- else if (ide_str_equal0 (current->name, "name") ||
- ide_str_equal0 (current->name, "nsname") ||
- ide_str_equal0 (current->name, "value"))
+ else if (dzl_str_equal0 (current->name, "name") ||
+ dzl_str_equal0 (current->name, "nsname") ||
+ dzl_str_equal0 (current->name, "value"))
{
if (xmlHasProp (current, NS_PROP) == NULL)
{
@@ -505,7 +505,7 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
xmlSetProp (current, NS_PROP, ns);
}
- if (ide_str_equal0 (current->name, "name"))
+ if (dzl_str_equal0 (current->name, "name"))
{
g_autoxmlfree guchar *name = NULL;
g_autoxmlfree guchar *local = NULL;
@@ -524,18 +524,18 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
}
}
}
- else if (ide_str_equal0 (current->name, "except") && current != root)
+ else if (dzl_str_equal0 (current->name, "except") && current != root)
{
if (current->parent != NULL &&
- (ide_str_equal0 (current->parent->name, "anyName") ||
- ide_str_equal0 (current->parent->name, "nsName")))
+ (dzl_str_equal0 (current->parent->name, "anyName") ||
+ dzl_str_equal0 (current->parent->name, "nsName")))
{
ide_xml_rng_parser_cleanup (self, current);
goto next_node;
}
}
- if (ide_str_equal0 (current->name, "div"))
+ if (dzl_str_equal0 (current->name, "div"))
{
g_autoxmlfree guchar *ns = NULL;
xmlNode *child;
@@ -578,8 +578,8 @@ ide_xml_rng_parser_cleanup (IdeXmlRngParser *self,
{
if (current->parent != NULL && current->parent->type == XML_ELEMENT_NODE)
{
- if (!ide_str_equal0 (current->parent->name, "value") &&
- !ide_str_equal0 (current->parent->name, "param"))
+ if (!dzl_str_equal0 (current->parent->name, "value") &&
+ !dzl_str_equal0 (current->parent->name, "param"))
delete = current;
}
else
@@ -1097,7 +1097,7 @@ parse_pattern (IdeXmlRngParser *self,
else if (is_valid_rng_node (node, "ref"))
{
name = _strip (xmlGetProp (node, (const guchar *)"name"));
- if (!ide_str_empty0 ((gchar *)name))
+ if (!dzl_str_empty0 ((gchar *)name))
{
def = ide_xml_rng_define_new (node, parent, name, IDE_XML_RNG_DEFINE_REF);
ide_xml_hash_table_add (self->grammars->refs, (gchar *)def->name, ide_xml_rng_define_ref (def));
@@ -1412,7 +1412,7 @@ parse_include (IdeXmlRngParser *self,
if (NULL != (include = node->psvi) &&
NULL != (root = xmlDocGetRootElement(include->doc)) &&
- ide_str_equal0 (root->name, "grammar") &&
+ dzl_str_equal0 (root->name, "grammar") &&
root->children != NULL)
{
parse_grammar_content (self, root->children);
@@ -1442,16 +1442,16 @@ merge_starts (IdeXmlRngParser *self,
combine = NULL;
if (current->node != NULL &&
current->node->parent != NULL &&
- ide_str_equal0 (current->node->parent->name, "start"))
+ dzl_str_equal0 (current->node->parent->name, "start"))
{
if (NULL != (combine = xmlGetProp(current->node->parent, (const guchar *)"combine")))
{
- if (ide_str_equal0 (combine, "choice"))
+ if (dzl_str_equal0 (combine, "choice"))
{
if (combine_type == XML_RNG_COMBINE_UNDEF)
combine_type = XML_RNG_COMBINE_CHOICE;
}
- else if (ide_str_equal0 (combine, "interleave"))
+ else if (dzl_str_equal0 (combine, "interleave"))
{
if (combine_type == XML_RNG_COMBINE_UNDEF)
combine_type = XML_RNG_COMBINE_INTERLEAVE;
@@ -1503,12 +1503,12 @@ merge_defines_func (const gchar *name,
current = g_ptr_array_index (array, i);
if (NULL != (combine = xmlGetProp(current->node, (const guchar *)"combine")))
{
- if (ide_str_equal0 (combine, "choice"))
+ if (dzl_str_equal0 (combine, "choice"))
{
if (combine_type == XML_RNG_COMBINE_UNDEF)
combine_type = XML_RNG_COMBINE_CHOICE;
}
- else if (ide_str_equal0 (combine, "interleave"))
+ else if (dzl_str_equal0 (combine, "interleave"))
{
if (combine_type == XML_RNG_COMBINE_UNDEF)
combine_type = XML_RNG_COMBINE_INTERLEAVE;
diff --git a/src/plugins/xml-pack/ide-xml-stack.c b/src/plugins/xml-pack/ide-xml-stack.c
index bc49364..add3dc1 100644
--- a/src/plugins/xml-pack/ide-xml-stack.c
+++ b/src/plugins/xml-pack/ide-xml-stack.c
@@ -52,7 +52,7 @@ ide_xml_stack_push (IdeXmlStack *self,
StackItem item;
g_return_if_fail (IDE_IS_XML_STACK (self));
- g_return_if_fail (!ide_str_empty0 (name));
+ g_return_if_fail (!dzl_str_empty0 (name));
g_return_if_fail (IDE_IS_XML_SYMBOL_NODE (node) || node == NULL);
g_return_if_fail (IDE_IS_XML_SYMBOL_NODE (parent) || parent == NULL);
diff --git a/src/plugins/xml-pack/ide-xml-symbol-node.c b/src/plugins/xml-pack/ide-xml-symbol-node.c
index 9ca24ae..1ea955d 100644
--- a/src/plugins/xml-pack/ide-xml-symbol-node.c
+++ b/src/plugins/xml-pack/ide-xml-symbol-node.c
@@ -165,12 +165,12 @@ ide_xml_symbol_node_new (const gchar *name,
"flags", flags,
NULL);
- if (ide_str_empty0 (element_name))
+ if (dzl_str_empty0 (element_name))
self->element_name = g_strdup ("unknow");
else
self->element_name = g_strdup (element_name);
- if (!ide_str_empty0 (value))
+ if (!dzl_str_empty0 (value))
self->value = g_strdup (value);
return self;
@@ -550,7 +550,7 @@ ide_xml_symbol_node_set_element_name (IdeXmlSymbolNode *self,
const gchar *element_name)
{
g_return_if_fail (IDE_IS_XML_SYMBOL_NODE (self));
- g_return_if_fail (!ide_str_empty0 (element_name));
+ g_return_if_fail (!dzl_str_empty0 (element_name));
g_clear_pointer (&self->element_name, g_free);
@@ -723,7 +723,7 @@ ide_xml_symbol_node_get_attribute_value (IdeXmlSymbolNode *self,
for (gint i = 0; i < self->attributes->len; ++i)
{
attr = &g_array_index (self->attributes, Attribute, i);
- if (ide_str_equal0 (name, attr->name))
+ if (dzl_str_equal0 (name, attr->name))
return attr->value;
}
diff --git a/src/plugins/xml-pack/ide-xml-tree-builder-utils.c
b/src/plugins/xml-pack/ide-xml-tree-builder-utils.c
index 153afce..7836bf1 100644
--- a/src/plugins/xml-pack/ide-xml-tree-builder-utils.c
+++ b/src/plugins/xml-pack/ide-xml-tree-builder-utils.c
@@ -28,14 +28,14 @@ list_get_attribute (const guchar **attributes,
{
const guchar **l = attributes;
- g_return_val_if_fail (!ide_str_empty0 (name), NULL);
+ g_return_val_if_fail (!dzl_str_empty0 (name), NULL);
if (attributes == NULL)
return NULL;
while (l [0] != NULL)
{
- if (ide_str_equal0 (name, l [0]))
+ if (dzl_str_equal0 (name, l [0]))
return (const gchar *)l [1];
l += 2;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
