6 files changed, 16 insertions, 18 deletions

@@ -4,7 +4,6 @@
 #include "filter.h"
 #include "database.h"
 #include "query.h"
-#include "util.h"
 
 namespace verbly {
 
@@ -1,8 +1,8 @@
 #include "part.h"
 #include <stdexcept>
 #include <sqlite3.h>
+#include <hkutil/string.h>
 #include "database.h"
-#include "util.h"
 
 namespace verbly {
 
@@ -19,7 +19,7 @@ namespace verbly {
 
   const field part::selrestr_field::selrestrJoin = field::joinField(object::part, "part_id", "selrestrs");
   const field part::selrestr_field::selrestrField = field::stringField("selrestrs", "selrestr");
-  
+
   const field part::synrestr_field::synrestrJoin = field::joinField(object::part, "part_id", "synrestrs");
   const field part::synrestr_field::synrestrField = field::stringField("synrestrs", "synrestr");
 
@@ -91,8 +91,8 @@ namespace verbly {
       case part_type::preposition:
       {
         std::string serializedChoices(reinterpret_cast<const char*>(sqlite3_column_blob(row, 5)));
-        new(&preposition_.choices) std::vector<std::string>(split<std::vector<std::string>>(serializedChoices, ","));
-        
+        new(&preposition_.choices) std::vector<std::string>(hatkirby::split<std::vector<std::string>>(serializedChoices, ","));
+
         preposition_.literal = (sqlite3_column_int(row, 6) == 1);
 
         break;
@@ -1,8 +1,8 @@
 #include "pronunciation.h"
 #include <sqlite3.h>
+#include <hkutil/string.h>
 #include "form.h"
 #include "word.h"
-#include "util.h"
 
 namespace verbly {
 
@@ -27,7 +27,7 @@ namespace verbly {
     id_ = sqlite3_column_int(row, 0);
 
     std::string phonemesStr(reinterpret_cast<const char*>(sqlite3_column_text(row, 1)));
-    phonemes_ = split<std::vector<std::string>>(phonemesStr, " ");
+    phonemes_ = hatkirby::split<std::vector<std::string>>(phonemesStr, " ");
 
     syllables_ = sqlite3_column_int(row, 2);
     stress_ = std::string(reinterpret_cast<const char*>(sqlite3_column_text(row, 3)));
@@ -1,8 +1,8 @@
 #include "statement.h"
 #include <sstream>
 #include <utility>
+#include <hkutil/string.h>
 #include "filter.h"
-#include "util.h"
 #include "order.h"
 
 namespace verbly {
@@ -69,7 +69,7 @@ namespace verbly {
         ctes.push_back(cteStream.str());
       }
 
-      queryStream << implode(std::begin(ctes), std::end(ctes), ", ");
+      queryStream << hatkirby::implode(std::begin(ctes), std::end(ctes), ", ");
       queryStream << " ";
     }
 
@@ -80,7 +80,7 @@ namespace verbly {
     }
 
     queryStream << "SELECT ";
-    queryStream << implode(std::begin(realSelect), std::end(realSelect), ", ");
+    queryStream << hatkirby::implode(std::begin(realSelect), std::end(realSelect), ", ");
     queryStream << " FROM ";
     queryStream << tables_.at(topTable_);
     queryStream << " AS ";
@@ -1069,7 +1069,7 @@ namespace verbly {
         {
           return clauses.front();
         } else {
-          std::string result = implode(std::begin(clauses), std::end(clauses), group_.orlogic_ ? " OR " : " AND ");
+          std::string result = hatkirby::implode(std::begin(clauses), std::end(clauses), group_.orlogic_ ? " OR " : " AND ");
 
           if (toplevel)
           {
@@ -1,7 +1,7 @@
 #include "token.h"
 #include <stdexcept>
 #include <algorithm>
-#include "util.h"
+#include <hkutil/string.h>
 
 namespace verbly {
 
@@ -359,7 +359,7 @@ namespace verbly {
         } else if (capitalization == casing::title_case)
         {
           std::list<std::string> swords =
-            split<std::list<std::string>>(result, " ");
+            hatkirby::split<std::list<std::string>>(result, " ");
 
           for (std::string& sword : swords)
           {
@@ -369,7 +369,7 @@ namespace verbly {
             }
           }
 
-          result = implode(std::begin(swords), std::end(swords), " ");
+          result = hatkirby::implode(std::begin(swords), std::end(swords), " ");
         } else if (capitalization == casing::all_caps)
         {
           for (char& ch : result)
@@ -410,7 +410,7 @@ namespace verbly {
         } else if (capitalization == casing::title_case)
         {
           std::list<std::string> swords =
-            split<std::list<std::string>>(result, " ");
+            hatkirby::split<std::list<std::string>>(result, " ");
 
           for (std::string& sword : swords)
           {
@@ -420,7 +420,7 @@ namespace verbly {
             }
           }
 
-          result = implode(std::begin(swords), std::end(swords), " ");
+          result = hatkirby::implode(std::begin(swords), std::end(swords), " ");
         } else if (capitalization == casing::all_caps)
         {
           for (char& ch : result)
@@ -458,7 +458,7 @@ namespace verbly {
           first = false;
         }
 
-        return implode(std::begin(compiled), std::end(compiled), separator);
+        return hatkirby::implode(std::begin(compiled), std::end(compiled), separator);
       }
 
       case type::transform:
@@ -1,7 +1,6 @@
 #ifndef VERBLY_H_5B39CE50
 #define VERBLY_H_5B39CE50
 
-#include "util.h"
 #include "database.h"
 #include "filter.h"
 #include "field.h"