Remove XMonad.Operations imports

darcs-hash:20071208000547-a5988-874ebc1bfa76ad6ec2191812240fa2303b2d531c.gz

39 files changed, 3 insertions, 41 deletions

diff --git a/XMonad/Actions/Commands.hs b/XMonad/Actions/Commands.hs
index 9252e9b..6826c3e 100644
--- a/XMonad/Actions/Commands.hs
+++ b/XMonad/Actions/Commands.hs
@@ -26,7 +26,6 @@ module XMonad.Actions.Commands (
                               ) where
 
 import XMonad
-import XMonad.Operations
 import XMonad.StackSet hiding (workspaces)
 import XMonad.Util.Dmenu (dmenu)
 import XMonad.Layouts
diff --git a/XMonad/Actions/ConstrainedResize.hs b/XMonad/Actions/ConstrainedResize.hs
index 2520d6b..7d0dc0b 100644
--- a/XMonad/Actions/ConstrainedResize.hs
+++ b/XMonad/Actions/ConstrainedResize.hs
@@ -22,7 +22,6 @@ module XMonad.Actions.ConstrainedResize (
 ) where
 
 import XMonad
-import XMonad.Operations
 
 -- $usage
 --
diff --git a/XMonad/Actions/CopyWindow.hs b/XMonad/Actions/CopyWindow.hs
index cde5194..00766f3 100644
--- a/XMonad/Actions/CopyWindow.hs
+++ b/XMonad/Actions/CopyWindow.hs
@@ -23,7 +23,6 @@ module XMonad.Actions.CopyWindow (
 import Prelude hiding ( filter )
 import qualified Data.List as L
 import XMonad hiding (modify)
-import XMonad.Operations ( windows, kill )
 import XMonad.StackSet
 
 -- $usage
diff --git a/XMonad/Actions/CycleWS.hs b/XMonad/Actions/CycleWS.hs
index 24aa377..f64f2fb 100644
--- a/XMonad/Actions/CycleWS.hs
+++ b/XMonad/Actions/CycleWS.hs
@@ -31,7 +31,6 @@ import Data.Ord ( comparing )
 import XMonad hiding (workspaces)
 import qualified XMonad (workspaces)
 import XMonad.StackSet hiding (filter)
-import XMonad.Operations
 
 -- $usage
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@ file:
diff --git a/XMonad/Actions/DeManage.hs b/XMonad/Actions/DeManage.hs
index edd89f0..23130e7 100644
--- a/XMonad/Actions/DeManage.hs
+++ b/XMonad/Actions/DeManage.hs
@@ -35,7 +35,6 @@ module XMonad.Actions.DeManage (
 
 import qualified XMonad.StackSet as W
 import XMonad
-import XMonad.Operations
 
 -- $usage
 -- To use demanage, add this import to your @~\/.xmonad\/xmonad.hs@:
diff --git a/XMonad/Actions/DwmPromote.hs b/XMonad/Actions/DwmPromote.hs
index c29f81a..8158c1b 100644
--- a/XMonad/Actions/DwmPromote.hs
+++ b/XMonad/Actions/DwmPromote.hs
@@ -23,7 +23,6 @@ module XMonad.Actions.DwmPromote (
                                 ) where
 
 import XMonad
-import XMonad.Operations (windows)
 import XMonad.StackSet
 
 -- $usage
diff --git a/XMonad/Actions/DynamicWorkspaces.hs b/XMonad/Actions/DynamicWorkspaces.hs
index 24d4847..17506aa 100644
--- a/XMonad/Actions/DynamicWorkspaces.hs
+++ b/XMonad/Actions/DynamicWorkspaces.hs
@@ -25,7 +25,6 @@ module XMonad.Actions.DynamicWorkspaces (
 import Data.List ( sort )
 
 import XMonad hiding (workspaces)
-import XMonad.Operations
 import XMonad.StackSet hiding (filter, modify, delete)
 import XMonad.Prompt.Workspace
 import XMonad.Prompt ( XPConfig, mkXPrompt, XPrompt(..) )
diff --git a/XMonad/Actions/FindEmptyWorkspace.hs b/XMonad/Actions/FindEmptyWorkspace.hs
index 6974ea3..f2c89f4 100644
--- a/XMonad/Actions/FindEmptyWorkspace.hs
+++ b/XMonad/Actions/FindEmptyWorkspace.hs
@@ -24,8 +24,6 @@ import Data.Maybe ( isNothing )
 import XMonad
 import XMonad.StackSet
 
-import XMonad.Operations
-
 -- $usage
 --
 -- To use, import this module into your @~\/.xmonad\/xmonad.hs@:
diff --git a/XMonad/Actions/FlexibleManipulate.hs b/XMonad/Actions/FlexibleManipulate.hs
index 613548e..4ef96df 100644
--- a/XMonad/Actions/FlexibleManipulate.hs
+++ b/XMonad/Actions/FlexibleManipulate.hs
@@ -23,7 +23,6 @@ module XMonad.Actions.FlexibleManipulate (
 ) where
 
 import XMonad
-import XMonad.Operations
 
 -- $usage
 -- First, add this import to your @~\/.xmonad\/xmonad.hs@:
diff --git a/XMonad/Actions/FlexibleResize.hs b/XMonad/Actions/FlexibleResize.hs
index 28f654c..2998592 100644
--- a/XMonad/Actions/FlexibleResize.hs
+++ b/XMonad/Actions/FlexibleResize.hs
@@ -19,7 +19,6 @@ module XMonad.Actions.FlexibleResize (
 ) where
 
 import XMonad
-import XMonad.Operations
 import Foreign.C.Types
 
 -- $usage
diff --git a/XMonad/Actions/FloatKeys.hs b/XMonad/Actions/FloatKeys.hs
index b424a6c..5e38b7e 100644
--- a/XMonad/Actions/FloatKeys.hs
+++ b/XMonad/Actions/FloatKeys.hs
@@ -19,7 +19,6 @@ module XMonad.Actions.FloatKeys (
                 keysResizeWindow,
                 keysAbsResizeWindow) where
 
-import XMonad.Operations
 import XMonad
 
 -- $usage
diff --git a/XMonad/Actions/FocusNth.hs b/XMonad/Actions/FocusNth.hs
index b82736d..8c140cd 100644
--- a/XMonad/Actions/FocusNth.hs
+++ b/XMonad/Actions/FocusNth.hs
@@ -17,7 +17,6 @@ module XMonad.Actions.FocusNth (
                  focusNth) where
 
 import XMonad.StackSet
-import XMonad.Operations
 import XMonad
 
 -- $usage
diff --git a/XMonad/Actions/MouseGestures.hs b/XMonad/Actions/MouseGestures.hs
index ba1908d..38cecf6 100644
--- a/XMonad/Actions/MouseGestures.hs
+++ b/XMonad/Actions/MouseGestures.hs
@@ -20,7 +20,6 @@ module XMonad.Actions.MouseGestures (
 ) where
 
 import XMonad
-import XMonad.Operations
 
 import Data.IORef
 import qualified Data.Map as M
diff --git a/XMonad/Actions/RotSlaves.hs b/XMonad/Actions/RotSlaves.hs
index fab30cb..d565f52 100644
--- a/XMonad/Actions/RotSlaves.hs
+++ b/XMonad/Actions/RotSlaves.hs
@@ -18,7 +18,6 @@ module XMonad.Actions.RotSlaves (
 	) where
 
 import XMonad.StackSet
-import XMonad.Operations
 import XMonad
 
 -- $usage
diff --git a/XMonad/Actions/RotView.hs b/XMonad/Actions/RotView.hs
index ff2b93d..a77177c 100644
--- a/XMonad/Actions/RotView.hs
+++ b/XMonad/Actions/RotView.hs
@@ -24,7 +24,6 @@ import Data.Ord ( comparing )
 
 import XMonad
 import XMonad.StackSet hiding (filter)
-import XMonad.Operations
 
 -- $usage
 --
diff --git a/XMonad/Actions/SinkAll.hs b/XMonad/Actions/SinkAll.hs
index d956b33..7b84570 100644
--- a/XMonad/Actions/SinkAll.hs
+++ b/XMonad/Actions/SinkAll.hs
@@ -14,7 +14,6 @@ module XMonad.Actions.SinkAll (
     -- $usage
     sinkAll) where
 
-import XMonad.Operations
 import XMonad
 import XMonad.StackSet
 
diff --git a/XMonad/Actions/Submap.hs b/XMonad/Actions/Submap.hs
index 4d00957..b9bd219 100644
--- a/XMonad/Actions/Submap.hs
+++ b/XMonad/Actions/Submap.hs
@@ -19,7 +19,6 @@ module XMonad.Actions.Submap (
                             ) where
 
 import XMonad hiding (keys)
-import XMonad.Operations (cleanMask)
 import qualified Data.Map as M
 import Control.Monad.Fix (fix)
 
diff --git a/XMonad/Actions/TagWindows.hs b/XMonad/Actions/TagWindows.hs
index 59ba9c7..42c3613 100644
--- a/XMonad/Actions/TagWindows.hs
+++ b/XMonad/Actions/TagWindows.hs
@@ -29,7 +29,6 @@ import Data.List (nub,concat,sortBy)
 import Control.Monad
 
 import XMonad.StackSet hiding (filter)
-import XMonad.Operations (windows, withFocused)
 
 import XMonad.Prompt
 import XMonad hiding (workspaces)
diff --git a/XMonad/Actions/Warp.hs b/XMonad/Actions/Warp.hs
index 86e4d8d..b864f40 100644
--- a/XMonad/Actions/Warp.hs
+++ b/XMonad/Actions/Warp.hs
@@ -21,7 +21,6 @@ module XMonad.Actions.Warp (
 
 import Data.Ratio
 import Data.List
-import XMonad.Operations
 import XMonad
 import XMonad.StackSet as W
 
diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs
index 411d32e..cd31de8 100644
--- a/XMonad/Actions/WindowBringer.hs
+++ b/XMonad/Actions/WindowBringer.hs
@@ -23,7 +23,6 @@ module XMonad.Actions.WindowBringer (
 import Data.Char (toLower)
 import qualified Data.Map as M
 
-import XMonad.Operations (windows)
 import qualified XMonad.StackSet as W
 import XMonad
 import qualified XMonad as X
diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs
index dc1d1b7..114404c 100644
--- a/XMonad/Config/Arossato.hs
+++ b/XMonad/Config/Arossato.hs
@@ -25,7 +25,6 @@ import qualified Data.Map as M
 import XMonad
 import XMonad.Layouts
 import XMonad.ManageHook
-import XMonad.Operations
 import qualified XMonad.StackSet as W
 
 import XMonad.Actions.CycleWS
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs
index a6a44c0..16d2798 100644
--- a/XMonad/Config/Droundy.hs
+++ b/XMonad/Config/Droundy.hs
@@ -16,7 +16,6 @@ import XMonad.Config ( defaultConfig )
 
 --import XMonad.Core ( windowset )
 import XMonad.Layouts hiding ( (|||) )
-import XMonad.Operations
 import qualified XMonad.StackSet as W
 import qualified Data.Map as M
 import System.Exit
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs
index a657c1e..5e10273 100644
--- a/XMonad/Config/Sjanssen.hs
+++ b/XMonad/Config/Sjanssen.hs
@@ -7,7 +7,6 @@ import XMonad.Actions.CopyWindow
 import XMonad.Layouts hiding (Tall)
 import XMonad.Layout.Tabbed
 import XMonad.Layout.HintedTile
-import XMonad.Operations
 import XMonad.Config (defaultConfig)
 import XMonad.Layout.NoBorders
 import XMonad.Hooks.DynamicLog
diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs
index 0cce565..809f7e1 100644
--- a/XMonad/Hooks/ManageDocks.hs
+++ b/XMonad/Hooks/ManageDocks.hs
@@ -46,7 +46,6 @@ module XMonad.Hooks.ManageDocks (
     ) where
 
 import XMonad
-import XMonad.Operations
 import qualified XMonad.StackSet as W
 import Foreign.C.Types (CLong)
 import Data.Maybe (catMaybes)
diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs
index df38226..633503d 100644
--- a/XMonad/Hooks/UrgencyHook.hs
+++ b/XMonad/Hooks/UrgencyHook.hs
@@ -30,7 +30,6 @@ module XMonad.Hooks.UrgencyHook (
                                  ) where
 
 import XMonad
-import XMonad.Operations (windows)
 import qualified XMonad.StackSet as W
 
 import XMonad.Layout.LayoutModifier hiding (hook)
diff --git a/XMonad/Layout/Combo.hs b/XMonad/Layout/Combo.hs
index bfd2c0b..09e728a 100644
--- a/XMonad/Layout/Combo.hs
+++ b/XMonad/Layout/Combo.hs
@@ -24,7 +24,7 @@ module XMonad.Layout.Combo (
 
 import Data.List ( delete, intersect, (\\) )
 import Data.Maybe ( isJust )
-import XMonad
+import XMonad hiding (focus)
 import XMonad.StackSet ( integrate, Stack(..) )
 import XMonad.Layout.WindowNavigation ( MoveWindowToWindow(..) )
 import qualified XMonad.StackSet as W ( differentiate )
diff --git a/XMonad/Layout/DragPane.hs b/XMonad/Layout/DragPane.hs
index 6082656..dfe47b1 100644
--- a/XMonad/Layout/DragPane.hs
+++ b/XMonad/Layout/DragPane.hs
@@ -32,7 +32,6 @@ import XMonad
 import Data.Unique
 
 import XMonad.Layouts
-import XMonad.Operations
 import qualified XMonad.StackSet as W 
 import XMonad.Util.Invisible
 import XMonad.Util.XUtils
diff --git a/XMonad/Layout/HintedTile.hs b/XMonad/Layout/HintedTile.hs
index e76e651..08e7e1f 100644
--- a/XMonad/Layout/HintedTile.hs
+++ b/XMonad/Layout/HintedTile.hs
@@ -22,7 +22,6 @@ module XMonad.Layout.HintedTile (
 
 import XMonad
 import XMonad.Layouts    (Resize(..), IncMasterN(..))
-import XMonad.Operations (applySizeHints, D)
 import qualified XMonad.StackSet as W
 import Control.Applicative ((<$>))
 import Control.Monad
diff --git a/XMonad/Layout/LayoutHints.hs b/XMonad/Layout/LayoutHints.hs
index 1639873..252e200 100644
--- a/XMonad/Layout/LayoutHints.hs
+++ b/XMonad/Layout/LayoutHints.hs
@@ -19,7 +19,6 @@ module XMonad.Layout.LayoutHints (
     layoutHints,
     LayoutHints) where
 
-import XMonad.Operations ( applySizeHints, D )
 import XMonad hiding ( trace )
 import XMonad.Layout.LayoutModifier
 
diff --git a/XMonad/Layout/LayoutScreens.hs b/XMonad/Layout/LayoutScreens.hs
index 73b29af..bb705fc 100644
--- a/XMonad/Layout/LayoutScreens.hs
+++ b/XMonad/Layout/LayoutScreens.hs
@@ -20,7 +20,6 @@ module XMonad.Layout.LayoutScreens (
 
 import XMonad
 import qualified XMonad.StackSet as W
-import qualified XMonad.Operations as O
 
 -- $usage
 -- This module allows you to pretend that you have more than one screen by
@@ -58,7 +57,7 @@ layoutScreens nscr _ | nscr < 1 = trace $ "Can't layoutScreens with only " ++ sh
 layoutScreens nscr l =
     do rtrect <- asks theRoot >>= getWindowRectangle
        (wss, _) <- doLayout l rtrect W.Stack { W.focus=1, W.up=[],W.down=[1..nscr-1] }
-       O.windows $ \ws@(W.StackSet { W.current = v, W.visible = vs, W.hidden = hs }) ->
+       windows $ \ws@(W.StackSet { W.current = v, W.visible = vs, W.hidden = hs }) ->
            let (x:xs, ys) = splitAt nscr $ map W.workspace (v:vs) ++ hs
                gaps = map (statusGap . W.screenDetail) $ v:vs
                (s:ss, g:gg) = (map snd wss, take nscr $ gaps ++ repeat (head gaps))
diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
index 71d38ac..8f954b6 100644
--- a/XMonad/Layout/Mosaic.hs
+++ b/XMonad/Layout/Mosaic.hs
@@ -41,7 +41,6 @@ import XMonad.Util.Anneal
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
 --
 -- > import XMonad.Layout.Mosaic
--- > import XMonad.Operations
 --
 -- Then edit your @layoutHook@ by adding the Mosaic layout:
 --
diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs
index a3c6ac2..5733130 100644
--- a/XMonad/Layout/Tabbed.hs
+++ b/XMonad/Layout/Tabbed.hs
@@ -26,7 +26,6 @@ import Data.Maybe
 import Data.List
 
 import XMonad
-import XMonad.Operations
 import qualified XMonad.StackSet as W
 
 import XMonad.Util.NamedWindows
diff --git a/XMonad/Layout/TwoPane.hs b/XMonad/Layout/TwoPane.hs
index 8344087..e7ff399 100644
--- a/XMonad/Layout/TwoPane.hs
+++ b/XMonad/Layout/TwoPane.hs
@@ -22,7 +22,7 @@ module XMonad.Layout.TwoPane (
                               TwoPane (..)
                              ) where
 
-import XMonad
+import XMonad hiding (focus)
 import XMonad.Layouts ( Resize(..), splitHorizontallyBy )
 import XMonad.StackSet ( focus, up, down)
 
diff --git a/XMonad/Layout/WindowNavigation.hs b/XMonad/Layout/WindowNavigation.hs
index 78592b7..443e2d5 100644
--- a/XMonad/Layout/WindowNavigation.hs
+++ b/XMonad/Layout/WindowNavigation.hs
@@ -28,7 +28,6 @@ module XMonad.Layout.WindowNavigation (
 import Data.List ( nub, sortBy, (\\) )
 import XMonad hiding (Point)
 import qualified XMonad.StackSet as W
-import XMonad.Operations ( windows )
 import XMonad.Layout.LayoutModifier
 import XMonad.Util.Invisible
 import XMonad.Util.XUtils
diff --git a/XMonad/Layout/WorkspaceDir.hs b/XMonad/Layout/WorkspaceDir.hs
index 8737c8d..d7ff24e 100644
--- a/XMonad/Layout/WorkspaceDir.hs
+++ b/XMonad/Layout/WorkspaceDir.hs
@@ -32,7 +32,6 @@ module XMonad.Layout.WorkspaceDir (
 import System.Directory ( setCurrentDirectory, getCurrentDirectory )
 
 import XMonad
-import XMonad.Operations ( sendMessage )
 import XMonad.Util.Run ( runProcessWithInput )
 import XMonad.Prompt ( XPConfig )
 import XMonad.Prompt.Directory ( directoryPrompt )
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs
index c6315e0..c30d003 100644
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -42,7 +42,6 @@ module XMonad.Prompt (
                              ) where
 
 import XMonad  hiding (config, io)
-import XMonad.Operations (initColor)
 import qualified XMonad.StackSet as W
 import XMonad.Util.Font
 import XMonad.Util.XSelection (getSelection)
diff --git a/XMonad/Prompt/Layout.hs b/XMonad/Prompt/Layout.hs
index 1e7fe61..492cc07 100644
--- a/XMonad/Prompt/Layout.hs
+++ b/XMonad/Prompt/Layout.hs
@@ -20,7 +20,6 @@ module XMonad.Prompt.Layout (
 
 import Data.List ( sort, nub )
 import XMonad hiding ( workspaces )
-import XMonad.Operations ( sendMessage )
 import XMonad.Prompt
 import XMonad.StackSet ( workspaces, layout )
 import XMonad.Layout.LayoutCombinators ( JumpToLayout(..) )
diff --git a/XMonad/Prompt/Window.hs b/XMonad/Prompt/Window.hs
index b286bcd..b4f6656 100644
--- a/XMonad/Prompt/Window.hs
+++ b/XMonad/Prompt/Window.hs
@@ -27,7 +27,6 @@ import Data.List
 
 import qualified XMonad.StackSet as W
 import XMonad
-import XMonad.Operations (windows)
 import XMonad.Prompt
 import XMonad.Actions.WindowBringer
 
diff --git a/XMonad/Util/Font.cpphs b/XMonad/Util/Font.cpphs
index 13321c6..d3ee154 100644
--- a/XMonad/Util/Font.cpphs
+++ b/XMonad/Util/Font.cpphs
@@ -31,7 +31,6 @@ module XMonad.Util.Font  (
 
 import XMonad
 import Foreign
-import XMonad.Operations
 
 #ifdef XFT
 import Data.List