From 6c4dc5b1db441e5be88abdd636d085da90445fe0 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Fri, 30 Jan 2015 09:35:24 -0500
Subject: [PATCH] filter: Remove lowercase() function

And switch everything over to using the new implementation.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 core/filter.cpp       |  7 -------
 core/tags/generic.cpp |  6 +++---
 tests/core/filter.cpp | 20 --------------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/core/filter.cpp b/core/filter.cpp
index 37689362..a10c9d1c 100644
--- a/core/filter.cpp
+++ b/core/filter.cpp
@@ -132,10 +132,3 @@ void filter :: search(const std::string &text, std::set<unsigned int> &res)
 	for (it++; it != parsed.end(); it++)
 		find_intersection(*it, res);
 }
-
-std::string filter :: lowercase(const std::string &text)
-{
-	std::list<std::string> parsed;
-	parse_text(text, parsed);
-	return reassemble_text(parsed);
-}
diff --git a/core/tags/generic.cpp b/core/tags/generic.cpp
index 7b639921..bb2a045b 100644
--- a/core/tags/generic.cpp
+++ b/core/tags/generic.cpp
@@ -2,13 +2,13 @@
  * @file
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/filter.h>
+#include <core/string.h>
 #include <core/tags/generic.h>
 
 GenericTag :: GenericTag() {}
 
 GenericTag :: GenericTag(const std::string &name)
-	    : _name(name), _lower(filter :: lowercase(name))
+	    : _name(name), _lower(string :: lowercase(name))
 {
 }
 
@@ -25,7 +25,7 @@ const std::string GenericTag :: primary_key() const
 void GenericTag :: read(File &file)
 {
 	_name  = file.getline();
-	_lower = filter :: lowercase(_name);
+	_lower = string :: lowercase(_name);
 }
 
 void GenericTag :: write(File &file)
diff --git a/tests/core/filter.cpp b/tests/core/filter.cpp
index 107c78ab..5852d19a 100644
--- a/tests/core/filter.cpp
+++ b/tests/core/filter.cpp
@@ -6,25 +6,6 @@
 #include <core/filter.h>
 #include <tests/test.h>
 
-static void do_test_lowercase(const std::string &text, const std::string &lc)
-{
-	test_equal(filter :: lowercase(text), lc);
-}
-
-static void test_lowercase()
-{
-	do_test_lowercase("  	  ", "");
-	do_test_lowercase("  	  test	\
-				  text", "test text");
-	do_test_lowercase("test text", "test text");
-	do_test_lowercase("Test Text", "test text");
-	do_test_lowercase("Test? Text!", "test text");
-	do_test_lowercase("Test?123 Text!456", "test123 text456");
-	do_test_lowercase("Test?123 Text!456", "test123 text456");
-	do_test_lowercase("Test(text);123-456", "test text 123 456");
-	do_test_lowercase("Test((text));;123--456", "test text 123 456");
-}
-
 static void do_test_add(const std::string &text, const std::string &lc)
 {
 	static unsigned int i = 0;
@@ -106,7 +87,6 @@ static void test_search()
 
 int main(int argc, char **argv)
 {
-	test :: run("Filter Lowercase Test", test_lowercase);
 	test :: run("Filter Add Test", test_add);
 	test :: run("Filter Search Test", test_search);
 	return 0;