diff options
52 files changed, 122 insertions, 122 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index 4cefc758..76766029 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -404,12 +404,12 @@ <variable>int access;</variable> <variable>TQStringList selectedGroups;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init( const TQStringList & specifiedGroups )</slot> <slot access="protected">accept()</slot> <slot returnType="TQStringList">getSelectedGroups()</slot> <slot returnType="int">getAccess()</slot> <slot returnType="TQString">getGroupKind()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index da9690be..64d7331d 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -222,8 +222,8 @@ <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="local" impldecl="in implementation">joindomaindlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>accept()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index e12f0f0f..2f260ecf 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -8365,10 +8365,10 @@ This is only available if the SSL libraries have been compiled on your system an <include location="global" impldecl="in implementation">tdelistview.h</include> <include location="local" impldecl="in implementation">kcminterface.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>init()</slot> <slot>changedSlot()</slot> <slot>securityLevelCombo_activated( int i )</slot> @@ -8377,6 +8377,6 @@ This is only available if the SSL libraries have been compiled on your system an <slot>allowGuestLoginsChk_toggled( bool b )</slot> <slot>mapToGuestCombo_activated( int i )</slot> <slot>updateSecurityLevelHelpLbl()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index e6e47938..490e24db 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -1195,11 +1195,11 @@ <include location='global' impldecl='in implementation'>kurlrequester.h</include> <include location='local' impldecl='in implementation'>kcmprinterdlg.ui.h</include> </includes> - <Q_SLOTS> + <slots> <slot>init()</slot> <slot>accept()</slot> <slot>reject()</slot> <slot>printersChkToggled( bool )</slot> - </Q_SLOTS> + </slots> <layoutdefaults margin='11' spacing='6'/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/konqinterface.ui b/filesharing/advanced/kcm_sambaconf/konqinterface.ui index 7f3293c6..93e0f63a 100644 --- a/filesharing/advanced/kcm_sambaconf/konqinterface.ui +++ b/filesharing/advanced/kcm_sambaconf/konqinterface.ui @@ -532,12 +532,12 @@ <tabstop>availableChk</tabstop> <tabstop>moreOptionsBtn</tabstop> </tabstops> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>changedSlot()</slot> <slot>moreOptionsPressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index c0d5397d..772dd16d 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -3245,7 +3245,7 @@ Only change something if you know what you are doing.</string> <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">checkValues()</slot> <slot access="private" specifier="non virtual">init()</slot> <slot>trytoAccept()</slot> @@ -3264,7 +3264,7 @@ Only change something if you know what you are doing.</string> <slot>oplockContentionLimitSpin_valueChanged( int i )</slot> <slot>storeDosAttributesChk_toggled( bool b )</slot> <slot>buttonHelp_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">klineedit.h</include> diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui index e2d4be95..839d2f3e 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui @@ -323,10 +323,10 @@ <variables> <variable>SambaShare* _share;</variable> </variables> -<Q_SLOTS> +<slots> <slot>setShare( SambaShare * share )</slot> <slot access="private" returnType="bool">getBoolValue( const TQString & str, const TQString & name )</slot> <slot access="private" returnType="int">getIntValue( const TQString & str, const TQString & name )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui index e4333ba1..51f46877 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui @@ -270,11 +270,11 @@ <variable>TQStringList selectedUsers;</variable> <variable>int access;</variable> </variables> -<Q_SLOTS> +<slots> <slot>init( const TQStringList & specifiedUsers, SambaShare * share )</slot> <slot access="protected">accept()</slot> <slot specifier="non virtual" returnType="TQStringList">getSelectedUsers()</slot> <slot specifier="non virtual" returnType="int">getAccess()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/kcm_sambaconf/usertab.ui b/filesharing/advanced/kcm_sambaconf/usertab.ui index 8263e160..5ed788bf 100644 --- a/filesharing/advanced/kcm_sambaconf/usertab.ui +++ b/filesharing/advanced/kcm_sambaconf/usertab.ui @@ -338,15 +338,15 @@ <include location="local" impldecl="in implementation">groupselectdlg.h</include> <include location="local" impldecl="in implementation">usertab.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>addUserBtnClicked()</slot> <slot>removeSelectedBtnClicked()</slot> <slot>addGroupBtnClicked()</slot> <slot>expertBtnClicked()</slot> <slot>changedSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index 4dc8a38c..118155ef 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -548,11 +548,11 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <includes> <include location="local" impldecl="in implementation">hostprops.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>modified()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>setModified()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui index 2b72c451..0c2f7cf8 100644 --- a/filesharing/advanced/nfs/nfsdialoggui.ui +++ b/filesharing/advanced/nfs/nfsdialoggui.ui @@ -150,8 +150,8 @@ The first column shows the name or address of the host, the second column shows <include location="local" impldecl="in implementation">nfsdialoggui.ui.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>listView_selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index a7504571..deec946a 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui +++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui @@ -463,17 +463,17 @@ <variables> <variable>bool m_hasChanged;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">changedSlot()</slot> <slot>moreNFSBtn_clicked()</slot> <slot>sambaChkToggled( bool )</slot> <slot>publicSambaChkToggled( bool b )</slot> <slot>publicNFSChkToggled( bool b )</slot> <slot>moreSambaBtnClicked()</slot> -</Q_SLOTS> +</slots> <functions> <function returnType="bool">hasChanged()</function> </functions> diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index 4756dc90..7f22255d 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -472,12 +472,12 @@ <include location="global" impldecl="in implementation">krichtextlabel.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>changed()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">changedSlot()</slot> <slot>listView_selectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui index ac44a9a4..079eef31 100644 --- a/filesharing/simple/groupconfiggui.ui +++ b/filesharing/simple/groupconfiggui.ui @@ -198,8 +198,8 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistbox.h</include> </includes> -<Q_SLOTS> +<slots> <slot>listBox_selectionChanged( TQListBoxItem * i )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui index 03436214..5ceadc9b 100644 --- a/kget/dlgadvancedbase.ui +++ b/kget/dlgadvancedbase.ui @@ -266,9 +266,9 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index 6552d3bf..9ce53d1d 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -247,10 +247,10 @@ <include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">ktimewidget.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">disconnectToggled(bool b)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui index 197632c0..ef181977 100644 --- a/kget/dlgconnectionbase.ui +++ b/kget/dlgconnectionbase.ui @@ -394,10 +394,10 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotChanged()</slot> <slot access="protected" specifier="pure virtual">comboActivated(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index 3d128674..69003018 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -248,14 +248,14 @@ <include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">selectEntry(TQListViewItem *)</slot> <slot specifier="pure virtual">upEntry()</slot> <slot>downEntry()</slot> <slot>addEntry()</slot> <slot>deleteEntry()</slot> <slot>changeEntry()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>BarIconSet</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui index 03a15ddc..207b4bd2 100644 --- a/kget/dlglimitsbase.ui +++ b/kget/dlglimitsbase.ui @@ -177,9 +177,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index 12a9d8c7..5de865b9 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -159,9 +159,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">tdefontrequester.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/knewsticker/newssourcedlg.ui b/knewsticker/newssourcedlg.ui index 5a401d6e..90c0a7ff 100644 --- a/knewsticker/newssourcedlg.ui +++ b/knewsticker/newssourcedlg.ui @@ -397,12 +397,12 @@ <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in declaration">knuminput.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">slotOkClicked()</slot> <slot access="protected">slotCancelClicked()</slot> <slot access="protected">slotModified()</slot> <slot access="protected">slotSourceFileChanged()</slot> <slot access="protected">slotSuggestClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui index 2fdd4d64..da069516 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui +++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui @@ -604,11 +604,11 @@ <data format="XPM.GZ" length="4833">789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data> </image> </images> -<Q_SLOTS> +<slots> <slot>mHueSlider_valueChanged(int)</slot> <slot>mHueSlider_sliderPressed()</slot> <slot>mHueSlider_destroyed(TQObject*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/kopete/libkopete/API-TODO b/kopete/libkopete/API-TODO index 65e81dc1..50bebe1a 100644 --- a/kopete/libkopete/API-TODO +++ b/kopete/libkopete/API-TODO @@ -178,7 +178,7 @@ Richard's proposal: (email questions to the list or to [email protected]) order) by the object creating the filter chain. it either returns a new filter for the chain, or returns NULL (meaning this filter is not needed in this chain). - - the Q_SIGNALS in one filter are connected to the Q_SLOTS in the next. any + - the signals in one filter are connected to the slots in the next. any sent/received message is handed to the first filter in the appropriate chain. - how long does a filter chain live for? diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui index daa0c81c..6a6cbcf5 100644 --- a/kopete/plugins/cryptography/cryptographyprefsbase.ui +++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui @@ -184,11 +184,11 @@ <tabstop>Cache_Time</tabstop> <tabstop>Cache_Never</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>m_selectOwnKey_clicked()</slot> <slot>m_selectOwnKey_toggled(bool)</slot> <slot>m_selectOwnKey_stateChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kopete/protocols/groupwise/DESIGN b/kopete/protocols/groupwise/DESIGN index 86fb1dac..aa976191 100644 --- a/kopete/protocols/groupwise/DESIGN +++ b/kopete/protocols/groupwise/DESIGN @@ -19,7 +19,7 @@ Add new event tasks ChatOwner changed - vlarge Event proto update (large update -> requires new EventTransfer subclass) -Update Client with event Q_SIGNALS +Update Client with event signals Broadcast DONE Chatroom diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui index 09121e54..9660720c 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ b/kopete/protocols/irc/ui/networkconfig.ui @@ -370,13 +370,13 @@ <tabstop>saveButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SIGNALS> +<signals> <signal>accepted()</signal> <signal>rejected()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">accept()</slot> <slot access="protected">reject()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index bfd1cd6c..628ecda4 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -60,11 +60,11 @@ JingleSessionManager manage the JingleSession pointers. Do not delete it in user * JingleSessionManager(JabberAccount *) -* public Q_SLOTS: +* public slots: * JingleSession *createSession(const TQString &sessionType, const JidList &peers); * void removeSession(JingleSession *); -Q_SIGNALS: +signals: * void incomingSession(const TQString &sessionType, JingleSession *session); JingleSession @@ -89,10 +89,10 @@ Base class for Jingle session. A session is a // Return Session XML namespace * virtual TQString sessionType() = 0; -protected Q_SLOTS: +protected slots: void sendStanza(const TQString &stanza) { account()->client->send(stanza); -Q_SIGNALS: +signals: void accepted(); void declined(); void terminated(); @@ -105,7 +105,7 @@ Hold the PhoneSessionClient object. connect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&))); -private Q_SLOTS: +private slots: void receiveStanza(const TQString &stanza); VoiceConversationDialog diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index f5f40392..28e4a610 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -122,9 +122,9 @@ <tabstop>leServer</tabstop> <tabstop>leNick</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotBowse()</slot> <slot>slotJoin()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index ba344add..d542a942 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -172,12 +172,12 @@ <slot>slotDoubleClick(int,int,int,const TQPoint&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotQuery()</slot> <slot>slotJoin()</slot> <slot>slotClick(int row, int col, int button, const TQPoint& mousePos)</slot> <slot>slotDoubleClick(int row, int col, int button, const TQPoint& mousePos)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING index 38325050..1e1185d0 100644 --- a/kopete/protocols/oscar/liboscar/HACKING +++ b/kopete/protocols/oscar/liboscar/HACKING @@ -122,15 +122,15 @@ not be inline in the headers. The organization of the members in a class should roughly as follows: public: -public Q_SLOTS: +public slots: protected: -protected Q_SLOTS: -Q_SIGNALS: +protected slots: +signals: private: // member funtions -private Q_SLOTS: +private slots: private: // member variables -If there are no private Q_SLOTS there is no need for two private sections, however +If there are no private slots there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index df48d194..0dcd2a47 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -344,9 +344,9 @@ However, the recommended way is to ask your administrator to create this directo <tabstop>mHostName</tabstop> <tabstop>doInstallSamba</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>installSamba()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 90bbffd8..2f30df79 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -457,8 +457,8 @@ <tabstop>mAutoConnect</tabstop> <tabstop>buttonRegister</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private" specifier="nicht virtual">slotSelectPicture()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 63d7973e..571573f4 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -326,12 +326,12 @@ <slot>btnRemove_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnAddCustom_clicked()</slot> <slot>btnCancel_clicked()</slot> <slot>btnInvite_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> @@ -33,7 +33,7 @@ Server May serve more than one request per connection (this is HTTP persistence.) Creates Request object on incoming request. Creates Response object when incoming request is fully received. - Sends Request and Response objects out via Q_SIGNALS, so that they + Sends Request and Response objects out via signals, so that they may be used by ActiveMonitorItem objects. WebServer diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index b2b86a13..ec2e32bb 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -150,15 +150,15 @@ <variables> <variable>HostPrefPtrList deletedHosts;</variable> </variables> -<Q_SIGNALS> +<signals> <signal>hostDoubleClicked(HostPrefPtr)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>removeHost()</slot> <slot access="protected" specifier="non virtual">removeAllHosts()</slot> <slot access="protected" specifier="non virtual">selectionChanged()</slot> <slot>slotHostDoubleClicked( TQListViewItem * )</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">load()</function> <function specifier="non virtual">save()</function> diff --git a/krdc/maindialogbase.ui b/krdc/maindialogbase.ui index ee1fd79d..6b70bc99 100644 --- a/krdc/maindialogbase.ui +++ b/krdc/maindialogbase.ui @@ -340,14 +340,14 @@ Remote Desktop Connection only supports systems that use VNC.</string> <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">hostChanged( const TQString & text )</slot> <slot access="protected" specifier="pure virtual">toggleBrowsingArea()</slot> <slot access="protected" specifier="pure virtual">itemSelected( TQListViewItem * item )</slot> <slot access="protected" specifier="pure virtual">itemDoubleClicked( TQListViewItem * item )</slot> <slot access="protected" specifier="pure virtual">scopeSelected( const TQString & scope )</slot> <slot access="protected" specifier="pure virtual">rescan()</slot> -</Q_SLOTS> +</slots> <functions> <function access="protected" specifier="non virtual">enableBrowsingArea( bool enable )</function> </functions> diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index eb6d2b90..a622c992 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -490,11 +490,11 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">rdpprefs.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">resolutionChanged( int selection )</slot> <slot returnType="int">colorDepth()</slot> <slot>setColorDepth( int depth )</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setRdpWidth( int w )</function> <function specifier="non virtual" returnType="int">rdpWidth()</function> diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui index 5d402c20..9d1a1360 100644 --- a/krfb/krfb/invitewidget.ui +++ b/krfb/krfb/invitewidget.ui @@ -187,11 +187,11 @@ </spacer> </grid> </widget> -<Q_SIGNALS> +<signals> <signal>createInviteClicked()</signal> <signal>emailInviteClicked()</signal> <signal>manageInviteClicked()</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index 06d4f891..15f0280e 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -205,9 +205,9 @@ <include location="global" impldecl="in declaration">tdelistview.h</include> <include location="local" impldecl="in implementation">manageinvitations.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>listSizeChanged( int i )</slot> <slot>listSelectionChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index d5872cdf..1e70b356 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -330,8 +330,8 @@ <tabstop>PB_Connect</tabstop> <tabstop>PB_Cancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">passwordChanged(const TQString &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 6dd165a7..e8fe06c9 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -376,7 +376,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>item_changed()</slot> <slot>new_pressed()</slot> <slot>add_pressed()</slot> @@ -384,7 +384,7 @@ <slot>KLVAutoConnect_clicked(TQListViewItem*)</slot> <slot>kcl_clicked(TQListViewItem *)</slot> <slot>kvl_clicked(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index 5bd622be..a5d674d8 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -1049,7 +1049,7 @@ <tabstop>themeAddPB</tabstop> <tabstop>themeDelPB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>theme_clicked(TQListBoxItem*)</slot> <slot>themeNewPB_clicked()</slot> <slot>themeDelPB_clicked()</slot> @@ -1058,7 +1058,7 @@ <slot>setColourEnabled()</slot> <slot>coloursSetEnable()</slot> <slot>changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index faba97c8..c8f23163 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -531,10 +531,10 @@ <tabstop>showTopicCB</tabstop> <tabstop>enLoggingCB</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const TQString &)</slot> <slot>changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui index 3c5594d1..6c78af35 100644 --- a/ksirc/KSPrefs/page_irccolorsbase.ui +++ b/ksirc/KSPrefs/page_irccolorsbase.ui @@ -1249,10 +1249,10 @@ <slot>changed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>chanaged()</slot> <slot>changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index a0e89bb4..cead474e 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -309,11 +309,11 @@ <tabstop>sdiCB</tabstop> <tabstop>wallpaperPathLE</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const TQString &)</slot> <slot>changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui index 8f61fa2e..4c9dd5cf 100644 --- a/ksirc/KSPrefs/page_shortcutsbase.ui +++ b/ksirc/KSPrefs/page_shortcutsbase.ui @@ -48,10 +48,10 @@ </connections> <tabstops> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">setPreviewPixmap(bool)</slot> <slot access="protected">showWallpaperPixmap(const TQString &)</slot> <slot>changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index b69a5998..785cecdd 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -183,10 +183,10 @@ <slot>server_changed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>changed()</slot> <slot>server_changed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">keditlistbox.h</include> diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index 15455728..ea923060 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -183,13 +183,13 @@ <slot>kpbNew_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>kpbResume_clicked()</slot> <slot>kpbConnect_clicked()</slot> <slot>kpbRename_clicked()</slot> <slot>kpbAbort_clicked()</slot> <slot>kpbNew_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index 46c4ce0a..91ecdc9e 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -219,14 +219,14 @@ <slot>fileClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>chatClicked()</slot> <slot>radioButton4_clicked()</slot> <slot>fileSendClicked()</slot> <slot>send()</slot> <slot>sendClicked()</slot> <slot>fileClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">alistbox.h</include> diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index c6bf8136..cf44e77e 100644 --- a/ksirc/puke/HOWTO-PUKE.pod +++ b/ksirc/puke/HOWTO-PUKE.pod @@ -186,7 +186,7 @@ void PFrame::messageHandler(int fd, PukeMessage *pm) { Both these functions should be overriden and return your widget type, and set your widget. For setWidget you should connect required -Q_SIGNALS and eventFilters you are using. +signals and eventFilters you are using. Make sure to call the parents setWidget in setWidget so it can connect filters etc. diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui index c2d287aa..0fb136d9 100644 --- a/wifi/kcmwifi/configcrypto.ui +++ b/wifi/kcmwifi/configcrypto.ui @@ -344,12 +344,12 @@ <include location="local" impldecl="in declaration">wificonfig.h</include> <include location="local" impldecl="in implementation">configcrypto.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotUpdateKey1Status( const TQString & key )</slot> <slot>slotUpdateKey2Status( const TQString & key )</slot> <slot>slotUpdateKey3Status( const TQString & key )</slot> <slot>slotUpdateKey4Status( const TQString & key )</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">load( const IfConfig & ifconfig )</function> <function specifier="non virtual">save( IfConfig & ifconfig )</function> diff --git a/wifi/kcmwifi/configpower.ui b/wifi/kcmwifi/configpower.ui index d5a970b6..69795301 100644 --- a/wifi/kcmwifi/configpower.ui +++ b/wifi/kcmwifi/configpower.ui @@ -146,10 +146,10 @@ <include location="local" impldecl="in implementation">configpower.ui.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> </includes> -<Q_SLOTS> +<slots> <slot>load( const IfConfig & ifconfig )</slot> <slot>save( IfConfig & ifconfig )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> |