diff options
Diffstat (limited to 'otherlibs/labltk/builtin')
-rw-r--r-- | otherlibs/labltk/builtin/builtin_bind.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/builtini_bind.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/builtini_index.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/builtini_text.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/dialog.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/optionmenu.ml | 2 | ||||
-rw-r--r-- | otherlibs/labltk/builtin/selection_handle_set.ml | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/otherlibs/labltk/builtin/builtin_bind.ml b/otherlibs/labltk/builtin/builtin_bind.ml index 8cd3194ab..83bfe4e22 100644 --- a/otherlibs/labltk/builtin/builtin_bind.ml +++ b/otherlibs/labltk/builtin/builtin_bind.ml @@ -178,7 +178,7 @@ let wrapeventInfo f (what : eventField list) = ev_RootY = 0 } in function args -> let l = ref args in - List.iter fun:(function field -> + List.iter f:(function field -> match !l with | [] -> () | v :: rest -> filleventInfo ev v field; l := rest) diff --git a/otherlibs/labltk/builtin/builtini_bind.ml b/otherlibs/labltk/builtin/builtini_bind.ml index 61e0baa61..d6d708d4d 100644 --- a/otherlibs/labltk/builtin/builtini_bind.ml +++ b/otherlibs/labltk/builtin/builtini_bind.ml @@ -44,11 +44,11 @@ let cCAMLtoTKevent (ev : event) = | `Unmap -> "Unmap" | `Visibility -> "Visibility" | `Modified(ml, ev) -> - String.concat sep:"" (List.map fun:cCAMLtoTKmodifier ml) + String.concat sep:"" (List.map f:cCAMLtoTKmodifier ml) ^ convert ev in "<" ^ convert ev ^ ">" let cCAMLtoTKeventSequence (l : event list) = - TkToken(String.concat sep:"" (List.map fun:cCAMLtoTKevent l)) + TkToken(String.concat sep:"" (List.map f:cCAMLtoTKevent l)) diff --git a/otherlibs/labltk/builtin/builtini_index.ml b/otherlibs/labltk/builtin/builtini_index.ml index 5940a27ec..e30160066 100644 --- a/otherlibs/labltk/builtin/builtini_index.ml +++ b/otherlibs/labltk/builtin/builtini_index.ml @@ -28,7 +28,7 @@ let cCAMLtoTKtext_index = (cCAMLtoTKindex : text_index -> tkArgs) let cTKtoCAMLtext_index s = try - let p = String.index char:'.' s in + let p = String.index s '.' in `Linechar (int_of_string (String.sub s pos:0 len:p), int_of_string (String.sub s pos:(p + 1) len:(String.length s - p - 1))) diff --git a/otherlibs/labltk/builtin/builtini_text.ml b/otherlibs/labltk/builtin/builtini_text.ml index 076c29fd5..99b85f875 100644 --- a/otherlibs/labltk/builtin/builtini_text.ml +++ b/otherlibs/labltk/builtin/builtini_text.ml @@ -23,7 +23,7 @@ let cCAMLtoTKtextIndex (i : textIndex) = let ppTextIndex (base, ml : textIndex) = match cCAMLtoTKtext_index base with TkToken ppbase -> - String.concat sep:"" (ppbase :: List.map fun:ppTextModifier ml) + String.concat sep:"" (ppbase :: List.map f:ppTextModifier ml) | _ -> assert false in TkToken (ppTextIndex i) diff --git a/otherlibs/labltk/builtin/dialog.ml b/otherlibs/labltk/builtin/dialog.ml index 257661b5e..bd8262489 100644 --- a/otherlibs/labltk/builtin/dialog.ml +++ b/otherlibs/labltk/builtin/dialog.ml @@ -7,6 +7,6 @@ let create :parent :title :message :buttons ?:name TkToken message; cCAMLtoTKbitmap bitmap; TkToken (string_of_int default); - TkTokenList (List.map fun:(fun x -> TkToken x) buttons)|] + TkTokenList (List.map f:(fun x -> TkToken x) buttons)|] in int_of_string res diff --git a/otherlibs/labltk/builtin/optionmenu.ml b/otherlibs/labltk/builtin/optionmenu.ml index 3ade5d57d..0fcba9b13 100644 --- a/otherlibs/labltk/builtin/optionmenu.ml +++ b/otherlibs/labltk/builtin/optionmenu.ml @@ -9,7 +9,7 @@ let create :parent :variable ?:name values = tkEval [|TkToken "tk_optionMenu"; TkToken (Widget.name w); cCAMLtoTKtextVariable variable; - TkTokenList (List.map fun:(fun x -> TkToken x) values)|] in + TkTokenList (List.map f:(fun x -> TkToken x) values)|] in if res <> Widget.name mw then raise (TkError "internal error in Optionmenu.create") else diff --git a/otherlibs/labltk/builtin/selection_handle_set.ml b/otherlibs/labltk/builtin/selection_handle_set.ml index 9d05bb059..2a7fe8b4c 100644 --- a/otherlibs/labltk/builtin/selection_handle_set.ml +++ b/otherlibs/labltk/builtin/selection_handle_set.ml @@ -7,7 +7,7 @@ selection_handle_icccm_optionals (fun opts w -> cCAMLtoTKwidget w; let id = register_callback w callback:(function args -> let a1 = int_of_string (List.hd args) in - let a2 = int_of_string (List.nth args pos:1) in + let a2 = int_of_string (List.nth args 1) in tkreturn (cmd pos:a1 len:a2)) in TkToken ("camlcb " ^ id) |]) |