InterruptibleDelay.hs -> src/Control/Concurrent/Delay.hs

7 files changed, 10 insertions, 12 deletions

diff --git a/dht/Connection.hs b/dht/Connection.hs
index 9a4077f5..ea86f4bb 100644
--- a/dht/Connection.hs
+++ b/dht/Connection.hs
@@ -11,7 +11,7 @@ import qualified Data.Map as Map
          ;import Data.Map (Map)
 import Network.Socket (SockAddr(..))
 
-import PingMachine
+import Control.Concurrent.PingMachine
 
 -- | This type indicates the current status of a connection.  The type
 -- parameter indicates protocol-specific status information.  To present
diff --git a/dht/Connection/Tcp.hs b/dht/Connection/Tcp.hs
index 06290a1c..4d50d47f 100644
--- a/dht/Connection/Tcp.hs
+++ b/dht/Connection/Tcp.hs
@@ -22,7 +22,7 @@
 --
 module Connection.Tcp
     ( module Connection.Tcp
-    , module PingMachine ) where
+    , module Control.Concurrent.PingMachine ) where
 
 import Data.ByteString (ByteString,hGetNonBlocking)
 import qualified Data.ByteString.Char8 as S -- ( hPutStrLn, hPutStr, pack)
@@ -71,8 +71,8 @@ import Data.Time.Clock (getCurrentTime,diffUTCTime)
 import qualified Data.Text as Text
          ;import Data.Text (Text)
 import DNSCache
-import InterruptibleDelay
-import PingMachine
+import Control.Concurrent.Delay
+import Control.Concurrent.PingMachine
 import Network.StreamServer
 import Network.SocketLike hiding (sClose)
 import qualified Connection as G
diff --git a/dht/Presence/DNSCache.hs b/dht/Presence/DNSCache.hs
index 14581fee..9bb354e1 100644
--- a/dht/Presence/DNSCache.hs
+++ b/dht/Presence/DNSCache.hs
@@ -46,7 +46,7 @@ import System.IO.Unsafe
 import SockAddr      ()
 import ControlMaybe  ( handleIO_ )
 import GetHostByAddr ( getHostByAddr )
-import InterruptibleDelay
+import Control.Concurrent.Delay
 import DPut
 import DebugTag
 
diff --git a/dht/dht-client.cabal b/dht/dht-client.cabal
index 4155e7e7..dc9b7ca2 100644
--- a/dht/dht-client.cabal
+++ b/dht/dht-client.cabal
@@ -110,7 +110,7 @@ library
                     Network.Tox.ContactInfo
                     Announcer
                     Announcer.Tox
-                    InterruptibleDelay
+                    Control.Concurrent.Delay
                     ByteStringOperators
                     ClientState
                     ConfigFiles
@@ -142,7 +142,7 @@ library
                     XMPPServer
                     Util
                     Presence
-                    PingMachine
+                    Control.Concurrent.PingMachine
                     Connection
                     ToxChat
                     ToxToXMPP
diff --git a/dht/InterruptibleDelay.hs b/dht/src/Control/Concurrent/Delay.hs
index b2683441..67dcd451 100644
--- a/dht/InterruptibleDelay.hs
+++ b/dht/src/Control/Concurrent/Delay.hs
@@ -1,4 +1,4 @@
-module InterruptibleDelay where
+module Control.Concurrent.Delay where
 
 import Control.Concurrent
 import Control.Monad
diff --git a/dht/PingMachine.hs b/dht/src/Control/Concurrent/PingMachine.hs
index ccf5b1d3..a8f10e83 100644
--- a/dht/PingMachine.hs
+++ b/dht/src/Control/Concurrent/PingMachine.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE TupleSections #-}
-module PingMachine where
+module Control.Concurrent.PingMachine where
 
 import Control.Monad
 import Data.Function
@@ -12,7 +12,7 @@ import GHC.Conc                  (labelThread)
 #endif
 import Control.Concurrent.STM
 
-import InterruptibleDelay
+import Control.Concurrent.Delay
 
 type Miliseconds = Int
 type TimeOut = Miliseconds
diff --git a/dht/todo.txt b/dht/todo.txt
index aaf1c6bd..98f10967 100644
--- a/dht/todo.txt
+++ b/dht/todo.txt
@@ -58,8 +58,6 @@ maint: Newtype for internet (ipv4,ipv6) sockaddr.
 maint: Rename files.
 
        Announcer                    -> Network.Kademlia.Announce
-       InterruptibleDelay           -> Control.Concurrent.Delay
-       Roster                       -> Network.Tox.ContactInfo
        Crypto.Tox                   -> Network.Tox.Crypto
        Network.Tox.Crypto.Handlers  -> Network.Tox.Friend.Handlers
        Network.Tox.Crypto.Transport -> Network.Tox.Friend.Transport