Restoring the "add-" prefix

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index 05ac20f14ad591fb04584c01d8723ae309a04ba7..fb32fd0fa4b6fcf52ad248377146391da432a1e4 100644 (file)
--- a/basis/ui/tools/browser/browser.factor
+++ b/basis/ui/tools/browser/browser.factor
@@ -39,7 +39,7 @@ M: browser-gadget set-history-value
 
 CONSTANT: help-header-background COLOR: FactorLightTan
 
-: help-header ( track -- track )
+: add-help-header ( track -- track )
     dup <help-header> { 3 3 } <border>
     help-header-background <solid> >>interior 
     { 1 0 } >>fill f track-add ;
@@ -47,7 +47,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
 : <help-pane> ( browser-gadget -- gadget )
     model>> [ '[ _ print-topic ] try ] <pane-control> ;
 
-: help-pane ( track -- track )
+: add-help-pane ( track -- track )
     dup dup <help-pane> margins
     <scroller> >>scroller scroller>> white-interior 1 track-add ;
 
@@ -68,7 +68,7 @@ CONSTANT: help-header-background COLOR: FactorLightTan
         over <toolbar> f track-add
         swap search-field>> "          Search" label-on-left 1 track-add ;
 
-: browser-toolbar ( track -- track )
+: add-browser-toolbar ( track -- track )
     dup <browser-toolbar> { 3 3 } <border>
     toolbar-background <solid> >>interior { 1 0 } >>fill
     f track-add ;
@@ -79,9 +79,9 @@ CONSTANT: help-header-background COLOR: FactorLightTan
         swap >link <model> >>model
         dup <history> >>history
         dup <search-field> >>search-field
-        browser-toolbar
-        help-header
-        help-pane ;
+        add-browser-toolbar
+        add-help-header
+        add-help-pane ;
 
 M: browser-gadget graft*
     [ add-definition-observer ] [ call-next-method ] bi ;

diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index 41adfffff9ffd634bb5749327a04e75617caeea9..85b83edd96d2f5260465c779c1ff4984ddceed02 100644 (file)
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -218,13 +218,15 @@ TUPLE: listener-gadget < tool error-summary output scroller input ;
     <error-summary> >>error-summary
     dup error-summary>> f track-add ;
     
-: listener-area ( listener -- listener )
+: add-listener-area ( listener -- listener )
     dup output>> margins <scroller> >>scroller
     dup scroller>> white-interior 1 track-add ;
 
 : <listener-gadget> ( -- listener )
-    vertical listener-gadget new-track
-    with-lines add-toolbar init-input/output listener-area
+    vertical listener-gadget new-track with-lines
+    add-toolbar
+    init-input/output
+    add-listener-area
     init-error-summary ;
 
 M: listener-gadget focusable-child*