From dbe7eb4bd0feafb4a687789c157b0dbed2d7b097 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Jan 2022 12:32:19 +0900 Subject: Replaced 'includehints' with 'includes' in *.ui files. Signed-off-by: Michele Calgaro (cherry picked from commit 3459eebc29bab84ae9b68498e6111acd0a58a299) --- filesharing/advanced/kcm_sambaconf/joindomaindlg.ui | 8 ++------ filesharing/advanced/kcm_sambaconf/kcminterface.ui | 16 +++++++--------- filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui | 6 ++---- filesharing/advanced/kcm_sambaconf/share.ui | 16 ++++++---------- kget/dlgautomationbase.ui | 6 ++---- knewsticker/knewstickerconfigwidget.ui | 16 +--------------- .../kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui | 9 ++------- .../kopete/addcontactwizard/fastaddcontactwizard_base.ui | 6 +++--- kopete/kopete/config/accounts/kopeteaccountconfigbase.ui | 3 --- .../config/appearance/appearanceconfig_contactlist.ui | 6 ++---- kopete/kopete/contactlist/customnotifications.ui | 6 ++---- kopete/kopete/contactlist/kopetemetalvipropswidget.ui | 8 +++----- kopete/kopete/grouptdeabcselectorwidget.ui | 8 ++++---- kopete/plugins/highlight/highlightprefsbase.ui | 4 +--- kopete/plugins/smpppdcs/smpppdcsprefs.ui | 4 +--- kopete/plugins/statistics/statisticswidget.ui | 6 ++---- kopete/plugins/webpresence/webpresenceprefs.ui | 4 +--- kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui | 6 +++--- .../protocols/meanwhile/ui/meanwhileeditaccountbase.ui | 6 +++--- kopete/protocols/msn/config/msnprefs.ui | 4 ---- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 6 +++--- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 6 +++--- kopete/protocols/sms/services/gsmlibprefs.ui | 6 ++---- kopete/protocols/sms/services/smsclientprefs.ui | 6 ++---- kopete/protocols/sms/services/smssendprefs.ui | 6 ++---- kopete/protocols/winpopup/ui/wpaddcontactbase.ui | 4 +--- kopete/protocols/winpopup/ui/wpeditaccountbase.ui | 4 +--- krfb/krfb/manageinvitations.ui | 3 --- ksirc/KSPrefs/page_looknfeelbase.ui | 6 ++---- ksirc/KSPrefs/page_startupbase.ui | 4 +--- ksirc/dccNewbase.ui | 4 +--- wifi/kcmwifi/ifconfigpagebase.ui | 4 +--- 32 files changed, 66 insertions(+), 141 deletions(-) diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index 110187f4..aebfb6ad 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -224,16 +224,12 @@ kpassdlg.h - tdemessagebox.h tdelocale.h - joindomaindlg.ui.h + tdemessagebox.h + joindomaindlg.ui.h accept() - - kpassdlg.h - kpassdlg.h - diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index dd1f162d..55c8773d 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -8389,13 +8389,17 @@ This is only available if the SSL libraries have been compiled on your system an oplockBreakWaitTimeSpin - tqptrlist.h share.h + tqptrlist.h + kiconloader.h + klineedit.h knuminput.h kprocess.h - kiconloader.h + kpushbutton.h kurllabel.h - kcminterface.ui.h + kurlrequester.h + tdelistview.h + kcminterface.ui.h changed() @@ -8411,10 +8415,4 @@ This is only available if the SSL libraries have been compiled on your system an updateSecurityLevelHelpLbl() - - kurlrequester.h - klineedit.h - kpushbutton.h - tdelistview.h - diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 870654c6..e6e47938 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -1187,12 +1187,13 @@ _tabs - kcmprinterdlg.ui.h kcombobox.h kiconloader.h klineedit.h knuminput.h + kpushbutton.h kurlrequester.h + kcmprinterdlg.ui.h init() @@ -1201,7 +1202,4 @@ printersChkToggled( bool ) - - kpushbutton.h - diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 075878cb..25f3e5a9 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -3248,13 +3248,6 @@ Only change something if you know what you are doing. buttonOk buttonCancel - - kiconloader.h - tqptrlist.h - tdemessagebox.h - kprocess.h - share.ui.h - checkValues() init() @@ -3282,8 +3275,11 @@ Only change something if you know what you are doing. krestrictedline.h kurlrequester.h tdelistview.h + kprocess.h + kpushbutton.h + tdemessagebox.h + tqptrlist.h + kiconloader.h + share.ui.h - - kpushbutton.h - diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index 3853a8c0..6552d3bf 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -241,9 +241,11 @@ kdatetimewidget.h + kdatewidget.h kdialog.h klineedit.h knuminput.h + ktimewidget.h slotChanged() @@ -251,8 +253,4 @@ - - kdatewidget.h - ktimewidget.h - diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index 92f1da17..4dfcdf68 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -1157,22 +1157,8 @@ Note that the filters are processed from the top to the bottom so that of two fi kcolorbutton.h kcombobox.h klineedit.h - tdelistview.h knuminput.h + tdelistview.h - - knuminput.h - knuminput.h - tdelistview.h - tdelistview.h - kcombobox.h - kcombobox.h - klineedit.h - kcombobox.h - kcombobox.h - kcolorbutton.h - kcolorbutton.h - kcolorbutton.h - diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index 9af2b331..9e5cde20 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -202,14 +202,9 @@ - tdelistbox.h - kurllabel.h kseparator.h + kurllabel.h + tdelistbox.h - - kurllabel.h - kseparator.h - tdelistbox.h - diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index 88e7ecba..a96bbcd8 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -213,7 +213,7 @@ - - tdelistview.h - + + tdelistview.h + diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index f84bbcfc..725c64c8 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -265,7 +265,4 @@ The priority is used to determine which contact to use when you click on a metac kpushbutton.h tdelistview.h - - kpushbutton.h - diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index ff41c06e..dfc1d19a 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -390,10 +390,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index c5949844..ed48c00a 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -231,10 +231,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index 646e58ff..64201f76 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -572,13 +572,11 @@ + addressbooklinkwidget.h + kcombobox.h kicondialog.h + klineedit.h kpushbutton.h kurlrequester.h - - addressbooklinkwidget.h - klineedit.h - kcombobox.h - diff --git a/kopete/kopete/grouptdeabcselectorwidget.ui b/kopete/kopete/grouptdeabcselectorwidget.ui index bdcf1045..5a0ecfb9 100644 --- a/kopete/kopete/grouptdeabcselectorwidget.ui +++ b/kopete/kopete/grouptdeabcselectorwidget.ui @@ -84,8 +84,8 @@
addressbooklinkwidget.h
- - klineedit.h - kpushbutton.h - + + klineedit.h + kpushbutton.h + diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 45653bd4..0c3c1c87 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -457,10 +457,8 @@ kcolorbutton.h kcombobox.h klineedit.h + kpushbutton.h kurlrequester.h tdelistview.h - - kpushbutton.h - diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index c0445894..b75b8d9c 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -278,9 +278,7 @@ kpushbutton.h + smpppdlocationwidget.h tdelistview.h - - smpppdlocationwidget.h - diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index fca8f50e..f996f8b7 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -239,10 +239,8 @@ kdatepicker.h + kdatetbl.h + klineedit.h ktimewidget.h - - klineedit.h - kdatetbl.h - diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index dfe781f1..9ede265d 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -361,9 +361,7 @@ images/winpopup_protocol.png kcombobox.h klineedit.h + kpushbutton.h kurlrequester.h - - kpushbutton.h - diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 551d9322..5a13dbd9 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -1043,7 +1043,7 @@ If two resources have the same priority, the messages will be sent to the one co cbSendComposingEvent - - kopetepasswordwidget.h - + + kopetepasswordwidget.h + diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 914d1533..024b4657 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -431,7 +431,7 @@ mScreenName - - kopetepasswordwidget.h - + + kopetepasswordwidget.h + diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index 13817584..96821c2f 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -210,8 +210,4 @@ knuminput.h - - knuminput.h - knuminput.h - diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 98932d9b..18386cc2 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -534,7 +534,7 @@ rbBlockDenyList - - kopetepasswordwidget.h - + + kopetepasswordwidget.h + diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index bd9f2f8e..fd0ac697 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -480,7 +480,7 @@ If you do not currently have an ICQ account, please click the button to create o chkWebAware - - kopetepasswordwidget.h - + + kopetepasswordwidget.h + diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index 31e71c76..e37dcee1 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -93,10 +93,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 43cb42e1..0e35f7f5 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -125,10 +125,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index 04cc3406..98ac7c31 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -181,10 +181,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index fde15b0b..fa427760 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -183,9 +183,7 @@ kcombobox.h + klineedit.h kpushbutton.h - - klineedit.h - diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index ed10dfb2..df48d194 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -349,11 +349,9 @@ However, the recommended way is to ask your administrator to create this directo + klineedit.h knuminput.h kpushbutton.h kurlrequester.h - - klineedit.h - diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index 34f6590c..06d4f891 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -210,7 +210,4 @@ listSelectionChanged() - - tdelistview.h - diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index 576707cc..a0e89bb4 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -316,10 +316,8 @@ + klineedit.h + kpushbutton.h kurlrequester.h - - klineedit.h - kpushbutton.h - diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index 07cd7ff4..b69a5998 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -190,8 +190,6 @@ keditlistbox.h + klineedit.h - - klineedit.h - diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index c98e60e6..46c4ce0a 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -229,10 +229,8 @@ + alistbox.h kcombobox.h klineedit.h - - alistbox.h - diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index b58a3503..73f37cd8 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -489,11 +489,9 @@ kdialog.h klineedit.h + kpushbutton.h kurlrequester.h - - kpushbutton.h - -- cgit v1.2.1