Merge pull request #4 from mtachrono/master

WalterBright · WalterBright · commit e5d8df0abea8 · 2012-11-23T13:17:24.000-08:00
this allows to use import deimos.ncurses.curses; for this module!
diff --git a/deimos/ncurses/curses.d b/deimos/ncurses/curses.d
@@ -33,7 +33,7 @@
  ****************************************************************************/
 
 /* $Id: curses.h.in,v 1.215 2010/04/29 09:46:38 tom Exp $ */
-module curses;
+module deimos.ncurses.curses;
 
 /*
  * We need FILE, etc.  Include this before checking any feature symbols.
@@ -43,7 +43,7 @@ import std.c.stddef;    /* we want wchar_t */
 import std.c.stdarg;    /* we need va_list */
 
 //#include <ncursesw/unctrl.h>
-public import unctrl;
+public import deimos.ncurses.unctrl;
 
 //TODO check if needed... I don't have a windows machine...
 version(Win32)
diff --git a/deimos/ncurses/eti.d b/deimos/ncurses/eti.d
@@ -31,7 +31,7 @@
  ****************************************************************************/
 /* $Id: eti.h,v 1.8 2003/10/25 15:24:29 tom Exp $ */
 
-module eti;
+module deimos.ncurses.eti;
 
 immutable enum :int
 {
diff --git a/deimos/ncurses/form.d b/deimos/ncurses/form.d
@@ -34,8 +34,8 @@
 
 
 import std.c.stdarg;
-public import ncurses;
-public import eti;
+public import deimos.ncurses.ncurses;
+public import deimos.ncurses.eti;
 
 extern(C)
 {
diff --git a/deimos/ncurses/menu.d b/deimos/ncurses/menu.d
@@ -30,9 +30,10 @@
  *   Author:  Juergen Pfeifer, 1995,1997                                    *
  ****************************************************************************/
 /* $Id: menu.h,v 1.20 2009/04/05 00:28:07 tom Exp $ */
-module menu;
+module deimos.ncurses.menu;
 
-public import curses, eti;
+public import deimos.ncurses.curses,
+	      deimos.ncurses.eti;
 
 extern(C)
 {
diff --git a/deimos/ncurses/ncurses.d b/deimos/ncurses/ncurses.d
@@ -29,6 +29,6 @@
 /****************************************************************************
  *  Author: Jude "1100110" Young <10equals2@gmail.com.                      *
  ****************************************************************************/
-module ncurses;
+module deimos.ncurses.curses;
 
-public import curses;
+public import deimos.ncurses.curses;
diff --git a/deimos/ncurses/panel.d b/deimos/ncurses/panel.d
@@ -34,9 +34,9 @@
 /* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */
 /* panel.h -- interface file for panels library */
 
-module panel;
+module deimos.ncurses.panel;
 
-public import curses;
+public import deimos.ncurses.curses;
 
 extern (C)
 {
diff --git a/deimos/ncurses/unctrl.d b/deimos/ncurses/unctrl.d
@@ -31,6 +31,8 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
+module deimos.ncurses.unctrl;
+
 /*
  * unctrl.h
  *
diff --git a/examples/acs_vars.d b/examples/acs_vars.d
@@ -1,6 +1,6 @@
 
 import std.string: toStringz;
-import curses;
+import deimos.ncurses.curses;
 
 void main()
 {
diff --git a/examples/form_attrib.d b/examples/form_attrib.d
@@ -1,4 +1,4 @@
-import form;
+import deimos.ncurses.form;
 import std.string;
 
 
diff --git a/examples/form_simple.d b/examples/form_simple.d
@@ -1,4 +1,4 @@
-import form;
+import deimos.ncurses.form;
 
 int main()
 {	FIELD*[3] field;
diff --git a/examples/hello_world.d b/examples/hello_world.d
@@ -12,7 +12,7 @@
  * Modified by: 1100110
  */
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 void main()
 {   //toStringz returns immutable char*   Which is what most of these
diff --git a/examples/init_func_example.d b/examples/init_func_example.d
@@ -8,7 +8,7 @@
  */ 
 
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 void main()
 {
diff --git a/examples/key_code.d b/examples/key_code.d
@@ -1,7 +1,7 @@
 //Modified by: 1100110
 
 import std.stdio: writefln;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 
 void main()
diff --git a/examples/menu_attrib.d b/examples/menu_attrib.d
@@ -1,4 +1,4 @@
-import menu;
+import deimos.ncurses.menu;
 
 const int CTRLD = 4;
 
diff --git a/examples/menu_scroll.d b/examples/menu_scroll.d
@@ -1,4 +1,4 @@
-import menu;
+import deimos.ncurses.menu;
 
 const int CTRLD = 4;
 
diff --git a/examples/menu_simple.d b/examples/menu_simple.d
@@ -1,4 +1,4 @@
-import menu;
+import deimos.ncurses.menu;
 
 const int CTRLD = 4;
 
diff --git a/examples/mouse_menu.d b/examples/mouse_menu.d
@@ -1,6 +1,6 @@
 
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 //immutable maybe??
 immutable int WIDTH     = 30;
diff --git a/examples/other_border.d b/examples/other_border.d
@@ -1,5 +1,5 @@
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 struct WIN_BORDER
 {
diff --git a/examples/panel_simple.d b/examples/panel_simple.d
@@ -1,4 +1,4 @@
-import panel;
+import deimos.ncurses.panel;
 
 int main()
 {	WINDOW*[3] my_wins;
diff --git a/examples/printw_example.d b/examples/printw_example.d
@@ -1,7 +1,7 @@
 //Modified by: 1100110
 
 import std.string;
-import ncurses;						/* ncurses.h includes stdio.h */  
+import deimos.ncurses.ncurses;				/* ncurses.h includes stdio.h */  
  
 void main()
 {
diff --git a/examples/simple_color.d b/examples/simple_color.d
@@ -2,7 +2,7 @@
 
 import std.stdio: writeln;
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 
 
diff --git a/examples/simple_key.d b/examples/simple_key.d
@@ -1,6 +1,6 @@
 //import std.stdio;
 //This does NOT loop properly.
-import ncurses;
+import deimos.ncurses.ncurses;
 
 const int WIDTH = 30;
 const int HEIGHT = 10;
diff --git a/examples/temp_leave.d b/examples/temp_leave.d
@@ -2,7 +2,7 @@
 //Now THIS is interesting.
 
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 extern(C) int system(immutable char* command);
 
diff --git a/examples/win_border.d b/examples/win_border.d
@@ -1,7 +1,7 @@
 //Modified by: 1100110
 
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 
 void main()
diff --git a/examples/with_chgat.d b/examples/with_chgat.d
@@ -1,5 +1,5 @@
 import std.string: toStringz;
-import ncurses;
+import deimos.ncurses.ncurses;
 
 void main()
 {   initscr();          //Start curses mode

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`****************************************************************************/`
`32`	`32`	`/* $Id: eti.h,v 1.8 2003/10/25 15:24:29 tom Exp $ */`
`33`	`33`
`34`		`-module eti;`
	`34`	`+module deimos.ncurses.eti;`
`35`	`35`
`36`	`36`	`immutable enum :int`
`37`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@`
`34`	`34`
`35`	`35`
`36`	`36`	`import std.c.stdarg;`
`37`		`-public import ncurses;`
`38`		`-public import eti;`
	`37`	`+public import deimos.ncurses.ncurses;`
	`38`	`+public import deimos.ncurses.eti;`
`39`	`39`
`40`	`40`	`extern(C)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,9 @@`
`34`	`34`	`/* $Id: panel.h,v 1.11 2009/04/11 19:50:40 tom Exp $ */`
`35`	`35`	`/* panel.h -- interface file for panels library */`
`36`	`36`
`37`		`-module panel;`
	`37`	`+module deimos.ncurses.panel;`
`38`	`38`
`39`		`-public import curses;`
	`39`	`+public import deimos.ncurses.curses;`
`40`	`40`
`41`	`41`	`extern (C)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`* and: Eric S. Raymond <[email protected]> *`
`32`	`32`	`****************************************************************************/`
`33`	`33`
	`34`	`+module deimos.ncurses.unctrl;`
	`35`	`+`
`34`	`36`	`/*`
`35`	`37`	`* unctrl.h`
`36`	`38`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`import std.string: toStringz;`
`3`		`-import curses;`
	`3`	`+import deimos.ncurses.curses;`
`4`	`4`
`5`	`5`	`void main()`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import form;`
	`1`	`+import deimos.ncurses.form;`
`2`	`2`	`import std.string;`
`3`	`3`
`4`	`4`