[libdazzle] search: move fuzzy/trie/levenshtein into search directory

[Christian Hergert <chergert src gnome org>]

commit 9739f94a9c6d914d68f7eed9b8f63336aaccb5c6
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jun 5 18:39:45 2017 -0700

    search: move fuzzy/trie/levenshtein into search directory
    
    It's nicer to have all the search stuff in one place rather than scattered
    haphazardly.

 src/dazzle.h                                    |   14 ++++----
 src/meson.build                                 |   38 +++++++++++------------
 src/{fuzzy => search}/dzl-fuzzy-index-builder.c |    2 +-
 src/{fuzzy => search}/dzl-fuzzy-index-builder.h |    0
 src/{fuzzy => search}/dzl-fuzzy-index-cursor.c  |    6 ++--
 src/{fuzzy => search}/dzl-fuzzy-index-cursor.h  |    0
 src/{fuzzy => search}/dzl-fuzzy-index-match.c   |    0
 src/{fuzzy => search}/dzl-fuzzy-index-match.h   |    0
 src/{fuzzy => search}/dzl-fuzzy-index-private.h |    0
 src/{fuzzy => search}/dzl-fuzzy-index.c         |    0
 src/{fuzzy => search}/dzl-fuzzy-index.h         |    0
 src/{fuzzy => search}/dzl-fuzzy-mutable-index.c |    2 +-
 src/{fuzzy => search}/dzl-fuzzy-mutable-index.h |    0
 src/{util => search}/dzl-levenshtein.c          |    0
 src/{util => search}/dzl-levenshtein.h          |    0
 src/{trie => search}/dzl-trie.c                 |    0
 src/{trie => search}/dzl-trie.h                 |    0
 17 files changed, 30 insertions(+), 32 deletions(-)
---
diff --git a/src/dazzle.h b/src/dazzle.h
index 1da2e44..6868bb9 100644
--- a/src/dazzle.h
+++ b/src/dazzle.h
@@ -44,11 +44,6 @@ G_BEGIN_DECLS
 #include "cache/dzl-task-cache.h"
 #include "files/dzl-directory-model.h"
 #include "files/dzl-directory-reaper.h"
-#include "fuzzy/dzl-fuzzy-index.h"
-#include "fuzzy/dzl-fuzzy-index-builder.h"
-#include "fuzzy/dzl-fuzzy-index-cursor.h"
-#include "fuzzy/dzl-fuzzy-index-match.h"
-#include "fuzzy/dzl-fuzzy-mutable-index.h"
 #include "graphing/dzl-cpu-graph.h"
 #include "graphing/dzl-cpu-model.h"
 #include "graphing/dzl-graph-column.h"
@@ -73,6 +68,13 @@ G_BEGIN_DECLS
 #include "panel/dzl-dock.h"
 #include "panel/dzl-tab-strip.h"
 #include "panel/dzl-tab.h"
+#include "search/dzl-fuzzy-index.h"
+#include "search/dzl-fuzzy-index-builder.h"
+#include "search/dzl-fuzzy-index-cursor.h"
+#include "search/dzl-fuzzy-index-match.h"
+#include "search/dzl-fuzzy-mutable-index.h"
+#include "search/dzl-levenshtein.h"
+#include "search/dzl-trie.h"
 #include "settings/dzl-settings-sandwich.h"
 #include "shortcuts/dzl-shortcut-accel-dialog.h"
 #include "shortcuts/dzl-shortcut-chord.h"
@@ -100,7 +102,6 @@ G_BEGIN_DECLS
 #include "tree/dzl-tree-builder.h"
 #include "tree/dzl-tree-node.h"
 #include "tree/dzl-tree-types.h"
-#include "trie/dzl-trie.h"
 #include "util/dzl-cairo.h"
 #include "util/dzl-counter.h"
 #include "util/dzl-date-time.h"
@@ -108,7 +109,6 @@ G_BEGIN_DECLS
 #include "util/dzl-file-manager.h"
 #include "util/dzl-gdk.h"
 #include "util/dzl-heap.h"
-#include "util/dzl-levenshtein.h"
 #include "util/dzl-pango.h"
 #include "util/dzl-rgba.h"
 #include "util/dzl-ring.h"
diff --git a/src/meson.build b/src/meson.build
index 13d5d70..38599d4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -54,12 +54,6 @@ libdazzle_public_headers = [
   'graphing/dzl-graph-renderer.h',
   'graphing/dzl-graph-view.h',
 
-  'fuzzy/dzl-fuzzy-index-builder.h',
-  'fuzzy/dzl-fuzzy-index-cursor.h',
-  'fuzzy/dzl-fuzzy-index-match.h',
-  'fuzzy/dzl-fuzzy-index.h',
-  'fuzzy/dzl-fuzzy-mutable-index.h',
-
   'menus/dzl-menu-manager.h',
 
   'panel/dzl-dock-bin-edge.h',
@@ -79,6 +73,14 @@ libdazzle_public_headers = [
   'panel/dzl-tab-strip.h',
   'panel/dzl-tab.h',
 
+  'search/dzl-fuzzy-index-builder.h',
+  'search/dzl-fuzzy-index-cursor.h',
+  'search/dzl-fuzzy-index-match.h',
+  'search/dzl-fuzzy-index.h',
+  'search/dzl-fuzzy-mutable-index.h',
+  'search/dzl-levenshtein.h',
+  'search/dzl-trie.h',
+
   'settings/dzl-settings-sandwich.h',
 
   'shortcuts/dzl-shortcut-accel-dialog.h',
@@ -112,8 +114,6 @@ libdazzle_public_headers = [
   'tree/dzl-tree-types.h',
   'tree/dzl-tree.h',
 
-  'trie/dzl-trie.h',
-
   'util/dzl-cairo.h',
   'util/dzl-counter.h',
   'util/dzl-date-time.h',
@@ -121,7 +121,6 @@ libdazzle_public_headers = [
   'util/dzl-file-manager.h',
   'util/dzl-gdk.h',
   'util/dzl-heap.h',
-  'util/dzl-levenshtein.h',
   'util/dzl-pango.h',
   'util/dzl-rgba.h',
   'util/dzl-ring.h',
@@ -171,12 +170,6 @@ libdazzle_public_sources = [
   'files/dzl-directory-model.c',
   'files/dzl-directory-reaper.c',
 
-  'fuzzy/dzl-fuzzy-index-builder.c',
-  'fuzzy/dzl-fuzzy-index-cursor.c',
-  'fuzzy/dzl-fuzzy-index-match.c',
-  'fuzzy/dzl-fuzzy-index.c',
-  'fuzzy/dzl-fuzzy-mutable-index.c',
-
   'graphing/dzl-cpu-graph.c',
   'graphing/dzl-cpu-model.c',
   'graphing/dzl-graph-column.c',
@@ -203,6 +196,14 @@ libdazzle_public_sources = [
   'panel/dzl-tab-strip.c',
   'panel/dzl-tab.c',
 
+  'search/dzl-fuzzy-index-builder.c',
+  'search/dzl-fuzzy-index-cursor.c',
+  'search/dzl-fuzzy-index-match.c',
+  'search/dzl-fuzzy-index.c',
+  'search/dzl-fuzzy-mutable-index.c',
+  'search/dzl-levenshtein.c',
+  'search/dzl-trie.c',
+
   'settings/dzl-settings-sandwich.c',
 
   'shortcuts/dzl-shortcut-accel-dialog.c',
@@ -234,8 +235,6 @@ libdazzle_public_sources = [
   'tree/dzl-tree.c',
   'tree/dzl-tree-node.c',
 
-  'trie/dzl-trie.c',
-
   'util/dzl-cairo.c',
   'util/dzl-counter.c',
   'util/dzl-date-time.c',
@@ -243,7 +242,6 @@ libdazzle_public_sources = [
   'util/dzl-file-manager.c',
   'util/dzl-gdk.c',
   'util/dzl-heap.c',
-  'util/dzl-levenshtein.c',
   'util/dzl-pango.c',
   'util/dzl-rgba.c',
   'util/dzl-ring.c',
@@ -287,8 +285,6 @@ libdazzle_sources = [
   'animation/dzl-frame-source.c',
   'animation/dzl-frame-source.h',
 
-  'fuzzy/dzl-fuzzy-index-private.h',
-
   'graphing/dzl-column-private.h',
   'graphing/dzl-graph-column-private.h',
 
@@ -296,6 +292,8 @@ libdazzle_sources = [
   'panel/dzl-dock-paned-private.h',
   'panel/dzl-tab-private.h',
 
+  'search/dzl-fuzzy-index-private.h',
+
   'shortcuts/dzl-shortcut-closure-chain.c',
   'shortcuts/dzl-shortcut-closure-chain.h',
   'shortcuts/dzl-shortcut-private.h',
diff --git a/src/fuzzy/dzl-fuzzy-index-builder.c b/src/search/dzl-fuzzy-index-builder.c
similarity index 99%
rename from src/fuzzy/dzl-fuzzy-index-builder.c
rename to src/search/dzl-fuzzy-index-builder.c
index 1a654c2..3ed28e9 100644
--- a/src/fuzzy/dzl-fuzzy-index-builder.c
+++ b/src/search/dzl-fuzzy-index-builder.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "fuzzy/dzl-fuzzy-index-builder.h"
+#include "search/dzl-fuzzy-index-builder.h"
 #include "util/dzl-variant.h"
 
 struct _DzlFuzzyIndexBuilder
diff --git a/src/fuzzy/dzl-fuzzy-index-builder.h b/src/search/dzl-fuzzy-index-builder.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index-builder.h
rename to src/search/dzl-fuzzy-index-builder.h
diff --git a/src/fuzzy/dzl-fuzzy-index-cursor.c b/src/search/dzl-fuzzy-index-cursor.c
similarity index 99%
rename from src/fuzzy/dzl-fuzzy-index-cursor.c
rename to src/search/dzl-fuzzy-index-cursor.c
index 86ca9fe..777d8cc 100644
--- a/src/fuzzy/dzl-fuzzy-index-cursor.c
+++ b/src/search/dzl-fuzzy-index-cursor.c
@@ -20,9 +20,9 @@
 
 #include <string.h>
 
-#include "fuzzy/dzl-fuzzy-index-cursor.h"
-#include "fuzzy/dzl-fuzzy-index-match.h"
-#include "fuzzy/dzl-fuzzy-index-private.h"
+#include "search/dzl-fuzzy-index-cursor.h"
+#include "search/dzl-fuzzy-index-match.h"
+#include "search/dzl-fuzzy-index-private.h"
 
 struct _DzlFuzzyIndexCursor
 {
diff --git a/src/fuzzy/dzl-fuzzy-index-cursor.h b/src/search/dzl-fuzzy-index-cursor.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index-cursor.h
rename to src/search/dzl-fuzzy-index-cursor.h
diff --git a/src/fuzzy/dzl-fuzzy-index-match.c b/src/search/dzl-fuzzy-index-match.c
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index-match.c
rename to src/search/dzl-fuzzy-index-match.c
diff --git a/src/fuzzy/dzl-fuzzy-index-match.h b/src/search/dzl-fuzzy-index-match.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index-match.h
rename to src/search/dzl-fuzzy-index-match.h
diff --git a/src/fuzzy/dzl-fuzzy-index-private.h b/src/search/dzl-fuzzy-index-private.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index-private.h
rename to src/search/dzl-fuzzy-index-private.h
diff --git a/src/fuzzy/dzl-fuzzy-index.c b/src/search/dzl-fuzzy-index.c
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index.c
rename to src/search/dzl-fuzzy-index.c
diff --git a/src/fuzzy/dzl-fuzzy-index.h b/src/search/dzl-fuzzy-index.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-index.h
rename to src/search/dzl-fuzzy-index.h
diff --git a/src/fuzzy/dzl-fuzzy-mutable-index.c b/src/search/dzl-fuzzy-mutable-index.c
similarity index 99%
rename from src/fuzzy/dzl-fuzzy-mutable-index.c
rename to src/search/dzl-fuzzy-mutable-index.c
index a651acd..08432f0 100644
--- a/src/fuzzy/dzl-fuzzy-mutable-index.c
+++ b/src/search/dzl-fuzzy-mutable-index.c
@@ -19,7 +19,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "fuzzy/dzl-fuzzy-mutable-index.h"
+#include "search/dzl-fuzzy-mutable-index.h"
 
 /**
  * SECTION:dzl-fuzzy-mutable-index
diff --git a/src/fuzzy/dzl-fuzzy-mutable-index.h b/src/search/dzl-fuzzy-mutable-index.h
similarity index 100%
rename from src/fuzzy/dzl-fuzzy-mutable-index.h
rename to src/search/dzl-fuzzy-mutable-index.h
diff --git a/src/util/dzl-levenshtein.c b/src/search/dzl-levenshtein.c
similarity index 100%
rename from src/util/dzl-levenshtein.c
rename to src/search/dzl-levenshtein.c
diff --git a/src/util/dzl-levenshtein.h b/src/search/dzl-levenshtein.h
similarity index 100%
rename from src/util/dzl-levenshtein.h
rename to src/search/dzl-levenshtein.h
diff --git a/src/trie/dzl-trie.c b/src/search/dzl-trie.c
similarity index 100%
rename from src/trie/dzl-trie.c
rename to src/search/dzl-trie.c
diff --git a/src/trie/dzl-trie.h b/src/search/dzl-trie.h
similarity index 100%
rename from src/trie/dzl-trie.h
rename to src/search/dzl-trie.h