From 4a13633e5dc37dd892a46996488016d4e70c5b1c Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 13 Dec 2014 16:25:48 -0800 Subject: [PATCH] cocoa: cleanup usings. --- basis/cocoa/application/application.factor | 6 ++---- basis/cocoa/dialogs/dialogs.factor | 8 ++++---- basis/cocoa/messages/messages.factor | 10 +++++----- basis/cocoa/nibs/nibs.factor | 7 +++---- basis/cocoa/pasteboard/pasteboard.factor | 6 +++--- basis/cocoa/plists/plists.factor | 11 +++++------ basis/cocoa/subclassing/subclassing.factor | 10 ++++------ basis/cocoa/types/types.factor | 4 ++-- basis/cocoa/views/views.factor | 5 ++--- basis/cocoa/windows/windows.factor | 3 +-- 10 files changed, 31 insertions(+), 39 deletions(-) diff --git a/basis/cocoa/application/application.factor b/basis/cocoa/application/application.factor index e7e60e1a17..b560353442 100644 --- a/basis/cocoa/application/application.factor +++ b/basis/cocoa/application/application.factor @@ -1,9 +1,7 @@ ! Copyright (C) 2006, 2010 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.c-types alien.syntax io kernel namespaces -core-foundation core-foundation.strings cocoa.messages cocoa -cocoa.classes cocoa.runtime sequences init summary -kernel.private assocs ; +USING: alien.c-types alien.syntax cocoa cocoa.classes +cocoa.runtime core-foundation.strings kernel sequences ; IN: cocoa.application : ( str -- alien ) -> autorelease ; diff --git a/basis/cocoa/dialogs/dialogs.factor b/basis/cocoa/dialogs/dialogs.factor index 7761286127..f479e7336e 100644 --- a/basis/cocoa/dialogs/dialogs.factor +++ b/basis/cocoa/dialogs/dialogs.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2006, 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: kernel cocoa cocoa.messages cocoa.classes -cocoa.application sequences splitting core-foundation -core-foundation.strings ; +USING: cocoa cocoa.application cocoa.classes +core-foundation.strings kernel splitting ; IN: cocoa.dialogs : ( -- panel ) @@ -27,8 +26,9 @@ CONSTANT: NSCancelButton 0 : (open-panel) ( panel -- paths ) dup -> runModal NSOKButton = [ -> filenames CF>string-array ] [ drop f ] if ; - + : open-panel ( -- paths ) (open-panel) ; + : open-dir-panel ( -- paths ) (open-panel) ; : split-path ( path -- dir file ) diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor index 155c39c25c..262939d711 100644 --- a/basis/cocoa/messages/messages.factor +++ b/basis/cocoa/messages/messages.factor @@ -1,11 +1,11 @@ ! Copyright (C) 2006, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien alien.c-types alien.data alien.strings -arrays assocs classes.struct continuations combinators compiler -core-graphics.types stack-checker kernel math namespaces make -quotations sequences strings words cocoa.runtime cocoa.types io -macros memoize io.encodings.utf8 effects layouts libc lexer init -core-foundation fry generalizations specialized-arrays locals ; +arrays assocs classes.struct cocoa.runtime cocoa.types +combinators core-graphics.types fry generalizations +io.encodings.utf8 kernel layouts libc locals macros make math +memoize namespaces quotations sequences specialized-arrays +stack-checker strings words ; QUALIFIED-WITH: alien.c-types c IN: cocoa.messages diff --git a/basis/cocoa/nibs/nibs.factor b/basis/cocoa/nibs/nibs.factor index 320b4783a5..2d242b49db 100644 --- a/basis/cocoa/nibs/nibs.factor +++ b/basis/cocoa/nibs/nibs.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2008, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.c-types alien.data cocoa.application cocoa.messages -cocoa.classes cocoa.runtime cocoa core-foundation -core-foundation.arrays kernel ; +USING: alien.c-types alien.data cocoa cocoa.application +cocoa.classes core-foundation.arrays kernel ; IN: cocoa.nibs : load-nib ( name -- ) @@ -18,4 +17,4 @@ IN: cocoa.nibs f { void* } [ -> instantiateNibWithOwner:topLevelObjects: ] with-out-parameters - swap [ CF>array ] [ drop f ] if ; \ No newline at end of file + swap [ CF>array ] [ drop f ] if ; diff --git a/basis/cocoa/pasteboard/pasteboard.factor b/basis/cocoa/pasteboard/pasteboard.factor index ef1c86836b..f98d69fe81 100644 --- a/basis/cocoa/pasteboard/pasteboard.factor +++ b/basis/cocoa/pasteboard/pasteboard.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.accessors arrays kernel cocoa.messages -cocoa.classes cocoa.application sequences cocoa core-foundation -core-foundation.strings core-foundation.arrays ; +USING: alien.accessors arrays cocoa cocoa.application +core-foundation.arrays core-foundation.strings kernel sequences +; IN: cocoa.pasteboard CONSTANT: NSStringPboardType "NSStringPboardType" diff --git a/basis/cocoa/plists/plists.factor b/basis/cocoa/plists/plists.factor index 63662d5489..dccb43d026 100644 --- a/basis/cocoa/plists/plists.factor +++ b/basis/cocoa/plists/plists.factor @@ -1,12 +1,11 @@ ! Copyright (C) 2007, 2009 Slava Pestov. ! Copyright (C) 2008 Joe Groff. ! See http://factorcode.org/license.txt for BSD license. -USING: strings arrays hashtables assocs sequences fry macros -cocoa cocoa.messages cocoa.classes cocoa.application -kernel namespaces io.backend math cocoa.enumeration byte-arrays -combinators alien.c-types alien.data words quotations -core-foundation core-foundation.data core-foundation.strings -core-foundation.utilities ; +USING: alien.c-types alien.data arrays byte-arrays cocoa +cocoa.application cocoa.classes cocoa.enumeration combinators +core-foundation.data core-foundation.strings +core-foundation.utilities fry io.backend kernel macros math +quotations sequences ; IN: cocoa.plists : >plist ( value -- plist ) >cf -> autorelease ; diff --git a/basis/cocoa/subclassing/subclassing.factor b/basis/cocoa/subclassing/subclassing.factor index 742b0b6b75..47f38a5442 100644 --- a/basis/cocoa/subclassing/subclassing.factor +++ b/basis/cocoa/subclassing/subclassing.factor @@ -1,11 +1,9 @@ ! Copyright (C) 2006, 2010 Slava Pestov, Joe Groff. ! See http://factorcode.org/license.txt for BSD license. -USING: alien alien.c-types alien.parser alien.strings arrays -assocs combinators compiler hashtables kernel lexer libc -locals.parser locals.types math namespaces parser sequences -words cocoa.messages cocoa.runtime locals compiler.units -io.encodings.utf8 continuations make fry effects stack-checker -stack-checker.errors ; +USING: alien alien.parser alien.strings arrays assocs +cocoa.messages cocoa.runtime combinators compiler.units fry +io.encodings.utf8 kernel lexer locals locals.parser locals.types +make namespaces parser sequences words ; IN: cocoa.subclassing : init-method ( method -- sel imp types ) diff --git a/basis/cocoa/types/types.factor b/basis/cocoa/types/types.factor index 1e1ec98245..87533c4fbc 100644 --- a/basis/cocoa/types/types.factor +++ b/basis/cocoa/types/types.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006, 2009 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: alien.c-types alien.syntax combinators kernel layouts -classes.struct cocoa.runtime core-graphics.types ; +USING: alien.c-types alien.syntax classes.struct cocoa.runtime +core-graphics.types ; IN: cocoa.types TYPEDEF: long NSInteger diff --git a/basis/cocoa/views/views.factor b/basis/cocoa/views/views.factor index 585f23dde3..4e4c459fb7 100644 --- a/basis/cocoa/views/views.factor +++ b/basis/cocoa/views/views.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2006, 2009 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel math namespaces make -cocoa cocoa.messages cocoa.classes core-graphics -core-graphics.types sequences continuations accessors ; +USING: accessors arrays cocoa core-graphics.types kernel math +sequences ; IN: cocoa.views CONSTANT: NSOpenGLPFAAllRenderers 1 diff --git a/basis/cocoa/windows/windows.factor b/basis/cocoa/windows/windows.factor index 4f18adeedf..b2449d0046 100644 --- a/basis/cocoa/windows/windows.factor +++ b/basis/cocoa/windows/windows.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2006, 2007 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: arrays kernel math cocoa cocoa.messages cocoa.classes -sequences math.bitwise ; +USING: cocoa cocoa.classes kernel math ; IN: cocoa.windows ! Window styles