1 files changed, 7 insertions, 10 deletions
diff --git a/lib/skels/jao-skel-cpp.el b/lib/skels/jao-skel-cpp.el
index 9a57123..0ddb61e 100644
--- a/lib/skels/jao-skel-cpp.el
+++ b/lib/skels/jao-skel-cpp.el
@@ -56,7 +56,7 @@
 (defun jao-skel-cpp-make-guard-name (ns)
   "Create a standard include guard name"
   (upcase (mapconcat #'identity
-                     `(,@ns ,(jao-basename) ,(jao-extension)
+                     `(,@ns ,(jao-skel-basename) ,(jao-skel-extension)
                             ,(user-login-name)
                             ,(format-time-string "%y%m%d%H%M"))
                      "_")))
@@ -136,16 +136,16 @@
   > \n
   "*"
   > \n
-  (jao-copyright-line "* " "")
+  (jao-skel-copyright-line "* " "")
   "*"
   > ?\n
-  (jao-insert-copyright-file)
+  (jao-skel-insert-license)
   > \n \n _)
 
 (define-skeleton jao-skel-cpp-header-brief
   "Brief initial header blurb"
   nil
-  (jao-copyright-line "/* " " */")
+  (jao-skel-copyright-line "/* " " */")
   \n)
 
 (define-skeleton jao-skel-cpp-header-comment
@@ -172,7 +172,6 @@
   '(jao-skel-cpp-header-comment)
   "#include \"" (jao-skel-cpp--find-other "h") "\""
   > _ \n \n \n \n
-  (jao-scm-line "/* " " */")
   > \n)
 
 
@@ -183,7 +182,7 @@
 (define-skeleton jao-skel-cpp-class-def
   "Insert a class definition"
   nil
-  '(setq v1 (jao-basename))
+  '(setq v1 (jao-skel-basename))
   > \n
   "/**"
   > \n
@@ -240,11 +239,9 @@
   "#define " v1
   > _ \n \n \n \n
   "#endif /* " v1 " */"
-  > \n \n
-  (jao-scm-line "/* " " */")
-  > \n)
+  > \n > \n)
 
-(jao-skel-provide
+(jao-skel-install*
  '(("\\.cpp$" jao-skel-cpp-source-header)
    ("\\.hpp$" jao-skel-cpp-header)
    ("\\.c$" jao-skel-c-source-header)