suppress some warnings under ghc 6.12.1 and clean up redundant imports to get rid of some others.

Ignore-this: bf3487b27036b02797d9f528a078d006

darcs-hash:20100112172507-1e371-1b466e62ac727b196330c72c8553116282ef5702.gz

13 files changed, 6 insertions, 22 deletions

diff --git a/XMonad/Layout/ComboP.hs b/XMonad/Layout/ComboP.hs
index 9218d86..48a5fc9 100644
--- a/XMonad/Layout/ComboP.hs
+++ b/XMonad/Layout/ComboP.hs
@@ -27,7 +27,7 @@ import Data.List ( delete, intersect, (\\) )
 import Data.Maybe ( isJust )
 import Control.Monad
 import XMonad hiding (focus)
-import XMonad.StackSet ( integrate, Workspace (..), Stack(..) )
+import XMonad.StackSet ( Workspace (..), Stack(..) )
 import XMonad.Layout.WindowNavigation
 import XMonad.Util.WindowProperties
 import qualified XMonad.StackSet as W
diff --git a/XMonad/Layout/DecorationAddons.hs b/XMonad/Layout/DecorationAddons.hs
index 28b8eb9..798a289 100644
--- a/XMonad/Layout/DecorationAddons.hs
+++ b/XMonad/Layout/DecorationAddons.hs
@@ -29,7 +29,6 @@ import XMonad.Layout.Maximize
 import XMonad.Hooks.ManageDocks
 import XMonad.Util.Font
 import XMonad.Util.PositionStore
-import XMonad.Util.XUtils (fi)
 
 import Control.Applicative((<$>))
 import Data.Maybe
diff --git a/XMonad/Layout/DecorationMadness.hs b/XMonad/Layout/DecorationMadness.hs
index d428f89..0ad373b 100644
--- a/XMonad/Layout/DecorationMadness.hs
+++ b/XMonad/Layout/DecorationMadness.hs
@@ -94,7 +94,6 @@ import XMonad.Layout.TabBarDecoration
 
 import XMonad.Layout.Accordion
 import XMonad.Layout.Circle
-import XMonad.Layout.ResizeScreen
 import XMonad.Layout.WindowArranger
 import XMonad.Layout.SimpleFloat
 
diff --git a/XMonad/Layout/Dishes.hs b/XMonad/Layout/Dishes.hs
index 821f0df..89723b5 100644
--- a/XMonad/Layout/Dishes.hs
+++ b/XMonad/Layout/Dishes.hs
@@ -21,7 +21,6 @@ module XMonad.Layout.Dishes (
                               Dishes (..)
                             ) where
 
-import Data.List
 import XMonad
 import XMonad.StackSet (integrate)
 import Control.Monad (ap)
diff --git a/XMonad/Layout/IM.hs b/XMonad/Layout/IM.hs
index a88d8ef..d21baa2 100644
--- a/XMonad/Layout/IM.hs
+++ b/XMonad/Layout/IM.hs
@@ -29,8 +29,6 @@ module XMonad.Layout.IM (
 
 import XMonad
 import qualified XMonad.StackSet as S
-import Data.List
-import XMonad.Layout (splitHorizontallyBy)
 import XMonad.Layout.Grid
 import XMonad.Layout.LayoutModifier
 import XMonad.Util.WindowProperties
diff --git a/XMonad/Layout/IndependentScreens.hs b/XMonad/Layout/IndependentScreens.hs
index 4992a5f..b1ec055 100644
--- a/XMonad/Layout/IndependentScreens.hs
+++ b/XMonad/Layout/IndependentScreens.hs
@@ -26,7 +26,6 @@ module XMonad.Layout.IndependentScreens (
 -- for the screen stuff
 import Control.Arrow hiding ((|||))
 import Control.Monad
-import Control.Monad.Instances
 import Data.List
 import Graphics.X11.Xinerama
 import XMonad
diff --git a/XMonad/Layout/LayoutBuilder.hs b/XMonad/Layout/LayoutBuilder.hs
index 7b21087..434dc0a 100644
--- a/XMonad/Layout/LayoutBuilder.hs
+++ b/XMonad/Layout/LayoutBuilder.hs
@@ -28,11 +28,8 @@ module XMonad.Layout.LayoutBuilder (
 ) where
 
 import XMonad
-import XMonad.Layout
 import qualified XMonad.StackSet as W
-import Graphics.X11.Xlib
 import Data.Maybe (isJust)
-import Control.Monad
 
 -- $usage
 -- You can use this module with the following in your @~\/.xmonad\/xmonad.hs@:
diff --git a/XMonad/Layout/LayoutHints.hs b/XMonad/Layout/LayoutHints.hs
index d3859b1..ee3de7f 100644
--- a/XMonad/Layout/LayoutHints.hs
+++ b/XMonad/Layout/LayoutHints.hs
@@ -32,7 +32,7 @@ import XMonad.Layout.LayoutModifier(ModifiedLayout(..),
 import XMonad.Util.Types(Direction2D(..))
 import Control.Applicative((<$>))
 import Control.Arrow(Arrow((***), first, second))
-import Control.Monad(Monad(return), mapM, join)
+import Control.Monad(join)
 import Data.Function(on)
 import Data.List(sortBy)
 
diff --git a/XMonad/Layout/LimitWindows.hs b/XMonad/Layout/LimitWindows.hs
index 1b66c93..23d7690 100644
--- a/XMonad/Layout/LimitWindows.hs
+++ b/XMonad/Layout/LimitWindows.hs
@@ -29,7 +29,6 @@ module XMonad.Layout.LimitWindows (
 import XMonad.Layout.LayoutModifier
 import XMonad
 import qualified XMonad.StackSet as W
-import XMonad.Layout (IncMasterN (..))
 import Control.Monad((<=<),guard)
 import Control.Applicative((<$>))
 import Data.Maybe(fromJust)
diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
index 4a5ff5a..d67d3ea 100644
--- a/XMonad/Layout/NoBorders.hs
+++ b/XMonad/Layout/NoBorders.hs
@@ -33,7 +33,6 @@ module XMonad.Layout.NoBorders (
 import XMonad
 import XMonad.Layout.LayoutModifier
 import qualified XMonad.StackSet as W
-import Control.Monad
 import Data.List
 import qualified Data.Map as M
 import Data.Function (on)
diff --git a/XMonad/Layout/SubLayouts.hs b/XMonad/Layout/SubLayouts.hs
index 53e7e8f..20aadee 100644
--- a/XMonad/Layout/SubLayouts.hs
+++ b/XMonad/Layout/SubLayouts.hs
@@ -51,13 +51,10 @@ import XMonad.Util.Types(Direction2D(..))
 import XMonad
 import Control.Applicative((<$>),(<*))
 import Control.Arrow(Arrow(second, (&&&)))
-import Control.Monad(Monad(return), Functor(..),
-                     MonadPlus(mplus), (=<<), sequence, foldM, guard, when, join)
-import Data.Function((.), ($), flip, id, on)
-import Data.List((++), foldr, filter, map, concatMap, elem,
-                 notElem, null, nubBy, (\\), find)
-import Data.Maybe(Maybe(..), isNothing, maybe, fromMaybe, listToMaybe,
-                  mapMaybe)
+import Control.Monad(MonadPlus(mplus), foldM, guard, when, join)
+import Data.Function(on)
+import Data.List(nubBy, (\\), find)
+import Data.Maybe(isNothing, fromMaybe, listToMaybe, mapMaybe)
 import Data.Traversable(sequenceA)
 
 import qualified XMonad.Layout.BoringWindows as B
diff --git a/XMonad/Layout/Tabbed.hs b/XMonad/Layout/Tabbed.hs
index fce93d0..9a486b1 100644
--- a/XMonad/Layout/Tabbed.hs
+++ b/XMonad/Layout/Tabbed.hs
@@ -28,7 +28,6 @@ module XMonad.Layout.Tabbed
     , Shrinker(..)
     ) where
 
-import Data.Maybe
 import Data.List
 
 import XMonad
diff --git a/XMonad/Layout/WindowArranger.hs b/XMonad/Layout/WindowArranger.hs
index 43ccb0a..a74e7d3 100644
--- a/XMonad/Layout/WindowArranger.hs
+++ b/XMonad/Layout/WindowArranger.hs
@@ -32,7 +32,6 @@ import XMonad.Util.XUtils (fi)
 
 import Control.Arrow
 import Data.List
-import Data.Maybe
 
 -- $usage
 -- You can use this module with the following in your