Mercurial > octave
diff libinterp/corefcn/ft-text-renderer.cc @ 23795:980f39c3ab90
Use C++11 nullptr rather than 0 in code (bug #51565).
* Backend.cc, BaseControl.h, ButtonGroup.cc, CheckBoxControl.cc,
Container.cc, ContextMenu.cc, ContextMenu.h, EditControl.cc, Figure.cc,
FigureWindow.cc, ListBoxControl.cc, Menu.cc, Menu.h, MouseModeActionGroup.cc,
Object.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc, PushButtonControl.cc,
PushTool.cc, RadioButtonControl.cc, SliderControl.cc, TextControl.cc,
ToggleButtonControl.cc, ToggleTool.cc, ToolBar.cc, ToolBar.h, ToolBarButton.cc,
ToolBarButton.h, QTerminal.h, BlockArray.cpp, Emulation.cpp, Filter.cpp,
Filter.h, History.cpp, KeyboardTranslator.cpp, QUnixTerminalImpl.h, Screen.cpp,
ScreenWindow.cpp, ScreenWindow.h, SelfListener.h, TerminalCharacterDecoder.cpp,
TerminalModel.cpp, TerminalView.cpp, TerminalView.h, kpty.cpp, dialog.cc,
dialog.h, files-dock-widget.cc, find-files-model.h, file-editor-tab.cc,
file-editor.cc, main-window.cc, octave-dock-widget.cc, octave-gui.cc,
parser.cc, resource-manager.cc, resource-manager.h, shortcut-manager.cc,
shortcut-manager.h, workspace-model.cc, workspace-view.cc, __magick_read__.cc,
c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h,
daspk.cc, dasrt.cc, dassl.cc, det.cc, display.h, error.cc, ft-text-renderer.cc,
gl-render.cc, gl2ps-print.cc, graphics.in.h, help.cc, input.cc, interpreter.cc,
load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, ls-mat5.cc, lsode.cc,
mex.cc, mxarray.in.h, oct-errno.h, oct-hist.cc, oct-iostrm.h, oct-procbuf.cc,
oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
oct-tex-parser.in.yy, octave-link.h, pager.cc, pager.h, pr-output.cc,
procstream.h, qz.cc, sighandlers.cc, svd.cc, symtab.cc, symtab.h,
text-renderer.cc, txt-eng.h, utils.cc, variables.cc, zfstream.cc, zfstream.h,
__glpk__.cc, __init_fltk__.cc, __ode15__.cc, audiodevinfo.cc, ccolamd.cc,
colamd.cc, dmperm.cc, gzip.cc, symbfact.cc, ov-base-int.cc, ov-base-int.h,
ov-base-mat.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc,
ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc,
ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-oncleanup.cc, ov-range.cc, ov-range.h,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-typeinfo.cc,
ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, octave.cc, bp-table.cc,
bp-table.h, jit-ir.h, jit-typeinfo.cc, lex.h, profiler.cc, pt-arg-list.cc,
pt-array-list.cc, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h,
pt-cell.cc, pt-classdef.cc, pt-classdef.h, pt-colon.cc, pt-colon.h, pt-decl.cc,
pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.h, pt-fcn-handle.cc,
pt-fcn-handle.h, pt-idx.cc, pt-jit.cc, pt-loop.h, pt-mat.cc, pt-select.h,
pt-stmt.h, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt.cc, Array-C.cc, Array-d.cc,
Array-f.cc, Array-fC.cc, Array-util.cc, Array.cc, Array.h, CMatrix.cc,
CSparse.cc, DiagArray2.h, MArray.h, MDiagArray2.h, MatrixType.cc, Sparse.cc,
Sparse.h, dMatrix.cc, dSparse.cc, fMatrix.cc, idx-vector.cc, idx-vector.h,
DAEFunc.h, DAERTFunc.h, ODEFunc.h, ODESFunc.h, eigs-base.cc, oct-fftw.cc,
oct-fftw.h, oct-rand.h, oct-spparms.h, schur.cc, sparse-chol.cc,
sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, child-list.h, dir-ops.cc,
dir-ops.h, file-ops.cc, lo-sysdep.cc, oct-env.h, oct-time.cc, cmd-edit.cc,
cmd-edit.h, cmd-hist.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, oct-shlib.cc,
oct-shlib.h, oct-sort.cc, oct-sort.h, quit.cc, singleton-cleanup.h, str-vec.cc:
Use C++11 nullptr rather than 0 in code (bug #51565).
author | Rik <rik@octave.org> |
---|---|
date | Tue, 25 Jul 2017 14:54:10 -0700 |
parents | 08036a7f3660 |
children | 336f89b6208b |
line wrap: on
line diff
--- a/libinterp/corefcn/ft-text-renderer.cc Mon Jul 24 16:48:03 2017 +0200 +++ b/libinterp/corefcn/ft-text-renderer.cc Tue Jul 25 14:54:10 2017 -0700 @@ -156,14 +156,14 @@ return retval; } - static void cleanup_instance (void) { delete instance; instance = 0; } + static void cleanup_instance (void) { delete instance; instance = nullptr; } static FT_Face get_font (const std::string& name, const std::string& weight, const std::string& angle, double size) { return (instance_ok () ? instance->do_get_font (name, weight, angle, size) - : 0); + : nullptr); } static void font_destroyed (FT_Face face) @@ -187,7 +187,7 @@ FT_Face do_get_font (const std::string& name, const std::string& weight, const std::string& angle, double size) { - FT_Face retval = 0; + FT_Face retval = nullptr; #if defined (HAVE_FT_REFERENCE_FACE) // Look first into the font cache, then use fontconfig. If the font @@ -236,13 +236,13 @@ FcPatternAddInteger (pat, FC_SLANT, fc_angle); FcPatternAddDouble (pat, FC_PIXEL_SIZE, size); - if (FcConfigSubstitute (0, pat, FcMatchPattern)) + if (FcConfigSubstitute (nullptr, pat, FcMatchPattern)) { FcResult res; FcPattern *match; FcDefaultSubstitute (pat); - match = FcFontMatch (0, pat, &res); + match = FcFontMatch (nullptr, pat, &res); // FIXME: originally, this test also required that // res != FcResultNoMatch. Is that really needed? @@ -307,7 +307,7 @@ cache.erase (*pkey); delete pkey; - face->generic.data = 0; + face->generic.data = nullptr; } } @@ -423,10 +423,10 @@ public: ft_font (void) - : text_renderer::font (), face (0) { } + : text_renderer::font (), face (nullptr) { } ft_font (const std::string& nm, const std::string& wt, - const std::string& ang, double sz, FT_Face f = 0) + const std::string& ang, double sz, FT_Face f = nullptr) : text_renderer::font (nm, wt, ang, sz), face (f) { } @@ -520,7 +520,7 @@ { // FIXME: take "fontunits" into account - font = ft_font (name, weight, angle, size, 0); + font = ft_font (name, weight, angle, size, nullptr); } void @@ -904,7 +904,7 @@ if (r != 0) ::warning ("ft_text_renderer: failed to decode string `%s' with " "locale `%s'", str.c_str (), - std::setlocale (LC_CTYPE, 0)); + std::setlocale (LC_CTYPE, nullptr)); break; } } @@ -1321,7 +1321,7 @@ } ft_text_renderer::ft_font::ft_font (const ft_font& ft) - : text_renderer::font (ft), face (0) + : text_renderer::font (ft), face (nullptr) { #if defined (HAVE_FT_REFERENCE_FACE) FT_Face ft_face = ft.get_face (); @@ -1341,7 +1341,7 @@ if (face) { FT_Done_Face (face); - face = 0; + face = nullptr; } #if defined (HAVE_FT_REFERENCE_FACE)