Replace Q_SIGNALS and Q_SLOTS

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/84/head
Michele Calgaro 10 months ago
parent c616fab905
commit bda52bd053
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -56,9 +56,9 @@
<includes> <includes>
<include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kdialog.h</include>
</includes> </includes>
<Q_SLOTS> <slots>
<slot>buttonGroup1_clicked(int)</slot> <slot>buttonGroup1_clicked(int)</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -142,12 +142,12 @@
<include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include>
<include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include>
</includes> </includes>
<Q_SIGNALS> <signals>
<signal>configClicked()</signal> <signal>configClicked()</signal>
</Q_SIGNALS> </signals>
<Q_SLOTS> <slots>
<slot specifier="non virtual">setDetectedVersion( TQString v )</slot> <slot specifier="non virtual">setDetectedVersion( TQString v )</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

@ -519,7 +519,7 @@ diff -u -p -r1.3 kpviewscrollablecontainer.h
virtual void viewportPaintEvent (QPaintEvent *e); virtual void viewportPaintEvent (QPaintEvent *e);
virtual void paintEvent (QPaintEvent *e); virtual void paintEvent (QPaintEvent *e);
+protected Q_SLOTS: +protected slots:
+ void windowActivationChanged (); + void windowActivationChanged ();
+protected: +protected:
+ virtual void windowActivationChange (bool wasActive); + virtual void windowActivationChange (bool wasActive);

@ -265,11 +265,11 @@
<include location="global" impldecl="in implementation">kiconloader.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include>
<include location="local" impldecl="in implementation">dlgperformance.ui.h</include> <include location="local" impldecl="in implementation">dlgperformance.ui.h</include>
</includes> </includes>
<Q_SLOTS> <slots>
<slot>lowRadio_toggled( bool on )</slot> <slot>lowRadio_toggled( bool on )</slot>
<slot>normalRadio_toggled( bool on )</slot> <slot>normalRadio_toggled( bool on )</slot>
<slot>aggressiveRadio_toggled( bool on )</slot> <slot>aggressiveRadio_toggled( bool on )</slot>
</Q_SLOTS> </slots>
<functions> <functions>
<function access="private">init()</function> <function access="private">init()</function>
</functions> </functions>

@ -201,11 +201,11 @@ things are set multiple times. But it works :-)
(load-library "vc") (load-library "vc")
;;for QT ;;for QT
(set c-C++-access-key "\\<\\(Q_SIGNALS\\|public\\|protected\\|private (set c-C++-access-key "\\<\\(signals\\|public\\|protected\\|private
\\|public Q_SLOTS\\|protected Q_SLOTS\\|private Q_SLOTS\\)\\>[ \t]*:") \\|public slots\\|protected slots\\|private slots\\)\\>[ \t]*:")
;; modify the colour of Q_SLOTS to match public, private, etc ... ;; modify the colour of slots to match public, private, etc ...
(font-lock-add-keywords 'c++-mode (font-lock-add-keywords 'c++-mode
'(("\\<\\(Q_SLOTS\\|Q_SIGNALS\\)\\>" . font-lock-type-face))) '(("\\<\\(slots\\|signals\\)\\>" . font-lock-type-face)))
;; make new font for rest of qt keywords ;; make new font for rest of qt keywords
(make-face 'qt-keywords-face) (make-face 'qt-keywords-face)
(set-face-foreground 'qt-keywords-face "green") (set-face-foreground 'qt-keywords-face "green")

@ -357,15 +357,15 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
<include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include>
</includes> </includes>
<Q_SIGNALS> <signals>
<signal>newClicked()</signal> <signal>newClicked()</signal>
<signal>saveClicked()</signal> <signal>saveClicked()</signal>
<signal>copyClicked()</signal> <signal>copyClicked()</signal>
<signal>printClicked()</signal> <signal>printClicked()</signal>
<signal>openWithKPClicked()</signal> <signal>openWithKPClicked()</signal>
<signal>startImageDrag()</signal> <signal>startImageDrag()</signal>
</Q_SIGNALS> </signals>
<Q_SLOTS> <slots>
<slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot> <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot>
<slot access="protected" specifier="non virtual">slotNewClicked()</slot> <slot access="protected" specifier="non virtual">slotNewClicked()</slot>
<slot access="protected" specifier="non virtual">slotSaveClicked()</slot> <slot access="protected" specifier="non virtual">slotSaveClicked()</slot>
@ -375,7 +375,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot> <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot>
<slot specifier="non virtual" returnType="int">previewWidth()</slot> <slot specifier="non virtual" returnType="int">previewWidth()</slot>
<slot specifier="non virtual" returnType="int">previewHeight()</slot> <slot specifier="non virtual" returnType="int">previewHeight()</slot>
</Q_SLOTS> </slots>
<functions> <functions>
<function specifier="non virtual">setPreview( const TQPixmap &amp; pm )</function> <function specifier="non virtual">setPreview( const TQPixmap &amp; pm )</function>
<function specifier="non virtual">setDelay( int i )</function> <function specifier="non virtual">setDelay( int i )</function>

@ -270,10 +270,10 @@
<forwards> <forwards>
<forward>class KURL</forward> <forward>class KURL</forward>
</forwards> </forwards>
<Q_SLOTS> <slots>
<slot access="private" specifier="non virtual">init()</slot> <slot access="private" specifier="non virtual">init()</slot>
<slot specifier="non virtual">noSort()</slot> <slot specifier="non virtual">noSort()</slot>
</Q_SLOTS> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI> </UI>

Loading…
Cancel
Save