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/Actions/Commands.hs | 1 - XMonad/Actions/CopyWindow.hs | 4 +--- XMonad/Actions/CycleWS.hs | 2 -- XMonad/Actions/DeManage.hs | 1 - XMonad/Actions/DynamicWorkspaces.hs | 4 +--- XMonad/Actions/FindEmptyWorkspace.hs | 1 - XMonad/Actions/MouseGestures.hs | 2 +- XMonad/Actions/RotView.hs | 1 - XMonad/Actions/Submap.hs | 3 +-- XMonad/Actions/TagWindows.hs | 7 ++----- XMonad/Actions/Warp.hs | 3 --- XMonad/Actions/WindowBringer.hs | 4 +--- 12 files changed, 7 insertions(+), 26 deletions(-) (limited to 'XMonad/Actions') diff --git a/XMonad/Actions/Commands.hs b/XMonad/Actions/Commands.hs index 7daccfe..9252e9b 100644 --- a/XMonad/Actions/Commands.hs +++ b/XMonad/Actions/Commands.hs @@ -31,7 +31,6 @@ import XMonad.StackSet hiding (workspaces) import XMonad.Util.Dmenu (dmenu) import XMonad.Layouts -import Control.Monad.Reader import qualified Data.Map as M import System.Exit import Data.Maybe diff --git a/XMonad/Actions/CopyWindow.hs b/XMonad/Actions/CopyWindow.hs index ac530da..cde5194 100644 --- a/XMonad/Actions/CopyWindow.hs +++ b/XMonad/Actions/CopyWindow.hs @@ -21,10 +21,8 @@ module XMonad.Actions.CopyWindow ( ) where import Prelude hiding ( filter ) -import Graphics.X11.Xlib ( Window ) -import Control.Monad.State ( gets ) import qualified Data.List as L -import XMonad +import XMonad hiding (modify) import XMonad.Operations ( windows, kill ) import XMonad.StackSet diff --git a/XMonad/Actions/CycleWS.hs b/XMonad/Actions/CycleWS.hs index bff11aa..24aa377 100644 --- a/XMonad/Actions/CycleWS.hs +++ b/XMonad/Actions/CycleWS.hs @@ -24,8 +24,6 @@ module XMonad.Actions.CycleWS ( toggleWS, ) where -import Control.Monad.Reader ( asks ) -import Control.Monad.State ( gets ) import Data.List ( sortBy, findIndex ) import Data.Maybe ( fromMaybe ) import Data.Ord ( comparing ) diff --git a/XMonad/Actions/DeManage.hs b/XMonad/Actions/DeManage.hs index 2171ec8..7866cd2 100644 --- a/XMonad/Actions/DeManage.hs +++ b/XMonad/Actions/DeManage.hs @@ -36,7 +36,6 @@ module XMonad.Actions.DeManage ( import qualified XMonad.StackSet as W import XMonad import XMonad.Operations -import Control.Monad.State import Graphics.X11 (Window) -- $usage diff --git a/XMonad/Actions/DynamicWorkspaces.hs b/XMonad/Actions/DynamicWorkspaces.hs index 9292f57..24d4847 100644 --- a/XMonad/Actions/DynamicWorkspaces.hs +++ b/XMonad/Actions/DynamicWorkspaces.hs @@ -22,11 +22,9 @@ module XMonad.Actions.DynamicWorkspaces ( toNthWorkspace, withNthWorkspace ) where -import Control.Monad.Reader ( asks ) -import Control.Monad.State ( gets ) import Data.List ( sort ) -import XMonad ( X, XState(..), WindowSet, config, layoutHook ) +import XMonad hiding (workspaces) import XMonad.Operations import XMonad.StackSet hiding (filter, modify, delete) import XMonad.Prompt.Workspace diff --git a/XMonad/Actions/FindEmptyWorkspace.hs b/XMonad/Actions/FindEmptyWorkspace.hs index 90459ba..6974ea3 100644 --- a/XMonad/Actions/FindEmptyWorkspace.hs +++ b/XMonad/Actions/FindEmptyWorkspace.hs @@ -18,7 +18,6 @@ module XMonad.Actions.FindEmptyWorkspace ( viewEmptyWorkspace, tagToEmptyWorkspace ) where -import Control.Monad.State import Data.List import Data.Maybe ( isNothing ) diff --git a/XMonad/Actions/MouseGestures.hs b/XMonad/Actions/MouseGestures.hs index f57f6a7..1edec0d 100644 --- a/XMonad/Actions/MouseGestures.hs +++ b/XMonad/Actions/MouseGestures.hs @@ -24,10 +24,10 @@ import XMonad.Operations import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras -import Control.Monad.Reader import Data.IORef import qualified Data.Map as M import Data.Map (Map) +import Control.Monad import System.IO diff --git a/XMonad/Actions/RotView.hs b/XMonad/Actions/RotView.hs index 794d717..ff2b93d 100644 --- a/XMonad/Actions/RotView.hs +++ b/XMonad/Actions/RotView.hs @@ -18,7 +18,6 @@ module XMonad.Actions.RotView ( rotView ) where -import Control.Monad.State ( gets ) import Data.List ( sortBy, find ) import Data.Maybe ( isJust ) import Data.Ord ( comparing ) diff --git a/XMonad/Actions/Submap.hs b/XMonad/Actions/Submap.hs index eb3c9c1..b4b1ec2 100644 --- a/XMonad/Actions/Submap.hs +++ b/XMonad/Actions/Submap.hs @@ -18,13 +18,12 @@ module XMonad.Actions.Submap ( submap ) where -import Control.Monad.Reader - import XMonad hiding (keys) import XMonad.Operations (cleanMask) import Graphics.X11.Xlib import Graphics.X11.Xlib.Extras import qualified Data.Map as M +import Control.Monad.Fix (fix) {- $usage diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs index 030338c..59ba9c7 100644 --- a/XMonad/Actions/TagWindows.hs +++ b/XMonad/Actions/TagWindows.hs @@ -26,14 +26,11 @@ module XMonad.Actions.TagWindows ( ) where import Data.List (nub,concat,sortBy) +import Control.Monad -import Control.Monad.State import XMonad.StackSet hiding (filter) import XMonad.Operations (windows, withFocused) -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras - import XMonad.Prompt import XMonad hiding (workspaces) @@ -88,7 +85,7 @@ getTags w = withDisplay $ \d -> -- | check a window for the given tag hasTag :: String -> Window -> X Bool -hasTag s w = (s `elem`) `liftM` getTags w +hasTag s w = (s `elem`) `fmap` getTags w -- | add a tag to the existing ones addTag :: String -> Window -> X () diff --git a/XMonad/Actions/Warp.hs b/XMonad/Actions/Warp.hs index 4f3bd5c..86e4d8d 100644 --- a/XMonad/Actions/Warp.hs +++ b/XMonad/Actions/Warp.hs @@ -21,9 +21,6 @@ module XMonad.Actions.Warp ( import Data.Ratio import Data.List -import Control.Monad.RWS -import Graphics.X11.Xlib -import Graphics.X11.Xlib.Extras import XMonad.Operations import XMonad import XMonad.StackSet as W diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs index 7ce8391..411d32e 100644 --- a/XMonad/Actions/WindowBringer.hs +++ b/XMonad/Actions/WindowBringer.hs @@ -20,14 +20,12 @@ module XMonad.Actions.WindowBringer ( gotoMenu, bringMenu, windowMapWith ) where -import Control.Monad.State (gets) import Data.Char (toLower) import qualified Data.Map as M -import Graphics.X11.Xlib (Window()) import XMonad.Operations (windows) import qualified XMonad.StackSet as W -import XMonad (X) +import XMonad import qualified XMonad as X import XMonad.Util.Dmenu (dmenuMap) import XMonad.Util.NamedWindows (getName) -- cgit v1.2.3