finished pushing Assistant monad into all relevant files

All temporary and old functions are removed.

1 files changed, 0 insertions, 23 deletions

diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs
index 4223b6ce9..4744c86ba 100644
--- a/Assistant/DaemonStatus.hs
+++ b/Assistant/DaemonStatus.hs
@@ -24,30 +24,12 @@ import Data.Time
 import System.Locale
 import qualified Data.Map as M
 
--- TODO remove this
-getDaemonStatusOld :: DaemonStatusHandle -> IO DaemonStatus
-getDaemonStatusOld = atomically . readTMVar
-
 getDaemonStatus :: Assistant DaemonStatus
 getDaemonStatus = (atomically . readTMVar) <<~ daemonStatusHandle
 
--- TODO remove this
-modifyDaemonStatusOld_ :: DaemonStatusHandle -> (DaemonStatus -> DaemonStatus) -> IO ()
-modifyDaemonStatusOld_ dstatus a = modifyDaemonStatusOld dstatus $ \s -> (a s, ())
-
 modifyDaemonStatus_ :: (DaemonStatus -> DaemonStatus) -> Assistant ()
 modifyDaemonStatus_ a = modifyDaemonStatus $ \s -> (a s, ())
 
--- TODO remove this
-modifyDaemonStatusOld :: DaemonStatusHandle -> (DaemonStatus -> (DaemonStatus, b)) -> IO b
-modifyDaemonStatusOld dstatus a = do
-	(s, b) <- atomically $ do
-		r@(s, _) <- a <$> takeTMVar dstatus
-		putTMVar dstatus s
-		return r
-	sendNotification $ changeNotifier s
-	return b
-
 modifyDaemonStatus :: (DaemonStatus -> (DaemonStatus, b)) -> Assistant b
 modifyDaemonStatus a = do
 	dstatus <- getAssistant daemonStatusHandle
@@ -188,11 +170,6 @@ notifyTransfer = do
 	liftIO $ sendNotification
 		=<< transferNotifier <$> atomically (readTMVar dstatus)
 
--- TODO remove
-notifyTransferOld :: DaemonStatusHandle -> IO ()
-notifyTransferOld dstatus = sendNotification
-	=<< transferNotifier <$> atomically (readTMVar dstatus)
-
 {- Send a notification when alerts are changed. -}
 notifyAlert :: Assistant ()
 notifyAlert = do