Mercurial > octave
diff libinterp/octave-value/ov-classdef.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 938794bc82b7 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-classdef.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Sat Aug 14 22:48:52 2021 -0400 @@ -599,7 +599,7 @@ std::string cname = args(0).xstring_value ("PACKAGE_NAME must be a string"); - return octave::to_ov (octave::lookup_package (cname)); + return to_ov (lookup_package (cname)); } DEFUN (metaclass, args, , @@ -611,9 +611,9 @@ if (args.length () != 1) print_usage (); - octave::cdef_object obj = octave::to_cdef (args(0)); + cdef_object obj = to_cdef (args(0)); - return octave::to_ov (obj.get_class ()); + return to_ov (obj.get_class ()); } // FIXME: What about dynamic properties if obj is a scalar, or the @@ -651,14 +651,14 @@ else err_wrong_type_arg ("properties", arg); - octave::cdef_class cls; + cdef_class cls; - cls = octave::lookup_class (class_name, false, true); + cls = lookup_class (class_name, false, true); if (! cls.ok ()) error ("invalid class: %s", class_name.c_str ()); - std::map<std::string, octave::cdef_property> property_map = + std::map<std::string, cdef_property> property_map = cls.get_property_map (); std::list<std::string> property_names; @@ -668,7 +668,7 @@ // FIXME: this loop duplicates a significant portion of the loops // in octave_classdef::print_raw. - const octave::cdef_property& prop = pname_prop.second; + const cdef_property& prop = pname_prop.second; std::string nm = prop.get_name (); @@ -731,11 +731,11 @@ string_vector sv; - octave::cdef_class cls = octave::lookup_class (class_name, false, true); + cdef_class cls = lookup_class (class_name, false, true); if (cls.ok ()) { - std::map<std::string, octave::cdef_method> method_map + std::map<std::string, cdef_method> method_map = cls.get_method_map (false, true); std::list<std::string> method_names; @@ -752,7 +752,7 @@ // The following will also find methods for legacy @CLASS objects. - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); sv.append (lp.methods (class_name));