From 50eac9b49e8171cd0f217fca2ec7e673f191d0c7 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 22 Jun 2015 21:01:46 +0200
Subject: db/update/ExcludeList: move class Pattern to fs/Glob.hxx

---
 src/db/update/ExcludeList.hxx | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

(limited to 'src/db/update/ExcludeList.hxx')

diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx
index ae196a7b2..eae0cac40 100644
--- a/src/db/update/ExcludeList.hxx
+++ b/src/db/update/ExcludeList.hxx
@@ -27,40 +27,17 @@
 
 #include "check.h"
 #include "Compiler.h"
+#include "fs/Glob.hxx"
 
+#ifdef HAVE_CLASS_GLOB
 #include <forward_list>
-
-#ifdef HAVE_GLIB
-#include <glib.h>
 #endif
 
 class Path;
 
 class ExcludeList {
-#ifdef HAVE_GLIB
-	class Pattern {
-		GPatternSpec *pattern;
-
-	public:
-		Pattern(const char *_pattern)
-			:pattern(g_pattern_spec_new(_pattern)) {}
-
-		Pattern(Pattern &&other)
-			:pattern(other.pattern) {
-			other.pattern = nullptr;
-		}
-
-		~Pattern() {
-			g_pattern_spec_free(pattern);
-		}
-
-		gcc_pure
-		bool Check(const char *name_fs) const {
-			return g_pattern_match_string(pattern, name_fs);
-		}
-	};
-
-	std::forward_list<Pattern> patterns;
+#ifdef HAVE_CLASS_GLOB
+	std::forward_list<Glob> patterns;
 #else
 	// TODO: implement
 #endif
@@ -68,7 +45,7 @@ class ExcludeList {
 public:
 	gcc_pure
 	bool IsEmpty() const {
-#ifdef HAVE_GLIB
+#ifdef HAVE_CLASS_GLOB
 		return patterns.empty();
 #else
 		// TODO: implement
-- 
cgit v1.2.3