Internal code cleanup

1 files changed, 3 insertions, 21 deletions

diff --git a/matlab/lib/+IceInternal/WrapperObject.m b/matlab/lib/+IceInternal/WrapperObject.m
index 125c879958d..81f762bc51a 100644
--- a/matlab/lib/+IceInternal/WrapperObject.m
+++ b/matlab/lib/+IceInternal/WrapperObject.m
@@ -26,17 +26,17 @@ classdef (Abstract) WrapperObject < handle
     methods(Hidden)
         function delete(obj)
             if ~isempty(obj.impl_)
-                obj.call_('_release');
+                obj.iceCall('unref');
             end
         end
-        function call_(obj, fn, varargin)
+        function iceCall(obj, fn, varargin)
             name = strcat(obj.type_, '_', fn);
             ex = calllib('icematlab', name, obj.impl_, varargin{:});
             if ~isempty(ex)
                 ex.throwAsCaller();
             end
         end
-        function r = callWithResult_(obj, fn, varargin)
+        function r = iceCallWithResult(obj, fn, varargin)
             name = strcat(obj.type_, '_', fn);
             result = calllib('icematlab', name, obj.impl_, varargin{:});
             if isempty(result)
@@ -47,24 +47,6 @@ classdef (Abstract) WrapperObject < handle
                 r = result.result;
             end
         end
-        function callOnType_(obj, type, fn, varargin)
-            name = strcat(type, '_', fn);
-            ex = calllib('icematlab', name, obj.impl_, varargin{:});
-            if ~isempty(ex)
-                ex.throwAsCaller();
-            end
-        end
-        function r = callOnTypeWithResult_(obj, type, fn, varargin)
-            name = strcat(type, '_', fn);
-            result = calllib('icematlab', name, obj.impl_, varargin{:});
-            if isempty(result)
-                r = result;
-            elseif ~isempty(result.exception)
-                result.exception.throwAsCaller();
-            else
-                r = result.result;
-            end
-        end
     end
     properties(Hidden,SetAccess=protected)
         impl_