cleanup some QUALIFIED: that are no longer needed.

diff --git a/basis/alien/c-types/c-types-docs.factor b/basis/alien/c-types/c-types-docs.factor
index 216a278206bda658365f181e0ce5693adf8271a7..bf35d968afb8cbe36a92e7ea5e74d5c5558cd5ca 100644 (file)
--- a/basis/alien/c-types/c-types-docs.factor
+++ b/basis/alien/c-types/c-types-docs.factor
@@ -2,8 +2,6 @@ USING: alien help.syntax help.markup libc kernel.private
 byte-arrays strings hashtables alien.syntax alien.strings
 sequences io.encodings.string debugger destructors vocabs.loader
 classes.struct math kernel ;
-QUALIFIED: math
-QUALIFIED: sequences
 IN: alien.c-types
 
 HELP: heap-size

diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index 4e0e4c111f97e41a8b7409e03c35fd2f378ad52a..18865cee4ba1b8706f904c84c614ba751e73b365 100644 (file)
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -4,7 +4,6 @@ USING: accessors alien alien.accessors arrays byte-arrays
 classes combinators compiler.units cpu.architecture delegate
 fry kernel layouts locals macros math math.order quotations
 sequences system words words.symbol summary ;
-QUALIFIED: math
 IN: alien.c-types
 
 SYMBOLS:

diff --git a/basis/alien/data/data.factor b/basis/alien/data/data.factor
index 789094fb8beb8d38d3dc6a5276cae9070a78757c..a1fffa3781ad877d7fee56212206947db7b1bc68 100644 (file)
--- a/basis/alien/data/data.factor
+++ b/basis/alien/data/data.factor
@@ -4,7 +4,6 @@ arrays byte-arrays combinators combinators.short-circuit
 cpu.architecture fry generalizations io io.streams.memory kernel
 libc locals macros math math.functions parser sequences
 stack-checker.dependencies summary words ;
-QUALIFIED: math
 IN: alien.data
 
 : <ref> ( value c-type -- c-ptr )

diff --git a/basis/classes/struct/struct.factor b/basis/classes/struct/struct.factor
index 0d14fa12cc0fc4a41c2dddbd818e5adc00eca363..e09b3ddfed8a9ae5dc0c9f014b6859a23e94e2ed 100644 (file)
--- a/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor
@@ -10,7 +10,6 @@ generic.parser io kernel kernel.private lexer libc locals macros
 math math.order parser quotations sequences slots slots.private
 specialized-arrays stack-checker.dependencies summary vectors
 vocabs.loader vocabs.parser words ;
-QUALIFIED: math
 IN: classes.struct
 
 SPECIALIZED-ARRAY: uchar

diff --git a/basis/cocoa/cocoa.factor b/basis/cocoa/cocoa.factor
index ecf2769ba7cee5b0a201818714bb4c50036ce885..247312e7309c4f5b6ea4d36711d022d4b4a58005 100644 (file)
--- a/basis/cocoa/cocoa.factor
+++ b/basis/cocoa/cocoa.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: cocoa.messages compiler.units core-foundation.bundles
 hashtables init io kernel lexer namespaces sequences vocabs ;
-QUALIFIED: cocoa.messages
 IN: cocoa
 
 SYMBOL: sent-messages

diff --git a/basis/compiler/cfg/intrinsics/intrinsics.factor b/basis/compiler/cfg/intrinsics/intrinsics.factor
index 2f5a6ce5a18ba435d7db9ba4cf8f204c19d8190d..57a1c5ec539823996018d9d0934910ba3be9df02 100644 (file)
--- a/basis/compiler/cfg/intrinsics/intrinsics.factor
+++ b/basis/compiler/cfg/intrinsics/intrinsics.factor
@@ -13,7 +13,6 @@ QUALIFIED: alien.data.private
 QUALIFIED: arrays
 QUALIFIED: byte-arrays
 QUALIFIED: classes.tuple.private
-QUALIFIED: kernel
 QUALIFIED: kernel.private
 QUALIFIED: math.bitwise.private
 QUALIFIED: math.floats.private

diff --git a/basis/compression/zlib/zlib.factor b/basis/compression/zlib/zlib.factor
index 533d55bb68b68feaa05c0bbfa9e984f044e46f40..f258097a5c697204c5e292ebe9dfb5eb455c62b9 100644 (file)
--- a/basis/compression/zlib/zlib.factor
+++ b/basis/compression/zlib/zlib.factor
@@ -4,7 +4,6 @@ USING: accessors alien alien.c-types alien.data alien.syntax
 byte-arrays byte-vectors classes.struct combinators
 compression.zlib.ffi continuations destructors fry kernel libc
 math math.functions math.ranges sequences system ;
-QUALIFIED: compression.zlib.ffi
 IN: compression.zlib
 
 ERROR: zlib-failed n string ;

diff --git a/basis/documents/documents.factor b/basis/documents/documents.factor
index ca9440ff370def31b4db9502028bffede5426200..edab127f5ecd8b1d1ee18fef0dcaf4169dc555ad 100644 (file)
--- a/basis/documents/documents.factor
+++ b/basis/documents/documents.factor
@@ -2,7 +2,6 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays fry kernel locals math math.order
 math.ranges models sequences splitting ;
-QUALIFIED: models
 IN: documents
 
 : +col ( loc n -- newloc ) [ first2 ] dip + 2array ;

diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor
index db85c22bd64dab76fb90416f6a76ce37d2568813..16870824147034519ac09dae53a64fcee48efbe9 100755 (executable)
--- a/basis/io/files/info/windows/windows.factor
+++ b/basis/io/files/info/windows/windows.factor
@@ -9,7 +9,6 @@ continuations destructors calendar ascii
 combinators.short-circuit literals locals classes.struct
 specialized-arrays alien.data libc windows.shell32 ;
 SPECIALIZED-ARRAY: ushort
-QUALIFIED: sequences
 IN: io.files.info.windows
 
 :: round-up-to ( n multiple -- n' )

diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index b0c4a9e7113e96de2fad2d8c09b5c21fb1f3bf73..995ff1065a1c7ab3cb93d2fa30a577a70e17ab54 100755 (executable)
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -11,18 +11,7 @@ tools.deploy.config combinators combinators.private classes
 vocabs.loader.private classes.builtin slots.private grouping
 command-line io.pathnames memoize namespaces.private
 hashtables locals ;
-QUALIFIED: bootstrap.stage2
 QUALIFIED: classes.private
-QUALIFIED: compiler.crossref
-QUALIFIED: compiler.errors
-QUALIFIED: continuations
-QUALIFIED: definitions
-QUALIFIED: init
-QUALIFIED: layouts
-QUALIFIED: source-files
-QUALIFIED: source-files.errors
-QUALIFIED: vocabs
-QUALIFIED: vocabs.loader
 IN: tools.deploy.shaker
 
 ! This file is some hairy shit.

diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor
index 9536ebb9d2f5a5e814a2774d4f503ea4f10d841b..ebc3f6d9ef03b4898949f1f4ea61904f92d16033 100644 (file)
--- a/basis/unicode/data/data.factor
+++ b/basis/unicode/data/data.factor
@@ -5,7 +5,6 @@ combinators.short-circuit grouping hashtables interval-sets
 io.encodings.utf8 io.files kernel locals make math math.bitwise
 math.order math.parser math.ranges memoize namespaces sequences
 sets simple-flat-file sorting splitting strings.parser ;
-QUALIFIED: interval-sets
 IN: unicode.data
 
 <PRIVATE

diff --git a/basis/unix/groups/groups.factor b/basis/unix/groups/groups.factor
index e51ccc40c47632b829f2de706279cf803a162be2..65a26da0ef980fa511caecfa7ae77c2046308a73 100644 (file)
--- a/basis/unix/groups/groups.factor
+++ b/basis/unix/groups/groups.factor
@@ -5,7 +5,6 @@ assocs byte-arrays classes.struct combinators
 combinators.short-circuit continuations fry io.encodings.utf8
 kernel math math.parser namespaces sequences splitting strings
 unix unix.ffi unix.users unix.utilities ;
-QUALIFIED: unix.ffi
 QUALIFIED: grouping
 IN: unix.groups
 

diff --git a/core/bootstrap/stage1.factor b/core/bootstrap/stage1.factor
index 55b09061ffd9894fb0f557368d822b64b2b94246..7fe5515cfe8f4d8d8caf6994b1cbd25e2c69bf40 100644 (file)
--- a/core/bootstrap/stage1.factor
+++ b/core/bootstrap/stage1.factor
@@ -5,8 +5,6 @@ hash-sets hashtables init io io.files kernel kernel.private
 make math memory namespaces parser parser.notes prettyprint
 sequences splitting system vectors vocabs vocabs.loader words ;
 QUALIFIED: bootstrap.image.private
-QUALIFIED: hashtables
-QUALIFIED: hash-sets
 IN: bootstrap.stage1
 
 "Bootstrap stage 1..." print flush

diff --git a/extra/benchmark/hashtables/hashtables.factor b/extra/benchmark/hashtables/hashtables.factor
index d6738de9b6e458e8b2b20f9cc30b6b49868c684b..ca4eb4b8d8f17f6eeee94340765ca118eef2e0ba 100644 (file)
--- a/extra/benchmark/hashtables/hashtables.factor
+++ b/extra/benchmark/hashtables/hashtables.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators kernel locals math
-math.ranges memoize sequences strings hashtables
-math.parser grouping ;
-QUALIFIED: assocs
+USING: accessors assocs combinators grouping kernel locals math
+math.parser math.ranges memoize sequences ;
 IN: benchmark.hashtables
 
 MEMO: strings ( -- str )

diff --git a/extra/compiler/cfg/gvn/avail/avail.factor b/extra/compiler/cfg/gvn/avail/avail.factor
index 99008c9fc8f20246db9acab9013fd0e3e3e9743c..9d07225315c0aff8ec5333bb1df253dfabaec4f2 100644 (file)
--- a/extra/compiler/cfg/gvn/avail/avail.factor
+++ b/extra/compiler/cfg/gvn/avail/avail.factor
@@ -9,7 +9,6 @@ compiler.cfg.gvn.graph
 compiler.cfg.predecessors
 compiler.cfg.renaming.functor
 compiler.cfg.rpo ;
-QUALIFIED: assocs
 IN: compiler.cfg.gvn.avail
 
 : defined ( bb -- vregs )

diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor
index ffd0a7a09dafe7bb48f73ca76490cf5259af05c5..d6cc3d672a2c486a54dc5fde420b62d9c12b8b14 100644 (file)
--- a/extra/images/png/png.factor
+++ b/extra/images/png/png.factor
@@ -6,8 +6,6 @@ images images.loader io io.binary io.encodings.ascii
 io.encodings.binary io.encodings.string io.streams.byte-array
 io.streams.throwing kernel locals math math.bitwise
 math.functions math.order math.ranges sequences sorting ;
-QUALIFIED-WITH: bitstreams bs
-QUALIFIED: math
 IN: images.png
 
 SINGLETON: png-image
@@ -169,10 +167,10 @@ ERROR: bad-filter n ;
         count 2 * count!
     ] when
 
-    bs:<msb0-bit-reader> :> br
+    bitstreams:<msb0-bit-reader> :> br
     height [
-        count [ depth br bs:read ] B{ } replicate-as
-        8 br bs:align
+        count [ depth br bitstreams:read ] B{ } replicate-as
+        8 br bitstreams:align
     ] replicate concat ;
 
 :: reverse-interlace-none ( bytes loading-png -- array )

diff --git a/extra/memcached/memcached-tests.factor b/extra/memcached/memcached-tests.factor
index 6317a08347cecd5b1ac154672546bdd954111ed9..572e56ae292e58e72aad1f68bc14674ddfb6221f 100644 (file)
--- a/extra/memcached/memcached-tests.factor
+++ b/extra/memcached/memcached-tests.factor
@@ -6,8 +6,6 @@ io.timeouts kernel math math.functions memcached
 memcached.private namespaces present sequences sorting system
 threads tools.test ;
 
-QUALIFIED: memcached
-
 IN: memcached.tests
 
 ! Use a version of with-memcached that sets a timeout

diff --git a/extra/redis/redis-tests.factor b/extra/redis/redis-tests.factor
index 3d53953f065c7cf1537b36fa13bba59dc03adc10..89cef6f42b4be8cefdef2c9f706f6bc55d45c081 100644 (file)
--- a/extra/redis/redis-tests.factor
+++ b/extra/redis/redis-tests.factor
@@ -4,8 +4,6 @@
 USING: continuations kernel redis math math.parser sequences
 sorting tools.test ;
 
-QUALIFIED: redis
-
 IN: redis.tests
 
 : with-redis ( quot -- )

diff --git a/extra/webapps/site-watcher/site-watcher.factor b/extra/webapps/site-watcher/site-watcher.factor
index a41dbdba8f260ac6db3f62fb7b9c4942ab992a64..e1c1b62dabb9045c4f1984192a7de5c195d8f0d4 100644 (file)
--- a/extra/webapps/site-watcher/site-watcher.factor
+++ b/extra/webapps/site-watcher/site-watcher.factor
@@ -10,7 +10,6 @@ http.server.dispatchers kernel namespaces site-watcher site-watcher.db
 site-watcher.private urls sequences validators
 webapps.site-watcher.common webapps.site-watcher.watching
 webapps.site-watcher.spidering webapps.utils ;
-QUALIFIED: assocs
 IN: webapps.site-watcher
 
 : <main-action> ( -- action )