[Gtk2hs-commit] gtk2hs/gtk/general FFI.hs,1.5,1.6 General.chs,1.14,1.15 StockItems.hsc,1.10,1.11 Structs.hsc,1.27,1.28

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28179/gtk/general

Modified Files:
	FFI.hs General.chs StockItems.hsc Structs.hsc 
Log Message:
Change some import modules to use modern hierarchical modules so we no longer
need the LocalData or LocalControl modules, nor the data or lang packages.

This should still work all the way back to ghc 5.04.x, though it needs testing.


Index: StockItems.hsc
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/StockItems.hsc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- StockItems.hsc	23 May 2004 15:58:48 -0000	1.10
+++ StockItems.hsc	9 Dec 2004 18:26:01 -0000	1.11
@@ -124,7 +124,7 @@
 import Monad	(liftM)
 import FFI
 
-import LocalData(unsafePerformIO)	-- to read CStrings lazyly
+import Foreign	(unsafePerformIO)	-- to read CStrings lazyly
 import GList	(GSList, fromGSListRev)
 import Events	(Modifier)
 

Index: Structs.hsc
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Structs.hsc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Structs.hsc	8 Aug 2004 19:34:14 -0000	1.27
+++ Structs.hsc	9 Dec 2004 18:26:01 -0000	1.28
@@ -95,14 +95,14 @@
 import Monad		(liftM)
 import FFI
 
-import LocalData	(testBit)
+import Data.Bits	(testBit)
 import Object		(makeNewObject)
 import GObject		(makeNewGObject)
 import Hierarchy
 import GdkEnums	(Function, Fill, SubwindowMode, LineStyle, CapStyle, JoinStyle)
 import Enums	(StateType)
-import IORef
-import Exception
+import Data.IORef
+import Control.Exception
 
 #include <gtk/gtk.h>
 

Index: FFI.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/FFI.hs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FFI.hs	10 Aug 2004 14:51:46 -0000	1.5
+++ FFI.hs	9 Dec 2004 18:26:01 -0000	1.6
@@ -46,7 +46,7 @@
 
 import Monad	(liftM)
 import Char
-import LocalData(unsafePerformIO)
+import Foreign (unsafePerformIO)
 
 import Data.Bits
 import Foreign.C

Index: General.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/General.chs,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- General.chs	10 Aug 2004 14:51:46 -0000	1.14
+++ General.chs	9 Dec 2004 18:26:01 -0000	1.15
@@ -57,8 +57,8 @@
 import Monad	(liftM, mapM)
 import FFI
 
-import LocalData(newIORef, readIORef, writeIORef)
-import Exception (ioError, Exception(ErrorCall))
+import Data.IORef	 (newIORef, readIORef, writeIORef)
+import Control.Exception (ioError, Exception(ErrorCall))
 import Object	(makeNewObject)
 {#import Hierarchy#}	 
 {#import Signal#}