From 94812c1f49dff45b4e2285b909fed1250f8d87b5 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 19 Aug 2011 14:31:19 -0700
Subject: [PATCH] Moving io.trash to io.files.trash.

---
 extra/io/{ => files}/trash/authors.txt            | 0
 extra/io/{ => files}/trash/macosx/macosx.factor   | 4 ++--
 extra/io/{ => files}/trash/macosx/platforms.txt   | 0
 extra/io/{ => files}/trash/summary.txt            | 0
 extra/io/{ => files}/trash/trash-docs.factor      | 4 ++--
 extra/io/{ => files}/trash/trash.factor           | 8 ++++----
 extra/io/{ => files}/trash/unix/platforms.txt     | 0
 extra/io/{ => files}/trash/unix/unix.factor       | 6 +++---
 extra/io/{ => files}/trash/windows/platforms.txt  | 0
 extra/io/{ => files}/trash/windows/windows.factor | 4 ++--
 10 files changed, 13 insertions(+), 13 deletions(-)
 rename extra/io/{ => files}/trash/authors.txt (100%)
 rename extra/io/{ => files}/trash/macosx/macosx.factor (93%)
 rename extra/io/{ => files}/trash/macosx/platforms.txt (100%)
 rename extra/io/{ => files}/trash/summary.txt (100%)
 rename extra/io/{ => files}/trash/trash-docs.factor (76%)
 rename extra/io/{ => files}/trash/trash.factor (52%)
 rename extra/io/{ => files}/trash/unix/platforms.txt (100%)
 rename extra/io/{ => files}/trash/unix/unix.factor (93%)
 rename extra/io/{ => files}/trash/windows/platforms.txt (100%)
 rename extra/io/{ => files}/trash/windows/windows.factor (94%)

diff --git a/extra/io/trash/authors.txt b/extra/io/files/trash/authors.txt
similarity index 100%
rename from extra/io/trash/authors.txt
rename to extra/io/files/trash/authors.txt
diff --git a/extra/io/trash/macosx/macosx.factor b/extra/io/files/trash/macosx/macosx.factor
similarity index 93%
rename from extra/io/trash/macosx/macosx.factor
rename to extra/io/files/trash/macosx/macosx.factor
index 456afbdfb2..42a1509993 100644
--- a/extra/io/trash/macosx/macosx.factor
+++ b/extra/io/files/trash/macosx/macosx.factor
@@ -2,9 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license
 
 USING: alien.c-types alien.strings alien.syntax classes.struct
-core-foundation io.encodings.utf8 io.trash kernel system ;
+core-foundation io.encodings.utf8 io.files.trash kernel system ;
 
-IN: io.trash.macosx
+IN: io.files.trash.macosx
 
 <PRIVATE
 
diff --git a/extra/io/trash/macosx/platforms.txt b/extra/io/files/trash/macosx/platforms.txt
similarity index 100%
rename from extra/io/trash/macosx/platforms.txt
rename to extra/io/files/trash/macosx/platforms.txt
diff --git a/extra/io/trash/summary.txt b/extra/io/files/trash/summary.txt
similarity index 100%
rename from extra/io/trash/summary.txt
rename to extra/io/files/trash/summary.txt
diff --git a/extra/io/trash/trash-docs.factor b/extra/io/files/trash/trash-docs.factor
similarity index 76%
rename from extra/io/trash/trash-docs.factor
rename to extra/io/files/trash/trash-docs.factor
index a88e3165be..1652d9ebaf 100644
--- a/extra/io/trash/trash-docs.factor
+++ b/extra/io/files/trash/trash-docs.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2010 John Benediktsson
 ! See http://factorcode.org/license.txt for BSD license
 
-USING: help.markup help.syntax io.trash ;
+USING: help.markup help.syntax io.files.trash ;
 
-IN: io.trash
+IN: io.files.trash
 
 HELP: send-to-trash
 { $values { "path" "a file path" } }
diff --git a/extra/io/trash/trash.factor b/extra/io/files/trash/trash.factor
similarity index 52%
rename from extra/io/trash/trash.factor
rename to extra/io/files/trash/trash.factor
index 50efc912af..2539fc9e2a 100644
--- a/extra/io/trash/trash.factor
+++ b/extra/io/files/trash/trash.factor
@@ -3,13 +3,13 @@
 
 USING: combinators system vocabs.loader ;
 
-IN: io.trash
+IN: io.files.trash
 
 HOOK: send-to-trash os ( path -- )
 
 {
-    { [ os macosx? ] [ "io.trash.macosx"  ] }
-    { [ os unix?   ] [ "io.trash.unix"    ] }
-    { [ os winnt?  ] [ "io.trash.windows" ] }
+    { [ os macosx? ] [ "io.files.trash.macosx"  ] }
+    { [ os unix?   ] [ "io.files.trash.unix"    ] }
+    { [ os winnt?  ] [ "io.files.trash.windows" ] }
 } cond require
 
diff --git a/extra/io/trash/unix/platforms.txt b/extra/io/files/trash/unix/platforms.txt
similarity index 100%
rename from extra/io/trash/unix/platforms.txt
rename to extra/io/files/trash/unix/platforms.txt
diff --git a/extra/io/trash/unix/unix.factor b/extra/io/files/trash/unix/unix.factor
similarity index 93%
rename from extra/io/trash/unix/unix.factor
rename to extra/io/files/trash/unix/unix.factor
index ba604079e9..e8b8489cdb 100644
--- a/extra/io/trash/unix/unix.factor
+++ b/extra/io/files/trash/unix/unix.factor
@@ -3,11 +3,11 @@
 
 USING: accessors calendar combinators.short-circuit environment
 formatting io io.directories io.encodings.utf8 io.files
-io.files.info io.files.info.unix io.files.types io.pathnames
-io.trash kernel math math.parser sequences system unix.stat
+io.files.info io.files.info.unix io.files.trash io.files.types
+io.pathnames kernel math math.parser sequences system unix.stat
 unix.users ;
 
-IN: io.trash.unix
+IN: io.files.trash.unix
 
 ! Implements the FreeDesktop.org Trash Specification 0.7
 
diff --git a/extra/io/trash/windows/platforms.txt b/extra/io/files/trash/windows/platforms.txt
similarity index 100%
rename from extra/io/trash/windows/platforms.txt
rename to extra/io/files/trash/windows/platforms.txt
diff --git a/extra/io/trash/windows/windows.factor b/extra/io/files/trash/windows/windows.factor
similarity index 94%
rename from extra/io/trash/windows/windows.factor
rename to extra/io/files/trash/windows/windows.factor
index 3ed3bf0dc7..d0cf039296 100644
--- a/extra/io/trash/windows/windows.factor
+++ b/extra/io/files/trash/windows/windows.factor
@@ -3,10 +3,10 @@
 
 USING: accessors alien.c-types alien.data alien.strings
 alien.syntax classes.struct classes.struct.packed destructors
-kernel io.encodings.utf16n io.trash libc math sequences system
+kernel io.encodings.utf16n io.files.trash libc math sequences system
 windows.types ;
 
-IN: io.trash.windows
+IN: io.files.trash.windows
 
 <PRIVATE