diff options
117 files changed, 236 insertions, 236 deletions
diff --git a/buildtools/ada/adaproject_optionsdlgbase.ui b/buildtools/ada/adaproject_optionsdlgbase.ui index b98bc1a3..35774d19 100644 --- a/buildtools/ada/adaproject_optionsdlgbase.ui +++ b/buildtools/ada/adaproject_optionsdlgbase.ui @@ -447,7 +447,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -457,7 +457,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addapplicationdlgbase.ui b/buildtools/autotools/addapplicationdlgbase.ui index e7495907..61e0d105 100644 --- a/buildtools/autotools/addapplicationdlgbase.ui +++ b/buildtools/autotools/addapplicationdlgbase.ui @@ -539,11 +539,11 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">addTypeClicked()</slot> <slot access="protected">iconClicked()</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addicondlgbase.ui b/buildtools/autotools/addicondlgbase.ui index 354a8f88..7d65613d 100644 --- a/buildtools/autotools/addicondlgbase.ui +++ b/buildtools/autotools/addicondlgbase.ui @@ -260,9 +260,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>somethingChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addservicedlgbase.ui b/buildtools/autotools/addservicedlgbase.ui index ad8e1b49..a921195e 100644 --- a/buildtools/autotools/addservicedlgbase.ui +++ b/buildtools/autotools/addservicedlgbase.ui @@ -530,12 +530,12 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">iconClicked()</slot> <slot access="protected">addTypeClicked()</slot> <slot access="protected">propertyExecuted(TQListViewItem*)</slot> <slot access="protected">removeTypeClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/addtargetdlgbase.ui b/buildtools/autotools/addtargetdlgbase.ui index 77bb8adc..b7b48d36 100644 --- a/buildtools/autotools/addtargetdlgbase.ui +++ b/buildtools/autotools/addtargetdlgbase.ui @@ -334,9 +334,9 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">primaryChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index 9bcddff0..9747faca 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -202,12 +202,12 @@ <tabstop>newFileList</tabstop> <tabstop>neverAskAgainCheckbox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotActiveTargetToggled(bool)</slot> <slot access="protected">slotChooseTargetToggled(bool)</slot> <slot access="private">slotSubprojectChanged(const TQString&)</slot> <slot access="private">slotTargetChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/buildtools/autotools/configureoptionswidgetbase.ui b/buildtools/autotools/configureoptionswidgetbase.ui index a8821504..3392c6a5 100644 --- a/buildtools/autotools/configureoptionswidgetbase.ui +++ b/buildtools/autotools/configureoptionswidgetbase.ui @@ -1014,7 +1014,7 @@ headers in a nonstandard directory <include dir></string> <tabstop>f77flags_edit</tabstop> <tabstop>f77flags_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">builddirClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">configAdded()</slot> @@ -1028,7 +1028,7 @@ headers in a nonstandard directory <include dir></string> <slot access="protected">f77serviceChanged()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">topsourcedirClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/managecustomcommandsbase.ui b/buildtools/autotools/managecustomcommandsbase.ui index eab430e9..9088ba07 100644 --- a/buildtools/autotools/managecustomcommandsbase.ui +++ b/buildtools/autotools/managecustomcommandsbase.ui @@ -117,9 +117,9 @@ <tabstop>addButton</tabstop> <tabstop>removeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addButton_clicked()</slot> <slot>removeButton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/autotools/subprojectoptionsdlgbase.ui b/buildtools/autotools/subprojectoptionsdlgbase.ui index d417e73b..90059f0a 100644 --- a/buildtools/autotools/subprojectoptionsdlgbase.ui +++ b/buildtools/autotools/subprojectoptionsdlgbase.ui @@ -964,7 +964,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">buildorderMoveDownClicked()</slot> <slot access="protected">cflagsClicked()</slot> <slot access="protected">cxxFlagsClicked()</slot> @@ -980,7 +980,7 @@ <slot access="protected">removePrefixClicked()</slot> <slot access="private">addPrefixClicked()</slot> <slot access="private">editPrefixClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/autotools/targetoptionsdlgbase.ui b/buildtools/autotools/targetoptionsdlgbase.ui index 2fad9db1..ea5d4738 100644 --- a/buildtools/autotools/targetoptionsdlgbase.ui +++ b/buildtools/autotools/targetoptionsdlgbase.ui @@ -700,7 +700,7 @@ <tabstop>okbutton</tabstop> <tabstop>cancelbutton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insideMoveDownClicked()</slot> <slot access="protected">insideMoveUpClicked()</slot> <slot access="protected">outsideAddClicked()</slot> @@ -708,7 +708,7 @@ <slot access="protected">outsideMoveDownClicked()</slot> <slot access="protected">outsideMoveUpClicked()</slot> <slot access="protected">outsideRemoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui index 2b1bfdff..0e1658ea 100644 --- a/buildtools/custommakefiles/custombuildoptionswidgetbase.ui +++ b/buildtools/custommakefiles/custombuildoptionswidgetbase.ui @@ -144,10 +144,10 @@ </spacer> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected">makeToggled(bool)</slot> <slot access="protected">otherToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui index cae0a6e0..47d23c9b 100644 --- a/buildtools/custommakefiles/custommakeconfigwidgetbase.ui +++ b/buildtools/custommakefiles/custommakeconfigwidgetbase.ui @@ -375,13 +375,13 @@ <tabstop>copyenvs_button</tabstop> <tabstop>removeenvs_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/custommakefiles/customotherconfigwidgetbase.ui b/buildtools/custommakefiles/customotherconfigwidgetbase.ui index 3f7290af..60f4adbc 100644 --- a/buildtools/custommakefiles/customotherconfigwidgetbase.ui +++ b/buildtools/custommakefiles/customotherconfigwidgetbase.ui @@ -276,13 +276,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">envNameChanged(const TQString &)</slot> <slot access="protected">envChanged(const TQString&)</slot> <slot access="protected">envAdded()</slot> <slot access="protected">envRemoved()</slot> <slot access="protected">envCopied()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui index 3fb32462..139f1908 100644 --- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui +++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui @@ -210,11 +210,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged(TQListBoxItem*)</slot> <slot>tabWidget2_selected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui index ad580b4c..970f6ee8 100644 --- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui +++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui @@ -240,11 +240,11 @@ <slot>tabWidget2_selected(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>addAll_clicked()</slot> <slot>choose_clicked()</slot> <slot>files_currentChanged( TQListBoxItem * )</slot> <slot>tabWidget2_selected( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui index e7246de3..53605001 100644 --- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui +++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui @@ -189,12 +189,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addVarClicked()</slot> <slot>removeVarClicked()</slot> <slot>editVarClicked()</slot> <slot>environmentClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui index d5206ac6..c9300c18 100644 --- a/buildtools/lib/widgets/removesubprojectdlgbase.ui +++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui @@ -145,10 +145,10 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui index 404af030..27ce6736 100644 --- a/buildtools/lib/widgets/runoptionswidgetbase.ui +++ b/buildtools/lib/widgets/runoptionswidgetbase.ui @@ -235,9 +235,9 @@ <tabstop>startinterminal_box</tabstop> <tabstop>autocompile_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>mainProgramChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui index a87cbd34..22873790 100644 --- a/buildtools/lib/widgets/subclassesdlgbase.ui +++ b/buildtools/lib/widgets/subclassesdlgbase.ui @@ -205,12 +205,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">changeCurrentURL(const TQString &str)</slot> <slot access="protected">removeRelation()</slot> <slot access="protected">newRelation()</slot> <slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/pascal/pascalproject_optionsdlgbase.ui b/buildtools/pascal/pascalproject_optionsdlgbase.ui index a6f9321c..3ec7662d 100644 --- a/buildtools/pascal/pascalproject_optionsdlgbase.ui +++ b/buildtools/pascal/pascalproject_optionsdlgbase.ui @@ -450,7 +450,7 @@ <tabstop>addconfig_button</tabstop> <tabstop>removeconfig_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">compiler_box_activated(const TQString&)</slot> <slot access="protected">addconfig_button_clicked()</slot> <slot access="protected">configRemoved()</slot> @@ -460,7 +460,7 @@ <slot access="protected">configAdded()</slot> <slot access="protected">setDirty()</slot> <slot access="protected">setDefaultOptions()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/newwidgetdlgbase.ui b/buildtools/qmake/newwidgetdlgbase.ui index 84d552b2..fde51b13 100644 --- a/buildtools/qmake/newwidgetdlgbase.ui +++ b/buildtools/qmake/newwidgetdlgbase.ui @@ -216,10 +216,10 @@ <tabstop>okayButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>subclassingPressed()</slot> <slot>templateSelChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 09193bdf..d809814d 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -2596,7 +2596,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>updateProjectConfiguration()</slot> <slot>buildorderMoveUpClicked()</slot> <slot>buildorderMoveDownClicked()</slot> @@ -2640,7 +2640,7 @@ <slot>activateApply( const TQString & )</slot> <slot>activateApply( TQListViewItem * )</slot> <slot>customVarChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/editors/editor-chooser/editchooser.ui b/editors/editor-chooser/editchooser.ui index a1e265cd..40106306 100644 --- a/editors/editor-chooser/editchooser.ui +++ b/editors/editor-chooser/editchooser.ui @@ -122,9 +122,9 @@ already open files.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotEditPartChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui index 13a56a04..9cb136ae 100644 --- a/kdevdesigner/designer/actioneditor.ui +++ b/kdevdesigner/designer/actioneditor.ui @@ -210,14 +210,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">connectionsClicked()</slot> <slot access="protected">currentActionChanged( TQListViewItem * )</slot> <slot access="protected">deleteAction()</slot> <slot access="protected">newAction()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui index 226cdd35..6b006d74 100644 --- a/kdevdesigner/designer/configtoolboxdialog.ui +++ b/kdevdesigner/designer/configtoolboxdialog.ui @@ -305,7 +305,7 @@ <includes> <include location="local" impldecl="in implementation">configtoolboxdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>addTool()</slot> <slot>removeTool()</slot> <slot>moveToolUp()</slot> @@ -313,7 +313,7 @@ <slot>currentToolChanged( TQListViewItem * i )</slot> <slot>currentCommonToolChanged( TQListViewItem * i )</slot> <slot>ok()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private">init()</function> </functions> diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui index 51995633..d6712a84 100644 --- a/kdevdesigner/designer/connectiondialog.ui +++ b/kdevdesigner/designer/connectiondialog.ui @@ -201,7 +201,7 @@ <variable>TQObject *defaultSender;</variable> <variable>TQObject *defaultReceiver;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>addConnection()</slot> <slot returnType="ConnectionContainer *">addConnection( TQObject * sender, TQObject * receiver, const TQString & signal, const TQString & slot )</slot> @@ -214,6 +214,6 @@ <slot>updateEditSlotsButton()</slot> <slot>updateConnectionContainers()</slot> <slot>ensureConnectionVisible()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui index 99f98961..d1cfc071 100644 --- a/kdevdesigner/designer/customwidgeteditor.ui +++ b/kdevdesigner/designer/customwidgeteditor.ui @@ -573,7 +573,7 @@ <cstring>listSignals</cstring> </property> <property name="whatsThis" stdset="0"> - <string>The list of all the Q_SIGNALS that the selected widget can emit.</string> + <string>The list of all the signals that the selected widget can emit.</string> </property> </widget> <widget class="TQLayoutWidget"> @@ -787,7 +787,7 @@ <string>Change slot access</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public Q_SLOTS.</p></string> + <string><b>Change the slot's access policy.</b><p>You can only connect to the widget's public slots.</p></string> </property> </widget> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4"> diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui index 1510629b..c21e0ce8 100644 --- a/kdevdesigner/designer/dbconnection.ui +++ b/kdevdesigner/designer/dbconnection.ui @@ -214,10 +214,10 @@ <tabstop>editHostname</tabstop> <tabstop>editPort</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui index a5075250..fefe1dfe 100644 --- a/kdevdesigner/designer/editfunctions.ui +++ b/kdevdesigner/designer/editfunctions.ui @@ -696,7 +696,7 @@ <tabstop>addFunction</tabstop> <tabstop>deleteFunction</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">currentItemChanged( TQListViewItem * )</slot> <slot access="protected">currentSpecifierChanged( const TQString & )</slot> <slot access="protected">currentTextChanged( const TQString & )</slot> @@ -709,7 +709,7 @@ <slot access="protected">functionAdd()</slot> <slot access="protected">functionRemove()</slot> <slot access="protected">displaySlots( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui index 9b16cd8c..c257206e 100644 --- a/kdevdesigner/designer/finddialog.ui +++ b/kdevdesigner/designer/finddialog.ui @@ -264,11 +264,11 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doFind()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui index 812f30a0..89afbd97 100644 --- a/kdevdesigner/designer/formsettings.ui +++ b/kdevdesigner/designer/formsettings.ui @@ -542,9 +542,9 @@ <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui index 8711bd6b..93cb8ac7 100644 --- a/kdevdesigner/designer/iconvieweditor.ui +++ b/kdevdesigner/designer/iconvieweditor.ui @@ -439,7 +439,7 @@ <tabstop>buttonHelp</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -451,7 +451,7 @@ <slot access="protected">insertNewItem()</slot> <slot access="protected">deletePixmap()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui index 6c5a8408..628a622c 100644 --- a/kdevdesigner/designer/listboxeditor.ui +++ b/kdevdesigner/designer/listboxeditor.ui @@ -434,7 +434,7 @@ <tabstop>helpButton</tabstop> <tabstop>buttonApply</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">insertNewItem()</slot> @@ -448,7 +448,7 @@ <slot access="protected">deletePixmap()</slot> <slot access="protected">moveItemUp()</slot> <slot access="protected">moveItemDown()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui index addab137..2376ea9b 100644 --- a/kdevdesigner/designer/listeditor.ui +++ b/kdevdesigner/designer/listeditor.ui @@ -158,7 +158,7 @@ <forwards> <forward>class TQStringList;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>setList( const TQStringList & l )</slot> <slot>addItem()</slot> @@ -166,7 +166,7 @@ <slot>removeItems()</slot> <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui index 8a0abe14..234b52ba 100644 --- a/kdevdesigner/designer/listvieweditor.ui +++ b/kdevdesigner/designer/listvieweditor.ui @@ -897,7 +897,7 @@ <tabstop>colClickable</tabstop> <tabstop>colResizable</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -925,7 +925,7 @@ <slot access="protected">newColumnClicked()</slot> <slot access="protected">itemRightClicked()</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui index f0ff2129..83579b04 100644 --- a/kdevdesigner/designer/multilineeditor.ui +++ b/kdevdesigner/designer/multilineeditor.ui @@ -172,10 +172,10 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>applyClicked()</slot> <slot>okClicked()</slot> <slot>cancelClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui index 81cb4fa5..7b95ee55 100644 --- a/kdevdesigner/designer/newform.ui +++ b/kdevdesigner/designer/newform.ui @@ -230,9 +230,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui index 30f74183..e939397f 100644 --- a/kdevdesigner/designer/pixmapcollectioneditor.ui +++ b/kdevdesigner/designer/pixmapcollectioneditor.ui @@ -202,7 +202,7 @@ <variable>Project *project;</variable> <variable>bool chooser;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>addPixmap()</slot> @@ -213,6 +213,6 @@ <slot>setCurrentItem(const TQString & name)</slot> <slot>setProject(Project * pro)</slot> <slot returnType="TQPixmap">scaledPixmap(const TQPixmap & p)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui index c00cf82a..c5ee2847 100644 --- a/kdevdesigner/designer/preferences.ui +++ b/kdevdesigner/designer/preferences.ui @@ -636,9 +636,9 @@ <tabstop>checkBoxTextLabels</tabstop> <tabstop>helpButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui index 2e03d928..cac4e813 100644 --- a/kdevdesigner/designer/projectsettings.ui +++ b/kdevdesigner/designer/projectsettings.ui @@ -288,7 +288,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">chooseDatabaseFile()</slot> <slot access="protected">chooseProjectFile()</slot> <slot access="protected">destroy()</slot> @@ -296,7 +296,7 @@ <slot access="protected">init()</slot> <slot access="protected">languageChanged( const TQString & )</slot> <slot access="protected">okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui index 27d01a58..e983e9d3 100644 --- a/kdevdesigner/designer/replacedialog.ui +++ b/kdevdesigner/designer/replacedialog.ui @@ -307,12 +307,12 @@ <variable>EditorInterface *editor;</variable> <variable>TQObject *formWindow;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>doReplace()</slot> <slot>doReplaceAll()</slot> <slot>setEditor( EditorInterface * e, TQObject * fw )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui index 0f53fed5..bebb31f5 100644 --- a/kdevdesigner/designer/richtextfontdialog.ui +++ b/kdevdesigner/designer/richtextfontdialog.ui @@ -334,7 +334,7 @@ <variable>TQColor color</variable> <variable>TQString size</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>selectColor()</slot> <slot>accept()</slot> @@ -342,6 +342,6 @@ <slot returnType="TQString">getSize()</slot> <slot returnType="TQString">getColor()</slot> <slot returnType="TQString">getFont()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui index 5f36d6db..ef1d96f3 100644 --- a/kdevdesigner/designer/startdialog.ui +++ b/kdevdesigner/designer/startdialog.ui @@ -305,11 +305,11 @@ <slot>recentItemChanged(TQIconViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>recentItemChanged( TQIconViewItem * )</slot> <slot>clearFileInfo()</slot> <slot>accept()</slot> <slot>reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui index 21874754..86995ec0 100644 --- a/kdevdesigner/designer/tableeditor.ui +++ b/kdevdesigner/designer/tableeditor.ui @@ -793,7 +793,7 @@ <tabstop>buttonRowDown</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">applyClicked()</slot> @@ -815,7 +815,7 @@ <slot access="protected">rowTextChanged( const TQString & )</slot> <slot access="protected">rowUpClicked()</slot> <slot access="protected">columnDownClicked()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIcon2</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui index d9cdc7ef..721c45c4 100644 --- a/kdevdesigner/designer/variabledialog.ui +++ b/kdevdesigner/designer/variabledialog.ui @@ -282,14 +282,14 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addVariable()</slot> <slot>deleteVariable()</slot> <slot>accessChanged()</slot> <slot>nameChanged()</slot> <slot>okClicked()</slot> <slot>currentItemChanged( TQListViewItem * i )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui index 84302d09..8885a825 100644 --- a/kdevdesigner/designer/wizardeditor.ui +++ b/kdevdesigner/designer/wizardeditor.ui @@ -319,7 +319,7 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">addClicked()</slot> @@ -332,7 +332,7 @@ <slot access="protected">okClicked()</slot> <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> -</Q_SLOTS> +</slots> <includes> <include location="local" impldecl="in implementation">myiconloader.h</include> </includes> diff --git a/languages/ada/addclassdlg.ui b/languages/ada/addclassdlg.ui index 046b06ab..94006be8 100644 --- a/languages/ada/addclassdlg.ui +++ b/languages/ada/addclassdlg.ui @@ -420,9 +420,9 @@ <tabstop>PushButton2</tabstop> <tabstop>PushButton3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>Public_toggled( bool )</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/ada/configproblemreporter.ui b/languages/ada/configproblemreporter.ui index f2e03383..32a9b13d 100644 --- a/languages/ada/configproblemreporter.ui +++ b/languages/ada/configproblemreporter.ui @@ -78,12 +78,12 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">configproblemreporter.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/addattributedialogbase.ui b/languages/cpp/addattributedialogbase.ui index 793d26b4..86ee3f25 100644 --- a/languages/cpp/addattributedialogbase.ui +++ b/languages/cpp/addattributedialogbase.ui @@ -353,14 +353,14 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addAttribute()</slot> <slot>deleteCurrentAttribute()</slot> <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/addmethoddialogbase.ui b/languages/cpp/addmethoddialogbase.ui index b4af8a5e..83af7489 100644 --- a/languages/cpp/addmethoddialogbase.ui +++ b/languages/cpp/addmethoddialogbase.ui @@ -436,7 +436,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addMethod()</slot> @@ -444,7 +444,7 @@ <slot>currentChanged(TQListViewItem*)</slot> <slot>updateGUI()</slot> <slot>browseImplementationFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui index 365f4cf2..90cac0c6 100644 --- a/languages/cpp/app_templates/khello2/widgetbase.ui +++ b/languages/cpp/app_templates/khello2/widgetbase.ui @@ -45,8 +45,8 @@ <slot>button_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui index 194d8ffe..a5481dd2 100644 --- a/languages/cpp/app_templates/kmake/mainview.ui +++ b/languages/cpp/app_templates/kmake/mainview.ui @@ -69,8 +69,8 @@ <slot>slotHelloButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHelloButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART index 4d23ce93..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART +++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART index 4d23ce93..7036e4cb 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART +++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART @@ -64,7 +64,7 @@ To make scons run (much) faster, consult ./addons/README in bksys MOC PROCESSING In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro TQ_OBJECT +signals and slots, then 'foo.h' must contain the macro TQ_OBJECT in order to compile. foo_moc.cpp is usually generated, and is used to produce foo_moc.o which is linked with the program or the library. diff --git a/languages/cpp/ccconfigwidgetbase.ui b/languages/cpp/ccconfigwidgetbase.ui index 49b6c553..294deadc 100644 --- a/languages/cpp/ccconfigwidgetbase.ui +++ b/languages/cpp/ccconfigwidgetbase.ui @@ -1655,7 +1655,7 @@ you right click on a variable in a header file.</string> <tabstop>newPCSButton</tabstop> <tabstop>advancedOptions</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">implementationFile()</slot> <slot access="protected">interfaceFile()</slot> <slot access="protected">slotAddPPPath()</slot> @@ -1676,7 +1676,7 @@ you right click on a variable in a header file.</string> <slot>isQMakeExecutable(const TQString&)</slot> <slot>isValidQtDir(const TQString&)</slot> <slot>openPluginPaths()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/classgeneratorconfigbase.ui b/languages/cpp/classgeneratorconfigbase.ui index a047fca3..a0c7f964 100644 --- a/languages/cpp/classgeneratorconfigbase.ui +++ b/languages/cpp/classgeneratorconfigbase.ui @@ -253,9 +253,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">templateTypeChanged(int type)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/configproblemreporter.ui b/languages/cpp/configproblemreporter.ui index d752d715..9085a377 100644 --- a/languages/cpp/configproblemreporter.ui +++ b/languages/cpp/configproblemreporter.ui @@ -176,14 +176,14 @@ If disabled, the parser will typically only run when the file is saved.</string> <variables> <variable>CppSupportPart* m_part;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>setPart( CppSupportPart * part )</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> <slot access="protected">setDelayLabel( int delay )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 6cef7a20..4f827821 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -1236,7 +1236,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <tabstop>gen_config</tabstop> <tabstop>constructors_cpp_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">updateClassStore()</slot> <slot access="protected">access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint & p, int c )</slot> <slot access="protected">classNameChanged( const TQString & text )</slot> @@ -1278,7 +1278,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <slot access="protected">scopeboxActivated( int )</slot> <slot access="protected">classNamespaceChanged( const TQString & )</slot> <slot access="protected">headeronly_box_stateChanged(int val)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/cpp/creategettersetter.ui b/languages/cpp/creategettersetter.ui index fcd6e684..1080ffc3 100644 --- a/languages/cpp/creategettersetter.ui +++ b/languages/cpp/creategettersetter.ui @@ -219,9 +219,9 @@ <tabstop>m_btnCancel</tabstop> <tabstop>m_btnOk</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotInlineChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index a128e877..14e859b0 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -159,10 +159,10 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotSelected(const TQString&)</slot> <slot>slotSelectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/debugger/debuggertracingdialogbase.ui b/languages/cpp/debugger/debuggertracingdialogbase.ui index b6e01791..4f42b213 100644 --- a/languages/cpp/debugger/debuggertracingdialogbase.ui +++ b/languages/cpp/debugger/debuggertracingdialogbase.ui @@ -130,9 +130,9 @@ If custom format string is not enabled, names and values of all expressions will <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>enableOrDisable()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/doc/qt-kdev3.toc b/languages/cpp/doc/qt-kdev3.toc index ff9826cd..4675d7c2 100644 --- a/languages/cpp/doc/qt-kdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -16,7 +16,7 @@ <tocsect2 name="Designing the program" url="#Designing_the_Program"/> <tocsect2 name="Adding widgets" url="#Adding_Widgets"/> <tocsect2 name="Getting spaced out" url="#Getting_Spaced_Out"/> - <tocsect2 name="Signals and Q_SLOTS" url="#Signals_and_Slots"/> + <tocsect2 name="Signals and slots" url="#Signals_and_Slots"/> <tocsect2 name="Generating the source" url="#Generating_the_Source"/> <tocsect2 name="Implementing the slot" url="#Implementing_the_Slot"/> </tocsect1> diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index 7fc72d0e..5d1ff666 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -55,9 +55,9 @@ </widget> </vbox> </widget> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index efba8920..af41060e 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -125,12 +125,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 8ac0d2db..7253be6d 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -118,12 +118,12 @@ Only the selected entry will be used</string> <forwards> <forward>class TQListBoxItem;</forward> </forwards> -<Q_SIGNALS> +<signals> <signal>enabled(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>slotSelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/languages/cpp/subclassingdlgbase.ui b/languages/cpp/subclassingdlgbase.ui index 67dcd97f..1b41e69e 100644 --- a/languages/cpp/subclassingdlgbase.ui +++ b/languages/cpp/subclassingdlgbase.ui @@ -233,9 +233,9 @@ <slot>onChangedClassName()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 9bea48d7..c253e1d4 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,7 +234,7 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> @@ -244,7 +244,7 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/kjssupport/subclassingdlgbase.ui b/languages/kjssupport/subclassingdlgbase.ui index 23ec7b34..250da264 100644 --- a/languages/kjssupport/subclassingdlgbase.ui +++ b/languages/kjssupport/subclassingdlgbase.ui @@ -245,9 +245,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>onChangedClassName()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/lib/debugger/Mainpage.dox b/languages/lib/debugger/Mainpage.dox index 9a804a36..c0e6b077 100644 --- a/languages/lib/debugger/Mainpage.dox +++ b/languages/lib/debugger/Mainpage.dox @@ -12,7 +12,7 @@ This library contains classes to implement debugger support for a programming la Each debugger support plugin must interact with an editor to set breakpoints, jump to execution points, etc. This kind of interaction is implemented in @ref Debugger class. Your debugger support plugin just need to create -an instance of @ref Debugger class and connect its Q_SIGNALS, for example: +an instance of @ref Debugger class and connect its signals, for example: @code m_debugger = new Debugger( partController() ); diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index d2780bc1..45cebd8e 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -257,9 +257,9 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">classNameChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/languages/pascal/configproblemreporter.ui b/languages/pascal/configproblemreporter.ui index 020557a1..3ba64c82 100644 --- a/languages/pascal/configproblemreporter.ui +++ b/languages/pascal/configproblemreporter.ui @@ -77,12 +77,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> <slot>bgParserCheckbox_toggled( bool b )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/languages/php/phpconfigwidgetbase.ui b/languages/php/phpconfigwidgetbase.ui index 09124bf8..4213cca5 100644 --- a/languages/php/phpconfigwidgetbase.ui +++ b/languages/php/phpconfigwidgetbase.ui @@ -544,12 +544,12 @@ the internal web browser. Please make sure that the webserver was compiled with <tabstop>zend_edit</tabstop> <tabstop>zend_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAboutClicked()</slot> <slot>slotPHPExeButtonClicked()</slot> <slot>slotPHPIniButtonClicked()</slot> <slot>slotZendButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/python/app_templates/pyqt/templates-ui-mainwin b/languages/python/app_templates/pyqt/templates-ui-mainwin index 5ce4dec8..62d6d51a 100644 --- a/languages/python/app_templates/pyqt/templates-ui-mainwin +++ b/languages/python/app_templates/pyqt/templates-ui-mainwin @@ -400,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -416,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index 8d135b19..f5b9927e 100644 --- a/languages/ruby/app_templates/kapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'fileOpen()', 'fileSave()', 'fileSaveAs()', diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index b81155b0..7ee8133f 100644 --- a/languages/ruby/app_templates/kapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < TQt::Widget # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'slotOnURL(const TQString&)', + slots 'slotOnURL(const TQString&)', 'slotSetTitle(const TQString&)' def initialize(parent) diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb index f7a18399..4ffcfe51 100644 --- a/languages/ruby/app_templates/kxt/app.rb +++ b/languages/ruby/app_templates/kxt/app.rb @@ -9,7 +9,7 @@ class %{APPNAMESC} < KDE::MainWindow - Q_SLOTS 'fileNew()', + slots 'fileNew()', 'optionsPreferences()', 'newToolbarConfig()', 'changeStatusbar(const TQString&)', diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb index 4f63037f..2557b9da 100644 --- a/languages/ruby/app_templates/kxt/appview.rb +++ b/languages/ruby/app_templates/kxt/appview.rb @@ -15,14 +15,14 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base # # Use this signal to change the content of the statusbar # - Q_SIGNALS 'signalChangeStatusbar(const TQString&)' + signals 'signalChangeStatusbar(const TQString&)' # # Use this signal to change the content of the caption # - Q_SIGNALS 'signalChangeCaption(const TQString&)' + signals 'signalChangeCaption(const TQString&)' - Q_SLOTS 'switchColors()', + slots 'switchColors()', 'settingsChanged()' def initialize(parent) diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb index 1f399323..ceae4ad1 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb @@ -1,6 +1,6 @@ class %{APPNAMESC} < TQt::MainWindow - Q_SLOTS 'newDoc()', + slots 'newDoc()', 'choose()', 'load( const TQString& )', 'save()', diff --git a/languages/sql/sqlconfigwidget.ui b/languages/sql/sqlconfigwidget.ui index cfa61833..81e20b78 100644 --- a/languages/sql/sqlconfigwidget.ui +++ b/languages/sql/sqlconfigwidget.ui @@ -164,10 +164,10 @@ <variable access="private">TQDomDocument* doc;</variable> <variable access="private">bool changed;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>newConfigSaved()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>init()</slot> <slot>valueChanged( int, int )</slot> <slot>removeDb()</slot> @@ -176,7 +176,7 @@ <slot>accept()</slot> <slot>setProjectDom( TQDomDocument * doc )</slot> <slot>loadConfig()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 0febd41d..7c97cf16 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -10,14 +10,14 @@ GUI Designer integration framework. \section designerintegration Overview of GUI designer integration process Each KPart that wants to act as a GUI Designer must implement @ref KInterfaceDesigner::Designer -interface. It defines necessary Q_SIGNALS to communicate with an IDE and abstract virtual +interface. It defines necessary signals to communicate with an IDE and abstract virtual functions to determine designer type. If a part which can "design" user interface files of a certain mimetype implements this interface and sets itself as a default handler for that mimetype then it becomes automatically integrated into TDevelop IDE. -When a part is embedded into TDevelop shell, its Q_SIGNALS (defined in @ref +When a part is embedded into TDevelop shell, its signals (defined in @ref KInterfaceDesigner::Designer interface): @code void addedFunction(DesignerType type, const TQString &formName, Function function) @@ -26,7 +26,7 @@ KInterfaceDesigner::Designer interface): void editFunction(DesignerType type, const TQString &formName, const TQString &functionName) void editSource(DesignerType type, const TQString &formName); @endcode -are connected to corresponding Q_SLOTS of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. +are connected to corresponding slots of TDevelop designer integration engine which can be implemented in TDevelop language support plugin. Each language support which wants to use integrated designer, must reimplement @code diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui index fd04ec23..0597bd4c 100644 --- a/parts/abbrev/abbrevconfigwidgetbase.ui +++ b/parts/abbrev/abbrevconfigwidgetbase.ui @@ -179,12 +179,12 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addTemplate()</slot> <slot access="protected">codeChanged()</slot> <slot access="protected">removeTemplate()</slot> <slot access="protected">selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/abbrev/cpp_keywords b/parts/abbrev/cpp_keywords index 3badf3ba..19bd1a82 100644 --- a/parts/abbrev/cpp_keywords +++ b/parts/abbrev/cpp_keywords @@ -1,9 +1,9 @@ K_DCOP k_dcop -k_dcop_Q_SIGNALS +k_dcop_signals TQ_OBJECT -Q_SIGNALS -Q_SLOTS +signals +slots emit __int64 __asm__ diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index f9c22c2f..af51e997 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -634,7 +634,7 @@ <forward>class TQListViewItem;</forward> <forward>class TQIconViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">licenseChanged()</slot> <slot access="protected">destButtonClicked( const TQString & )</slot> <slot access="protected">projectLocationChanged()</slot> @@ -645,7 +645,7 @@ <slot access="protected">templatesContextMenu( TQListViewItem *, const TQPoint &, int )</slot> <slot access="protected">favouritesContextMenu( TQIconViewItem *, const TQPoint & )</slot> <slot>showTemplates(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index 2ed199f3..3d54ce93 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -523,7 +523,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt def dcopGenerator(target, source, env, for_signature): act=[] act.append('dcopidl '+source[0].path+' > '+target[1].path+'|| ( rm -f '+target[1].path+' ; false)') - act.append('dcopidl2cpp --c++-suffix cpp --no-Q_SIGNALS --no-stub '+target[1].path) + act.append('dcopidl2cpp --c++-suffix cpp --no-signals --no-stub '+target[1].path) return act def dcopEmitter(target, source, env): diff --git a/parts/appwizard/filepropspagebase.ui b/parts/appwizard/filepropspagebase.ui index 00d7f677..11c20e9e 100644 --- a/parts/appwizard/filepropspagebase.ui +++ b/parts/appwizard/filepropspagebase.ui @@ -150,10 +150,10 @@ <tabstop>baseclass_edit</tabstop> <tabstop>implfile_edit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotSelectionChanged()</slot> <slot>slotClassnameChanged(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/appwizard/importdlgbase.ui b/parts/appwizard/importdlgbase.ui index aa778f00..c18beff7 100644 --- a/parts/appwizard/importdlgbase.ui +++ b/parts/appwizard/importdlgbase.ui @@ -346,12 +346,12 @@ will be the author, everything between <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">dirButtonClicked()</slot> <slot>dirChanged()</slot> <slot access="protected">projectTypeChanged(const TQString &)</slot> <slot access="protected">projectTypeChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui index 73cf691a..28a3432e 100644 --- a/parts/astyle/astyleconfig.ui +++ b/parts/astyle/astyleconfig.ui @@ -1324,9 +1324,9 @@ multiple single-statement lines.</string> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>allFiles()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui index 111fbf94..797414c5 100644 --- a/parts/ctags2/ctags2_createtagfilebase.ui +++ b/parts/ctags2/ctags2_createtagfilebase.ui @@ -135,10 +135,10 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createTagFile()</slot> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui index 5a048cab..e25f4cd9 100644 --- a/parts/ctags2/ctags2_selecttagfilebase.ui +++ b/parts/ctags2/ctags2_selecttagfilebase.ui @@ -116,9 +116,9 @@ <slot>validate()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>validate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index a4bd5378..98273191 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -361,13 +361,13 @@ <slot>clear()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>createNewTagSlot()</slot> <slot>addNewTagFile()</slot> <slot>removeTagFile()</slot> <slot>moveUpTagFile()</slot> <slot>moveDownTagFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 0379142f..919ca946 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -168,11 +168,11 @@ <tabstop>input_edit</tabstop> <tabstop>output_view</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">line_edit_changed_delayed()</slot> <slot access="private">line_edit_changed()</slot> <slot access="private">regeneratebutton_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 63cad280..1d287ca8 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -1193,14 +1193,14 @@ Build Files</string> <tabstop>uploadRemoveToolButton</tabstop> <tabstop>uploadFileListBox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotbuildAllPushButtonPressed()</slot> <slot>slotexportSPECPushButtonPressed()</slot> <slot>slotimportSPECPushButtonPressed()</slot> <slot>slotSrcPackagePushButtonPressed()</slot> <slot>slotAddFileButtonPressed()</slot> <slot>slotRemoveFile(TQListBoxItem *item)</slot> -</Q_SLOTS> +</slots> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui index b88906eb..2734918d 100644 --- a/parts/documentation/addcatalogdlgbase.ui +++ b/parts/documentation/addcatalogdlgbase.ui @@ -189,10 +189,10 @@ <slot>locationURLChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> <slot>docTypeChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 5d2d4038..2befa99f 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -557,7 +557,7 @@ <tabstop>info_box</tabstop> <tabstop>man_box</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>addCollectionButtonClicked()</slot> <slot>editCollectionButtonClicked()</slot> <slot>removeCollectionButtonClicked()</slot> @@ -565,7 +565,7 @@ <slot>collectionsBoxCurrentChanged( int )</slot> <slot>updateConfig()</slot> <slot>updateIndex()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/docprojectconfigwidgetbase.ui b/parts/documentation/docprojectconfigwidgetbase.ui index 8914aaa1..a882bc77 100644 --- a/parts/documentation/docprojectconfigwidgetbase.ui +++ b/parts/documentation/docprojectconfigwidgetbase.ui @@ -140,9 +140,9 @@ <tabstop>catalogURL</tabstop> <tabstop>docSystemCombo</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>changeDocSystem(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui index 7315092b..34769563 100644 --- a/parts/documentation/editcatalogdlgbase.ui +++ b/parts/documentation/editcatalogdlgbase.ui @@ -178,9 +178,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>locationURLChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/find_documentation_optionsbase.ui b/parts/documentation/find_documentation_optionsbase.ui index 3dd843f6..2a31e034 100644 --- a/parts/documentation/find_documentation_optionsbase.ui +++ b/parts/documentation/find_documentation_optionsbase.ui @@ -204,9 +204,9 @@ sources and change their priority here.</string> <slot>sourceMoveDown()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>sourceMoveUp()</slot> <slot>sourceMoveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index d7a4e46a..4e917917 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -148,7 +148,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>clickOptions()</slot> <slot>setSearchTerm( const TQString & term )</slot> <slot>startSearch()</slot> @@ -161,7 +161,7 @@ <slot>procInfoReadFromStdout()</slot> <slot>clickOnItem( TQListViewItem * item )</slot> <slot>buttonPressedOnItem( int button, TQListViewItem * item, const TQPoint & pos, int c )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="1" margin="1"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/documentation/selecttopicbase.ui b/parts/documentation/selecttopicbase.ui index fe558f89..a2931c19 100644 --- a/parts/documentation/selecttopicbase.ui +++ b/parts/documentation/selecttopicbase.ui @@ -129,8 +129,8 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/filecreate/fcconfigwidgetbase.ui b/parts/filecreate/fcconfigwidgetbase.ui index be039483..7c710cb5 100644 --- a/parts/filecreate/fcconfigwidgetbase.ui +++ b/parts/filecreate/fcconfigwidgetbase.ui @@ -520,7 +520,7 @@ <variables> <variable>AddGlobalDlg *global_dlg;</variable> </variables> -<Q_SLOTS> +<slots> <slot>removetemplate_button_clicked()</slot> <slot>copyToProject_button_clicked()</slot> <slot>newtype_button_clicked()</slot> @@ -534,7 +534,7 @@ <slot>edit_template_contents_button_clicked()</slot> <slot>edit_template_content_button_clicked()</slot> <slot>edit_type_content_button_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui index 6e34899d..a208ab49 100644 --- a/parts/filecreate/fctemplateeditbase.ui +++ b/parts/filecreate/fctemplateeditbase.ui @@ -176,9 +176,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui index 53fe4203..62198bda 100644 --- a/parts/filecreate/fctypeeditbase.ui +++ b/parts/filecreate/fctypeeditbase.ui @@ -263,9 +263,9 @@ <tabstop>ok_button</tabstop> <tabstop>cancel_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin index 5ce4dec8..62d6d51a 100644 --- a/parts/filecreate/file-templates/ui-mainwin +++ b/parts/filecreate/file-templates/ui-mainwin @@ -400,7 +400,7 @@ <slot>helpAbout()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>fileNew()</slot> <slot>fileOpen()</slot> <slot>fileSave()</slot> @@ -416,6 +416,6 @@ <slot>helpIndex()</slot> <slot>helpContents()</slot> <slot>helpAbout()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/parts/fileview/filegroupsconfigwidgetbase.ui b/parts/fileview/filegroupsconfigwidgetbase.ui index 01574b69..5abee50c 100644 --- a/parts/fileview/filegroupsconfigwidgetbase.ui +++ b/parts/fileview/filegroupsconfigwidgetbase.ui @@ -217,13 +217,13 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">addGroup()</slot> <slot access="protected">editGroup()</slot> <slot access="protected">removeGroup()</slot> <slot access="protected">moveUp()</slot> <slot access="protected">moveDown()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 64a2ff0f..23c028c7 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -161,12 +161,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotTextChanged( const TQString & )</slot> <slot>executed( TQListBoxItem * )</slot> <slot>slotExecuted( TQListBoxItem * )</slot> <slot>slotReturnPressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 48916460..290440c1 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -218,10 +218,10 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotFileChange( int id )</slot> <slot specifier="pure virtual">slotArgsChange( int id )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include> diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui index 8d6bf504..e21bba69 100644 --- a/parts/regexptest/regexptestdlgbase.ui +++ b/parts/regexptest/regexptestdlgbase.ui @@ -336,11 +336,11 @@ <tabstop>cancelbutton</tabstop> <tabstop>extendedposix_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">insertQuoted()</slot> <slot>somethingChanged()</slot> <slot access="protected">showRegExpEditor()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui index f7bafb74..7b924164 100644 --- a/parts/snippet/snippetdlg.ui +++ b/parts/snippet/snippetdlg.ui @@ -197,9 +197,9 @@ <tabstop>btnAdd</tabstop> <tabstop>btnCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index ece7a089..79dd24ae 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -226,11 +226,11 @@ executed.</p></string> <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot returnType="TQString">getApp()</slot> <slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui index 67f9b7b5..4f9dfc4c 100644 --- a/parts/tools/toolsconfigwidgetbase.ui +++ b/parts/tools/toolsconfigwidgetbase.ui @@ -397,14 +397,14 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">dircontextaddClicked()</slot> <slot access="protected">filecontextaddClicked()</slot> <slot access="protected">filecontextremoveClicked()</slot> <slot access="protected">dircontextremoveClicked()</slot> <slot access="protected">toolsmenuaddClicked()</slot> <slot access="protected">toolsmenuremoveClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui index 98fe652f..bf9f71d3 100644 --- a/parts/uimode/uichooser.ui +++ b/parts/uimode/uichooser.ui @@ -242,9 +242,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">maybeEnableCloseOnHover(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui index 74b4a941..f09997c1 100644 --- a/parts/valgrind/dialog_widget.ui +++ b/parts/valgrind/dialog_widget.ui @@ -331,10 +331,10 @@ <tabstop>ctParamEdit</tabstop> <tabstop>kcExecutableEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private" specifier="non virtual">checkBoxToggled()</slot> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/src/pluginselectdialogbase.ui b/src/pluginselectdialogbase.ui index 8f53d109..81795f29 100644 --- a/src/pluginselectdialogbase.ui +++ b/src/pluginselectdialogbase.ui @@ -169,9 +169,9 @@ <slot>saveAsDefault()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">saveAsDefault()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurllabel.h</include> diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 36acd44d..b9d17720 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -649,7 +649,7 @@ <tabstop>disabledList</tabstop> <tabstop>pluginsView</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>profileExecuted(TQListViewItem *item)</slot> <slot>propertyExecuted(TQListBoxItem *item)</slot> <slot>addProfile()</slot> @@ -660,7 +660,7 @@ <slot>delEnabled()</slot> <slot>addDisabled()</slot> <slot>delDisabled()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 9887fac9..4a4c5b8c 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-) Implementation of this component is done by: - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also - intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". + intercepts signals like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking functions (like checking for whether files are in repository, provide checks on file lists, ...). @@ -73,7 +73,7 @@ Implementation of this component is done by: \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ -\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ... +\todo Additional slots for more complex stuff as status, revert, patch creation, ... \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b> Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-) diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6660faab..5dc8ae11 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -389,11 +389,11 @@ <tabstop>login</tabstop> <tabstop>init</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init_clicked()</slot> <slot>login_clicked()</slot> <slot>createModule_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index b1811858..9a4e9c38 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -196,9 +196,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>Form1_destroyed( TQObject * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> |