Renamed pushIQ' to pushIQ

There is no longer any naming conflict.

source/Network/Xmpp/Internal.hs

@@ -27,7 +27,7 @@ module Network.Xmpp.Internal
   , auth
   , pushStanza
   , pullStanza
-  , pushIQ'
+  , pushIQ
   , pickleElem
   , unpickleElem
   , xpLangTag

source/Network/Xmpp/Sasl.hs

@@ -110,7 +110,7 @@ bindBody = pickleElem $
 -- resource and extract the JID from the non-error response.
 xmppBind  :: Maybe Text -> TMVar Stream -> IO (Either XmppFailure Jid)
 xmppBind rsrc c = runErrorT $ do
-    answer <- ErrorT $ pushIQ' "bind" Nothing Set Nothing (bindBody rsrc) c
+    answer <- ErrorT $ pushIQ "bind" Nothing Set Nothing (bindBody rsrc) c
     case answer of
         Right IQResult{iqResultPayload = Just b} -> do
             let jid = unpickleElem xpJid b
@@ -151,7 +151,7 @@ sessionIQ = IQRequestS $ IQRequest { iqRequestID      = "sess"
 -- if an IQ error stanza is returned from the server.
 startSession :: TMVar Stream -> IO ()
 startSession con = do
-    answer <- pushIQ' "session" Nothing Set Nothing sessionXml con
+    answer <- pushIQ "session" Nothing Set Nothing sessionXml con
     case answer of
         Left e -> error $ show e
         Right _ -> return ()

source/Network/Xmpp/Stream.hs

@@ -452,14 +452,14 @@ killStream = withStream $ do
 
 -- Sends an IQ request and waits for the response. If the response ID does not
 -- match the outgoing ID, an error is thrown.
-pushIQ' :: StanzaId
+pushIQ :: StanzaId
-            -> Maybe Jid
+       -> Maybe Jid
-            -> IQRequestType
+       -> IQRequestType
-            -> Maybe LangTag
+       -> Maybe LangTag
-            -> Element
+       -> Element
-            -> TMVar Stream
+       -> TMVar Stream
-            -> IO (Either XmppFailure (Either IQError IQResult))
+       -> IO (Either XmppFailure (Either IQError IQResult))
-pushIQ' iqID to tp lang body stream = do
+pushIQ iqID to tp lang body stream = do
     pushStanza (IQRequestS $ IQRequest iqID Nothing to lang tp body) stream
     res <- pullStanza stream
     case res of

source/Network/Xmpp/Xep/InbandRegistration.hs

@@ -71,7 +71,7 @@ emptyQuery = Query Nothing False False []
 
 query :: IQRequestType -> Query -> TMVar Stream -> IO (Either IbrError Query)
 query queryType x con = do
-    answer <- pushIQ' "ibr" Nothing queryType Nothing (pickleElem xpQuery x) con
+    answer <- pushIQ "ibr" Nothing queryType Nothing (pickleElem xpQuery x) con
     case answer of
         Right IQResult{iqResultPayload = Just b} ->
             case unpickleElem xpQuery b of

source/Network/Xmpp/Xep/ServiceDiscovery.hs

@@ -104,7 +104,7 @@ xmppQueryInfo :: Maybe Jid
      -> TMVar Stream
      -> IO (Either DiscoError QueryInfoResult)
 xmppQueryInfo to node con = do
-    res <- pushIQ' "info" to Get Nothing queryBody con
+    res <- pushIQ "info" to Get Nothing queryBody con
     return $ case res of
         Left e -> Left $ DiscoIQError Nothing
         Right res' -> case res' of