From e4c4405c6204f09e6bdeb39e80f668820814de5a Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 17 Jul 2011 23:05:56 +0000
Subject: [PATCH] refactor: simplify some imports

---
 hledger-chart/Hledger/Chart/Main.hs |  7 +++----
 hledger-lib/Hledger.hs              |  1 +
 hledger-lib/Hledger/Read.hs         |  1 +
 hledger-vty/Hledger/Vty/Main.hs     |  5 ++---
 hledger-web/Handlers.hs             |  5 +----
 hledger/Hledger/Cli.hs              |  5 +----
 hledger/Hledger/Cli/Add.hs          | 10 ++++------
 hledger/Hledger/Cli/Balance.hs      |  8 +++-----
 hledger/Hledger/Cli/Print.hs        |  4 +---
 hledger/Hledger/Cli/Register.hs     |  6 ++----
 10 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/hledger-chart/Hledger/Chart/Main.hs b/hledger-chart/Hledger/Chart/Main.hs
index 7729193d0..38f04ce34 100644
--- a/hledger-chart/Hledger/Chart/Main.hs
+++ b/hledger-chart/Hledger/Chart/Main.hs
@@ -22,13 +22,12 @@ import Safe (readDef)
 import System.Console.GetOpt
 import System.Exit (exitFailure)
 
+import Hledger
+import Prelude hiding (putStr, putStrLn)
+import Hledger.Utils.UTF8 (putStr, putStrLn)
 import Hledger.Cli.Options
 import Hledger.Cli.Utils (withJournalDo)
 import Hledger.Cli.Version
-import Hledger.Data
-import Hledger.Utils
-import Prelude hiding (putStr, putStrLn)
-import Hledger.Utils.UTF8 (putStr, putStrLn)
 
 
 progname_chart = progname_cli ++ "-chart"
diff --git a/hledger-lib/Hledger.hs b/hledger-lib/Hledger.hs
index 757d35324..722d4fa9a 100644
--- a/hledger-lib/Hledger.hs
+++ b/hledger-lib/Hledger.hs
@@ -7,4 +7,5 @@ module Hledger (
 where
 import Hledger.Data
 import Hledger.Read
+import Hledger.Report
 import Hledger.Utils
diff --git a/hledger-lib/Hledger/Read.hs b/hledger-lib/Hledger/Read.hs
index a6d158387..a35c64415 100644
--- a/hledger-lib/Hledger/Read.hs
+++ b/hledger-lib/Hledger/Read.hs
@@ -14,6 +14,7 @@ module Hledger.Read (
        myTimelogPath,
        myJournal,
        myTimelog,
+       someamount,
 )
 where
 import Control.Monad.Error
diff --git a/hledger-vty/Hledger/Vty/Main.hs b/hledger-vty/Hledger/Vty/Main.hs
index a42a61851..b5f9068bf 100644
--- a/hledger-vty/Hledger/Vty/Main.hs
+++ b/hledger-vty/Hledger/Vty/Main.hs
@@ -15,11 +15,10 @@ import Graphics.Vty
 import Safe (headDef)
 import System.Console.GetOpt
 
-import Hledger.Cli
-import Hledger.Data
-import Hledger.Utils
+import Hledger
 import Prelude hiding (putStr, putStrLn)
 import Hledger.Utils.UTF8 (putStr, putStrLn)
+import Hledger.Cli
 
 
 progname_vty = progname_cli ++ "-vty"
diff --git a/hledger-web/Handlers.hs b/hledger-web/Handlers.hs
index c06fa26c6..f9cbba3d6 100644
--- a/hledger-web/Handlers.hs
+++ b/hledger-web/Handlers.hs
@@ -26,11 +26,8 @@ import Text.Printf
 import Yesod.Form
 import Yesod.Json
 
+import Hledger hiding (today)
 import Hledger.Cli
-import Hledger.Data hiding (today)
-import Hledger.Read (journalFromPathAndString)
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
 
 import App
 import Settings
diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs
index 7b2a96b10..2cd8f96e5 100644
--- a/hledger/Hledger/Cli.hs
+++ b/hledger/Hledger/Cli.hs
@@ -23,6 +23,7 @@ import Data.Time.Calendar
 import System.Time (ClockTime(TOD))
 import Test.HUnit
 
+import Hledger
 import Hledger.Cli.Add
 import Hledger.Cli.Balance
 import Hledger.Cli.Convert
@@ -33,10 +34,6 @@ import Hledger.Cli.Stats
 import Hledger.Cli.Options
 import Hledger.Cli.Utils
 import Hledger.Cli.Version
-import Hledger.Data  -- including testing utils in Hledger.Data.Utils
-import Hledger.Read
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
 
 
 -- | hledger and hledger-lib's unit tests aggregated from all modules
diff --git a/hledger/Hledger/Cli/Add.hs b/hledger/Hledger/Cli/Add.hs
index bb53a6028..3f5f63439 100644
--- a/hledger/Hledger/Cli/Add.hs
+++ b/hledger/Hledger/Cli/Add.hs
@@ -28,14 +28,12 @@ import Text.Printf
 import qualified Data.Foldable as Foldable (find)
 import qualified Data.Set as Set
 
-import Hledger.Cli.Options
-import Hledger.Cli.Register (postingRegisterReport, postingRegisterReportAsText)
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
+import Hledger
 import Prelude hiding (putStr, putStrLn, appendFile)
 import Hledger.Utils.UTF8 (putStr, putStrLn, appendFile)
+import Hledger.Cli.Options
+import Hledger.Cli.Register (postingRegisterReportAsText)
+import Hledger.Cli.Utils
 
 
 {- | Information used as the basis for suggested account names, amounts,
diff --git a/hledger/Hledger/Cli/Balance.hs b/hledger/Hledger/Cli/Balance.hs
index 7aeed8ec0..14b97a260 100644
--- a/hledger/Hledger/Cli/Balance.hs
+++ b/hledger/Hledger/Cli/Balance.hs
@@ -105,14 +105,12 @@ import Data.List
 import Data.Maybe
 import Test.HUnit
 
+import Hledger
+import Prelude hiding (putStr)
+import Hledger.Utils.UTF8 (putStr)
 import Hledger.Cli.Format
 import qualified Hledger.Cli.Format as Format
 import Hledger.Cli.Options
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Utils
-import Prelude hiding (putStr)
-import Hledger.Utils.UTF8 (putStr)
 
 
 -- | Print a balance report.
diff --git a/hledger/Hledger/Cli/Print.hs b/hledger/Hledger/Cli/Print.hs
index 9bdff7290..f0779f343 100644
--- a/hledger/Hledger/Cli/Print.hs
+++ b/hledger/Hledger/Cli/Print.hs
@@ -11,9 +11,7 @@ module Hledger.Cli.Print (
 ) where
 import Data.List
 
-import Hledger.Cli.Options
-import Hledger.Cli.Utils
-import Hledger.Data
+import Hledger
 import Prelude hiding (putStr)
 import Hledger.Utils.UTF8 (putStr)
 import Hledger.Cli.Options
diff --git a/hledger/Hledger/Cli/Register.hs b/hledger/Hledger/Cli/Register.hs
index ef95faf4b..0bc93f4c3 100644
--- a/hledger/Hledger/Cli/Register.hs
+++ b/hledger/Hledger/Cli/Register.hs
@@ -17,12 +17,10 @@ import Data.Maybe
 import Test.HUnit
 import Text.Printf
 
-import Hledger.Cli.Options
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Utils
+import Hledger
 import Prelude hiding (putStr)
 import Hledger.Utils.UTF8 (putStr)
+import Hledger.Cli.Options
 
 
 -- | Print a (posting) register report.