From 88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:20:07 +0200
Subject: 5.4

---
 lib/db_file.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/db_file.cpp')

diff --git a/lib/db_file.cpp b/lib/db_file.cpp
index 1bc75d82..33c83a0e 100644
--- a/lib/db_file.cpp
+++ b/lib/db_file.cpp
@@ -15,7 +15,7 @@
 #include <zen/file_io.h>
 #include <zen/scope_guard.h>
 #include <zen/guid.h>
-#include <zen/utf8.h>
+#include <zen/utf.h>
 
 #ifdef FFS_WIN
 #include <zen/win.h> //includes "windows.h"
@@ -128,7 +128,7 @@ StreamMapping loadStreams(const Zstring& filename) //throw FileError
     }
     catch (const std::bad_alloc& e)
     {
-        throw FileError(_("Out of memory!") + L" " + utf8CvrtTo<std::wstring>(e.what()));
+        throw FileError(_("Out of memory!") + L" " + utfCvrtTo<std::wstring>(e.what()));
     }
 }
 
@@ -148,7 +148,7 @@ public:
         }
         catch (const std::bad_alloc& e)
         {
-            throw FileError(_("Out of memory!") + L" " + utf8CvrtTo<std::wstring>(e.what()));
+            throw FileError(_("Out of memory!") + L" " + utfCvrtTo<std::wstring>(e.what()));
         }
     }
 
@@ -160,7 +160,7 @@ private:
 
     Zstring readStringUtf8() const
     {
-        return utf8CvrtTo<Zstring>(readString<Zbase<char>>());
+        return utfCvrtTo<Zstring>(readString<Zbase<char>>());
     }
 
     FileId readFileId() const
@@ -280,7 +280,7 @@ private:
         writePOD<bool>(false); //mark last entry
     }
 
-    void writeStringUtf8(const Zstring& str) { writeString(utf8CvrtTo<Zbase<char>>(str)); }
+    void writeStringUtf8(const Zstring& str) { writeString(utfCvrtTo<Zbase<char>>(str)); }
 
     void writeFileId(const FileId& id)
     {
-- 
cgit