1 files changed, 24 insertions, 24 deletions

diff --git a/src/Network/BitTorrent/Address.hs b/src/Network/BitTorrent/Address.hs
index eeb04c74..3159fab0 100644
--- a/src/Network/BitTorrent/Address.hs
+++ b/src/Network/BitTorrent/Address.hs
@@ -110,7 +110,7 @@ import Text.Read        (readMaybe)
 import Network.HTTP.Types.QueryLike
 import Network.Socket
 import Text.PrettyPrint as PP hiding ((<>))
-import Text.PrettyPrint.Class
+import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.Locale    (defaultTimeLocale)
 import System.Entropy
 
@@ -121,7 +121,7 @@ import System.Entropy
 -----------------------------------------------------------------------}
 
 instance Pretty UTCTime where
-  pretty = PP.text . show
+  pPrint = PP.text . show
 
 class (Eq a, Serialize a, Typeable a, Hashable a, Pretty a)
     => Address a where
@@ -216,7 +216,7 @@ instance IsString PeerId where
       bs = fromString str
 
 instance Pretty PeerId where
-  pretty = text . BC.unpack . getPeerId
+  pPrint = text . BC.unpack . getPeerId
 
 instance Convertible BS.ByteString PeerId where
   safeConvert bs
@@ -373,8 +373,8 @@ instance Hashable PortNumber where
   {-# INLINE hashWithSalt #-}
 
 instance Pretty PortNumber where
-  pretty = PP.int . fromEnum
-  {-# INLINE pretty #-}
+  pPrint = PP.int . fromEnum
+  {-# INLINE pPrint #-}
 
 {-----------------------------------------------------------------------
 --  IP addr
@@ -451,16 +451,16 @@ instance Serialize IPv6 where
     get = fromHostAddress6 <$> get
 
 instance Pretty IPv4 where
-  pretty = PP.text . show
-  {-# INLINE pretty #-}
+  pPrint = PP.text . show
+  {-# INLINE pPrint #-}
 
 instance Pretty IPv6 where
-  pretty = PP.text . show
-  {-# INLINE pretty #-}
+  pPrint = PP.text . show
+  {-# INLINE pPrint #-}
 
 instance Pretty IP where
-  pretty = PP.text . show
-  {-# INLINE pretty #-}
+  pPrint = PP.text . show
+  {-# INLINE pPrint #-}
 
 instance Hashable IPv4 where
   hashWithSalt = hashUsing toHostAddress
@@ -569,11 +569,11 @@ instance IsString (PeerAddr IP) where
 -- | fingerprint + "at" + dotted.host.inet.addr:port
 -- TODO: instances for IPv6, HostName
 instance Pretty a => Pretty (PeerAddr a) where
-  pretty PeerAddr {..}
-    | Just pid <- peerId = pretty (fingerprint pid) <+> "at" <+> paddr
+  pPrint PeerAddr {..}
+    | Just pid <- peerId = pPrint (fingerprint pid) <+> "at" <+> paddr
     |     otherwise      = paddr
     where
-      paddr = pretty peerHost <> ":" <> text (show peerPort)
+      paddr = pPrint peerHost <> ":" <> text (show peerPort)
 
 instance Hashable a => Hashable (PeerAddr a) where
   hashWithSalt s PeerAddr {..} =
@@ -649,7 +649,7 @@ instance IsString NodeId where
 
 -- | base16 encoded.
 instance Pretty NodeId where
-  pretty (NodeId nid) = PP.text $ BC.unpack $ Base16.encode nid
+  pPrint (NodeId nid) = PP.text $ BC.unpack $ Base16.encode nid
 
 -- | Test if the nth bit is set.
 testIdBit :: NodeId -> Word -> Bool
@@ -675,7 +675,7 @@ newtype NodeDistance = NodeDistance BS.ByteString
   deriving (Eq, Ord)
 
 instance Pretty NodeDistance where
-  pretty (NodeDistance bs) = foldMap bitseq $ BS.unpack bs
+  pPrint (NodeDistance bs) = foldMap bitseq $ BS.unpack bs
     where
       listBits w = L.map (testBit w) (L.reverse [0..bitSize w - 1])
       bitseq = foldMap (int . fromEnum) . listBits
@@ -721,7 +721,7 @@ instance Hashable a => Hashable (NodeAddr a) where
   {-# INLINE hashWithSalt #-}
 
 instance Pretty ip => Pretty (NodeAddr ip) where
-  pretty NodeAddr {..} = pretty nodeHost <> ":" <> pretty nodePort
+  pPrint NodeAddr {..} = pPrint nodeHost <> ":" <> pPrint nodePort
 
 -- | Example:
 --
@@ -755,10 +755,10 @@ instance Serialize a => Serialize (NodeInfo a) where
   put NodeInfo {..} = put nodeId >> put nodeAddr
 
 instance Pretty ip => Pretty (NodeInfo ip) where
-  pretty NodeInfo {..} = pretty nodeId <> "@(" <> pretty nodeAddr <> ")"
+  pPrint NodeInfo {..} = pPrint nodeId <> "@(" <> pPrint nodeAddr <> ")"
 
 instance Pretty ip => Pretty [NodeInfo ip] where
-  pretty = PP.vcat . PP.punctuate "," . L.map pretty
+  pPrint = PP.vcat . PP.punctuate "," . L.map pPrint
 
 -- | Order by closeness: nearest nodes first.
 rank :: Eq ip => NodeId -> [NodeInfo ip] -> [NodeInfo ip]
@@ -952,9 +952,9 @@ instance IsString Software where
       alist = L.map mk [minBound..maxBound]
       mk  x = (L.tail $ show x, x)
 
--- | Example: @pretty 'IBitLet' == \"IBitLet\"@
+-- | Example: @pPrint 'IBitLet' == \"IBitLet\"@
 instance Pretty Software where
-  pretty = text . L.tail . show
+  pPrint = text . L.tail . show
 
 -- | Just the '0' version.
 instance Default Version where
@@ -972,7 +972,7 @@ instance IsString Version where
       chunkNums = sequence . L.map readMaybe . L.linesBy ('.' ==)
 
 instance Pretty Version where
-  pretty = text . showVersion
+  pPrint = text . showVersion
 
 -- | The all sensible infomation that can be obtained from a peer
 -- identifier or torrent /createdBy/ field.
@@ -993,7 +993,7 @@ instance IsString Fingerprint where
       (impl, _ver) = L.span ((/=) '-') str
 
 instance Pretty Fingerprint where
-  pretty (Fingerprint s v) = pretty s <+> "version" <+> pretty v
+  pPrint (Fingerprint s v) = pPrint s <+> "version" <+> pPrint v
 
 -- | Fingerprint of this (the bittorrent library) package. Normally,
 -- applications should introduce its own fingerprints, otherwise they
@@ -1005,7 +1005,7 @@ libFingerprint =  Fingerprint IlibHSbittorrent version
 -- | HTTP user agent of this (the bittorrent library) package. Can be
 -- used in HTTP tracker requests.
 libUserAgent :: String
-libUserAgent = render (pretty IlibHSbittorrent <> "/" <> pretty version)
+libUserAgent = render (pPrint IlibHSbittorrent <> "/" <> pPrint version)
 
 {-----------------------------------------------------------------------
 --  For torrent file