Mercurial > octave-nkf
comparison libinterp/dldfcn/__init_fltk__.cc @ 20267:a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
* liboctave/array/Array.h (Array::length): deprecate for ::numel.
* liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel.
* libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc,
libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc,
libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc,
libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc,
libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc,
libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc,
liboctave/array/Array-util.cc, liboctave/array/Array.cc,
liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc,
liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc,
liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h,
liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc,
liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc,
liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc,
liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc,
liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc,
liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc,
liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc,
liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc,
liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc,
liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc,
liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc,
liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc,
liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc,
liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc,
liboctave/util/glob-match.h, liboctave/util/kpse.cc,
liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc,
liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc,
liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage
of Array::length() and Sparse::length() with ::numel().
| author | Carnë Draug <carandraug@octave.org> |
|---|---|
| date | Sat, 30 May 2015 03:14:07 +0100 |
| parents | aa36fb998a4d |
| children | 7ac907da9fba |
comparison
equal
deleted
inserted
replaced
| 20266:83792dd9bcc1 | 20267:a9574e3c6e9e |
|---|---|
| 561 | 561 |
| 562 void add_to_menu (uimenu::properties& uimenup) | 562 void add_to_menu (uimenu::properties& uimenup) |
| 563 { | 563 { |
| 564 std::vector<int> delayed_menus; | 564 std::vector<int> delayed_menus; |
| 565 Matrix kids = find_uimenu_children (uimenup); | 565 Matrix kids = find_uimenu_children (uimenup); |
| 566 int len = kids.length (); | 566 int len = kids.numel (); |
| 567 std::string fltk_label = uimenup.get_fltk_label (); | 567 std::string fltk_label = uimenup.get_fltk_label (); |
| 568 int count = 0; | 568 int count = 0; |
| 569 | 569 |
| 570 add_entry (uimenup); | 570 add_entry (uimenup); |
| 571 update_foregroundcolor (uimenup); | 571 update_foregroundcolor (uimenup); |
| 611 | 611 |
| 612 void add_to_menu (figure::properties& figp) | 612 void add_to_menu (figure::properties& figp) |
| 613 { | 613 { |
| 614 std::vector<int> delayed_menus; | 614 std::vector<int> delayed_menus; |
| 615 Matrix kids = find_uimenu_children (figp); | 615 Matrix kids = find_uimenu_children (figp); |
| 616 int len = kids.length (); | 616 int len = kids.numel (); |
| 617 int count = 0; | 617 int count = 0; |
| 618 menubar->clear (); | 618 menubar->clear (); |
| 619 for (octave_idx_type ii = 0; ii < len; ii++) | 619 for (octave_idx_type ii = 0; ii < len; ii++) |
| 620 { | 620 { |
| 621 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1))); | 621 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1))); |
| 656 void remove_from_menu (T_prop& prop) | 656 void remove_from_menu (T_prop& prop) |
| 657 { | 657 { |
| 658 Matrix kids; | 658 Matrix kids; |
| 659 std::string type = prop.get_type (); | 659 std::string type = prop.get_type (); |
| 660 kids = find_uimenu_children (prop); | 660 kids = find_uimenu_children (prop); |
| 661 int len = kids.length (); | 661 int len = kids.numel (); |
| 662 | 662 |
| 663 for (octave_idx_type ii = 0; ii < len; ii++) | 663 for (octave_idx_type ii = 0; ii < len; ii++) |
| 664 { | 664 { |
| 665 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1))); | 665 graphics_object kgo = gh_manager::get_object (kids (len - (ii + 1))); |
| 666 | 666 |
| 1111 } | 1111 } |
| 1112 | 1112 |
| 1113 graphics_handle pixel2axes_or_ca (int px, int py) | 1113 graphics_handle pixel2axes_or_ca (int px, int py) |
| 1114 { | 1114 { |
| 1115 Matrix kids = fp.get_children (); | 1115 Matrix kids = fp.get_children (); |
| 1116 int len = kids.length (); | 1116 int len = kids.numel (); |
| 1117 | 1117 |
| 1118 for (int k = 0; k < len; k++) | 1118 for (int k = 0; k < len; k++) |
| 1119 { | 1119 { |
| 1120 graphics_handle hnd = gh_manager::lookup (kids(k)); | 1120 graphics_handle hnd = gh_manager::lookup (kids(k)); |
| 1121 | 1121 |