From fb927daed709343c2823857230ac91bb9b37fe76 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Sat, 8 Dec 2007 00:38:27 +0100 Subject: Remove redundant imports darcs-hash:20071207233827-a5988-9e41d51120499637f14d115f2cf1428edaf326bb.gz --- XMonad/Hooks/DynamicLog.hs | 1 - XMonad/Hooks/EwmhDesktops.hs | 2 +- XMonad/Hooks/ManageDocks.hs | 1 - XMonad/Hooks/SetWMName.hs | 1 - XMonad/Hooks/UrgencyHook.hs | 2 -- XMonad/Hooks/XPropManage.hs | 7 ++----- 6 files changed, 3 insertions(+), 11 deletions(-) (limited to 'XMonad/Hooks') diff --git a/XMonad/Hooks/DynamicLog.hs b/XMonad/Hooks/DynamicLog.hs index c93b0e1..4f9f3b3 100644 --- a/XMonad/Hooks/DynamicLog.hs +++ b/XMonad/Hooks/DynamicLog.hs @@ -42,7 +42,6 @@ module XMonad.Hooks.DynamicLog ( -- import XMonad import XMonad.Layouts -import Control.Monad.Reader import Data.Maybe ( isJust ) import Data.List import Data.Ord ( comparing ) diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index 80f7ae2..899ea3d 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -21,8 +21,8 @@ import Data.List (elemIndex, sortBy) import Data.Ord (comparing) import Data.Maybe (fromMaybe) -import Control.Monad.Reader import XMonad +import Control.Monad import qualified XMonad.StackSet as W import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index e5774a9..6380f94 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -45,7 +45,6 @@ module XMonad.Hooks.ManageDocks ( ,avoidStruts, ToggleStruts(ToggleStruts) ) where -import Control.Monad.Reader import XMonad import XMonad.Operations import qualified XMonad.StackSet as W diff --git a/XMonad/Hooks/SetWMName.hs b/XMonad/Hooks/SetWMName.hs index 5a8f435..0da0bed 100644 --- a/XMonad/Hooks/SetWMName.hs +++ b/XMonad/Hooks/SetWMName.hs @@ -36,7 +36,6 @@ module XMonad.Hooks.SetWMName ( setWMName) where import Control.Monad (join) -import Control.Monad.Reader (asks) import Data.Char (ord) import Data.List (nub) import Data.Maybe (fromJust, listToMaybe, maybeToList) diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs index 61c30b3..7c670ce 100644 --- a/XMonad/Hooks/UrgencyHook.hs +++ b/XMonad/Hooks/UrgencyHook.hs @@ -38,8 +38,6 @@ import XMonad.Util.Dzen (dzenWithArgs, seconds) import XMonad.Util.NamedWindows (getName) import Control.Monad (when) -import Control.Monad.Reader (asks) -import Control.Monad.State (gets) import Data.Bits (testBit, clearBit) import Data.IORef import Data.List ((\\), delete) diff --git a/XMonad/Hooks/XPropManage.hs b/XMonad/Hooks/XPropManage.hs index 1e4b135..3f6c90f 100644 --- a/XMonad/Hooks/XPropManage.hs +++ b/XMonad/Hooks/XPropManage.hs @@ -20,11 +20,8 @@ module XMonad.Hooks.XPropManage ( import Data.Char (chr) import Data.List (concat) import Data.Monoid (mconcat, Endo(..)) - -import Control.Monad.Reader -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras +import Control.Monad.Trans (lift) import XMonad import XMonad.ManageHook ((-->)) @@ -70,7 +67,7 @@ pmP f _ = return f xPropManageHook :: [XPropMatch] -> ManageHook xPropManageHook tms = mconcat $ map propToHook tms where - propToHook (ms, f) = liftM and (mapM mkQuery ms) --> mkHook f + propToHook (ms, f) = fmap and (mapM mkQuery ms) --> mkHook f mkQuery (a, tf) = fmap tf (getQuery a) mkHook func = ask >>= Query . lift . fmap Endo . func -- cgit v1.2.3