Mercurial > octave

diff libinterp/dldfcn/__init_fltk__.cc @ 23577:80c42f4cca13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Deprecate is_empty and replace with isempty. * ov.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * ov.h (isempty): New function. * Array.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Array.h (isempty): New function. * Range.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Range.h (isempty): New function. * Sparse.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Sparse.h (isempty): New function. * Backend.cc, BaseControl.cc, Canvas.cc, Figure.cc, gl-select.cc, __magick_read__.cc, __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, det.cc, eig.cc, error.cc, fft.cc, filter.cc, find.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, hess.cc, inv.cc, lsode.cc, lu.cc, max.cc, mex.cc, mxarray.in.h, oct-handle.h, oct-lvalue.cc, oct-map.cc, oct-map.h, oct-stream.cc, pinv.cc, pr-output.cc, quadcc.cc, qz.cc, strfind.cc, strfns.cc, sylvester.cc, time.cc, toplev.cc, tril.cc, urlwrite.cc, utils.cc, utils.h, xnorm.cc, __delaunayn__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, chol.cc, convhulln.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-intx.h, ov-java.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.cc, ov.cc, ov.h, bp-table.cc, oct-parse.in.yy, pt-eval.cc, pt-tm-const.cc, pt-tm-const.h, Array.cc, Range.cc, Range.h, Sparse.cc, Sparse.h, chNDArray.cc, dNDArray.cc, fNDArray.cc, DASPK.cc, DASRT.cc, DASSL.cc, LSODE.cc, bsxfun-defs.cc, eigs-base.cc, oct-convn.cc, qr.cc: Replace instances of is_empty with isempty.
author Rik <rik@octave.org>
date Sun, 11 Jun 2017 22:14:09 -0700
parents 614d71cdf614
children 47c39af89401
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc	Sun Jun 11 15:35:21 2017 -0700
+++ b/libinterp/dldfcn/__init_fltk__.cc	Sun Jun 11 22:14:09 2017 -0700
@@ -481,7 +481,7 @@
           = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ()));
         if (item)
           {
-            if (! uimenup.get_callback ().is_empty ())
+            if (! uimenup.get_callback ().isempty ())
               item->callback (static_cast<Fl_Callback *> (script_cb),
                               static_cast<void *> (&uimenup));
             else
@@ -1519,7 +1519,7 @@
 
               m_fp.set_currentcharacter (std::string (e_text));
 
-              if (! m_fp.get_keypressfcn ().is_empty ()
+              if (! m_fp.get_keypressfcn ().isempty ()
                   && (evt.contents ("Key").length () > 0))
                 {
                   // Update CurrentPoint before callback
@@ -1593,7 +1593,7 @@
                   evt = format_key_event (e_key, e_text, e_state);
                 }
 
-              if (! m_fp.get_keyreleasefcn ().is_empty ()
+              if (! m_fp.get_keyreleasefcn ().isempty ()
                   && (evt.contents ("Key").length () > 0))
                 m_fp.execute_keyreleasefcn (evt);
               return 1;
@@ -1640,7 +1640,7 @@
 
               // Ensure windowbuttondownfcn is called after currentpoint
               // is updated but before calling buttondownfcn.
-              if (! m_fp.get_windowbuttondownfcn ().is_empty ())
+              if (! m_fp.get_windowbuttondownfcn ().isempty ())
                 m_fp.execute_windowbuttondownfcn (Fl::event_button ());
 
               if (gh.ok ())
@@ -1655,18 +1655,18 @@
                   m_fp.set_currentobject (m_ax_obj.get_handle ().value ());
 
                   base_properties& props = m_ax_obj.get_properties ();
-                  if (! props.get_buttondownfcn ().is_empty ())
+                  if (! props.get_buttondownfcn ().isempty ())
                     props.execute_buttondownfcn (Fl::event_button ());
 
                   return 1;
                 }
-              else if (! m_fp.get_buttondownfcn ().is_empty ())
+              else if (! m_fp.get_buttondownfcn ().isempty ())
                 m_fp.execute_buttondownfcn (Fl::event_button ());
 
               break;
 
             case FL_DRAG:
-              if (! m_fp.get_windowbuttonmotionfcn ().is_empty ())
+              if (! m_fp.get_windowbuttonmotionfcn ().isempty ())
                 {
                   set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ());
                   m_fp.execute_windowbuttonmotionfcn ();
@@ -1779,7 +1779,7 @@
               }
 
             case FL_RELEASE:
-              if (! m_fp.get_windowbuttonupfcn ().is_empty ())
+              if (! m_fp.get_windowbuttonupfcn ().isempty ())
                 {
                   set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ());
                   m_fp.execute_windowbuttonupfcn ();
@@ -2279,7 +2279,7 @@
       {
         octave_value ov = go.get (caseless_str ("__plot_stream__"));
 
-        if (! ov.is_empty ())
+        if (! ov.isempty ())
           figure_manager::delete_window (ov.string_value ());
       }
   }
@@ -2312,7 +2312,7 @@
       {
         octave_value ov = go.get (caseless_str ("__plot_stream__"));
 
-        if (! ov.is_empty ())
+        if (! ov.isempty ())
           {
             const figure::properties& fp =
               dynamic_cast<const figure::properties&> (go.get_properties ());