From 7f324e08476792e522987867c0f8098eeb0e50e0 Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Fri, 9 Nov 2012 02:35:06 +0100
Subject: Use Control.Exception.catch explitly to avoid warnings

Ignore-this: 2cebdfe604c581f2b4a644e9aed726c7

The base that comes with ghc-7.6.1 no longer includes Prelude.catch;
so these modules were changed so that there is no warning for

import Prelude hiding (catch)

At the same time these changes should be compatible with older GHCs,
since the catch being has never been the one in the Prelude.

darcs-hash:20121109013506-1499c-c593662b0780eb49287efcbfe0e9796f7dd57c73.gz
---
 XMonad/Util/Font.hs         | 7 +++----
 XMonad/Util/Loggers.hs      | 5 ++---
 XMonad/Util/NamedWindows.hs | 7 +++----
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'XMonad/Util')

diff --git a/XMonad/Util/Font.hs b/XMonad/Util/Font.hs
index 7f66c75..031a706 100644
--- a/XMonad/Util/Font.hs
+++ b/XMonad/Util/Font.hs
@@ -32,11 +32,10 @@ module XMonad.Util.Font
     , fi
     ) where
 
-import Prelude hiding (catch)
 import XMonad
 import Foreign
 import Control.Applicative
-import Control.Exception
+import Control.Exception as E
 import Data.Maybe
 
 #ifdef XFT
@@ -70,7 +69,7 @@ econst = const
 initCoreFont :: String -> X FontStruct
 initCoreFont s = do
   d <- asks display
-  io $ catch (getIt d) (fallBack d)
+  io $ E.catch (getIt d) (fallBack d)
       where getIt    d = loadQueryFont d s
             fallBack d = econst $ loadQueryFont d "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
 
@@ -82,7 +81,7 @@ releaseCoreFont fs = do
 initUtf8Font :: String -> X FontSet
 initUtf8Font s = do
   d <- asks display
-  (_,_,fs) <- io $ catch (getIt d) (fallBack d)
+  (_,_,fs) <- io $ E.catch (getIt d) (fallBack d)
   return fs
       where getIt    d = createFontSet d s
             fallBack d = econst $ createFontSet d "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
diff --git a/XMonad/Util/Loggers.hs b/XMonad/Util/Loggers.hs
index 19e6eae..36f91d9 100644
--- a/XMonad/Util/Loggers.hs
+++ b/XMonad/Util/Loggers.hs
@@ -52,9 +52,8 @@ import XMonad.Hooks.DynamicLog
 import XMonad.Util.Font (Align (..))
 import XMonad.Util.NamedWindows (getName)
 
-import Prelude hiding (catch)
 import Control.Applicative ((<$>))
-import Control.Exception
+import Control.Exception as E
 import Data.List (isPrefixOf, isSuffixOf)
 import Data.Maybe (fromMaybe)
 import Data.Traversable (traverse)
@@ -143,7 +142,7 @@ loadAvg = logCmd "/usr/bin/uptime | sed 's/.*: //; s/,//g'"
 -- | Create a 'Logger' from an arbitrary shell command.
 logCmd :: String -> Logger
 logCmd c = io $ do (_, out, _, _) <- runInteractiveCommand c
-                   fmap Just (hGetLine out) `catch` econst Nothing
+                   fmap Just (hGetLine out) `E.catch` econst Nothing
                    -- no need to waitForProcess, we ignore SIGCHLD
 
 -- | Get a count of filtered files in a directory.
diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs
index 653eb54..61176d5 100644
--- a/XMonad/Util/NamedWindows.hs
+++ b/XMonad/Util/NamedWindows.hs
@@ -22,9 +22,8 @@ module XMonad.Util.NamedWindows (
                                    unName
                                   ) where
 
-import Prelude hiding ( catch )
 import Control.Applicative ( (<$>) )
-import Control.Exception.Extensible ( bracket, catch, SomeException(..) )
+import Control.Exception.Extensible as E
 import Data.Maybe ( fromMaybe, listToMaybe )
 
 import qualified XMonad.StackSet as W ( peek )
@@ -50,11 +49,11 @@ getName w = withDisplay $ \d -> do
     let getIt = bracket getProp (xFree . tp_value) (fmap (`NW` w) . copy)
 
         getProp = (internAtom d "_NET_WM_NAME" False >>= getTextProperty d w)
-                      `catch` \(SomeException _) -> getTextProperty d w wM_NAME
+                      `E.catch` \(SomeException _) -> getTextProperty d w wM_NAME
 
         copy prop = fromMaybe "" . listToMaybe <$> wcTextPropertyToTextList d prop
 
-    io $ getIt `catch` \(SomeException _) ->  ((`NW` w) . resName) `fmap` getClassHint d w
+    io $ getIt `E.catch` \(SomeException _) ->  ((`NW` w) . resName) `fmap` getClassHint d w
 
 unName :: NamedWindow -> Window
 unName (NW _ w) = w
-- 
cgit v1.2.3