migrated some files from cmn to si

2016-04-28 15:29:28 +00:00
parent 49d3dcfeda
commit 9cb6c963fa
48 changed files with 792 additions and 775 deletions
--- a/qse/include/qse/cmn/Makefile.am
+++ b/qse/include/qse/cmn/Makefile.am
@ -23,7 +23,6 @@ pkginclude_HEADERS = \
 	mbwc.h \
 	mem.h \
 	nwad.h \
-	nwif.h \
 	oht.h \
 	opt.h \
 	path.h \
--- a/qse/include/qse/cmn/Makefile.in
+++ b/qse/include/qse/cmn/Makefile.in
@ -124,7 +124,7 @@ am__can_run_installinfo = \
  esac
 am__pkginclude_HEADERS_DIST = alg.h chr.h cp949.h cp950.h dir.h dll.h \
 	env.h fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h \
-	main.h map.h mb8.h mbwc.h mem.h nwad.h nwif.h oht.h opt.h \
+	main.h map.h mb8.h mbwc.h mem.h nwad.h oht.h opt.h \
 	path.h pma.h rbt.h rex.h sck.h sll.h slmb.h str.h time.h tmr.h \
 	tre.h uni.h uri.h utf8.h xma.h Mmgr.hpp StdMmgr.hpp \
 	HeapMmgr.hpp Mmged.hpp ScopedPtr.hpp SharedPtr.hpp StrBase.hpp \
@ -358,7 +358,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkginclude_HEADERS = alg.h chr.h cp949.h cp950.h dir.h dll.h env.h \
 	fma.h fmt.h fs.h gdl.h glob.h htb.h hton.h ipad.h lda.h main.h \
-	map.h mb8.h mbwc.h mem.h nwad.h nwif.h oht.h opt.h path.h \
+	map.h mb8.h mbwc.h mem.h nwad.h oht.h opt.h path.h \
 	pma.h rbt.h rex.h sck.h sll.h slmb.h str.h time.h tmr.h tre.h \
 	uni.h uri.h utf8.h xma.h $(am__append_1)
 all: all-am
--- a/qse/include/qse/io/Makefile.in
+++ b/qse/include/qse/io/Makefile.in
@ -356,9 +356,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/qse/io/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/qse/si/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign include/qse/io/Makefile
+	  $(AUTOMAKE) --foreign include/qse/si/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
--- a/qse/include/qse/sed/stdsed.h
+++ b/qse/include/qse/sed/stdsed.h
@ -28,7 +28,7 @@
 #define _QSE_SED_STDSED_H_

 #include <qse/sed/sed.h>
-#include <qse/io/sio.h>
+#include <qse/si/sio.h>

 /** \file
 * This file defines easier-to-use helper interface for a stream editor.
--- a/qse/include/qse/si/Makefile.am
+++ b/qse/include/qse/si/Makefile.am
@ -9,6 +9,7 @@ pkginclude_HEADERS = \
 	intr.h \
 	mtx.h \
 	mux.h \
+	nwif.h \
 	nwio.h  \
 	pio.h  \
 	rwl.h \
--- a/qse/include/qse/si/Makefile.in
+++ b/qse/include/qse/si/Makefile.in
@ -359,9 +359,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/qse/sys/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/qse/si/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign include/qse/sys/Makefile
+	  $(AUTOMAKE) --foreign include/qse/si/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
--- a/qse/include/qse/si/Socket.hpp
+++ b/qse/include/qse/si/Socket.hpp
@ -27,7 +27,7 @@
 #ifndef _QSE_SYS_SOCKET_HPP_
 #define _QSE_SYS_SOCKET_HPP_

-#include <qse/sys/SocketAddress.hpp>
+#include <qse/si/SocketAddress.hpp>
 #include <qse/cmn/sck.h>

 /////////////////////////////////
--- a/qse/include/qse/si/aio-pro.h
+++ b/qse/include/qse/si/aio-pro.h
@ -24,10 +24,10 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_IO_AIO_PRO_H_
-#define _QSE_IO_AIO_PRO_H_
+#ifndef _QSE_SI_AIO_PRO_H_
+#define _QSE_SI_AIO_PRO_H_

-#include <qse/io/aio.h>
+#include <qse/si/aio.h>

 enum qse_aio_dev_pro_sid_t
 {
--- a/qse/include/qse/si/aio-sck.h
+++ b/qse/include/qse/si/aio-sck.h
@ -24,10 +24,10 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_IO_AIO_SCK_H_
-#define _QSE_IO_AIO_SCK_H_
+#ifndef _QSE_SI_AIO_SCK_H_
+#define _QSE_SI_AIO_SCK_H_

-#include <qse/io/aio.h>
+#include <qse/si/aio.h>

 /* ========================================================================= */
 /* TOOD: move these to a separte file */
--- a/qse/include/qse/si/aio.h
+++ b/qse/include/qse/si/aio.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_IO_AIO_H_
-#define _QSE_IO_AIO_H_
+#ifndef _QSE_SI_AIO_H_
+#define _QSE_SI_AIO_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/cnd.h
+++ b/qse/include/qse/si/cnd.h
@ -24,13 +24,13 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_SYS_CND_H_
-#define _QSE_SYS_CND_H_
+#ifndef _QSE_SI_CND_H_
+#define _QSE_SI_CND_H_

 #include <qse/types.h>
 #include <qse/macros.h>
 #include <qse/cmn/time.h>
-#include <qse/sys/mtx.h>
+#include <qse/si/mtx.h>

 typedef struct qse_cnd_t qse_cnd_t;

--- a/qse/include/qse/si/intr.h
+++ b/qse/include/qse/si/intr.h
@ -25,8 +25,8 @@
 */


-#ifndef _QSE_SYS_INTR_H_
-#define _QSE_SYS_INTR_H_
+#ifndef _QSE_SI_INTR_H_
+#define _QSE_SI_INTR_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/mtx.h
+++ b/qse/include/qse/si/mtx.h
@ -25,8 +25,8 @@
 */


-#ifndef _QSE_SYS_MTX_H_
-#define _QSE_SYS_MTX_H_
+#ifndef _QSE_SI_MTX_H_
+#define _QSE_SI_MTX_H_

 #include <qse/types.h>
 #include <qse/macros.h>
--- a/qse/include/qse/si/mux.h
+++ b/qse/include/qse/si/mux.h
@ -24,8 +24,8 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_SYS_MUX_H_
-#define _QSE_SYS_MUX_H_
+#ifndef _QSE_SI_MUX_H_
+#define _QSE_SI_MUX_H_

 /** @file
 * This file provides functions and data types for I/O multiplexing.
--- a/qse/include/qse/cmn/nwif.h
+++ b/qse/include/qse/cmn/nwif.h
--- a/qse/include/qse/si/nwio.h
+++ b/qse/include/qse/si/nwio.h
@ -33,7 +33,7 @@

 #include <qse/types.h>
 #include <qse/macros.h>
-#include <qse/io/tio.h>
+#include <qse/si/tio.h>
 #include <qse/cmn/nwad.h>
 #include <qse/cmn/time.h>
 #include <qse/cmn/sck.h>
--- a/qse/include/qse/si/pio.h
+++ b/qse/include/qse/si/pio.h
@ -29,7 +29,7 @@

 #include <qse/types.h>
 #include <qse/macros.h>
-#include <qse/io/tio.h>
+#include <qse/si/tio.h>
 #include <qse/cmn/env.h>

 /** \file 
--- a/qse/include/qse/si/rwl.h
+++ b/qse/include/qse/si/rwl.h
@ -24,13 +24,13 @@
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _QSE_SYS_RWL_H_
-#define _QSE_SYS_RWL_H_
+#ifndef _QSE_SI_RWL_H_
+#define _QSE_SI_RWL_H_

 #include <qse/types.h>
 #include <qse/macros.h>
-#include <qse/sys/mtx.h>
-#include <qse/sys/cnd.h>
+#include <qse/si/mtx.h>
+#include <qse/si/cnd.h>

 enum qse_rwl_flag_t
 {
--- a/qse/include/qse/si/sio.h
+++ b/qse/include/qse/si/sio.h
@ -33,8 +33,8 @@

 #include <qse/types.h>
 #include <qse/macros.h>
-#include <qse/io/fio.h>
-#include <qse/io/tio.h>
+#include <qse/si/fio.h>
+#include <qse/si/tio.h>
 #include <stdarg.h>

 enum qse_sio_flag_t
--- a/qse/include/qse/xli/stdxli.h
+++ b/qse/include/qse/xli/stdxli.h
@ -28,7 +28,7 @@
 #define _QSE_XLI_STDXLI_H_

 #include <qse/xli/xli.h>
-#include <qse/io/sio.h>
+#include <qse/si/sio.h>

 /** \file
 * This file provides easier interface to a qse_xli_t object.