ui: trim even more using lists

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index 14840bab1935e0a22bd39b1b317a37c4f1c3559f..741ead32984c63319faf28879b340bbb0e49f17e 100644 (file)
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -1,12 +1,12 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays colors colors.constants combinators
-combinators.short-circuit fonts fry kernel locals math
-math.functions math.order math.rectangles math.vectors models
-namespaces opengl sequences splitting strings ui.commands
-ui.gadgets ui.gadgets.line-support ui.gadgets.menus
-ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.worlds
-ui.gestures ui.images ui.pens.solid ui.render ui.text ui.theme ;
+USING: accessors arrays colors combinators
+combinators.short-circuit fonts kernel math math.functions
+math.order math.rectangles math.vectors models namespaces opengl
+sequences splitting strings ui.commands ui.gadgets
+ui.gadgets.line-support ui.gadgets.menus ui.gadgets.scrollers
+ui.gadgets.status-bar ui.gadgets.worlds ui.gestures ui.images
+ui.pens.solid ui.render ui.text ui.theme ;
 IN: ui.gadgets.tables
 
 ! Row renderer protocol

diff --git a/basis/ui/gadgets/toolbar/toolbar.factor b/basis/ui/gadgets/toolbar/toolbar.factor
index 991dd324ad2bbd3ef013943215cf2dfb95336da6..f0321490114887c3d502593330fbaa0eaaf627ce 100644 (file)
--- a/basis/ui/gadgets/toolbar/toolbar.factor
+++ b/basis/ui/gadgets/toolbar/toolbar.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2005, 2009 Slava Pestov, 2015 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes fry kernel locals ui.baseline-alignment ui.commands
-ui.gadgets ui.gadgets.borders ui.gadgets.buttons
-ui.gadgets.buttons.private ui.gadgets.packs ui.theme
-ui.gadgets.tracks ui.pens ui.pens.solid ;
+USING: accessors assocs classes kernel ui.baseline-alignment
+ui.commands ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+ui.gadgets.buttons.private ui.gadgets.tracks ui.pens
+ui.pens.solid ui.theme ;
 IN: ui.gadgets.toolbar
 
 <PRIVATE

diff --git a/basis/ui/gadgets/tracks/tracks-docs.factor b/basis/ui/gadgets/tracks/tracks-docs.factor
index b32757316bb65f71fe4d9507271230df9ef2cb02..c3eb8197438dbd7c1c56caa43765a68b7589924d 100644 (file)
--- a/basis/ui/gadgets/tracks/tracks-docs.factor
+++ b/basis/ui/gadgets/tracks/tracks-docs.factor
@@ -1,5 +1,4 @@
-USING: ui.gadgets.packs help.markup help.syntax ui.gadgets
-arrays kernel quotations classes.tuple ;
+USING: help.markup help.syntax ui.gadgets ui.gadgets.packs ;
 IN: ui.gadgets.tracks
 
 ARTICLE: "ui-track-layout" "Track layouts"

diff --git a/basis/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor
index 0b133117239352b93c44c81162de0e1920948cd9..f01dbac37c9ab5a183a70af8d700a37d875c0070 100644 (file)
--- a/basis/ui/gadgets/tracks/tracks.factor
+++ b/basis/ui/gadgets/tracks/tracks.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors combinators fry kernel math math.vectors
-sequences ui.gadgets ui.gadgets.packs ui.gadgets.packs.private ;
+USING: accessors combinators kernel math math.vectors sequences
+ui.gadgets ui.gadgets.packs ui.gadgets.packs.private ;
 IN: ui.gadgets.tracks
 
 TUPLE: track < pack sizes ;

diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor
index 8e8a702e022edafb56ddc33f7b7ff9d7d1d0f2f6..89f342e0709fb71208e702d10b929ce0ed5f0416 100644 (file)
--- a/basis/ui/gadgets/worlds/worlds.factor
+++ b/basis/ui/gadgets/worlds/worlds.factor
@@ -2,10 +2,9 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs cache colors combinators
 combinators.short-circuit concurrency.promises continuations
-destructors fry kernel literals math models namespaces opengl
-opengl.capabilities opengl.gl opengl.textures sequences strings
-ui.backend ui.gadgets ui.gadgets.tracks ui.gestures ui.pixel-formats
-ui.render ;
+destructors kernel literals math models namespaces opengl
+sequences strings ui.backend ui.gadgets ui.gadgets.tracks
+ui.gestures ui.pixel-formats ui.render ;
 IN: ui.gadgets.worlds
 
 SYMBOLS:

diff --git a/basis/ui/gadgets/wrappers/wrappers.factor b/basis/ui/gadgets/wrappers/wrappers.factor
index fdcede7f235ef42c14e85948c09e49d1443e8e4c..989a2a5edb53ac4cce3cb31d38fe23d210e448ba 100644 (file)
--- a/basis/ui/gadgets/wrappers/wrappers.factor
+++ b/basis/ui/gadgets/wrappers/wrappers.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel ui.gadgets ui.baseline-alignment ;
+USING: accessors kernel ui.baseline-alignment ui.gadgets ;
 IN: ui.gadgets.wrappers
 
 TUPLE: wrapper < gadget ;

diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index d35ba2fca2d3ab1e16616336ba4418380f2395a7..79ea0a869190cf652f105e8a6300b0f8be8660b1 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs cache combinators images images.loader kernel math
-memoize namespaces opengl opengl.textures sequences splitting system
-ui.gadgets.worlds vocabs ;
+USING: accessors assocs cache combinators images images.loader
+kernel math namespaces opengl opengl.textures sequences
+splitting system ui.gadgets.worlds vocabs ;
 IN: ui.images
 
 TUPLE: image-name path ;

diff --git a/basis/ui/operations/operations.factor b/basis/ui/operations/operations.factor
index 7eb5a65a247b404189c3c4e788c7907ea818ca6c..d8755dc65f912702e9db68757b099148cce0a1ee 100644 (file)
--- a/basis/ui/operations/operations.factor
+++ b/basis/ui/operations/operations.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs combinators.short-circuit fry
-kernel linked-assocs namespaces sequences ui.commands words ;
+USING: accessors arrays assocs combinators.short-circuit kernel
+linked-assocs namespaces sequences ui.commands words ;
 IN: ui.operations
 
 SYMBOL: +keyboard+

diff --git a/basis/ui/pens/gradient/gradient.factor b/basis/ui/pens/gradient/gradient.factor
index 58c72f7505915d59f726fd9cd061bee383ad6b06..fc20f449a5f5bc92d5a3fca28c655e10b3e1f4a7 100644 (file)
--- a/basis/ui/pens/gradient/gradient.factor
+++ b/basis/ui/pens/gradient/gradient.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.data arrays colors combinators kernel
-locals math math.vectors opengl opengl.gl sequences
-specialized-arrays ui.pens ui.pens.caching ;
+math math.vectors opengl opengl.gl sequences specialized-arrays
+ui.pens ui.pens.caching ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 IN: ui.pens.gradient

diff --git a/basis/ui/pens/image/image.factor b/basis/ui/pens/image/image.factor
index d22ebe79637f9a2d16a76c681066f0ae2bfc6046..0223bb9281bac8edfa34e3149fca8f0437bc8f0f 100644 (file)
--- a/basis/ui/pens/image/image.factor
+++ b/basis/ui/pens/image/image.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors fry kernel math opengl sequences ui.images
-ui.pens ;
+USING: accessors kernel math opengl sequences ui.images ui.pens ;
 IN: ui.pens.image
 
 ! Image pen

diff --git a/basis/ui/pens/polygon/polygon.factor b/basis/ui/pens/polygon/polygon.factor
index 7a9bbd17140711b57df626a9c286b4503fcf1ad7..78a4c24181484b5616c5ff74780aac7b6a081086 100644 (file)
--- a/basis/ui/pens/polygon/polygon.factor
+++ b/basis/ui/pens/polygon/polygon.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types alien.data colors help.markup
-help.syntax kernel opengl opengl.gl sequences math.vectors
-ui.gadgets ui.pens specialized-arrays ;
+USING: accessors alien.c-types alien.data kernel opengl
+opengl.gl sequences specialized-arrays ui.gadgets ui.pens ;
 SPECIALIZED-ARRAY: float
 IN: ui.pens.polygon
 

diff --git a/basis/ui/pens/solid/solid.factor b/basis/ui/pens/solid/solid.factor
index 0cfc48edc1fcb1983eb52621ef220b741309f95f..deeb24604645c07fd9e9aa77f034e73ab2431551 100644 (file)
--- a/basis/ui/pens/solid/solid.factor
+++ b/basis/ui/pens/solid/solid.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel accessors opengl math colors ui.pens ui.pens.caching ;
+USING: accessors colors kernel math opengl ui.pens
+ui.pens.caching ;
 IN: ui.pens.solid
 
 TUPLE: solid < caching-pen color interior-vertices boundary-vertices ;

diff --git a/basis/ui/pens/tile/tile.factor b/basis/ui/pens/tile/tile.factor
index e2ee3dd066b0cfe92e71efdedb361f564ec0f3af..c6a1997c046703ad856fed76e375bc8b02ff7255 100644 (file)
--- a/basis/ui/pens/tile/tile.factor
+++ b/basis/ui/pens/tile/tile.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel accessors math.vectors ui.images opengl fry
-combinators ui.pens ;
+USING: accessors combinators kernel math.vectors opengl
+ui.images ui.pens ;
 IN: ui.pens.tile
 
 ! Tile pen

diff --git a/basis/ui/pixel-formats/pixel-formats.factor b/basis/ui/pixel-formats/pixel-formats.factor
index eb719677c98a1c3eab74358163e66572fd190f7b..03b77a1ecb65368ca57cea7b6f3c704cde77a6bf 100644 (file)
--- a/basis/ui/pixel-formats/pixel-formats.factor
+++ b/basis/ui/pixel-formats/pixel-formats.factor
@@ -1,6 +1,6 @@
 USING: accessors alien.c-types alien.data assocs classes
-combinators destructors fry kernel math sequences
-specialized-arrays ui.backend words ;
+combinators destructors kernel math sequences specialized-arrays
+ui.backend words ;
 SPECIALIZED-ARRAY: int
 IN: ui.pixel-formats
 

diff --git a/basis/ui/text/core-text/core-text.factor b/basis/ui/text/core-text/core-text.factor
index 1871fc4e381f2416923878dd7e476d71a28afd3e..fe7351adc62424002662173f002db5c13fa63bf1 100644 (file)
--- a/basis/ui/text/core-text/core-text.factor
+++ b/basis/ui/text/core-text/core-text.factor
@@ -2,10 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors cache core-graphics.types core-text
 core-text.fonts io.encodings.string io.encodings.utf16n kernel
-locals math math.vectors namespaces sequences ui.text
-ui.text.private ;
+math math.vectors namespaces sequences ui.text ui.text.private ;
 IN: ui.text.core-text
-
 SINGLETON: core-text-renderer
 
 <PRIVATE