From 5890e4a0b1a14fa16d0bde8c36ef2b83a6d69b7c Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Tue, 26 Aug 2014 08:59:24 +0800
Subject: [PATCH] use conventional util name and update koreader-base

---
 frontend/apps/filemanager/filemanagersearch.lua      |  8 ++++----
 frontend/apps/filemanager/filemanagersetdefaults.lua | 12 ++++++------
 frontend/ui/widget/multiinputdialog.lua              |  4 ++--
 koreader-base                                        |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagersearch.lua b/frontend/apps/filemanager/filemanagersearch.lua
index 6bef6673b..bdb39c172 100644
--- a/frontend/apps/filemanager/filemanagersearch.lua
+++ b/frontend/apps/filemanager/filemanagersearch.lua
@@ -9,7 +9,7 @@ local Screen = require("ui/screen")
 local _ = require("gettext")
 local Font = require("ui/font")
 local UIToolbox = require("ui/uitoolbox")
-local Util = require("ffi/util")
+local util = require("ffi/util")
 
 local calibre = "metadata.calibre"
 local koreaderfile = "temp/metadata.koreader"
@@ -240,7 +240,7 @@ function Search:find(option)
             s=string.sub(s,n,string.len(s)-j)
         end
 
-        s=string.gsub(s,"\\u([a-f0-9][a-f0-9][a-f0-9][a-f0-9])",function(w) return Util.unichar(tonumber(w, 16)) end)
+        s=string.gsub(s,"\\u([a-f0-9][a-f0-9][a-f0-9][a-f0-9])",function(w) return util.unichar(tonumber(w, 16)) end)
 
         return s
     end
@@ -568,7 +568,7 @@ function Search:browse(option,run,chosen)
     if run == 1 then
         self.results = {}
         if option == "series" then
-            for v,n in Util.orderedPairs(self.browse_series) do
+            for v,n in util.orderedPairs(self.browse_series) do
                 dummy = v
                 if not SEARCH_CASESENSITIVE then dummy = string.upper(dummy) end
                 if string.find(dummy,upsearch,nil,true) then
@@ -581,7 +581,7 @@ function Search:browse(option,run,chosen)
                 end
            end
         else
-            for v,n in Util.orderedPairs(self.browse_tags) do
+            for v,n in util.orderedPairs(self.browse_tags) do
                 dummy = v
                 if not SEARCH_CASESENSITIVE then dummy = string.upper(dummy) end
                 if string.find(dummy,upsearch,nil,true) then
diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua
index 1d7bc2d74..bfae0e2d4 100644
--- a/frontend/apps/filemanager/filemanagersetdefaults.lua
+++ b/frontend/apps/filemanager/filemanagersetdefaults.lua
@@ -9,7 +9,7 @@ local CenterContainer = require("ui/widget/container/centercontainer")
 local Screen = require("ui/screen")
 local Menu = require("ui/widget/menu")
 local Font = require("ui/font")
-local Util = require("ffi/util")
+local util = require("ffi/util")
 
 local SetDefaults = InputContainer:new{
     defaults_name = {},
@@ -62,7 +62,7 @@ function SetDefaults:init()
 
     if not self.already_read then
         local i = 0
-        for n,v in Util.orderedPairs(_G) do
+        for n,v in util.orderedPairs(_G) do
             if (not string.find(tostring(v), "<")) and (not string.find(tostring(v), ": ")) and string.sub(n,1,1) ~= "_" and string.upper(n) == n and n ~= "LIBRARY_PATH" then
                 i = i + 1
                 self.defaults_name[i] = n
@@ -111,7 +111,7 @@ function SetDefaults:init()
                                     callback = function()
                                         self:close()
                                         UIManager:show(menu_container)
-                                    end 
+                                    end
                                 },
                                 {
                                     text = "true",
@@ -177,7 +177,7 @@ function SetDefaults:init()
                                             _G[self.defaults_name[i]] = MultiInputDialog:getCredential()
 
                                             self.defaults_value[i] = "{"
-                                            for k,v in Util.orderedPairs(_G[self.defaults_name[i]]) do
+                                            for k,v in util.orderedPairs(_G[self.defaults_name[i]]) do
                                                 if tonumber(k) then
                                                     self.defaults_value[i] = self.defaults_value[i] .. v .. ", "
                                                 else
@@ -188,7 +188,7 @@ function SetDefaults:init()
 
                                             settings_changed = true
                                             self.changed[i] = true
-                                            
+
                                             self.results[i].text = self:build_setting(i)
 
                                             self:close()
@@ -252,7 +252,7 @@ function SetDefaults:init()
                         UIManager:show(self.set_dialog)
                     end
                 })
-            end            
+            end
         end
     end
     self.defaults_menu:swithItemTable("Defaults", self.results)
diff --git a/frontend/ui/widget/multiinputdialog.lua b/frontend/ui/widget/multiinputdialog.lua
index ca78539c1..d956f4500 100644
--- a/frontend/ui/widget/multiinputdialog.lua
+++ b/frontend/ui/widget/multiinputdialog.lua
@@ -9,7 +9,7 @@ local Geom = require("ui/geometry")
 local Screen = require("ui/screen")
 local DEBUG = require("dbg")
 local _ = require("gettext")
-local Util = require("ffi/util")
+local util = require("ffi/util")
 
 local InfoMessage = require("ui/widget/infomessage")
 local input_field
@@ -32,7 +32,7 @@ function MultiInputDialog:init()
 
     input_field = {}
     local k = 0
-    for i,j in Util.orderedPairs(self.field) do
+    for i,j in util.orderedPairs(self.field) do
         k = k + 1
         input_field[k] = InputText:new{
             text = tostring(i) .. " = " .. tostring(j),
diff --git a/koreader-base b/koreader-base
index 77654ebd3..446aa9314 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 77654ebd378925518ff61186848d0d6d2ed9a501
+Subproject commit 446aa931453c0c18ecdc7e94cf827730de6bd31d