TDE
/
tdesdk
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesdk
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Q_SIGNALS and Q_SLOTS

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8c249c286e)
r14.1.x
Michele Calgaro 9 months ago
parent 725db2ce09
commit d379951396
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
20 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

4
cervisia/cvsservice/DESIGN
Unescape View File

@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts:
3. CvsJob - This class represents a cvs job. You can execute and cancel it, 3. CvsJob - This class represents a cvs job. You can execute and cancel it,
and you can retrieve the output of the cvs client by either and you can retrieve the output of the cvs client by either
connecting to the proper DCOP Q_SIGNALS or by using the output() connecting to the proper DCOP signals or by using the output()
method. There are two types of jobs. First the non-concurrent method. There are two types of jobs. First the non-concurrent
job which has to run alone, like cvs update or import. Second job which has to run alone, like cvs update or import. Second
the jobs which can run concurrently like cvs log or annotate. the jobs which can run concurrently like cvs log or annotate.
@ -45,7 +45,7 @@ How-to use this service in C++ applications:
// call "cvs log" for cervisiapart.h // call "cvs log" for cervisiapart.h
DCOPRef job = cvsService.log("cervisiapart.h"); DCOPRef job = cvsService.log("cervisiapart.h");
// connect to Q_SIGNALS to get output // connect to signals to get output
connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]); connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]);
connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)", connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)",
[MY SLOT]); [MY SLOT]);

8
kbabel/catalogmanager/validateprogresswidget.ui
Unescape View File

@ -113,12 +113,12 @@
<includes> <includes>
<include location="local" impldecl="in implementation">validateprogresswidget.ui.h</include> <include location="local" impldecl="in implementation">validateprogresswidget.ui.h</include>
</includes> </includes>
<Q_SIGNALS> <signals>
<signal>setValidationProgressBar(int)</signal> <signal>setValidationProgressBar(int)</signal>
</Q_SIGNALS> </signals>
<Q_SLOTS> <slots>
<slot>setupFileProgressBar( TQString text, int maxvalue )</slot> <slot>setupFileProgressBar( TQString text, int maxvalue )</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includes> <includes>
<include location="global" impldecl="in implementation">kprogress.h</include> <include location="global" impldecl="in implementation">kprogress.h</include>

8
kbabel/commonui/tdelisteditor.ui
Unescape View File

@ -242,10 +242,10 @@
<includes> <includes>
<include location="local" impldecl="in implementation">tdelisteditor.ui.h</include> <include location="local" impldecl="in implementation">tdelisteditor.ui.h</include>
</includes> </includes>
<Q_SIGNALS> <signals>
<signal>itemsChanged()</signal> <signal>itemsChanged()</signal>
</Q_SIGNALS> </signals>
<Q_SLOTS> <slots>
<slot>addToList()</slot> <slot>addToList()</slot>
<slot>downInList()</slot> <slot>downInList()</slot>
<slot>removeFromList()</slot> <slot>removeFromList()</slot>
@ -256,6 +256,6 @@
<slot access="protected">editChanged( const TQString &amp; s )</slot> <slot access="protected">editChanged( const TQString &amp; s )</slot>
<slot>setTitle( const TQString &amp; s )</slot> <slot>setTitle( const TQString &amp; s )</slot>
<slot returnType="TQStringList">list()</slot> <slot returnType="TQStringList">list()</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

4
kbabel/kbabel/editorpreferences.ui
Unescape View File

@ -342,9 +342,9 @@ activated, you will still see a message in the statusbar.
<include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kcolorbutton.h</include>
<include location="local" impldecl="in implementation">editorpreferences.ui.h</include> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include>
</includes> </includes>
<Q_SLOTS> <slots>
<slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">ledWarning( bool show )</slot>
<slot specifier="non virtual">toggleOther( bool other )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

4
kbabel/kbabel/fontpreferences.ui
Unescape View File

@ -57,8 +57,8 @@
<include location="local" impldecl="in implementation">fontpreferences.ui.h</include> <include location="local" impldecl="in implementation">fontpreferences.ui.h</include>
<include location="global" impldecl="in implementation">tdefontdialog.h</include> <include location="global" impldecl="in implementation">tdefontdialog.h</include>
</includes> </includes>
<Q_SLOTS> <slots>
<slot access="private">showOnlyFixedFonts( bool on )</slot> <slot access="private">showOnlyFixedFonts( bool on )</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

2
kompare/DESIGN
Unescape View File

@ -10,7 +10,7 @@ The diffmodel is comparable to a document and the view part is comparable
to the view and the komparemodellist is comparable to a documentmanager. to the view and the komparemodellist is comparable to a documentmanager.
The navtree can be viewed as a document view manager. The navtree can be viewed as a document view manager.
The model is fully separated from the view and all communication goes The model is fully separated from the view and all communication goes
through Q_SIGNALS and Q_SLOTS. The view gets a model that contains all differences through signals and slots. The view gets a model that contains all differences
for the compared files A and B. The view gets this model from the modellist, for the compared files A and B. The view gets this model from the modellist,
the central entity in the part. the central entity in the part.

4
poxml/lauri.po
Unescape View File

@ -407,7 +407,7 @@ msgid ""
"-&gt; int penWidth()\n" "-&gt; int penWidth()\n"
"-&gt; { return pen.width(); }\n" "-&gt; { return pen.width(); }\n"
"\n" "\n"
" public Q_SLOTS:\n" " public slots:\n"
" void updateAllViews(KScribbleView *sender);\n" " void updateAllViews(KScribbleView *sender);\n"
" \n" " \n"
" protected:\n" " protected:\n"
@ -429,7 +429,7 @@ msgstr ""
" \n" " \n"
"-&gt; int penWidth()\n" "-&gt; int penWidth()\n"
"-&gt; { return pen.width(); }\n" "-&gt; { return pen.width(); }\n"
" public Q_SLOTS:\n" " public slots:\n"
" void updateAllViews(KScribbleView *sender);\n" " void updateAllViews(KScribbleView *sender);\n"
" \n" " \n"
" protected:\n" " protected:\n"

2
poxml/lauri.xml
Unescape View File

@ -221,7 +221,7 @@ Send ppp
-&gt; int penWidth() -&gt; int penWidth()
-&gt; { return pen.width(); } -&gt; { return pen.width(); }
public Q_SLOTS: public slots:
void updateAllViews(KScribbleView *sender); void updateAllViews(KScribbleView *sender);
protected: protected:

2
scripts/completions/zsh/_tdekillall
Unescape View File

@ -4,5 +4,5 @@ local progs
progs=(`ps x | grep tdeinit: | grep -v Running | grep -v grep | sed 's,.*tdeinit: ,,' | sed 's, .*,,'`) progs=(`ps x | grep tdeinit: | grep -v Running | grep -v grep | sed 's,.*tdeinit: ,,' | sed 's, .*,,'`)
_alternative \ _alternative \
'Q_SIGNALS:: _Q_SIGNALS -p' \ 'signals:: _signals -p' \
'compadd $progs' 'compadd $progs'

4
scripts/kde-devel-emacs.el
Unescape View File

@ -98,7 +98,7 @@ With arg, to it arg times."
indent-tabs-mode nil indent-tabs-mode nil
fume-auto-rescan-buffer-p nil fume-auto-rescan-buffer-p nil
c-basic-offset 4 c-basic-offset 4
c-access-key "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" c-access-key "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:"
c-hanging-comment-ender-p nil c-hanging-comment-ender-p nil
c-offsets-alist (append '((case-label . 0) c-offsets-alist (append '((case-label . 0)
(access-label . -) (access-label . -)
@ -758,7 +758,7 @@ With arg, to it arg times."
(save-excursion (save-excursion
(c-safe (progn (c-backward-sexp 1) t)) (c-safe (progn (c-backward-sexp 1) t))
;; agulbrahack 2 ;; agulbrahack 2
(and (looking-at "Q_SLOTS:") (and (looking-at "slots:")
(c-backward-sexp 1)) (c-backward-sexp 1))
(looking-at c-access-key))) (looking-at c-access-key)))
(c-backward-sexp 1) (c-backward-sexp 1)

10
scripts/kde-emacs/kde-emacs-core.el
Unescape View File

@ -151,10 +151,10 @@ With arg, do it arg times."
(define-key c++-mode-map "\ef" 'c-forward-into-nomenclature) (define-key c++-mode-map "\ef" 'c-forward-into-nomenclature)
(define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature) (define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature)
(define-key c++-mode-map "\eb" 'c-backward-into-nomenclature) (define-key c++-mode-map "\eb" 'c-backward-into-nomenclature)
;; fontify "public|protected|private Q_SLOTS" with one and the same face :) ;; fontify "public|protected|private slots" with one and the same face :)
;; NOTE: write face-at-point function to fontify those just like other ;; NOTE: write face-at-point function to fontify those just like other
;; access specifiers ;; access specifiers
(font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) Q_SLOTS\\)\\>" (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) slots\\)\\>"
. font-lock-reference-face))) . font-lock-reference-face)))
;; Add (set magic-keys-mode nil) to your .emacs (before loading this file) ;; Add (set magic-keys-mode nil) to your .emacs (before loading this file)
;; to disable the magic keys in C++ mode. ;; to disable the magic keys in C++ mode.
@ -866,7 +866,7 @@ This function does not do any hidden buffer changes."
(not (bobp)) (not (bobp))
(save-excursion (save-excursion
(c-safe (progn (c-backward-sexp 1) t)) (c-safe (progn (c-backward-sexp 1) t))
(and (looking-at "Q_SLOTS:") (and (looking-at "slots:")
(c-backward-sexp 1)) (c-backward-sexp 1))
(looking-at c-opt-access-key))) (looking-at c-opt-access-key)))
(c-backward-sexp 1) (c-backward-sexp 1)
@ -2116,7 +2116,7 @@ This function does not do any hidden buffer changes."
(not (bobp)) (not (bobp))
(save-excursion (save-excursion
(c-safe (progn (c-backward-sexp 1) t)) (c-safe (progn (c-backward-sexp 1) t))
(and (looking-at "Q_SLOTS:") (and (looking-at "slots:")
(c-backward-sexp 1)) (c-backward-sexp 1))
(looking-at c-opt-access-key))) (looking-at c-opt-access-key)))
(c-backward-sexp 1) (c-backward-sexp 1)
@ -3172,7 +3172,7 @@ This function does not do any hidden buffer changes."
(save-excursion (save-excursion
(c-safe (progn (c-backward-sexp 1) t)) (c-safe (progn (c-backward-sexp 1) t))
;; agulbrahack 2 ;; agulbrahack 2
(and (looking-at "Q_SLOTS:") (and (looking-at "slots:")
(c-backward-sexp 1)) (c-backward-sexp 1))
(looking-at c-access-key))) (looking-at c-access-key)))
(c-backward-sexp 1) (c-backward-sexp 1)

22
scripts/kde-emacs/kde-emacs-semantic.el
Unescape View File

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

2
scripts/kde-emacs/kde-emacs-vars.el
Unescape View File

@ -39,7 +39,7 @@
;*---------------------------------------------------------------------*/ ;*---------------------------------------------------------------------*/
(defconst kde-access-labels (defconst kde-access-labels
"\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:"
"KDE specific access labels regexp.") "KDE specific access labels regexp.")
(defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c") (defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c")

4
tdeunittest/testerwidget.ui
Unescape View File

@ -182,9 +182,9 @@
<includes> <includes>
<include location="local" impldecl="in implementation">testerwidget.ui.h</include> <include location="local" impldecl="in implementation">testerwidget.ui.h</include>
</includes> </includes>
<Q_SIGNALS> <signals>
<signal>run()</signal> <signal>run()</signal>
</Q_SIGNALS> </signals>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>
<function returnType="TQListView *">resultList()</function> <function returnType="TQListView *">resultList()</function>

4
umbrello/umbrello/autolayout/newautolayoutdialog.ui
Unescape View File

@ -528,7 +528,7 @@
<slot>slotSelectAlgorithm(const TQString&amp;)</slot> <slot>slotSelectAlgorithm(const TQString&amp;)</slot>
</connection> </connection>
</connections> </connections>
<Q_SLOTS> <slots>
<slot>slotDoAutolayout()</slot> <slot>slotDoAutolayout()</slot>
<slot>slotSaveSettings()</slot> <slot>slotSaveSettings()</slot>
<slot>slotReloadSettings()</slot> <slot>slotReloadSettings()</slot>
@ -543,6 +543,6 @@
<slot>slotSetCenterDiagram(bool b)</slot> <slot>slotSetCenterDiagram(bool b)</slot>
<slot>slotSetShapeSeparation(int i)</slot> <slot>slotSetShapeSeparation(int i)</slot>
<slot specifier="pure virtual">slotSelectAlgorithm(const TQString&amp;)</slot> <slot specifier="pure virtual">slotSelectAlgorithm(const TQString&amp;)</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

4
umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
Unescape View File

@ -470,9 +470,9 @@
<slot>browseClicked()</slot> <slot>browseClicked()</slot>
</connection> </connection>
</connections> </connections>
<Q_SLOTS> <slots>
<slot>browseClicked()</slot> <slot>browseClicked()</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includes> <includes>
<include location="global" impldecl="in implementation">kcombobox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include>

4
umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
Unescape View File

@ -521,10 +521,10 @@ is empty</string>
<slot>activeLanguageChanged(int)</slot> <slot>activeLanguageChanged(int)</slot>
</connection> </connection>
</connections> </connections>
<Q_SLOTS> <slots>
<slot access="protected">browseClicked()</slot> <slot access="protected">browseClicked()</slot>
<slot access="protected">activeLanguageChanged(int id)</slot> <slot access="protected">activeLanguageChanged(int id)</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includes> <includes>
<include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">knuminput.h</include>

4
umbrello/umbrello/dialogs/codegenerationpolicybase.ui
Unescape View File

@ -32,8 +32,8 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<Q_SLOTS> <slots>
<slot access="protected">apply()</slot> <slot access="protected">apply()</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

4
umbrello/umbrello/dialogs/codegenerationwizardbase.ui
Unescape View File

@ -300,10 +300,10 @@ for in the right hand side list</string>
<forwards> <forwards>
<forward>class UMLClassifier</forward> <forward>class UMLClassifier</forward>
</forwards> </forwards>
<Q_SLOTS> <slots>
<slot>selectClass()</slot> <slot>selectClass()</slot>
<slot access="protected">deselectClass()</slot> <slot access="protected">deselectClass()</slot>
<slot>classGenerated( UMLClassifier * /* c */ )</slot> <slot>classGenerated( UMLClassifier * /* c */ )</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

4
umbrello/umbrello/dialogs/codeviewerdialogbase.ui
Unescape View File

@ -106,8 +106,8 @@
<slot>close()</slot> <slot>close()</slot>
</connection> </connection>
</connections> </connections>
<Q_SLOTS> <slots>
<slot>changeHighlighting(int)</slot> <slot>changeHighlighting(int)</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

Write Preview
Loading…
Cancel
Save