From 08390cc32a10e431052df06a613db389baeef5d6 Mon Sep 17 00:00:00 2001
From: Philipp Balzarek <p.balzarek@googlemail.com>
Date: Mon, 17 Jun 2013 13:54:31 +0200
Subject: [PATCH] rename field of Item data type

---
 source/Network/Xmpp/IM/Roster.hs       | 20 ++++++++++----------
 source/Network/Xmpp/IM/Roster/Types.hs | 14 +++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/Network/Xmpp/IM/Roster.hs b/source/Network/Xmpp/IM/Roster.hs
index ba01377..6933543 100644
--- a/source/Network/Xmpp/IM/Roster.hs
+++ b/source/Network/Xmpp/IM/Roster.hs
@@ -145,23 +145,23 @@ retrieveRoster mbOldRoster sess = do
                                                is)
 
 toItem :: QueryItem -> Item
-toItem qi = Item { approved = fromMaybe False (qiApproved qi)
-                 , ask = qiAsk qi
-                 , jid = qiJid qi
-                 , name = qiName qi
-                 , subscription = fromMaybe None (qiSubscription qi)
-                 , groups = nub $ qiGroups qi
+toItem qi = Item { riApproved = fromMaybe False (qiApproved qi)
+                 , riAsk = qiAsk qi
+                 , riJid = qiJid qi
+                 , riName = qiName qi
+                 , riSubscription = fromMaybe None (qiSubscription qi)
+                 , riGroups = nub $ qiGroups qi
                  }
 
 fromItem :: Item -> QueryItem
 fromItem i = QueryItem { qiApproved = Nothing
                        , qiAsk = False
-                       , qiJid = jid i
-                       , qiName = name i
-                       , qiSubscription = case subscription i of
+                       , qiJid = riJid i
+                       , qiName = riName i
+                       , qiSubscription = case riSubscription i of
                            Remove -> Just Remove
                            _ -> Nothing
-                       , qiGroups = nub $ groups i
+                       , qiGroups = nub $ riGroups i
                        }
 
 xpItems :: PU [Node] [QueryItem]
diff --git a/source/Network/Xmpp/IM/Roster/Types.hs b/source/Network/Xmpp/IM/Roster/Types.hs
index 04854b4..b5de0ef 100644
--- a/source/Network/Xmpp/IM/Roster/Types.hs
+++ b/source/Network/Xmpp/IM/Roster/Types.hs
@@ -25,13 +25,13 @@ data Roster = Roster { ver :: Maybe Text
                      , items :: Map.Map Jid Item } deriving Show
 
 
-
-data Item = Item { approved :: Bool
-                 , ask :: Bool
-                 , jid :: Jid
-                 , name :: Maybe Text
-                 , subscription :: Subscription
-                 , groups :: [Text]
+-- | Roster Items
+data Item = Item { riApproved :: Bool
+                 , riAsk :: Bool
+                 , riJid :: Jid
+                 , riName :: Maybe Text
+                 , riSubscription :: Subscription
+                 , riGroups :: [Text]
                  } deriving Show
 
 data QueryItem = QueryItem { qiApproved :: Maybe Bool