|
|
|
@ -148,12 +148,12 @@ token and TOKENS have to be a list of functions from buffer."
|
|
|
|
|
ret
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defmacro kde-label-Q_SIGNALS (pt)
|
|
|
|
|
"Returns none-nil if the current access label == \"Q_SIGNALS\""
|
|
|
|
|
(defmacro kde-label-signals (pt)
|
|
|
|
|
"Returns none-nil if the current access label == \"signals\""
|
|
|
|
|
`(save-excursion
|
|
|
|
|
(goto-char ,pt)
|
|
|
|
|
(if (looking-at ":")
|
|
|
|
|
(re-search-backward "Q_SIGNALS" (point-at-bol) t)
|
|
|
|
|
(re-search-backward "signals" (point-at-bol) t)
|
|
|
|
|
)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
@ -171,13 +171,13 @@ token and TOKENS have to be a list of functions from buffer."
|
|
|
|
|
)
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defmacro kde-label-Q_SLOTS (pt)
|
|
|
|
|
"Return none-nil if at PT there's Q_SLOTS access specifier."
|
|
|
|
|
(defmacro kde-label-slots (pt)
|
|
|
|
|
"Return none-nil if at PT there's slots access specifier."
|
|
|
|
|
`(save-excursion
|
|
|
|
|
(goto-char ,pt)
|
|
|
|
|
(if (looking-at ":")
|
|
|
|
|
;; export this regex to a kde-emacs-vars defvar
|
|
|
|
|
(re-search-backward "\\(public\\|protected\\|private\\)[ \t]+Q_SLOTS" (point-at-bol) t))
|
|
|
|
|
(re-search-backward "\\(public\\|protected\\|private\\)[ \t]+slots" (point-at-bol) t))
|
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(defmacro kde-is-constructor (function)
|
|
|
|
@ -304,7 +304,7 @@ class-token has to be a token representing either a class or a struct."
|
|
|
|
|
(stringp cur-token-name))
|
|
|
|
|
(set aslot nil
|
|
|
|
|
asignal nil)
|
|
|
|
|
;;LABEL - unsets both Q_SIGNALS and Q_SLOTS
|
|
|
|
|
;;LABEL - unsets both signals and slots
|
|
|
|
|
)
|
|
|
|
|
((and
|
|
|
|
|
(eq cur-token 'variable)
|
|
|
|
@ -313,8 +313,8 @@ class-token has to be a token representing either a class or a struct."
|
|
|
|
|
)
|
|
|
|
|
((not (stringp cur-token-name))
|
|
|
|
|
(cond
|
|
|
|
|
((kde-label-Q_SIGNALS (car (semantic-token-extent elt)))
|
|
|
|
|
;;SIGNALS - next prototypes belong to Q_SIGNALS and we don't want to
|
|
|
|
|
((kde-label-signals (car (semantic-token-extent elt)))
|
|
|
|
|
;;SIGNALS - next prototypes belong to signals and we don't want to
|
|
|
|
|
;; expand those
|
|
|
|
|
(set asignal t
|
|
|
|
|
aslot nil)
|
|
|
|
@ -324,8 +324,8 @@ class-token has to be a token representing either a class or a struct."
|
|
|
|
|
;; so we do ;)
|
|
|
|
|
(set namespace (kde-label-namespace (car (semantic-token-extent elt))))
|
|
|
|
|
)
|
|
|
|
|
((kde-label-Q_SLOTS (car (semantic-token-extent elt)))
|
|
|
|
|
;;SLOTS - for now just unset Q_SIGNALS
|
|
|
|
|
((kde-label-slots (car (semantic-token-extent elt)))
|
|
|
|
|
;;SLOTS - for now just unset signals
|
|
|
|
|
(set aslot t
|
|
|
|
|
asignal nil)
|
|
|
|
|
)
|
|
|
|
|