diff options
| author | Michele Calgaro <[email protected]> | 2024-02-02 11:25:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-02-03 00:08:01 +0900 |
| commit | 67aa6b188ef42c2162da6172856ffbd4d7789414 (patch) | |
| tree | edb62b826c86a0354cd5b9501fecd7c65591961b | |
| parent | cf1bb69b2973368b5ac0d7d347a7fa7b8dfa43a1 (diff) | |
| download | koffice-67aa6b188ef42c2162da6172856ffbd4d7789414.tar.gz koffice-67aa6b188ef42c2162da6172856ffbd4d7789414.zip | |
Replace Q_SIGNALS and Q_SLOTS
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 63c2fcedcd98caf7979bc4797029cbcb32433a5a)
23 files changed, 52 insertions, 52 deletions
diff --git a/chalk/HACKING b/chalk/HACKING index a48526b0..7673eb70 100644 --- a/chalk/HACKING +++ b/chalk/HACKING @@ -86,8 +86,8 @@ Spaces Keep the source airy and open. (However, maybe I was wrong in wanting spaces around ->...) -Slots and Q_SIGNALS +Slots and signals - Prefix Q_SLOTS with slot and Q_SIGNALS with sig: slotUpdateSelection, sigSelectionUpdated. + Prefix slots with slot and signals with sig: slotUpdateSelection, sigSelectionUpdated. Boudewijn Rempt
\ No newline at end of file diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py index 00269818..ffe9a9d6 100755 --- a/chalk/core/createdcop.py +++ b/chalk/core/createdcop.py @@ -99,7 +99,7 @@ def parseHeader(headerfile, classname): line.startswith("TQ_OBJECT") or line.startswith("#") or line.startswith("}") or - line.startswith("public Q_SLOTS:") or + line.startswith("public slots:") or line.find("~") != -1 or len(line) == 0 ): diff --git a/chalk/doc/palettedesign.txt b/chalk/doc/palettedesign.txt index 9dc2cfab..549264a7 100644 --- a/chalk/doc/palettedesign.txt +++ b/chalk/doc/palettedesign.txt @@ -2,7 +2,7 @@ Requirements * Flexible: plugins should be able to add palettes or palette tabs * Connected: palette tabs should be able to connect to the main application - using Q_SIGNALS and Q_SLOTS + using signals and slots * Configurable: palette widgets should be drag & droppable from palette to palette, and from palette to void to create a new palette. * Persistent: the palette configuration of a view should be persisted diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui index e231e4a7..84469031 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -304,13 +304,13 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>newClicked()</signal> <signal>saveClicked()</signal> <signal>printClicked()</signal> <signal>startImageDrag()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot> <slot access="protected" specifier="non virtual">slotNewClicked()</slot> <slot access="protected" specifier="non virtual">slotSaveClicked()</slot> @@ -318,7 +318,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <slot access="protected" specifier="non virtual">slotStartDrag()</slot> <slot specifier="non virtual" returnType="int">previewWidth()</slot> <slot specifier="non virtual" returnType="int">previewHeight()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setPreview( const TQPixmap & pm )</function> <function specifier="non virtual">setDelay( int i )</function> diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui index 2b866c2f..8a117f9d 100644 --- a/chalk/ui/kis_matrix_widget.ui +++ b/chalk/ui/kis_matrix_widget.ui @@ -200,11 +200,11 @@ <includes> <include location="local" impldecl="in implementation">kis_matrix_widget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>valueChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">spinboxValueChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index ff8bcfbf..16cc6bd2 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -287,11 +287,11 @@ <data format="PNG" length="730">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002a149444154388db595df4b536118c73f3bdbecf8036c4e41f2c6695022045e486e90b721e4ba126f1a0966627f4108512004a197fd0586588220980a9a068be63abaa884cc1f6d30a7e29cfb216dceb39d9d2e2cf3c74997e417de97972fbc9fe77d1e789e57e772b9384d369b4d3deab95c2edd497784b3404ff20f460650fff732fc0ee0f5bc241298252dc710f4174e4be4908cb9661439cefa7c0fb71eee79fbe0486096b5af3d644e4e50537a3de880b4f2c7db07a7e51819156e77fe3b1860b4bb1095d871f0c1f4239108068381f84e9cc58545c6c7c78946a3d45dafa3b4b414511411f34456d756e9eded65706090924a076bdf9e1f071fd4c0c000c15010f7b49bc93793b4de6ba5abab0bd3451300bbbbbb783e7a08ac04d858dfd0cc4013dcdedebe7f368a462449a2ff553fcd4dcdf87c3eba7bba71bbdcf8fd7e8a8a8ab20703d4d6d6d2f1a00383d180b9c84c85a58282fc027c3e1ff537ea71dc71303a36caf6f6367d2ffab203773eeaa4e1660336ab8db49226c798839c9211f402b22c53535383cd6ac35261c1eff76b82353b4fafd7a3a80a899d048220904aa588842324779278bd5e9cef9cc41371ca2e9511de0a675f8ae1a161cc2633e5e5e5980a4d0882c06678133157243f2f9f85a50526a62698fb32c78c674613acf962dfb28fd05688443c41329944de95997e3fcdc8e8088b4b8bb85d6e42c110f6463b5557aab207c77ec458febe8c3fe067657585542a85d566c5bbecc5fdc18de5b285603088925168b9db927d294451c4e9745275b50a7ba39dc44e8292e212daeeb7517dad9aa9b7534833129224d1d4d4a409de9f6e9fc61eabaf9f9d7d9a7d1e7ba20e3dd5986e8a1c47c75ecf97543ab45ff117e5e416138f7af790474bb13edf435a0195d8a19ecf46eaaf2d9339609ed7a03ff56b3aabce0dfc13238259bff00a6d890000000049454e44ae426082</data> </image> </images> -<Q_SLOTS> +<slots> <slot>zoomChanged(int)</slot> <slot>zoomMinus()</slot> <slot>zoomPlus()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui index acf4516b..7e4c41b0 100644 --- a/chalk/ui/wdgtextbrush.ui +++ b/chalk/ui/wdgtextbrush.ui @@ -145,9 +145,9 @@ </widget> <customwidgets> </customwidgets> -<Q_SLOTS> +<slots> <slot access="private">boldButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 0d06f034..0775c562 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -655,10 +655,10 @@ <slot>removeLanguage()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addLanguage()</slot> <slot>removeLanguage()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 0d06f034..0775c562 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -655,10 +655,10 @@ <slot>removeLanguage()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addLanguage()</slot> <slot>removeLanguage()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui index 1176908b..44a6e029 100644 --- a/filters/xsltfilter/export/xsltdialog.ui +++ b/filters/xsltfilter/export/xsltdialog.ui @@ -210,12 +210,12 @@ <includes> <include location="local" impldecl="in implementation">xsltdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>cancelSlot()</slot> <slot>chooseRecentSlot()</slot> <slot>chooseSlot()</slot> <slot>chooseCommonSlot()</slot> <slot>okSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui index 1176908b..44a6e029 100644 --- a/filters/xsltfilter/import/xsltdialog.ui +++ b/filters/xsltfilter/import/xsltdialog.ui @@ -210,12 +210,12 @@ <includes> <include location="local" impldecl="in implementation">xsltdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>cancelSlot()</slot> <slot>chooseRecentSlot()</slot> <slot>chooseSlot()</slot> <slot>chooseCommonSlot()</slot> <slot>okSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui index 5a34dbb5..2eaa3173 100644 --- a/kdgantt/itemAttributeDialog.ui +++ b/kdgantt/itemAttributeDialog.ui @@ -702,7 +702,7 @@ <variables> <variable>KDGanttViewItem * myItem</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>ChangeText_clicked()</slot> <slot>ChangeStart_clicked()</slot> @@ -732,6 +732,6 @@ <slot>CalBox_toggled( bool mode )</slot> <slot>PrioSlider_valueChanged( int val )</slot> <slot returnType="KDGanttViewItem *">getItem()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui index 54247305..c0e999b4 100644 --- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui +++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui @@ -176,9 +176,9 @@ <tabstop>chkUseSocket</tabstop> <tabstop>chkSocketDefault</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotCBToggled( bool on )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui index c6ff117a..ab02d02e 100644 --- a/kexi/widget/kexiprjtypeselectorbase.ui +++ b/kexi/widget/kexiprjtypeselectorbase.ui @@ -152,9 +152,9 @@ <includes> <include location="local" impldecl="in implementation">kexiprjtypeselectorbase.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">slotSelectionChanged( int id )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui index 8b2cf4c0..1bba4168 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui @@ -98,11 +98,11 @@ <includes> <include location="local" impldecl="in declaration">kiconloader.h</include> </includes> -<Q_SLOTS> +<slots> <slot>zoomChanged(int)</slot> <slot>zoomMinus()</slot> <slot>zoomPlus()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon</pixmapfunction> <layoutdefaults spacing="2" margin="0"/> </UI> diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 24a86417..e0e9e152 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -87,11 +87,11 @@ <slot>itemClicked(TQListViewItem*,const TQPoint&,int)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">itemActivated(TQListViewItem*)</slot> <slot access="protected">itemClicked(TQListViewItem*,const TQPoint&,int)</slot> <slot access="protected">updateButtons(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdetoolbar.h</include> diff --git a/kplato/kptconfigbehaviorpanelbase.ui b/kplato/kptconfigbehaviorpanelbase.ui index eb329c71..29b17b07 100644 --- a/kplato/kptconfigbehaviorpanelbase.ui +++ b/kplato/kptconfigbehaviorpanelbase.ui @@ -92,11 +92,11 @@ <includes> <include location="local" impldecl="in implementation">kptconfigbehaviorpanelbase.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui index f6373be4..9a094cd3 100644 --- a/kplato/kptdurationwidget.ui +++ b/kplato/kptdurationwidget.ui @@ -386,10 +386,10 @@ <variable access="private">TQRegExpValidator *m_validator;</variable> <variable access="private">struct FieldDescriptor *m_fields;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>valueChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>setValue( const KPlato::Duration & newDuration )</slot> <slot access="private">dddLostFocus()</slot> <slot access="private">hhLostFocus()</slot> @@ -397,7 +397,7 @@ <slot access="private">ssLostFocus()</slot> <slot access="private">msLostFocus()</slot> <slot>handleLostFocus( int field )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> <function access="private" specifier="non virtual">destroy()</function> diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui index f3f52ab9..6cf7c918 100644 --- a/kplato/kpttasknotespanelbase.ui +++ b/kplato/kpttasknotespanelbase.ui @@ -44,8 +44,8 @@ </widget> </hbox> </widget> -<Q_SLOTS> +<slots> <slot>scheduling_clicked( int schedulingType )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui index 3c24676b..ee48d4e0 100644 --- a/kpresenter/shadowdialog.ui +++ b/kpresenter/shadowdialog.ui @@ -482,13 +482,13 @@ <tabstop>applyButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">colorChanged( const TQColor & )</slot> <slot access="protected">directionChanged( int )</slot> <slot access="protected">distanceChanged( int )</slot> <slot access="protected">applyClicked()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/kword/mailmerge/sql/qtsqldatasourceeditor.ui b/kword/mailmerge/sql/qtsqldatasourceeditor.ui index 24d32b79..6706b2bc 100644 --- a/kword/mailmerge/sql/qtsqldatasourceeditor.ui +++ b/kword/mailmerge/sql/qtsqldatasourceeditor.ui @@ -151,8 +151,8 @@ <includes> <include location="local" impldecl="in implementation">qtsqldatasourceeditor.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>filterCheckBox_toggled( bool fcb_state )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui index baf0e1a3..60136009 100644 --- a/lib/kotext/timedateformatwidget.ui +++ b/lib/kotext/timedateformatwidget.ui @@ -203,10 +203,10 @@ <tabstops> <tabstop>combo1</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>comboActivated()</slot> <slot>updateLabel()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py index 6db6d980..dceb323a 100644 --- a/lib/kross/test/testcase.py +++ b/lib/kross/test/testcase.py @@ -110,8 +110,8 @@ class TestPlugin(unittest.TestCase): #print "===========> %s" % self.pluginobject2.myName() print("testqobject1 properties=%s" % self.testqobject1.propertyNames()) - print("testqobject1 Q_SLOTS=%s" % self.testqobject1.slotNames()) - print("testqobject1 Q_SIGNALS=%s" % self.testqobject1.signalNames()) + print("testqobject1 slots=%s" % self.testqobject1.slotNames()) + print("testqobject1 signals=%s" % self.testqobject1.signalNames()) print("-----------------3") print("DIR=>%s" % dir(self.testqobject1)) |