[gnome-builder] pattern: drop use of IdePatternSpec for DzlPatternSpec



commit e6cab996a474020c6a7a1001e2a0a3c1800f2f4a
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jun 7 00:54:27 2017 -0700

    pattern: drop use of IdePatternSpec for DzlPatternSpec
    
    We can now depend on this stuff from libdazzle.

 libide/greeter/ide-greeter-perspective.c |   11 +-
 libide/ide.h                             |    1 -
 libide/meson.build                       |    2 -
 libide/search/ide-pattern-spec.c         |  178 ------------------------------
 libide/search/ide-pattern-spec.h         |   42 -------
 plugins/symbol-tree/symbol-tree-panel.c  |   10 +-
 6 files changed, 10 insertions(+), 234 deletions(-)
---
diff --git a/libide/greeter/ide-greeter-perspective.c b/libide/greeter/ide-greeter-perspective.c
index 29996d4..0b84a77 100644
--- a/libide/greeter/ide-greeter-perspective.c
+++ b/libide/greeter/ide-greeter-perspective.c
@@ -28,7 +28,6 @@
 #include "genesis/ide-genesis-addin.h"
 #include "greeter/ide-greeter-perspective.h"
 #include "greeter/ide-greeter-project-row.h"
-#include "search/ide-pattern-spec.h"
 #include "util/ide-gtk.h"
 #include "workbench/ide-perspective.h"
 #include "workbench/ide-workbench-private.h"
@@ -40,7 +39,7 @@ struct _IdeGreeterPerspective
 
   DzlSignalGroup       *signal_group;
   IdeRecentProjects    *recent_projects;
-  IdePatternSpec       *pattern_spec;
+  DzlPatternSpec       *pattern_spec;
   GActionMap           *actions;
   PeasExtensionSet     *genesis_set;
 
@@ -195,9 +194,9 @@ ide_greeter_perspective_apply_filter_all (IdeGreeterPerspective *self)
 
   g_assert (IDE_IS_GREETER_PERSPECTIVE (self));
 
-  g_clear_pointer (&self->pattern_spec, ide_pattern_spec_unref);
+  g_clear_pointer (&self->pattern_spec, dzl_pattern_spec_unref);
   if ((text = gtk_entry_get_text (GTK_ENTRY (self->search_entry))))
-    self->pattern_spec = ide_pattern_spec_new (text);
+    self->pattern_spec = dzl_pattern_spec_new (text);
 
   ide_greeter_perspective_apply_filter (self,
                                   self->my_projects_list_box,
@@ -426,7 +425,7 @@ ide_greeter_perspective_filter_row (GtkListBoxRow *row,
     return TRUE;
 
   search_text = ide_greeter_project_row_get_search_text (project_row);
-  ret = ide_pattern_spec_match (self->pattern_spec, search_text);
+  ret = dzl_pattern_spec_match (self->pattern_spec, search_text);
 
   return ret;
 }
@@ -1117,7 +1116,7 @@ ide_greeter_perspective_finalize (GObject *object)
   IdeGreeterPerspective *self = (IdeGreeterPerspective *)object;
 
   ide_clear_weak_pointer (&self->ready_binding);
-  g_clear_pointer (&self->pattern_spec, ide_pattern_spec_unref);
+  g_clear_pointer (&self->pattern_spec, dzl_pattern_spec_unref);
   g_clear_object (&self->signal_group);
   g_clear_object (&self->recent_projects);
   g_clear_object (&self->cancellable);
diff --git a/libide/ide.h b/libide/ide.h
index 8329de6..8e5a8f3 100644
--- a/libide/ide.h
+++ b/libide/ide.h
@@ -107,7 +107,6 @@ G_BEGIN_DECLS
 #include "runtimes/ide-runtime-provider.h"
 #include "runtimes/ide-runtime.h"
 #include "search/ide-omni-search-row.h"
-#include "search/ide-pattern-spec.h"
 #include "search/ide-search-context.h"
 #include "search/ide-search-engine.h"
 #include "search/ide-search-provider.h"
diff --git a/libide/meson.build b/libide/meson.build
index f7fa3eb..37cfd91 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -126,7 +126,6 @@ libide_public_headers = [
   'search/ide-omni-search-entry.h',
   'search/ide-omni-search-group.h',
   'search/ide-omni-search-row.h',
-  'search/ide-pattern-spec.h',
   'search/ide-search-context.h',
   'search/ide-search-engine.h',
   'search/ide-search-provider.h',
@@ -326,7 +325,6 @@ libide_public_sources = [
   'search/ide-omni-search-entry.c',
   'search/ide-omni-search-group.c',
   'search/ide-omni-search-row.c',
-  'search/ide-pattern-spec.c',
   'search/ide-search-context.c',
   'search/ide-search-engine.c',
   'search/ide-search-provider.c',
diff --git a/plugins/symbol-tree/symbol-tree-panel.c b/plugins/symbol-tree/symbol-tree-panel.c
index a764845..8480383 100644
--- a/plugins/symbol-tree/symbol-tree-panel.c
+++ b/plugins/symbol-tree/symbol-tree-panel.c
@@ -280,7 +280,7 @@ filter_symbols_cb (DzlTree     *tree,
                    DzlTreeNode *node,
                    gpointer     user_data)
 {
-  IdePatternSpec *spec = user_data;
+  DzlPatternSpec *spec = user_data;
   const gchar *text;
 
   g_assert (DZL_IS_TREE (tree));
@@ -288,7 +288,7 @@ filter_symbols_cb (DzlTree     *tree,
   g_assert (spec != NULL);
 
   if ((text = dzl_tree_node_get_text (node)) != NULL)
-    return ide_pattern_spec_match (spec, text);
+    return dzl_pattern_spec_match (spec, text);
 
   return FALSE;
 }
@@ -310,13 +310,13 @@ symbol_tree__search_entry_changed (SymbolTreePanel *self,
     }
   else
     {
-      IdePatternSpec *spec;
+      DzlPatternSpec *spec;
 
-      spec = ide_pattern_spec_new (text);
+      spec = dzl_pattern_spec_new (text);
       dzl_tree_set_filter (self->tree,
                            filter_symbols_cb,
                            spec,
-                           (GDestroyNotify)ide_pattern_spec_unref);
+                           (GDestroyNotify)dzl_pattern_spec_unref);
       gtk_tree_view_expand_all (GTK_TREE_VIEW (self->tree));
     }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]