Remove redundant imports

darcs-hash:20071207233827-a5988-9e41d51120499637f14d115f2cf1428edaf326bb.gz

6 files changed, 4 insertions, 15 deletions

diff --git a/XMonad/Util/CustomKeys.hs b/XMonad/Util/CustomKeys.hs
index 389a8d6..9d58f39 100644
--- a/XMonad/Util/CustomKeys.hs
+++ b/XMonad/Util/CustomKeys.hs
@@ -19,9 +19,9 @@ module XMonad.Util.CustomKeys (
                               ) where
 
 import XMonad
+import Control.Monad.Reader
 import Graphics.X11.Xlib
 
-import Control.Monad.Reader
 import qualified Data.Map as M
 
 -- $usage
diff --git a/XMonad/Util/Dmenu.hs b/XMonad/Util/Dmenu.hs
index 8eeb0d9..ea91f17 100644
--- a/XMonad/Util/Dmenu.hs
+++ b/XMonad/Util/Dmenu.hs
@@ -23,7 +23,6 @@ module XMonad.Util.Dmenu (
 import XMonad
 import qualified XMonad.StackSet as W
 import qualified Data.Map as M
-import Control.Monad.State
 import XMonad.Util.Run
 
 -- $usage
@@ -37,7 +36,7 @@ import XMonad.Util.Run
 -- <http://www.jcreigh.com/dmenu/dmenu-3.2-xinerama.patch>
 dmenuXinerama :: [String] -> X String
 dmenuXinerama opts = do
-    curscreen <- (fromIntegral . W.screen . W.current) `liftM` gets windowset :: X Int
+    curscreen <- (fromIntegral . W.screen . W.current) `fmap` gets windowset :: X Int
     io $ runProcessWithInput "dmenu" ["-xs", show (curscreen+1)] (unlines opts)
 
 dmenu :: [String] -> X String
diff --git a/XMonad/Util/Font.cpphs b/XMonad/Util/Font.cpphs
index 20ed576..13321c6 100644
--- a/XMonad/Util/Font.cpphs
+++ b/XMonad/Util/Font.cpphs
@@ -29,8 +29,6 @@ module XMonad.Util.Font  (
                             ) where
 
 
-import Graphics.X11.Xlib
-import Control.Monad.Reader
 import XMonad
 import Foreign
 import XMonad.Operations
diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs
index 967095c..c38e25b 100644
--- a/XMonad/Util/NamedWindows.hs
+++ b/XMonad/Util/NamedWindows.hs
@@ -22,13 +22,8 @@ module XMonad.Util.NamedWindows (
                                    unName
                                   ) where
 
-import Control.Monad.Reader ( asks )
-import Control.Monad.State ( gets )
-
 import qualified XMonad.StackSet as W ( peek )
 
-import Graphics.X11.Xlib
-import Graphics.X11.Xlib.Extras
 
 import XMonad
 
diff --git a/XMonad/Util/Run.hs b/XMonad/Util/Run.hs
index 95e0415..dead778 100644
--- a/XMonad/Util/Run.hs
+++ b/XMonad/Util/Run.hs
@@ -28,7 +28,6 @@ module XMonad.Util.Run (
                           spawnPipe
                          ) where
 
-import Control.Monad.Reader
 import System.Posix.IO
 import System.Posix.Process (createSession, forkProcess, executeFile,
                              getProcessStatus)
@@ -38,6 +37,7 @@ import System.Exit (ExitCode(ExitSuccess), exitWith)
 import System.IO
 import System.Process (runInteractiveProcess, waitForProcess)
 import XMonad
+import Control.Monad
 
 -- $usage
 -- For an example usage of 'runInTerm' see "XMonad.Prompt.Ssh"
diff --git a/XMonad/Util/XUtils.hs b/XMonad/Util/XUtils.hs
index 911826a..c8e403d 100644
--- a/XMonad/Util/XUtils.hs
+++ b/XMonad/Util/XUtils.hs
@@ -26,13 +26,10 @@ module XMonad.Util.XUtils  (
                             ) where
 
 
-import Graphics.X11.Xlib
-import Graphics.X11.Xlib.Extras
-
-import Control.Monad.Reader
 import Data.Maybe
 import XMonad
 import XMonad.Util.Font
+import Control.Monad
 
 -- $usage
 -- See "XMonad.Layout.Tabbed" or "XMonad.Layout.DragPane" for usage