CEDET: Fix "unknown slot [...]" warningsscratch/last-cedet-merge

Replace (oref OBJECT :SLOT) with (slot-value OBJECT 'SLOT).

TODO: ChangeLog

37 files changed, 175 insertions, 175 deletions

diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 13d721a5f9a..dd72397da27 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -628,15 +628,15 @@ instead of the current project."
 The other slot will be used to calculate values.
 PROJECT-FILE-NAME is a name of project file (short name, like `pom.xml', etc."
   (when (and (or (not (slot-boundp this :file))
-                 (not (oref this :file)))
+                 (not (slot-value this 'file)))
              (slot-boundp this :directory)
-             (oref this :directory))
-    (oset this :file (expand-file-name project-file-name (oref this :directory))))
+             (slot-value this 'directory))
+    (oset this :file (expand-file-name project-file-name (slot-value this 'directory))))
   (when (and (or (not (slot-boundp this :directory))
-                 (not (oref this :directory)))
+                 (not (slot-value this 'directory)))
              (slot-boundp this :file)
-             (oref this :file))
-    (oset this :directory (file-name-directory (oref this :file))))
+             (slot-value this 'file))
+    (oset this :directory (file-name-directory (slot-value this 'file))))
   )
 
 
diff --git a/lisp/cedet/ede/config.el b/lisp/cedet/ede/config.el
index 75d0197dffd..011ef7c7054 100644
--- a/lisp/cedet/ede/config.el
+++ b/lisp/cedet/ede/config.el
@@ -143,7 +143,7 @@ the directory isn't on the `safe' list, ask to add it to the safe list."
       (setq config nil))
 
     (when (not config)
-      (let* ((top (oref proj :directory))
+      (let* ((top (slot-value proj 'directory))
              (fname (expand-file-name (oref proj config-file-basename) top))
              (class (oref proj config-class))
              (ignore-type nil))
@@ -262,7 +262,7 @@ programs from a project.")
   "Run the current project derived from TARGET in a debugger."
   (let* ((proj (ede-target-parent target))
          (config (ede-config-get-configuration proj t))
-         (debug (oref config :debug-command))
+         (debug (slot-value config 'debug-command))
          (cmd (read-from-minibuffer
                "Debug Command: "
                debug))
@@ -279,7 +279,7 @@ programs from a project.")
   "Run the current project derived from TARGET."
   (let* ((proj (ede-target-parent target))
          (config (ede-config-get-configuration proj t))
-         (run (concat "./" (oref config :run-command)))
+         (run (concat "./" (slot-value config 'run-command)))
          (cmd (read-from-minibuffer "Run (like this): " run)))
     (ede-shell-run-something target cmd)))
 
@@ -310,7 +310,7 @@ This class brings in method overloads for for building.")
   "Compile the entire current project PROJ.
 Argument COMMAND is the command to use when compiling."
   (let* ((config (ede-config-get-configuration proj t))
-         (comp (oref config :build-command)))
+         (comp (slot-value config 'build-command)))
     (compile comp)))
 
 (cl-defmethod project-compile-target ((obj ede-target-with-config-build) &optional command)
@@ -379,7 +379,7 @@ the preprocessor map, and include paths.")
          filemap
          )
     ;; Preprocessor files
-    (dolist (G (oref config :c-preprocessor-files))
+    (dolist (G (slot-value config 'c-preprocessor-files))
       (let ((table (semanticdb-file-table-object
                     (ede-expand-filename root G))))
         (when table
@@ -388,7 +388,7 @@ the preprocessor map, and include paths.")
           (setq filemap (append filemap (oref table lexical-table)))
           )))
     ;; The core table
-    (setq filemap (append filemap (oref config :c-preprocessor-table)))
+    (setq filemap (append filemap (slot-value config 'c-preprocessor-table)))
 
     filemap
     ))
@@ -417,7 +417,7 @@ java class path.")
 
 (cl-defmethod ede-java-classpath ((proj ede-project-with-config-java))
   "Return the classpath for this project."
-  (oref (ede-config-get-configuration proj) :classpath))
+  (slot-value (ede-config-get-configuration proj) 'classpath))
 
 ;; Local variables:
 ;; generated-autoload-file: "loaddefs.el"
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 319854e07c4..9e56fc6c6fa 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -281,7 +281,7 @@ Each directory needs a project file to control it.")
   "Make sure the :file is fully expanded."
   ;; Add ourselves to the master list
   (cl-call-next-method)
-  (let ((f (expand-file-name (oref this :file))))
+  (let ((f (expand-file-name (slot-value this 'file))))
     ;; Remove any previous entries from the main list.
     (let ((old (eieio-instance-tracker-find (file-name-directory f)
                                             :directory 'ede-cpp-root-project-list)))
@@ -457,8 +457,8 @@ This is for project include paths and spp source files."
   "Compile the entire current project PROJ.
 Argument COMMAND is the command to use when compiling."
   ;; we need to be in the proj root dir for this to work
-  (let* ((cmd (oref proj :compile-command))
-         (ov (oref proj :local-variables))
+  (let* ((cmd (slot-value proj 'compile-command))
+         (ov (slot-value proj 'local-variables))
          (lcmd (when ov (cdr (assoc 'compile-command ov))))
          (cmd-str (cond
                    ((stringp cmd) cmd)
@@ -472,8 +472,8 @@ Argument COMMAND is the command to use when compiling."
 (cl-defmethod project-compile-target ((obj ede-cpp-root-target) &optional command)
   "Compile the current target OBJ.
 Argument COMMAND is the command to use for compiling the target."
-  (when (oref obj :project)
-    (project-compile-project (oref obj :project) command)))
+  (when (slot-value obj 'project)
+    (project-compile-project (slot-value obj 'project) command)))
 
 
 (cl-defmethod project-rescan ((this ede-cpp-root-project))
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 01a536aac43..559ddf06d6e 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -72,9 +72,9 @@ the current EDE project."
   (interactive)
   (let ((scanned nil))
     (dolist (P ede-projects)
-      (if (member (oref P :directory) scanned)
-          (error "Duplicate project (by dir) found in %s!" (oref P :directory))
-        (push (oref P :directory) scanned)))
+      (if (member (slot-value P 'directory) scanned)
+          (error "Duplicate project (by dir) found in %s!" (slot-value P 'directory))
+        (push (slot-value P 'directory) scanned)))
     (unless ede--disable-inode
       (setq scanned nil)
       (dolist (P ede-projects)
@@ -136,7 +136,7 @@ of the anchor file for the project."
   "Get the inode of the directory project PROJ is in."
   (if (slot-boundp proj 'dirinode)
       (oref proj dirinode)
-    (oset proj dirinode (ede--inode-for-dir (oref proj :directory)))))
+    (oset proj dirinode (ede--inode-for-dir (slot-value proj 'directory)))))
 
 (defun ede--inode-get-toplevel-open-project (inode)
   "Return an already open toplevel project that is managing INODE.
@@ -175,7 +175,7 @@ If DIR is the root project, then it is the same."
     (when rootreturn (set rootreturn proj))
     ;; Find subprojects.
     (when (and proj (if ede--disable-inode
-                        (not (string= ft (expand-file-name (oref proj :directory))))
+                        (not (string= ft (expand-file-name (slot-value proj 'directory))))
                       (not (equal inode (ede--project-inode proj)))))
       (setq ans (ede-find-subproject-for-directory proj ft)))
     ans))
@@ -191,7 +191,7 @@ If optional EXACT is non-nil, only return exact matches for DIR."
         (shortans nil))
     (while (and all (not ans))
       ;; Do the check.
-      (let ((pd (expand-file-name (oref (car all) :directory)))
+      (let ((pd (expand-file-name (slot-value (car all) 'directory)))
             )
         (cond
          ;; Exact text match.
@@ -203,7 +203,7 @@ If optional EXACT is non-nil, only return exact matches for DIR."
               (setq shortans (car all))
             ;; We already have a short answer, so see if pd (the match we found)
             ;; is longer.  If it is longer, then it is more precise.
-            (when (< (length (oref shortans :directory))
+            (when (< (length (slot-value shortans 'directory))
                      (length pd))
               (setq shortans (car all))))
           )
@@ -224,7 +224,7 @@ If optional EXACT is non-nil, only return exact matches for DIR."
               (setq shortans (car all))
             ;; We already have a short answer, so see if pd (the match we found)
             ;; is longer.  If it is longer, then it is more precise.
-            (when (< (length (expand-file-name (oref shortans :directory)))
+            (when (< (length (expand-file-name (slot-value shortans 'directory)))
                      (length pd))
               (setq shortans (car all))))
           )))
@@ -244,7 +244,7 @@ If optional EXACT is non-nil, only return exact matches for DIR."
          proj
          (lambda (SP)
            (when (not ans)
-             (if (string= fulldir (file-truename (oref SP :directory)))
+             (if (string= fulldir (file-truename (slot-value SP 'directory)))
                  (setq ans SP)
                (ede-find-subproject-for-directory SP dir)))))
         ans)
@@ -374,11 +374,11 @@ If DIR is not part of a project, return nil."
      ((and (string= dir default-directory)
            ede-object-root-project)
       ;; Try the local buffer cache first.
-      (oref ede-object-root-project :directory))
+      (slot-value ede-object-root-project 'directory))
 
      ;; See if there is an existing project in DIR.
      ((setq ans (ede-directory-get-toplevel-open-project dir))
-      (oref ans :directory))
+      (slot-value ans 'directory))
 
      ;; Detect using our file system detector.
      ((setq ans (ede-detect-directory-for-project dir))
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index 86b707a99f5..ea5ac2947fd 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -659,11 +659,11 @@ Strip out duplicates, and recurse on variables."
       (mapc (lambda (sp)
               (let* ((subdir (file-name-as-directory
                               (expand-file-name
-                               sp (file-name-directory (oref this :file)))))
+                               sp (file-name-directory (slot-value this 'file)))))
                      (submake (expand-file-name
                                "Makefile.am"
                                subdir)))
-                (if (string= submake (oref this :file))
+                (if (string= submake (slot-value this 'file))
                     nil ;; don't recurse.. please!
                   ;; For each project id found, see if we need to recycle,
                   ;; and if we do not, then make a new one.  Check the deep
@@ -695,16 +695,16 @@ Strip out duplicates, and recurse on variables."
 (cl-defmethod project-rescan ((this project-am-program))
   "Rescan object THIS."
   (oset this :source (makefile-macro-file-list (project-am-macro this)))
-  (unless (oref this :source)
-    (oset this :source (list (concat (oref this :name) ".c"))))
+  (unless (slot-value this 'source)
+    (oset this :source (list (concat (slot-value this 'name) ".c"))))
   (oset this :ldadd (makefile-macro-file-list
-                     (concat (oref this :name) "_LDADD"))))
+                     (concat (slot-value this 'name) "_LDADD"))))
 
 (cl-defmethod project-rescan ((this project-am-lib))
   "Rescan object THIS."
   (oset this :source (makefile-macro-file-list (project-am-macro this)))
-  (unless (oref this :source)
-    (oset this :source (list (concat (file-name-sans-extension (oref this :name)) ".c")))))
+  (unless (slot-value this 'source)
+    (oset this :source (list (concat (file-name-sans-extension (slot-value this 'name)) ".c")))))
 
 (cl-defmethod project-rescan ((this project-am-texinfo))
   "Rescan object THIS."
@@ -732,7 +732,7 @@ Strip out duplicates, and recurse on variables."
 
 (cl-defmethod project-am-macro ((this project-am-objectcode))
   "Return the default macro to `edit' for this object type."
-  (concat (subst-char-in-string ?- ?_ (oref this :name)) "_SOURCES"))
+  (concat (subst-char-in-string ?- ?_ (slot-value this 'name)) "_SOURCES"))
 
 (cl-defmethod project-am-macro ((this project-am-header-noinst))
   "Return the default macro to `edit' for this object."
@@ -752,11 +752,11 @@ Strip out duplicates, and recurse on variables."
 
 (cl-defmethod project-am-macro ((this project-am-texinfo))
   "Return the default macro to `edit' for this object type."
-  (concat (file-name-sans-extension (oref this :name)) "_TEXINFOS"))
+  (concat (file-name-sans-extension (slot-value this 'name)) "_TEXINFOS"))
 
 (cl-defmethod project-am-macro ((this project-am-man))
   "Return the default macro to `edit' for this object type."
-  (oref this :name))
+  (slot-value this 'name))
 
 (cl-defmethod project-am-macro ((this project-am-lisp))
   "Return the default macro to `edit' for this object."
@@ -784,7 +784,7 @@ nil means that this buffer belongs to no-one."
 (cl-defmethod ede-buffer-mine ((this project-am-makefile) buffer)
   "Return t if object THIS lays claim to the file in BUFFER."
   (let ((efn  (expand-file-name (buffer-file-name buffer))))
-    (or (string= (oref this :file) efn)
+    (or (string= (slot-value this 'file) efn)
         (string-match "/configure\\.ac$" efn)
         (string-match "/configure\\.in$" efn)
         (string-match "/configure$" efn)
@@ -798,25 +798,25 @@ nil means that this buffer belongs to no-one."
 
 (cl-defmethod ede-buffer-mine ((this project-am-objectcode) buffer)
   "Return t if object THIS lays claim to the file in BUFFER."
-  (member (file-relative-name (buffer-file-name buffer) (oref this :path))
-          (oref this :source)))
+  (member (file-relative-name (buffer-file-name buffer) (slot-value this 'path))
+          (slot-value this 'source)))
 
 (cl-defmethod ede-buffer-mine ((this project-am-texinfo) buffer)
   "Return t if object THIS lays claim to the file in BUFFER."
   (let ((bfn (file-relative-name (buffer-file-name buffer)
-                                 (oref this :path))))
-    (or (string= (oref this :name)  bfn)
-        (member bfn (oref this :include)))))
+                                 (slot-value this 'path))))
+    (or (string= (slot-value this 'name)  bfn)
+        (member bfn (slot-value this 'include)))))
 
 (cl-defmethod ede-buffer-mine ((this project-am-man) buffer)
   "Return t if object THIS lays claim to the file in BUFFER."
-  (string= (oref this :name)
-           (file-relative-name (buffer-file-name buffer) (oref this :path))))
+  (string= (slot-value this 'name)
+           (file-relative-name (buffer-file-name buffer) (slot-value this 'path))))
 
 (cl-defmethod ede-buffer-mine ((this project-am-lisp) buffer)
   "Return t if object THIS lays claim to the file in BUFFER."
-  (member (file-relative-name (buffer-file-name buffer) (oref this :path))
-          (oref this :source)))
+  (member (file-relative-name (buffer-file-name buffer) (slot-value this 'path))
+          (slot-value this 'source)))
 
 (cl-defmethod project-am-subtree ((ampf project-am-makefile) subdir)
   "Return the sub project in AMPF specified by SUBDIR."
@@ -829,11 +829,11 @@ nil means that this buffer belongs to no-one."
 
 (cl-defmethod project-compile-target-command ((this project-am-objectcode))
   "Default target to use when compiling an object code target."
-  (oref this :name))
+  (slot-value this 'name))
 
 (cl-defmethod project-compile-target-command ((this project-am-texinfo))
   "Default target t- use when compiling a texinfo file."
-  (let ((n (oref this :name)))
+  (let ((n (slot-value this 'name)))
     (if (string-match "\\.texi?\\(nfo\\)?" n)
         (setq n (replace-match ".info" t t n)))
     n))
@@ -993,7 +993,7 @@ Kill the Configure buffer if it was not already in a buffer."
   "Get the package information for directory topmost project dir over DIR.
 Calculates the info with `project-am-extract-package-info'."
   (let ((top (ede-toplevel)))
-    (when top (setq dir (oref top :directory)))
+    (when top (setq dir (slot-value top 'directory)))
     (project-am-extract-package-info dir)))
 
 ;; for simple per project include path extension
diff --git a/lisp/cedet/ede/shell.el b/lisp/cedet/ede/shell.el
index 37beea0b427..dfb7a795515 100644
--- a/lisp/cedet/ede/shell.el
+++ b/lisp/cedet/ede/shell.el
@@ -38,7 +38,7 @@
 COMMAND is a text string representing the thing to be run."
   (let* ((buff (ede-shell-buffer target))
          (cp (ede-target-parent target))
-         (dd (oref cp :directory)))
+         (dd (slot-value cp 'directory)))
     ;; Show the new buffer.
     (when (not (get-buffer-window buff))
       (switch-to-buffer-other-window buff t))
diff --git a/lisp/cedet/ede/util.el b/lisp/cedet/ede/util.el
index eb364d7eafb..c059257ef29 100644
--- a/lisp/cedet/ede/util.el
+++ b/lisp/cedet/ede/util.el
@@ -41,7 +41,7 @@ Argument NEWVERSION is the version number to use in the current project."
                                   v nil v))))
   (let ((ede-object (ede-toplevel)))
     ;; Don't update anything if there was no change.
-    (unless (string= (oref ede-object :version) newversion)
+    (unless (string= (slot-value ede-object 'version) newversion)
       (oset ede-object :version newversion)
       (project-update-version ede-object)
       (ede-update-version-in-source ede-object newversion))))
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 9918aacadd1..696b864cd20 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -202,7 +202,7 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze."
 (cl-defmethod semantic-analyze-interesting-tag
   ((context semantic-analyze-context))
   "Return a tag from CONTEXT that would be most interesting to a user."
-  (let ((prefix (reverse (oref context :prefix))))
+  (let ((prefix (reverse (slot-value context 'prefix))))
     ;; Go back through the prefix until we find a tag we can return.
     (while (and prefix (not (semantic-tag-p (car prefix))))
       (setq prefix (cdr prefix)))
@@ -212,12 +212,12 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze."
 (cl-defmethod semantic-analyze-interesting-tag
   ((context semantic-analyze-context-functionarg))
   "Try the base, and if that fails, return what we are assigning into."
-  (or (cl-call-next-method) (car-safe (oref context :function))))
+  (or (cl-call-next-method) (car-safe (slot-value context 'function))))
 
 (cl-defmethod semantic-analyze-interesting-tag
   ((context semantic-analyze-context-assignment))
   "Try the base, and if that fails, return what we are assigning into."
-  (or (cl-call-next-method) (car-safe (oref context :assignee))))
+  (or (cl-call-next-method) (car-safe (slot-value context 'assignee))))
 
 ;;; TYPE MEMBERS
 ;;
@@ -760,8 +760,8 @@ Optional argument CTXT is the context to show."
 (cl-defmethod semantic-analyze-pulse ((context semantic-analyze-context))
   "Pulse the region that CONTEXT affects."
   (require 'pulse)
-  (with-current-buffer (oref context :buffer)
-    (let ((bounds (oref context :bounds)))
+  (with-current-buffer (slot-value context 'buffer)
+    (let ((bounds (slot-value context 'bounds)))
       (when bounds
         (pulse-momentary-highlight-region (car bounds) (cdr bounds))))))
 
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index 6255bdf3005..adbd00d6187 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -478,7 +478,7 @@ variable `semantic-dependency-system-include-path'."))
 (defun semantic-analyzer-debug-describe-scope (ctxt &optional classconstraint)
   "Describe the scope in CTXT for finding a global symbol.
 Optional argument CLASSCONSTRAINT says to output to tags of that class."
-  (let* ((scope (oref ctxt :scope))
+  (let* ((scope (slot-value ctxt 'scope))
          (parents (oref scope parents))
          (cc (or classconstraint (oref ctxt prefixclass)))
          )
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 7fbaa2ce974..d0c84ac1dfd 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -104,7 +104,7 @@ Use `semantic-analyze-current-tag' to debug this fcn."
   "Return the implementations derived in the reference analyzer REFS.
 Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer."
   (let ((allhits (oref refs rawsearchdata))
-        (tag (oref refs :tag))
+        (tag (slot-value refs 'tag))
         (impl nil)
         )
     (semanticdb-find-result-mapc
@@ -129,7 +129,7 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti
   "Return the prototypes derived in the reference analyzer REFS.
 Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer."
   (let ((allhits (oref refs rawsearchdata))
-        (tag (oref refs :tag))
+        (tag (slot-value refs 'tag))
         (proto nil))
     (semanticdb-find-result-mapc
      (lambda (T DB)
diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index 78a0926ea33..33b0f6762b4 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -182,10 +182,10 @@ Any extra FLAGS are ignored."
   (require 'semantic/analyze/complete)
   (with-current-buffer (oref context buffer)
     (let* ((normal (semantic-analyze-possible-completions-default context))
-           (classes (oref context :prefixclass))
+           (classes (slot-value context 'prefixclass))
            (filetags nil))
       (when (memq 'filename classes)
-        (let* ((prefix (car (oref context :prefix)))
+        (let* ((prefix (car (slot-value context 'prefix)))
                (completetext (cond ((semantic-tag-p prefix)
                                     (semantic-tag-name prefix))
                                    ((stringp prefix)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 60ae3c984d6..dd4c3cc55a9 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1288,7 +1288,7 @@ Uses semanticdb for searching all tags in the current project."
          (localstuff (oref scope scope)))
     (list
      (cons
-      (oref scope :table)
+      (slot-value scope 'table)
       (semantic-find-tags-for-completion prefix localstuff)))))
     ;(semanticdb-brute-deep-find-tags-for-completion prefix (oref obj path))))
 
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index 442e5f93b2a..a43e6fad831 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -192,7 +192,7 @@ Returns a table of all matching tags."
            (faketags nil)
            )
       (when result
-        (dolist (T (oref result :hit-text))
+        (dolist (T (slot-value result 'hit-text))
           ;; We should look up each tag one at a time, but I'm lazy!
           ;; Doing this may be good enough.
           (setq faketags (cons
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 48e439e54f9..083b643b624 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -556,7 +556,7 @@ If there isn't one, create it.
         (stream nil)
         )
     (dolist (table (semanticdb-get-database-tables db))
-      (when (eq lmode (oref table :major-mode))
+      (when (eq lmode (slot-value table 'major-mode))
         (setq stream
               (semanticdb-typecache-merge-streams
                stream
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 180db3ab1fd..641974545cd 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -171,7 +171,7 @@ These buffers are brought into view when layout occurs.")
 (cl-defmethod semantic-debug-highlight-lexical-token ((iface semantic-debug-interface) token)
   "For IFACE, highlight TOKEN in the source buffer .
 TOKEN is a lexical token."
-  (set-buffer (oref iface :source-buffer))
+  (set-buffer (slot-value iface 'source-buffer))
 
   (object-add-to-list iface 'overlays
                       (semantic-lex-highlight-token token))
@@ -184,7 +184,7 @@ TOKEN is a lexical token."
 NONTERM is the name of the rule currently being processed that shows up
 as a nonterminal (or tag) in the source buffer.
 If RULE and MATCH indices are specified, highlight those also."
-  (set-buffer (oref iface :parser-buffer))
+  (set-buffer (slot-value iface 'parser-buffer))
 
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
          (nt (semantic-find-first-tag-by-name nonterm rules))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index c7b5eb55ef1..d66bd995bbf 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -437,11 +437,11 @@ its contents.
       ;; Get the semanticdb statement, and display it's contents.
       (princ "\nDetails for header file...\n")
       (princ "\nMajor Mode:          ")
-      (princ (oref table :major-mode))
+      (princ (slot-value table 'major-mode))
       (princ "\nTags:                ")
-      (princ (format "%s entries" (length (oref table :tags))))
+      (princ (format "%s entries" (length (slot-value table 'tags))))
       (princ "\nFile Size:           ")
-      (princ (format "%s chars" (oref table :pointmax)))
+      (princ (format "%s chars" (slot-value table 'pointmax)))
       (princ "\nSave State:          ")
       (cond ((oref table dirty)
              (princ "Table needs to be saved."))
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 5cd49326c99..6f642671b19 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1903,7 +1903,7 @@ Optional FLAGS are ignored."
       (with-mode-local emacs-lisp-mode
         (semantic-analyze-possible-completions context))
     (with-current-buffer (oref context buffer)
-      (let* ((prefix (car (reverse (oref context :prefix))))
+      (let* ((prefix (car (reverse (slot-value context 'prefix))))
              (completetext (cond ((semantic-tag-p prefix)
                                   (semantic-tag-name prefix))
                                  ((stringp prefix)
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 4fd2a869f28..434cca847a0 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -318,7 +318,7 @@ minor mode is enabled."
         (al nil))
     (while (< idx len)
       (let ((r (ring-ref ring idx)))
-        (setq al (cons (cons (oref r :object-name) r)
+        (setq al (cons (cons (slot-value r 'object-name) r)
                        al)))
       (setq idx (1+ idx)))
     (nreverse al)))
diff --git a/lisp/cedet/semantic/symref/cscope.el b/lisp/cedet/semantic/symref/cscope.el
index 181e3997681..42d5dcbb7fe 100644
--- a/lisp/cedet/semantic/symref/cscope.el
+++ b/lisp/cedet/semantic/symref/cscope.el
@@ -51,10 +51,10 @@ See the function `cedet-cscope-search' for more details.")
                               default-directory))
          ;; CScope has to be run from the project root where
          ;; cscope.out is.
-         (b (cedet-cscope-search (oref tool :searchfor)
-                                 (oref tool :searchtype)
-                                 (oref tool :resulttype)
-                                 (oref tool :searchscope)
+         (b (cedet-cscope-search (slot-value tool 'searchfor)
+                                 (slot-value tool 'searchtype)
+                                 (slot-value tool 'resulttype)
+                                 (slot-value tool 'searchscope)
                                  ))
         )
     (semantic-symref-parse-tool-output tool b)
@@ -66,22 +66,22 @@ See the function `cedet-cscope-search' for more details.")
 (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-cscope))
   "Parse one line of grep output, and return it as a match list.
 Moves cursor to end of the match."
-  (cond ((eq (oref tool :resulttype) 'file)
+  (cond ((eq (slot-value tool 'resulttype) 'file)
          ;; Search for files
          (when (re-search-forward "^\\([^\n]+\\)$" nil t)
            (match-string 1)))
-        ((eq (oref tool :searchtype) 'tagcompletions)
+        ((eq (slot-value tool 'searchtype) 'tagcompletions)
          ;; Search for files
          (when (re-search-forward "^[^ ]+ [^ ]+ [^ ]+ \\(.*\\)$" nil t)
            (let ((subtxt (match-string 1))
-                 (searchtxt (oref tool :searchfor)))
+                 (searchtxt (slot-value tool 'searchfor)))
              (if (string-match (concat "\\<" searchtxt "\\(\\w\\|\\s_\\)*\\>")
                                subtxt)
                  (match-string 0 subtxt)
                ;; We have to return something at this point.
                subtxt)))
          )
-        ((eq (oref tool :resulttype) 'line-and-text)
+        ((eq (slot-value tool 'resulttype) 'line-and-text)
          (when (re-search-forward semantic-symref-cscope--line-re nil t)
            (list (string-to-number (match-string 2))
                  (expand-file-name (match-string 1))
diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el
index e91ecf07bcc..f3a5b57c551 100644
--- a/lisp/cedet/semantic/symref/global.el
+++ b/lisp/cedet/semantic/symref/global.el
@@ -40,10 +40,10 @@ See the function `cedet-gnu-global-search' for more details.")
 
 (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global))
   "Perform a search with GNU Global."
-  (let ((b (cedet-gnu-global-search (oref tool :searchfor)
-                                    (oref tool :searchtype)
-                                    (oref tool :resulttype)
-                                    (oref tool :searchscope)
+  (let ((b (cedet-gnu-global-search (slot-value tool 'searchfor)
+                                    (slot-value tool 'searchtype)
+                                    (slot-value tool 'resulttype)
+                                    (slot-value tool 'searchscope)
                                     ))
         )
     (semantic-symref-parse-tool-output tool b)
@@ -55,12 +55,12 @@ See the function `cedet-gnu-global-search' for more details.")
 (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global))
   "Parse one line of grep output, and return it as a match list.
 Moves cursor to end of the match."
-  (cond ((or (eq (oref tool :resulttype) 'file)
-             (eq (oref tool :searchtype) 'tagcompletions))
+  (cond ((or (eq (slot-value tool 'resulttype) 'file)
+             (eq (slot-value tool 'searchtype) 'tagcompletions))
          ;; Search for files
          (when (re-search-forward "^\\([^\n]+\\)$" nil t)
            (match-string 1)))
-        ((eq (oref tool :resulttype) 'line-and-text)
+        ((eq (slot-value tool 'resulttype) 'line-and-text)
          (when (re-search-forward semantic-symref-global--line-re nil t)
            (list (string-to-number (match-string 2))
                  (match-string 3)
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 42dc40cce04..ecb93dd6084 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -137,7 +137,7 @@ This shell should support pipe redirect syntax."
 (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-grep))
   "Perform a search with Grep."
   ;; Grep doesn't support some types of searches.
-  (let ((st (oref tool :searchtype)))
+  (let ((st (slot-value tool 'searchtype)))
     (when (not (memq st '(symbol regexp)))
       (error "Symref impl GREP does not support searchtype of %s" st))
     )
@@ -147,13 +147,13 @@ This shell should support pipe redirect syntax."
          (filepatterns (semantic-symref-derive-find-filepatterns))
          (filepattern (mapconcat #'shell-quote-argument filepatterns " "))
          ;; Grep based flags.
-         (grepflags (cond ((eq (oref tool :resulttype) 'file)
+         (grepflags (cond ((eq (slot-value tool 'resulttype) 'file)
                            "-l ")
-                          ((eq (oref tool :searchtype) 'regexp)
+                          ((eq (slot-value tool 'searchtype) 'regexp)
                            "-nE ")
                           (t "-n ")))
          (greppat (shell-quote-argument
-                   (cond ((eq (oref tool :searchtype) 'regexp)
+                   (cond ((eq (slot-value tool 'searchtype) 'regexp)
                           (oref tool searchfor))
                          (t
                           ;; Can't use the word boundaries: Grep
@@ -195,11 +195,11 @@ This shell should support pipe redirect syntax."
 (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-grep))
   "Parse one line of grep output, and return it as a match list.
 Moves cursor to end of the match."
-  (cond ((eq (oref tool :resulttype) 'file)
+  (cond ((eq (slot-value tool 'resulttype) 'file)
          ;; Search for files
          (when (re-search-forward "^\\([^\n]+\\)$" nil t)
            (match-string 1)))
-        ((eq (oref tool :resulttype) 'line-and-text)
+        ((eq (slot-value tool 'resulttype) 'line-and-text)
          (when (re-search-forward semantic-symref-grep--line-re nil t)
            (list (string-to-number (match-string 2))
                  (match-string 1)
diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el
index 3c94f01c6d9..f5d6de5fa60 100644
--- a/lisp/cedet/semantic/symref/idutils.el
+++ b/lisp/cedet/semantic/symref/idutils.el
@@ -40,10 +40,10 @@ See the function `cedet-idutils-search' for more details.")
 
 (cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-idutils))
   "Perform a search with IDUtils."
-  (let ((b (cedet-idutils-search (oref tool :searchfor)
-                                 (oref tool :searchtype)
-                                 (oref tool :resulttype)
-                                 (oref tool :searchscope)
+  (let ((b (cedet-idutils-search (slot-value tool 'searchfor)
+                                 (slot-value tool 'searchtype)
+                                 (slot-value tool 'resulttype)
+                                 (slot-value tool 'searchscope)
                                  ))
         )
     (semantic-symref-parse-tool-output tool b)
@@ -55,14 +55,14 @@ See the function `cedet-idutils-search' for more details.")
 (cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-idutils))
   "Parse one line of grep output, and return it as a match list.
 Moves cursor to end of the match."
-  (cond ((eq (oref tool :resulttype) 'file)
+  (cond ((eq (slot-value tool 'resulttype) 'file)
          ;; Search for files
          (when (re-search-forward "^\\([^\n]+\\)$" nil t)
            (match-string 1)))
-        ((eq (oref tool :searchtype) 'tagcompletions)
+        ((eq (slot-value tool 'searchtype) 'tagcompletions)
          (when (re-search-forward "^\\([^ ]+\\) " nil t)
            (match-string 1)))
-        ((eq (oref tool :resulttype) 'line-and-text)
+        ((eq (slot-value tool 'resulttype) 'line-and-text)
          (when (re-search-forward semantic-symref-idutils--line-re nil t)
            (list (string-to-number (match-string 2))
                  (expand-file-name (match-string 1) default-directory)
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index e1a789d673a..d48b61246ce 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -210,7 +210,7 @@ Some useful functions are found in `semantic-format-tag-functions'."
     (erase-buffer)
     ;; Insert the contents.
     (let ((lastfile nil))
-      (dolist (T (oref results :hit-tags))
+      (dolist (T (slot-value results 'hit-tags))
         (unless (equal lastfile (semantic-tag-file-name T))
           (setq lastfile (semantic-tag-file-name T))
           (insert-button lastfile
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index d9a5058e55c..fb7c9928d63 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -419,9 +419,9 @@ useful.  Instead, look at the current symbol.  If it is a command
 do primitive texinfo built ins.  If not, use ispell to lookup words
 that start with that symbol.
 Any extra FLAGS are currently ignored."
-  (let ((prefix (car (oref context :prefix)))
+  (let ((prefix (car (slot-value context 'prefix)))
         )
-    (cond ((member 'function (oref context :prefixclass))
+    (cond ((member 'function (slot-value context 'prefixclass))
            ;; Do completion for texinfo commands
            (let* ((cmd (substring prefix 1))
                   (lst (all-completions
@@ -429,7 +429,7 @@ Any extra FLAGS are currently ignored."
              (mapcar (lambda (f) (semantic-tag (concat "@" f) 'function))
                      lst))
            )
-          ((member 'word (oref context :prefixclass))
+          ((member 'word (slot-value context 'prefixclass))
            ;; Do completion for words via ispell.
            (require 'ispell)
            (let ((word-list (ispell-lookup-words prefix)))
diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el
index facf96e9afb..9fc1b810827 100644
--- a/lisp/cedet/srecode/args.el
+++ b/lisp/cedet/srecode/args.el
@@ -174,7 +174,7 @@ do not contain any text from preceding or following text."
           (srecode-dictionary-set-value dict "PROJECT_FILENAME" relfname)
           (srecode-dictionary-set-value dict "PROJECT_DIRECTORY" reldir)
           (srecode-dictionary-set-value dict "PROJECT_NAME" (ede-name (ede-toplevel)))
-          (srecode-dictionary-set-value dict "PROJECT_VERSION" (oref (ede-toplevel) :version))
+          (srecode-dictionary-set-value dict "PROJECT_VERSION" (slot-value (ede-toplevel) 'version))
           )
       ;; If there is no EDE project, then put in some base values.
       (srecode-dictionary-set-value dict "PROJECT_FILENAME" bfn)
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 1b6cd704095..9bd47153294 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -548,8 +548,8 @@ A list of defined variables VARS provides a variable table."
 
     (while lp
 
-      (let* ((objname (oref (car lp) :object-name))
-             (context (oref (car lp) :context))
+      (let* ((objname (slot-value (car lp) 'object-name))
+             (context (slot-value (car lp) 'context))
              (globalname (concat context ":" objname))
              )
 
@@ -645,9 +645,9 @@ Argument INDENT specifies the indentation level for the list."
   "Dump the state of the SRecode template inserter INS."
   (princ "INS: \"")
   (princ (eieio-object-name-string ins))
-  (when (oref ins :secondname)
+  (when (slot-value ins 'secondname)
     (princ "\" : \"")
-    (princ (oref ins :secondname)))
+    (princ (slot-value ins 'secondname)))
   (princ "\" type \"")
   (let* ((oc (symbol-name (eieio-object-class ins)))
          (junk (string-match "srecode-template-inserter-" oc))
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index 8f9c0832844..9f675fcaf9e 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -122,7 +122,7 @@ specified in a C file."
   (srecode-semantic-apply-tag-to-dict-default tag-wrapper dict)
 
   ;; Pull out the tag for the individual pieces.
-  (let* ((tag   (oref tag-wrapper :prime))
+  (let* ((tag   (slot-value tag-wrapper 'prime))
          (class (semantic-tag-class tag)))
 
     ;; Add additional information based on the class of the tag.
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 2844c1b52da..5e581312fdd 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -123,7 +123,7 @@ Makes sure that :value is compiled."
 
     (cl-call-next-method this (nreverse newfields))
     (when (not (slot-boundp this 'compiled))
-      (let ((val (oref this :value))
+      (let ((val (slot-value this 'value))
             (comp nil))
         (while val
           (let ((nval (car val))
@@ -224,7 +224,7 @@ TPL is an object representing a compiled template file."
     ;; Tables are sorted with highest priority first, useful for looking
     ;; up templates, but this means we need to install the variables in
     ;; reverse order so higher priority variables override lower ones.
-    (let ((tabs (reverse (oref tpl :tables))))
+    (let ((tabs (reverse (slot-value tpl 'tables))))
       (require 'srecode/find) ; For srecode-template-table-in-project-p
       (while tabs
         (when (srecode-template-table-in-project-p (car tabs))
@@ -519,7 +519,7 @@ inserted with a new editable field.")
     (let* ((dv (oref cp defaultvalue))
            (sti (oref cp firstinserter))
            (start (point))
-           (name (oref sti :object-name)))
+           (name (slot-value sti 'object-name)))
 
       (cond
        ;; No default value.
diff --git a/lisp/cedet/srecode/el.el b/lisp/cedet/srecode/el.el
index 526a2a21070..50b880ddc31 100644
--- a/lisp/cedet/srecode/el.el
+++ b/lisp/cedet/srecode/el.el
@@ -86,7 +86,7 @@ Calls `srecode-semantic-apply-tag-to-dict-default' first."
   (srecode-semantic-apply-tag-to-dict-default tagobj dict)
 
   ;; Pull out the tag for the individual pieces.
-  (let* ((tag (oref tagobj :prime))
+  (let* ((tag (slot-value tagobj 'prime))
          (doc (semantic-tag-docstring tag)))
 
     ;; It is much more common to have doc on ELisp.
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index cd41afef6e2..df857e5e591 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -161,7 +161,7 @@ Return nil as this inserter will extract nothing."
 Return t if something was extracted.
 Return nil if this inserter doesn't need to extract anything."
   (srecode-dictionary-set-value vdict
-                                (oref ins :object-name)
+                                (slot-value ins 'object-name)
                                 (buffer-substring-no-properties
                                  start end)
                                 )
@@ -178,7 +178,7 @@ Return nil if this inserter doesn't need to extract anything."
   "Extract text from START/END and store in INDICT.
 Return the starting location of the first plain-text match.
 Return nil if nothing was extracted."
-  (let ((name (oref ins :object-name))
+  (let ((name (slot-value ins 'object-name))
         (subdict (srecode-create-dictionary indict))
         (allsubdict nil)
         )
@@ -217,10 +217,10 @@ Return nil if nothing was extracted."
   ;; There are two modes for includes.  One is with no dict,
   ;; so it is inserted straight.  If the dict has a name, then
   ;; we need to run once per dictionary occurrence.
-  (if (not (string= (oref ins :object-name) ""))
+  (if (not (string= (slot-value ins 'object-name) ""))
       ;; With a name, do the insertion.
       (let ((subdict (srecode-dictionary-add-section-dictionary
-                      dict (oref ins :object-name))))
+                      dict (slot-value ins 'object-name))))
         (error "Need to implement include w/ name extractor")
         ;; Recurse into the new template while no errors.
         (while (condition-case nil
diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el
index 913013c259c..de3e3e71bba 100644
--- a/lisp/cedet/srecode/find.el
+++ b/lisp/cedet/srecode/find.el
@@ -100,7 +100,7 @@ all template files for that application will be loaded."
   "Return non-nil if the table TAB can be used in the current project.
 If TAB has a :project set, check that the directories match.
 If TAB is nil, then always return t."
-  (let ((proj (oref tab :project)))
+  (let ((proj (slot-value tab 'project)))
     ;; Return t if the project wasn't set.
     (if (not proj) t
       ;; If the project directory was set, let's check it.
@@ -139,10 +139,10 @@ Optional argument APPLICATION restricts searches to only template tables
 belonging to a specific application.  If APPLICATION is nil, then only
 tables that do not belong to an application will be searched."
   (let* ((mt tab)
-         (tabs (oref mt :tables))
+         (tabs (slot-value mt 'tables))
          (ans nil))
     (while (and (not ans) tabs)
-      (let ((app (oref (car tabs) :application)))
+      (let ((app (slot-value (car tabs) 'application)))
         (when (or (and (not application) (null app))
                   (and application (eq app application)))
           (setq ans (srecode-template-get-table (car tabs) template-name
@@ -150,7 +150,7 @@ tables that do not belong to an application will be searched."
         (setq tabs (cdr tabs))))
     (or ans
         ;; Recurse to the default.
-        (when (not (equal (oref tab :major-mode) 'default))
+        (when (not (equal (slot-value tab 'major-mode) 'default))
           (srecode-template-get-table (srecode-get-mode-table 'default)
                                       template-name context application)))))
 
@@ -199,10 +199,10 @@ Optional argument APPLICATION restricts searches to only template tables
 belonging to a specific application.  If APPLICATION is nil, then only
 tables that do not belong to an application will be searched."
   (let* ((mt tab)
-         (tabs (oref mt :tables))
+         (tabs (slot-value mt 'tables))
          (ans nil))
     (while (and (not ans) tabs)
-      (let ((app (oref (car tabs) :application)))
+      (let ((app (slot-value (car tabs) 'application)))
         (when (or (and (not application) (null app))
                   (and application (eq app application)))
           (setq ans (srecode-template-get-table-for-binding
@@ -210,7 +210,7 @@ tables that do not belong to an application will be searched."
         (setq tabs (cdr tabs))))
     (or ans
         ;; Recurse to the default.
-        (when (not (equal (oref tab :major-mode) 'default))
+        (when (not (equal (slot-value tab 'major-mode) 'default))
           (srecode-template-get-table-for-binding
            (srecode-get-mode-table 'default) binding context)))))
 ;;; Interactive
@@ -241,10 +241,10 @@ templates."
 
     ;; Load up the hash table for our current mode.
     (let* ((mt   (srecode-get-mode-table mmode))
-           (tabs (when mt (oref mt :tables))))
+           (tabs (when mt (slot-value mt 'tables))))
       (dolist (tab tabs)
         ;; Exclude templates for a particular application.
-        (when (and (not (oref tab :application))
+        (when (and (not (slot-value tab 'application))
                    (srecode-template-table-in-project-p tab))
           (maphash (lambda (key temp)
                      (when (or (not predicate)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index c582e328b2b..e9c0a53721c 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -474,8 +474,8 @@ If SECONDNAME is nil, return VALUE."
                                   dictionary)
   "Insert the STI inserter."
   ;; Convert the name into a name/fcn pair
-  (let* ((name (oref sti :object-name))
-         (fcnpart (oref sti :secondname))
+  (let* ((name (slot-value sti 'object-name))
+         (fcnpart (slot-value sti 'secondname))
          (val (srecode-dictionary-lookup-name
                dictionary name))
          (do-princ t)
@@ -548,7 +548,7 @@ Loop over the prompts to see if we have a match."
         )
     (while prompts
       (when (string= (semantic-tag-name (car prompts))
-                     (oref ins :object-name))
+                     (slot-value ins 'object-name))
         (oset ins :prompt
               (semantic-tag-get-attribute (car prompts) :text))
         (oset ins :defaultfcn
@@ -564,7 +564,7 @@ Loop over the prompts to see if we have a match."
                                   dictionary)
   "Insert the STI inserter."
   (let ((val (srecode-dictionary-lookup-name
-              dictionary (oref sti :object-name))))
+              dictionary (slot-value sti 'object-name))))
     (if val
         ;; Does some extra work.  Oh well.
         (cl-call-next-method)
@@ -580,7 +580,7 @@ Loop over the prompts to see if we have a match."
       ;; the user can use the same name again later.
       (srecode-dictionary-set-value
        (srecode-root-dictionary dictionary)
-       (oref sti :object-name) val)
+       (slot-value sti 'object-name) val)
 
       ;; Now that this value is safely stowed in the dictionary,
       ;; we can do what regular inserters do.
@@ -590,7 +590,7 @@ Loop over the prompts to see if we have a match."
                                        dictionary)
   "Derive the default value for an askable inserter STI.
 DICTIONARY is used to derive some values."
-  (let ((defaultfcn (oref sti :defaultfcn)))
+  (let ((defaultfcn (slot-value sti 'defaultfcn)))
     (cond
      ((stringp defaultfcn)
       defaultfcn)
@@ -617,13 +617,13 @@ DICTIONARY is used to derive some values."
 Use DICTIONARY to resolve values."
   (let* ((prompt (oref sti prompt))
          (default (srecode-insert-ask-default sti dictionary))
-         (reader (oref sti :read-fcn))
+         (reader (slot-value sti 'read-fcn))
          (val nil)
          )
     (cond ((eq reader 'y-or-n-p)
            (if (y-or-n-p (or prompt
                              (format "%s? "
-                                     (oref sti :object-name))))
+                                     (slot-value sti 'object-name))))
                (setq val default)
              (setq val "")))
           ((eq reader 'read-char)
@@ -631,14 +631,14 @@ Use DICTIONARY to resolve values."
                       "%c"
                       (read-char (or prompt
                                      (format "Char for %s: "
-                                             (oref sti :object-name))))))
+                                             (slot-value sti 'object-name))))))
            )
           (t
            (save-excursion
              (setq val (funcall reader
                                 (or prompt
                                     (format "Specify %s: "
-                                            (oref sti :object-name)))
+                                            (slot-value sti 'object-name)))
                                 default
                                 )))))
     ;; Return our derived value.
@@ -651,7 +651,7 @@ Use DICTIONARY to resolve values."
 Use DICTIONARY to resolve values."
   (let* ((default (srecode-insert-ask-default sti dictionary))
          (compound-value
-          (srecode-field-value (oref sti :object-name)
+          (srecode-field-value (slot-value sti 'object-name)
                                :firstinserter sti
                                :defaultvalue default))
          )
@@ -819,12 +819,12 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
 Loops over the embedded CODE which was saved here during compilation.
 The template to insert is stored in SLOT."
   (let ((dicts (srecode-dictionary-lookup-name
-                dictionary (oref sti :object-name))))
+                dictionary (slot-value sti 'object-name))))
     (when (not (listp dicts))
       (srecode-insert-report-error
        dictionary
        "Cannot insert section %S from non-section variable."
-       (oref sti :object-name)))
+       (slot-value sti 'object-name)))
     ;; If there is no section dictionary, then don't output anything
     ;; from this section.
     (while dicts
@@ -832,7 +832,7 @@ The template to insert is stored in SLOT."
         (srecode-insert-report-error
          dictionary
          "Cannot insert section %S from non-section variable."
-         (oref sti :object-name)))
+         (slot-value sti 'object-name)))
       (srecode-insert-subtemplate sti (car dicts) slot)
       (setq dicts (cdr dicts)))))
 
@@ -863,7 +863,7 @@ applied to the text between the section start and the
 Shorten input until the END token is found.
 Return the remains of INPUT."
   (let* ((out (srecode-compile-split-code tag input STATE
-                                          (oref ins :object-name))))
+                                          (slot-value ins 'object-name))))
     (oset ins template (srecode-template
                         (eieio-object-name-string ins)
                         :context nil
@@ -896,7 +896,7 @@ are treated specially.")
 (cl-defmethod srecode-match-end ((ins srecode-template-inserter-section-end) name)
 
   "For the template inserter INS, do I end a section called NAME?"
-  (string= name (oref ins :object-name)))
+  (string= name (slot-value ins 'object-name)))
 
 (defclass srecode-template-inserter-include (srecode-template-inserter-subtemplate)
   ((key :initform ?>
@@ -927,13 +927,13 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use."
   "For the template inserter STI, lookup the template to include.
 Finds the template with this macro function part and stores it in
 this template instance."
-  (let ((templatenamepart (oref sti :secondname)))
+  (let ((templatenamepart (slot-value sti 'secondname)))
     ;; If there was no template name, throw an error.
     (unless templatenamepart
       (srecode-insert-report-error
        dictionary
        "Include macro `%s' needs a template name"
-       (oref sti :object-name)))
+       (slot-value sti 'object-name)))
 
     ;; NOTE: We used to cache the template and not look it up a second time,
     ;; but changes in the template tables can change which template is
@@ -978,7 +978,7 @@ this template instance."
       (srecode-insert-report-error
        dictionary
        "No template \"%s\" found for include macro `%s'"
-       templatenamepart (oref sti :object-name)))))
+       templatenamepart (slot-value sti 'object-name)))))
 
 (cl-defmethod srecode-insert-method ((sti srecode-template-inserter-include)
                                   dictionary)
@@ -988,7 +988,7 @@ with the dictionaries found in the dictionary."
   (srecode-insert-include-lookup sti dictionary)
   ;; Insert the template.
   ;; Our baseclass has a simple way to do this.
-  (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name))
+  (if (srecode-dictionary-lookup-name dictionary (slot-value sti 'object-name))
       ;; If we have a value, then call the next method
       (srecode-insert-method-helper sti dictionary 'includedtemplate)
     ;; If we don't have a special dictionary, then just insert with the
@@ -1057,7 +1057,7 @@ template where a ^ inserter occurs."
             (lambda (dict)
               (let ((srecode-template-inserter-point-override nil))
                 (if (srecode-dictionary-lookup-name
-                     dict (oref inserter1 :object-name))
+                     dict (slot-value inserter1 'object-name))
                     ;; Insert our sectional part with looping.
                     (srecode-insert-method-helper
                      inserter1 dict 'template)
diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el
index 566ab5d366a..c92c45fa885 100644
--- a/lisp/cedet/srecode/mode.el
+++ b/lisp/cedet/srecode/mode.el
@@ -196,7 +196,7 @@ MENU-DEF is the menu to bind this into."
   ;;(srecode-load-tables-for-mode major-mode)
 
   (let* ((modetable (srecode-get-mode-table major-mode))
-         (subtab (when modetable (oref modetable :tables)))
+         (subtab (when modetable (slot-value modetable 'tables)))
          (context nil)
          (active nil)
          (ltab nil)
@@ -319,17 +319,17 @@ Template is chosen based on the mode of the starting buffer."
       (if (not temp)
           (error "No Template named %s" template-name))
       ;; We need a template specific table, since tables chain.
-      (let ((tab (oref temp :table))
+      (let ((tab (slot-value temp 'table))
             (names nil)
             )
-        (find-file (oref tab :file))
-        (setq names (semantic-find-tags-by-name (oref temp :object-name)
+        (find-file (slot-value tab 'file))
+        (setq names (semantic-find-tags-by-name (slot-value temp 'object-name)
                                                 (current-buffer)))
         (cond ((= (length names) 1)
                (semantic-go-to-tag (car names))
                (semantic-momentary-highlight-tag (car names)))
               ((> (length names) 1)
-               (let* ((ctxt (semantic-find-tags-by-name (oref temp :context)
+               (let* ((ctxt (semantic-find-tags-by-name (slot-value temp 'context)
                                                         (current-buffer)))
                       (cls (semantic-find-tags-by-class 'context ctxt))
                       )
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index 7e24a320483..9500ca35979 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -63,9 +63,9 @@ If FUNCTION is non-nil, then FUNCTION is somehow applied to an
 aspect of the compound value."
   (if (not function)
       ;; Just format it in some handy dandy way.
-      (semantic-format-tag-prototype (oref cp :prime))
+      (semantic-format-tag-prototype (slot-value cp 'prime))
     ;; Otherwise, apply the function to the tag itself.
-    (funcall function (oref cp :prime))
+    (funcall function (slot-value cp 'prime))
     ))
 
 
@@ -106,7 +106,7 @@ variable default values, and other things."
   (srecode-dictionary-set-value dict "TAG" tagobj)
 
   ;; Pull out the tag for the individual pieces.
-  (let ((tag (oref tagobj :prime)))
+  (let ((tag (slot-value tagobj 'prime)))
 
     (srecode-dictionary-set-value dict "NAME" (semantic-tag-name tag))
     (srecode-dictionary-set-value dict "TYPE" (semantic-format-tag-type tag nil))
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 1a5a656e29a..2b0672a52c5 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -502,10 +502,10 @@ section or ? for an ask variable."
                  )
             (when inserter
               (let ((base
-                     (cons (oref inserter :object-name)
+                     (cons (slot-value inserter 'object-name)
                            (if (and (slot-boundp inserter :secondname)
-                                    (oref inserter :secondname))
-                               (split-string (oref inserter :secondname)
+                                    (slot-value inserter 'secondname))
+                               (split-string (slot-value inserter 'secondname)
                                              ":")
                              nil)))
                     (key (oref inserter key)))
@@ -629,7 +629,7 @@ section or ? for an ask variable."
   "Return a list of possible completions based on NONTEXT.
 Any extra FLAGS are ignored."
   (with-current-buffer (oref context buffer)
-    (let* ((prefix (car (last (oref context :prefix))))
+    (let* ((prefix (car (last (slot-value context 'prefix))))
            (prefixstr (cond ((stringp prefix)
                              prefix)
                             ((semantic-tag-p prefix)
@@ -640,7 +640,7 @@ Any extra FLAGS are ignored."
 ;                               prefix)
 ;                              ((stringp (car prefix))
 ;                               (car prefix))))
-           (argtype (car (oref context :argument)))
+           (argtype (car (slot-value context 'argument)))
            (matches nil))
 
       ;; Depending on what the analyzer is, we have different ways
diff --git a/lisp/cedet/srecode/table.el b/lisp/cedet/srecode/table.el
index 98e0c2d1d14..82b76400522 100644
--- a/lisp/cedet/srecode/table.el
+++ b/lisp/cedet/srecode/table.el
@@ -201,8 +201,8 @@ INIT are the initialization parameters for the new template table."
     ;; into the search table first, allowing lower priority items
     ;; to be the items found in the search table.
     (object-sort-list mt 'modetables (lambda (a b)
-                                       (> (oref a :priority)
-                                          (oref b :priority))))
+                                       (> (slot-value a 'priority)
+                                          (slot-value b 'priority))))
     ;; Return it.
     new))
 
@@ -239,9 +239,9 @@ Use PREDICATE is the same as for the `sort' function."
 (cl-defmethod srecode-dump ((tab srecode-mode-table))
   "Dump the contents of the SRecode mode table TAB."
   (princ "MODE TABLE FOR ")
-  (princ (oref tab :major-mode))
+  (princ (slot-value tab 'major-mode))
   (princ "\n--------------------------------------------\n\nNumber of tables: ")
-  (let ((subtab (oref tab :tables)))
+  (let ((subtab (slot-value tab 'tables)))
     (princ (length subtab))
     (princ "\n\n")
     (while subtab
@@ -254,17 +254,17 @@ Use PREDICATE is the same as for the `sort' function."
   (princ "Template Table for ")
   (princ (eieio-object-name-string tab))
   (princ "\nPriority: ")
-  (prin1 (oref tab :priority))
-  (when (oref tab :application)
+  (prin1 (slot-value tab 'priority))
+  (when (slot-value tab 'application)
     (princ "\nApplication: ")
-    (princ (oref tab :application)))
-  (when (oref tab :framework)
+    (princ (slot-value tab 'application)))
+  (when (slot-value tab 'framework)
     (princ "\nFramework: ")
-    (princ (oref tab :framework)))
-  (when (oref tab :project)
+    (princ (slot-value tab 'framework)))
+  (when (slot-value tab 'project)
     (require 'srecode/find) ; For srecode-template-table-in-project-p
     (princ "\nProject Directory: ")
-    (princ (oref tab :project))
+    (princ (slot-value tab 'project))
     (when (not (srecode-template-table-in-project-p tab))
       (princ "\n   ** Not Usable in this file. **")))
   (princ "\n\nVariables:\n")
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 5cc57bebee5..7220ce6b0c4 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -156,7 +156,7 @@ Adds the following:
       (error "No tag to insert for :texitag template argument"))
 
     ;; Extract the tag out of the compound object.
-    (setq tag (oref tag :prime))
+    (setq tag (slot-value tag 'prime))
 
     ;; Extract the doc string
     (setq doc (semantic-documentation-for-tag tag))