summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-03-30 14:55:33 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:26 +0100
commita3b06c1f069be1b2f67440c1813a2693be3442bc (patch)
tree568889dfe4fd38b87c5703f595eea97166419c47
parent0f6a43dfe5d0387da83757d0d357b14e7fd3e8bb (diff)
Use Q_SIGNALS/Q_SLOTS
-rw-r--r--kopete/addaccountwizard/addaccountwizard.h4
-rw-r--r--kopete/chatwindow/chatmemberslistview.h2
-rw-r--r--kopete/chatwindow/chatmessagepart.h6
-rw-r--r--kopete/chatwindow/chattexteditpart.h6
-rw-r--r--kopete/chatwindow/chatview.h6
-rw-r--r--kopete/chatwindow/emoticonselector.h6
-rw-r--r--kopete/chatwindow/kopetechatwindow.h6
-rw-r--r--kopete/chatwindow/kopetechatwindowstylemanager.h6
-rw-r--r--kopete/chatwindow/kopeteemailwindow.h6
-rw-r--r--kopete/chatwindow/kopeteemoticonaction.h2
-rw-r--r--kopete/chatwindow/kopeterichtextwidget.h4
-rw-r--r--kopete/chatwindow/tests/chatwindowstyle_test.h2
-rw-r--r--kopete/chatwindow/tests/chatwindowstylerendering_test.h2
-rw-r--r--kopete/config/accounts/accounttreewidget.h2
-rw-r--r--kopete/config/accounts/kopeteaccountconfig.h4
-rw-r--r--kopete/config/appearance/appearanceconfig.h2
-rw-r--r--kopete/config/appearance/contactlistlayouteditwidget.h2
-rw-r--r--kopete/config/appearance/contactlistlayoutwidget.h4
-rw-r--r--kopete/config/appearance/layout/Token.h2
-rw-r--r--kopete/config/appearance/layout/TokenDropTarget.h2
-rw-r--r--kopete/config/appearance/layout/TokenPool.h2
-rw-r--r--kopete/config/appearance/layout/TokenWithLayout.h2
-rw-r--r--kopete/config/appearance/tooltipeditdialog.h4
-rw-r--r--kopete/config/avdevice/IdGuiElements.h16
-rw-r--r--kopete/config/avdevice/avdeviceconfig.h2
-rw-r--r--kopete/config/behavior/behaviorconfig.h2
-rw-r--r--kopete/config/behavior/behaviorconfig_general.h2
-rw-r--r--kopete/config/chatwindow/chatwindowconfig.h2
-rw-r--r--kopete/config/plugins/kopetepluginconfig.h2
-rw-r--r--kopete/config/status/statusconfig.h2
-rw-r--r--kopete/config/status/statusconfig_manager.h6
-rw-r--r--kopete/contactlist/contactlistlayoutmanager.h2
-rw-r--r--kopete/contactlist/contactlistproxymodel.h4
-rw-r--r--kopete/contactlist/kabcexport.h4
-rw-r--r--kopete/contactlist/kopetecontactlistview.h4
-rw-r--r--kopete/contactlist/kopetegrouplistaction.h2
-rw-r--r--kopete/contactlist/kopeteitemdelegate.h2
-rw-r--r--kopete/contactlist/kopetelviprops.h4
-rw-r--r--kopete/identity/accountidentitydialog.h4
-rw-r--r--kopete/identity/identitydialog.h4
-rw-r--r--kopete/identity/identitystatuswidget.h2
-rw-r--r--kopete/kopeteaccountstatusbaricon.h2
-rw-r--r--kopete/kopeteapplication.h4
-rw-r--r--kopete/kopeteidentitystatusbaricon.h4
-rw-r--r--kopete/kopetewindow.h8
-rw-r--r--kopete/statusmenu/kopeteonlinestatusaction.h4
-rw-r--r--libkopete/avdevice/videodevicepool.h4
-rw-r--r--libkopete/chatsessionmemberslistmodel.h4
-rw-r--r--libkopete/connectionmanager.h2
-rw-r--r--libkopete/kabcpersistence.h2
-rw-r--r--libkopete/kopeteaccount.h10
-rw-r--r--libkopete/kopeteaccountmanager.h6
-rw-r--r--libkopete/kopeteblacklister.h4
-rw-r--r--libkopete/kopetechatsession.h6
-rw-r--r--libkopete/kopetechatsessionmanager.h4
-rw-r--r--libkopete/kopetecommand.h4
-rw-r--r--libkopete/kopetecommandhandler.h2
-rw-r--r--libkopete/kopetecontact.h6
-rw-r--r--libkopete/kopetecontactlist.h6
-rw-r--r--libkopete/kopetecontactlistelement.h2
-rw-r--r--libkopete/kopetegroup.h6
-rw-r--r--libkopete/kopeteidentity.h6
-rw-r--r--libkopete/kopeteidentitymanager.h6
-rw-r--r--libkopete/kopeteidletimer.h2
-rw-r--r--libkopete/kopetemessageevent.h4
-rw-r--r--libkopete/kopetemessagehandler.h2
-rw-r--r--libkopete/kopetemessagehandlerchain.h2
-rw-r--r--libkopete/kopetemetacontact.h10
-rw-r--r--libkopete/kopeteonlinestatusmanager.h4
-rw-r--r--libkopete/kopetepassword.h6
-rw-r--r--libkopete/kopetepasswordedaccount.h4
-rw-r--r--libkopete/kopeteplugin.h4
-rw-r--r--libkopete/kopetepluginmanager.h6
-rw-r--r--libkopete/kopetepropertycontainer.h2
-rw-r--r--libkopete/kopeteprotocol.h2
-rw-r--r--libkopete/kopetesimplemessagehandler.h2
-rw-r--r--libkopete/kopetesockettimeoutwatcher.h4
-rw-r--r--libkopete/kopetetransfermanager.h10
-rw-r--r--libkopete/kopetewalletmanager.h8
-rw-r--r--libkopete/managedconnectionaccount.h4
-rw-r--r--libkopete/private/kopeteutils_private.h2
-rw-r--r--libkopete/private/kopeteviewmanager.h6
-rw-r--r--libkopete/tests/kopetecontactlist_test.h2
-rw-r--r--libkopete/tests/kopetemessage_test.h2
-rw-r--r--libkopete/tests/kopetepasswordtest_program.h2
-rw-r--r--libkopete/tests/kopetepropertiestest.h2
-rw-r--r--libkopete/tests/kopetetask_test.h4
-rw-r--r--libkopete/tests/kopetewallettest_program.h4
-rw-r--r--libkopete/tests/statusmessage_test.h2
-rw-r--r--libkopete/tests/template_test.h2
-rw-r--r--libkopete/tests/xmlcontactstorage_test.h2
-rw-r--r--libkopete/ui/accountselector.h4
-rw-r--r--libkopete/ui/addcontactpage.h2
-rw-r--r--libkopete/ui/addressbooklinkwidget.h4
-rw-r--r--libkopete/ui/addressbookselectordialog.h2
-rw-r--r--libkopete/ui/addressbookselectorwidget.h4
-rw-r--r--libkopete/ui/collapsiblewidget.h6
-rw-r--r--libkopete/ui/contactaddednotifydialog.h6
-rw-r--r--libkopete/ui/kopetecontactaction.h4
-rw-r--r--libkopete/ui/kopeteinfodialog.h2
-rw-r--r--libkopete/ui/kopetelistview.h6
-rw-r--r--libkopete/ui/kopetelistviewitem.h4
-rw-r--r--libkopete/ui/kopetepasswordwidget.h6
-rw-r--r--libkopete/ui/kopetestdaction.h2
-rw-r--r--libkopete/ui/metacontactselectorwidget.h6
-rw-r--r--libkopete/ui/webcamwidget.h2
-rw-r--r--plugins/addbookmarks/addbookmarksplugin.h4
-rw-r--r--plugins/addbookmarks/addbookmarkspreferences.h4
-rw-r--r--plugins/autoreplace/autoreplaceplugin.h2
-rw-r--r--plugins/autoreplace/autoreplacepreferences.h4
-rw-r--r--plugins/contactnotes/contactnotesedit.h4
-rw-r--r--plugins/contactnotes/contactnotesplugin.h4
-rw-r--r--plugins/highlight/highlightplugin.h2
-rw-r--r--plugins/highlight/highlightpreferences.h2
-rw-r--r--plugins/latex/latexguiclient.h2
-rw-r--r--plugins/latex/latexplugin.h2
-rw-r--r--plugins/latex/latexpreferences.h2
-rw-r--r--plugins/otr/authenticationwizard.h2
-rw-r--r--plugins/otr/otrguiclient.h4
-rw-r--r--plugins/otr/otrlchatinterface.h4
-rw-r--r--plugins/otr/otrplugin.h17
-rw-r--r--plugins/otr/otrpreferences.h2
-rw-r--r--plugins/privacy/privacyguiclient.h2
-rw-r--r--plugins/statistics/statisticsdialog.h2
-rw-r--r--plugins/statistics/statisticsplugin.h4
-rw-r--r--plugins/texteffect/texteffectplugin.h2
-rw-r--r--plugins/texteffect/texteffectpreferences.h2
-rw-r--r--plugins/translator/translatordialog.h2
-rw-r--r--plugins/translator/translatorguiclient.h2
-rw-r--r--plugins/translator/translatorplugin.h2
-rw-r--r--plugins/translator/translatorpreferences.h4
-rw-r--r--plugins/urlpicpreview/linkpreview.h2
-rw-r--r--plugins/urlpicpreview/urlpicpreviewplugin.h4
-rw-r--r--plugins/webpresence/webpresenceplugin.h2
-rw-r--r--protocols/bonjour/bonjouraccount.h4
-rw-r--r--protocols/bonjour/bonjourcontact.h4
-rw-r--r--protocols/bonjour/bonjourcontactconnection.h4
-rw-r--r--protocols/groupwise/gwaccount.h10
-rw-r--r--protocols/groupwise/gwbytestream.h4
-rw-r--r--protocols/groupwise/gwconnector.h2
-rw-r--r--protocols/groupwise/gwcontact.h4
-rw-r--r--protocols/groupwise/gwmessagemanager.h4
-rw-r--r--protocols/groupwise/libgroupwise/bytestream.h2
-rw-r--r--protocols/groupwise/libgroupwise/chatroommanager.h4
-rw-r--r--protocols/groupwise/libgroupwise/client.h4
-rw-r--r--protocols/groupwise/libgroupwise/compress.h4
-rw-r--r--protocols/groupwise/libgroupwise/compressionhandler.h2
-rw-r--r--protocols/groupwise/libgroupwise/connector.h2
-rw-r--r--protocols/groupwise/libgroupwise/coreprotocol.h4
-rw-r--r--protocols/groupwise/libgroupwise/gwclientstream.h6
-rw-r--r--protocols/groupwise/libgroupwise/privacymanager.h6
-rw-r--r--protocols/groupwise/libgroupwise/qcatlshandler.h6
-rw-r--r--protocols/groupwise/libgroupwise/safedelete.h2
-rw-r--r--protocols/groupwise/libgroupwise/securestream.h8
-rw-r--r--protocols/groupwise/libgroupwise/stream.h2
-rw-r--r--protocols/groupwise/libgroupwise/task.h4
-rw-r--r--protocols/groupwise/libgroupwise/tasks/conferencetask.h4
-rw-r--r--protocols/groupwise/libgroupwise/tasks/connectiontask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/createconferencetask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/createcontacttask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/getdetailstask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/getstatustask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/joinconferencetask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/logintask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/needfoldertask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/searchchattask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/searchusertask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/statustask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tests/clientstream_test.h2
-rw-r--r--protocols/groupwise/libgroupwise/tlshandler.h2
-rw-r--r--protocols/groupwise/libgroupwise/userdetailsmanager.h4
-rw-r--r--protocols/groupwise/ui/gwaddcontactpage.h2
-rw-r--r--protocols/groupwise/ui/gwchatpropsdialog.h2
-rw-r--r--protocols/groupwise/ui/gwchatsearchdialog.h2
-rw-r--r--protocols/groupwise/ui/gwcontactproperties.h2
-rw-r--r--protocols/groupwise/ui/gweditaccountwidget.h2
-rw-r--r--protocols/groupwise/ui/gwprivacydialog.h2
-rw-r--r--protocols/groupwise/ui/gwreceiveinvitationdialog.h4
-rw-r--r--protocols/groupwise/ui/gwsearch.h4
-rw-r--r--protocols/jabber/jabberaccount.h8
-rw-r--r--protocols/jabber/jabberbasecontact.h2
-rw-r--r--protocols/jabber/jabberbookmarks.h2
-rw-r--r--protocols/jabber/jabbercapabilitiesmanager.h6
-rw-r--r--protocols/jabber/jabberchatsession.h4
-rw-r--r--protocols/jabber/jabberclient.h4
-rw-r--r--protocols/jabber/jabbercontact.h4
-rw-r--r--protocols/jabber/jabbercontactpool.h2
-rw-r--r--protocols/jabber/jabberfiletransfer.h2
-rw-r--r--protocols/jabber/jabberformlineedit.h2
-rw-r--r--protocols/jabber/jabberformtranslator.h2
-rw-r--r--protocols/jabber/jabbergroupchatmanager.h4
-rw-r--r--protocols/jabber/jabbergroupcontact.h4
-rw-r--r--protocols/jabber/jabbergroupmembercontact.h4
-rw-r--r--protocols/jabber/jabberresource.h4
-rw-r--r--protocols/jabber/jabberresourcepool.h2
-rw-r--r--protocols/jabber/jabbertransport.h2
-rw-r--r--protocols/jabber/jingle/abstractio.h2
-rw-r--r--protocols/jabber/jingle/alsaio.h4
-rw-r--r--protocols/jabber/jingle/jabberjinglecontent.h2
-rw-r--r--protocols/jabber/jingle/jabberjinglesession.h4
-rw-r--r--protocols/jabber/jingle/jinglecallsgui.h2
-rw-r--r--protocols/jabber/jingle/jinglecallsmanager.h4
-rw-r--r--protocols/jabber/jingle/jinglertpsession.h4
-rw-r--r--protocols/jabber/jingle/mediasession.h4
-rw-r--r--protocols/jabber/kioslave/jabberdisco.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/appledns/qdnssd.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/addressresolver.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/irisnetplugin.h8
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netavailability.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp8
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netinterface.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netnames.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netnames.h10
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp32
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/objectsession.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.cpp8
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/ice176.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/ice176.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icecomponent.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icecomponent.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.cpp6
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icetransport.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/legacy/ndns.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/legacy/safedelete.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h6
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/legacy/srvresolver.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/processquit.cpp6
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/processquit.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stunallocate.cpp10
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stunallocate.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stunbinding.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stunbinding.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.cpp4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.h4
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/turnclient.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/turnclient.h2
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/udpportreserver.cpp2
-rw-r--r--protocols/jabber/libiris/src/jdns/include/jdns/qjdns.h2
-rw-r--r--protocols/jabber/libiris/src/jdns/include/jdns/qjdnsshared.h6
-rw-r--r--protocols/jabber/libiris/src/jdns/src/qjdns/qjdns_p.h6
-rw-r--r--protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h16
-rw-r--r--protocols/jabber/libiris/src/jdns/tools/jdns/main.h6
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/compressionhandler.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.cpp4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h14
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h6
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_stream.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h10
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp12
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h16
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bytestream.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_caps.h8
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_client.h4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h10
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_task.h4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h8
-rw-r--r--protocols/jabber/libiris/src/xmpp/zlib/zlibcompressor.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/zlib/zlibdecompressor.h2
-rw-r--r--protocols/jabber/libjingle.h6
-rw-r--r--protocols/jabber/libjinglecalldialog.h2
-rw-r--r--protocols/jabber/tasks/privacymanager.h4
-rw-r--r--protocols/jabber/ui/dlgahclist.h2
-rw-r--r--protocols/jabber/ui/dlgahcommand.h2
-rw-r--r--protocols/jabber/ui/dlgjabberchangepassword.h2
-rw-r--r--protocols/jabber/ui/dlgjabberchatjoin.h6
-rw-r--r--protocols/jabber/ui/dlgjabberchatroomslist.h4
-rw-r--r--protocols/jabber/ui/dlgjabberregister.h2
-rw-r--r--protocols/jabber/ui/dlgjabberservices.h4
-rw-r--r--protocols/jabber/ui/dlgjabbervcard.h2
-rw-r--r--protocols/jabber/ui/dlgjabberxoauth2.h2
-rw-r--r--protocols/jabber/ui/dlgregister.h2
-rw-r--r--protocols/jabber/ui/dlgsearch.h2
-rw-r--r--protocols/jabber/ui/dlgxmppconsole.h4
-rw-r--r--protocols/jabber/ui/jabberaddcontactpage.h4
-rw-r--r--protocols/jabber/ui/jabberchooseserver.h2
-rw-r--r--protocols/jabber/ui/jabbereditaccountwidget.h2
-rw-r--r--protocols/jabber/ui/jabberregisteraccount.h4
-rw-r--r--protocols/jabber/ui/privacydlg.h2
-rw-r--r--protocols/jabber/ui/privacyruledlg.h2
-rw-r--r--protocols/jabber/xoauth2provider.cpp2
-rw-r--r--protocols/oscar/aim/aimaccount.h6
-rw-r--r--protocols/oscar/aim/aimcontact.h6
-rw-r--r--protocols/oscar/aim/aimjoinchat.h4
-rw-r--r--protocols/oscar/aim/aimuserinfo.h4
-rw-r--r--protocols/oscar/aim/icqcontact.h4
-rw-r--r--protocols/oscar/aim/ui/aimeditaccountwidget.h2
-rw-r--r--protocols/oscar/icq/aimcontact.h4
-rw-r--r--protocols/oscar/icq/icqaccount.h6
-rw-r--r--protocols/oscar/icq/icqcontact.h6
-rw-r--r--protocols/oscar/icq/icqreadaway.h4
-rw-r--r--protocols/oscar/icq/ui/editorwithicon.h4
-rw-r--r--protocols/oscar/icq/ui/iconcells.h4
-rw-r--r--protocols/oscar/icq/ui/icqaddcontactpage.h2
-rw-r--r--protocols/oscar/icq/ui/icqchangepassworddialog.h4
-rw-r--r--protocols/oscar/icq/ui/icqeditaccountwidget.h2
-rw-r--r--protocols/oscar/icq/ui/icqsearchdialog.h4
-rw-r--r--protocols/oscar/icq/ui/icquserinfowidget.h4
-rw-r--r--protocols/oscar/icq/ui/xtrazicqstatuseditor.h4
-rw-r--r--protocols/oscar/icq/xtrazstatusaction.h4
-rw-r--r--protocols/oscar/icqcontactbase.h2
-rw-r--r--protocols/oscar/liboscar/chatroomhandler.h2
-rw-r--r--protocols/oscar/liboscar/client.h6
-rw-r--r--protocols/oscar/liboscar/connection.h4
-rw-r--r--protocols/oscar/liboscar/contactmanager.h4
-rw-r--r--protocols/oscar/liboscar/coreprotocol.h4
-rw-r--r--protocols/oscar/liboscar/oftmetatransfer.h6
-rw-r--r--protocols/oscar/liboscar/rateclass.h4
-rw-r--r--protocols/oscar/liboscar/rateclassmanager.h2
-rw-r--r--protocols/oscar/liboscar/safedelete.h2
-rw-r--r--protocols/oscar/liboscar/stream.h2
-rw-r--r--protocols/oscar/liboscar/tasks/buddyicontask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/chatnavservicetask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/chatroomtask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/chatservicetask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/errortask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/filetransfertask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icquserinfotask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/logintask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/messageacktask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/messagereceivertask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/onlinenotifiertask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/oscarlogintask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/ownuserinfotask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/rateinfotask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/serverredirecttask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/servicesetuptask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/ssiauthtask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/ssilisttask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/task.h4
-rw-r--r--protocols/oscar/liboscar/tasks/typingnotifytask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/userinfotask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/usersearchtask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/warningtask.h2
-rw-r--r--protocols/oscar/liboscar/tests/aimlogintasktest.h2
-rw-r--r--protocols/oscar/liboscar/tests/buffertest.h2
-rw-r--r--protocols/oscar/liboscar/tests/filetransfertest.h2
-rw-r--r--protocols/oscar/liboscar/tests/guidtest.h2
-rw-r--r--protocols/oscar/liboscar/tests/logintest.h2
-rw-r--r--protocols/oscar/liboscar/tests/rateinfotest.h2
-rw-r--r--protocols/oscar/liboscar/tests/serverversionstest.h2
-rw-r--r--protocols/oscar/oscaraccount.h8
-rw-r--r--protocols/oscar/oscarcontact.h8
-rw-r--r--protocols/oscar/oscarencodingselectiondialog.h4
-rw-r--r--protocols/oscar/oscarlistnonservercontacts.h2
-rw-r--r--protocols/oscar/oscarmyselfcontact.h2
-rw-r--r--protocols/oscar/oscarprivacyengine.h2
-rw-r--r--protocols/oscar/oscarversionupdater.h2
-rw-r--r--protocols/qq/qqaccount.h4
-rw-r--r--protocols/qq/qqchatsession.h4
-rw-r--r--protocols/qq/qqcontact.h6
-rw-r--r--protocols/qq/qqnotifysocket.h2
-rw-r--r--protocols/qq/qqsocket.h8
-rw-r--r--protocols/qq/ui/dlgqqvcard.h2
-rw-r--r--protocols/qq/ui/qqeditaccountwidget.h2
-rw-r--r--protocols/qq/ui/qqwebcamdialog.h4
-rw-r--r--protocols/testbed/testbedaccount.h4
-rw-r--r--protocols/testbed/testbedcontact.h4
-rw-r--r--protocols/testbed/testbedfakeserver.h4
-rw-r--r--protocols/testbed/testbedincomingmessage.h2
-rw-r--r--protocols/testbed/ui/testbedwebcamdialog.h4
-rw-r--r--protocols/winpopup/libwinpopup/libwinpopup.h4
-rw-r--r--protocols/winpopup/wpaccount.h6
-rw-r--r--protocols/winpopup/wpaddcontact.h2
-rw-r--r--protocols/winpopup/wpcontact.h4
-rw-r--r--protocols/winpopup/wpeditaccount.h2
-rw-r--r--protocols/winpopup/wpprotocol.h2
-rw-r--r--protocols/winpopup/wpuserinfo.h4
-rw-r--r--protocols/yahoo/libkyahoo/bytestream.h2
-rw-r--r--protocols/yahoo/libkyahoo/client.h4
-rw-r--r--protocols/yahoo/libkyahoo/conferencetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/connector.h2
-rw-r--r--protocols/yahoo/libkyahoo/coreprotocol.h4
-rw-r--r--protocols/yahoo/libkyahoo/filetransfernotifiertask.h2
-rw-r--r--protocols/yahoo/libkyahoo/listtask.h2
-rw-r--r--protocols/yahoo/libkyahoo/logintask.h2
-rw-r--r--protocols/yahoo/libkyahoo/mailnotifiertask.h2
-rw-r--r--protocols/yahoo/libkyahoo/messagereceivertask.h2
-rw-r--r--protocols/yahoo/libkyahoo/modifybuddytask.h2
-rw-r--r--protocols/yahoo/libkyahoo/modifyyabtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/picturenotifiertask.h2
-rw-r--r--protocols/yahoo/libkyahoo/receivefiletask.h4
-rw-r--r--protocols/yahoo/libkyahoo/safedelete.h2
-rw-r--r--protocols/yahoo/libkyahoo/sendfiletask.h4
-rw-r--r--protocols/yahoo/libkyahoo/sendpicturetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/statusnotifiertask.h2
-rw-r--r--protocols/yahoo/libkyahoo/stream.h2
-rw-r--r--protocols/yahoo/libkyahoo/task.h4
-rw-r--r--protocols/yahoo/libkyahoo/tests/clientstream_test.h2
-rw-r--r--protocols/yahoo/libkyahoo/tests/logintest.h2
-rw-r--r--protocols/yahoo/libkyahoo/webcamtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/yabtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/yahoobuddyiconloader.h4
-rw-r--r--protocols/yahoo/libkyahoo/yahoobytestream.h4
-rw-r--r--protocols/yahoo/libkyahoo/yahooclientstream.h6
-rw-r--r--protocols/yahoo/libkyahoo/yahooconnector.h2
-rw-r--r--protocols/yahoo/ui/yahooinvitelistimpl.h6
-rw-r--r--protocols/yahoo/ui/yahoouserinfodialog.h6
-rw-r--r--protocols/yahoo/ui/yahoowebcamdialog.h4
-rw-r--r--protocols/yahoo/yahooaccount.h6
-rw-r--r--protocols/yahoo/yahooaddcontact.h2
-rw-r--r--protocols/yahoo/yahoochatchatsession.h4
-rw-r--r--protocols/yahoo/yahoochatsession.h2
-rw-r--r--protocols/yahoo/yahooconferencemessagemanager.h4
-rw-r--r--protocols/yahoo/yahoocontact.h6
-rw-r--r--protocols/yahoo/yahooeditaccount.h4
-rw-r--r--protocols/yahoo/yahooprotocol.h2
-rw-r--r--protocols/yahoo/yahooverifyaccount.h4
-rw-r--r--protocols/yahoo/yahoowebcam.h4
419 files changed, 780 insertions, 791 deletions
diff --git a/kopete/addaccountwizard/addaccountwizard.h b/kopete/addaccountwizard/addaccountwizard.h
index 04d9f34..0b1f63b 100644
--- a/kopete/addaccountwizard/addaccountwizard.h
+++ b/kopete/addaccountwizard/addaccountwizard.h
@@ -49,11 +49,11 @@ public:
*/
void setIdentity(Kopete::Identity *identity);
-private slots:
+private Q_SLOTS:
void slotProtocolListClicked();
void slotProtocolListDoubleClicked();
-protected slots:
+protected Q_SLOTS:
void back() Q_DECL_OVERRIDE;
void next() Q_DECL_OVERRIDE;
void accept() Q_DECL_OVERRIDE;
diff --git a/kopete/chatwindow/chatmemberslistview.h b/kopete/chatwindow/chatmemberslistview.h
index 4f93a84..64cdef5 100644
--- a/kopete/chatwindow/chatmemberslistview.h
+++ b/kopete/chatwindow/chatmemberslistview.h
@@ -39,7 +39,7 @@ public:
explicit ChatMembersListView(QWidget *parent = nullptr);
virtual ~ChatMembersListView();
-public slots:
+public Q_SLOTS:
void slotContextMenuRequested(const QPoint &pos);
private:
};
diff --git a/kopete/chatwindow/chatmessagepart.h b/kopete/chatwindow/chatmessagepart.h
index bb81dac..b13d06f 100644
--- a/kopete/chatwindow/chatmessagepart.h
+++ b/kopete/chatwindow/chatmessagepart.h
@@ -79,7 +79,7 @@ public:
*/
QString formatName(const QString &sourceName, Qt::TextFormat format) const;
-public slots:
+public Q_SLOTS:
/**
* Initiates a copy action
* If there is text selected in the HTML view, that text is copied
@@ -153,7 +153,7 @@ public slots:
*/
KDE_DEPRECATED void slotToggleGraphicOverride(bool enable);
-signals:
+Q_SIGNALS:
/**
* Emits before the context menu is about to show
*/
@@ -164,7 +164,7 @@ signals:
*/
void tooltipEvent(const QString &textUnderMouse, QString &toolTip);
-private slots:
+private Q_SLOTS:
void slotOpenURLRequest(const QUrl &url, const KParts::OpenUrlArguments &, const KParts::BrowserArguments &);
void slotFileTransferIncomingDone(unsigned int id);
void slotScrollView();
diff --git a/kopete/chatwindow/chattexteditpart.h b/kopete/chatwindow/chattexteditpart.h
index e0166cb..cf8fa05 100644
--- a/kopete/chatwindow/chattexteditpart.h
+++ b/kopete/chatwindow/chattexteditpart.h
@@ -143,7 +143,7 @@ public:
void resetConfig(KConfigGroup &config);
void writeConfig(KConfigGroup &config);
-public slots:
+public Q_SLOTS:
/**
* Go up an entry in the message history.
*/
@@ -166,7 +166,7 @@ public slots:
void checkToolbarEnabled();
-signals:
+Q_SIGNALS:
/**
* Emitted when a message is sent.
* @param message The message sent
@@ -188,7 +188,7 @@ signals:
void toolbarToggled(bool enabled);
void richTextChanged();
-private slots:
+private Q_SLOTS:
/**
* Called when a contact is added to the chat session.
* Adds this contact to the nickname completion list.
diff --git a/kopete/chatwindow/chatview.h b/kopete/chatwindow/chatview.h
index 9c70af9..ea6f6b0 100644
--- a/kopete/chatwindow/chatview.h
+++ b/kopete/chatwindow/chatview.h
@@ -175,7 +175,7 @@ public:
/** Reimplemented from KopeteView **/
void registerTooltipHandler(QObject *target, const char *slot) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* Initiates a cut action on the edit area of the chat view
*/
@@ -247,7 +247,7 @@ public slots:
/** Retrieves the tab state. */
KopeteTabState tabState() const;
-signals:
+Q_SIGNALS:
/**
* Emitted when a message is sent
* @param message The message sent
@@ -297,7 +297,7 @@ signals:
void autoSpellCheckEnabled(ChatView *, bool);
-private slots:
+private Q_SLOTS:
void slotRemoteTypingTimeout();
/**
diff --git a/kopete/chatwindow/emoticonselector.h b/kopete/chatwindow/emoticonselector.h
index 4c8910f..37ade78 100644
--- a/kopete/chatwindow/emoticonselector.h
+++ b/kopete/chatwindow/emoticonselector.h
@@ -56,21 +56,21 @@ public:
EmoticonSelector (QWidget *parent = nullptr);
// ~EmoticonSelector();
-signals:
+Q_SIGNALS:
/**
* gets emitted when an emoticon has been selected from the list
* the QString holds the emoticon as a string or is 0L if nothing was selected
**/
void itemSelected(const QString &);
-public slots:
+public Q_SLOTS:
void prepareList();
protected:
void hideEvent(QHideEvent *) Q_DECL_OVERRIDE;
void showEvent(QShowEvent *) Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void emoticonClicked(QListWidgetItem *);
void mouseOverItem(QListWidgetItem *);
void currentChanged();
diff --git a/kopete/chatwindow/kopetechatwindow.h b/kopete/chatwindow/kopetechatwindow.h
index a191ff5..df621ef 100644
--- a/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/chatwindow/kopetechatwindow.h
@@ -182,16 +182,16 @@ private:
bool m_UpdateChatLabel;
-signals:
+Q_SIGNALS:
void closing(KopeteChatWindow *);
void chatSessionChanged(Kopete::ChatSession *newSession);
-public slots:
+public Q_SLOTS:
void slotSmileyActivated(const QString &);
void setActiveView(QWidget *active);
void updateBackground(const QPixmap &pm);
-private slots:
+private Q_SLOTS:
// void slotPrepareSmileyMenu();
void testCanDecode(const QDragMoveEvent *, bool &);
void receivedDropEvent(QWidget *, QDropEvent *);
diff --git a/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/chatwindow/kopetechatwindowstylemanager.h
index 378eabd..8eb6f3f 100644
--- a/kopete/chatwindow/kopetechatwindowstylemanager.h
+++ b/kopete/chatwindow/kopetechatwindowstylemanager.h
@@ -80,7 +80,7 @@ public:
*/
QStringList getAvailableStyles() const;
-public slots:
+public Q_SLOTS:
/**
* Install a new style into user style directory
* Note that you must pass a path to a archive.
@@ -123,14 +123,14 @@ public slots:
*/
ChatWindowStyle *getValidStyleFromPool(const QString &styleName);
-signals:
+Q_SIGNALS:
/**
* This signal is emitted when all styles finished to list.
* Used to inform and/or update GUI.
*/
void loadStylesFinished();
-private slots:
+private Q_SLOTS:
/**
* KDirLister found new files.
* @param dirList new files found.
diff --git a/kopete/chatwindow/kopeteemailwindow.h b/kopete/chatwindow/kopeteemailwindow.h
index 1878b4f..f40ddd2 100644
--- a/kopete/chatwindow/kopeteemailwindow.h
+++ b/kopete/chatwindow/kopeteemailwindow.h
@@ -51,12 +51,12 @@ public:
return this;
}
-public slots:
+public Q_SLOTS:
virtual void sendMessage();
void appendMessage(Kopete::Message &message) Q_DECL_OVERRIDE;
void messageSentSuccessfully() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void shown();
void messageSent(Kopete::Message &message);
void closing(KopeteView *view);
@@ -66,7 +66,7 @@ protected:
void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE;
void changeEvent(QEvent *e) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotReplySend();
void slotUpdateReplySend();
void slotReadNext();
diff --git a/kopete/chatwindow/kopeteemoticonaction.h b/kopete/chatwindow/kopeteemoticonaction.h
index 273d9c4..2450509 100644
--- a/kopete/chatwindow/kopeteemoticonaction.h
+++ b/kopete/chatwindow/kopeteemoticonaction.h
@@ -34,7 +34,7 @@ public:
KopeteEmoticonAction(QObject *parent);
virtual ~KopeteEmoticonAction();
-signals:
+Q_SIGNALS:
void activated(const QString &item);
private:
diff --git a/kopete/chatwindow/kopeterichtextwidget.h b/kopete/chatwindow/kopeterichtextwidget.h
index b498e68..71fe17c 100644
--- a/kopete/chatwindow/kopeterichtextwidget.h
+++ b/kopete/chatwindow/kopeterichtextwidget.h
@@ -82,7 +82,7 @@ public Q_SLOTS:
void slotCheckSpellingChanged(bool b);
void slotDocumentSizeUpdated();
void slotEnableAutoResize(bool enable);
-signals:
+Q_SIGNALS:
void richTextSupportChanged();
void documentSizeUpdated(int difference);
@@ -90,7 +90,7 @@ protected:
void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE;
bool event(QEvent *event) Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void updateTextFormat();
void updateCharFormat(const QTextCharFormat &);
void slotTextModeChanged(KRichTextEdit::Mode mode);
diff --git a/kopete/chatwindow/tests/chatwindowstyle_test.h b/kopete/chatwindow/tests/chatwindowstyle_test.h
index 6636c0d..b9293fc 100644
--- a/kopete/chatwindow/tests/chatwindowstyle_test.h
+++ b/kopete/chatwindow/tests/chatwindowstyle_test.h
@@ -26,7 +26,7 @@ class ChatWindowStyle_Test : public KUnitTest::Tester
public:
void allTests();
-public slots:
+public Q_SLOTS:
void testPaths();
void testHtml();
void testVariants();
diff --git a/kopete/chatwindow/tests/chatwindowstylerendering_test.h b/kopete/chatwindow/tests/chatwindowstylerendering_test.h
index 0b21256..2aedeab 100644
--- a/kopete/chatwindow/tests/chatwindowstylerendering_test.h
+++ b/kopete/chatwindow/tests/chatwindowstylerendering_test.h
@@ -32,7 +32,7 @@ public:
~ChatWindowStyleRendering_Test();
void allTests();
-public slots:
+public Q_SLOTS:
void testHeaderRendering();
void testMessageRendering();
void testStatusRendering();
diff --git a/kopete/config/accounts/accounttreewidget.h b/kopete/config/accounts/accounttreewidget.h
index fe4e5a3..30e18dc 100644
--- a/kopete/config/accounts/accounttreewidget.h
+++ b/kopete/config/accounts/accounttreewidget.h
@@ -27,7 +27,7 @@ class AccountTreeWidget : public QTreeWidget
public:
AccountTreeWidget(QWidget *parent = nullptr);
-signals:
+Q_SIGNALS:
void itemPositionChanged();
protected:
diff --git a/kopete/config/accounts/kopeteaccountconfig.h b/kopete/config/accounts/kopeteaccountconfig.h
index 184ae17..6076105 100644
--- a/kopete/config/accounts/kopeteaccountconfig.h
+++ b/kopete/config/accounts/kopeteaccountconfig.h
@@ -51,7 +51,7 @@ public:
protected:
bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
@@ -81,7 +81,7 @@ private:
QAction *m_actionIdentityRemove;
QAction *m_actionIdentitySetDefault;
-private slots:
+private Q_SLOTS:
void slotModify();
void slotAddAccount();
diff --git a/kopete/config/appearance/appearanceconfig.h b/kopete/config/appearance/appearanceconfig.h
index 9b36af4..28cda78 100644
--- a/kopete/config/appearance/appearanceconfig.h
+++ b/kopete/config/appearance/appearanceconfig.h
@@ -36,7 +36,7 @@ public:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotHighlightChanged();
void slotChangeFont();
void slotEditTooltips();
diff --git a/kopete/config/appearance/contactlistlayouteditwidget.h b/kopete/config/appearance/contactlistlayouteditwidget.h
index 821b8d0..8677e17 100644
--- a/kopete/config/appearance/contactlistlayouteditwidget.h
+++ b/kopete/config/appearance/contactlistlayouteditwidget.h
@@ -48,7 +48,7 @@ public:
void readLayout(ContactList::LayoutItemConfig config);
ContactList::LayoutItemConfig config();
-signals:
+Q_SIGNALS:
void focussed(QWidget *);
void changed();
diff --git a/kopete/config/appearance/contactlistlayoutwidget.h b/kopete/config/appearance/contactlistlayoutwidget.h
index 261d1b2..7dfe4c3 100644
--- a/kopete/config/appearance/contactlistlayoutwidget.h
+++ b/kopete/config/appearance/contactlistlayoutwidget.h
@@ -31,10 +31,10 @@ public:
void load();
bool save();
-signals:
+Q_SIGNALS:
void changed();
-private slots:
+private Q_SLOTS:
void emitChanged();
void setLayout(const QString &layoutName);
void reloadLayoutList();
diff --git a/kopete/config/appearance/layout/Token.h b/kopete/config/appearance/layout/Token.h
index f8abe44..cc54e2b 100644
--- a/kopete/config/appearance/layout/Token.h
+++ b/kopete/config/appearance/layout/Token.h
@@ -50,7 +50,7 @@ public:
QString name() const;
int value() const;
-signals:
+Q_SIGNALS:
void changed();
protected:
diff --git a/kopete/config/appearance/layout/TokenDropTarget.h b/kopete/config/appearance/layout/TokenDropTarget.h
index 79b0844..380caf6 100644
--- a/kopete/config/appearance/layout/TokenDropTarget.h
+++ b/kopete/config/appearance/layout/TokenDropTarget.h
@@ -61,7 +61,7 @@ public:
// inline uint columnLimit() const { return m_limits[0]; }
// inline void setColumnLimit( uint c ) { m_limits[0] = c; }
-signals:
+Q_SIGNALS:
void changed();
void focussed(QWidget *);
diff --git a/kopete/config/appearance/layout/TokenPool.h b/kopete/config/appearance/layout/TokenPool.h
index 034679d..0a23f4d 100644
--- a/kopete/config/appearance/layout/TokenPool.h
+++ b/kopete/config/appearance/layout/TokenPool.h
@@ -44,7 +44,7 @@ protected:
void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE;
void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void onDoubleClick(Token *token); //connects to TokenLayoutWidget::addToken( QString )
private:
diff --git a/kopete/config/appearance/layout/TokenWithLayout.h b/kopete/config/appearance/layout/TokenWithLayout.h
index ee0bf67..2cc267a 100644
--- a/kopete/config/appearance/layout/TokenWithLayout.h
+++ b/kopete/config/appearance/layout/TokenWithLayout.h
@@ -68,7 +68,7 @@ public:
return m_suffix;
}
-public slots:
+public Q_SLOTS:
void setAlignLeft(bool);
void setAlignCenter(bool);
void setAlignRight(bool);
diff --git a/kopete/config/appearance/tooltipeditdialog.h b/kopete/config/appearance/tooltipeditdialog.h
index 4c3b68d..9f90ef4 100644
--- a/kopete/config/appearance/tooltipeditdialog.h
+++ b/kopete/config/appearance/tooltipeditdialog.h
@@ -31,7 +31,7 @@ class TooltipEditDialog : public KDialog, private Ui::TooltipEditWidget
public:
TooltipEditDialog(QWidget *parent = nullptr);
-private slots:
+private Q_SLOTS:
void slotUnusedSelected(const QItemSelection &);
void slotUsedSelected(const QItemSelection &);
void slotUpButton();
@@ -40,7 +40,7 @@ private slots:
void slotRemoveButton();
void slotOkClicked();
-signals:
+Q_SIGNALS:
void changed(bool);
private:
diff --git a/kopete/config/avdevice/IdGuiElements.h b/kopete/config/avdevice/IdGuiElements.h
index 359d0a8..6d9f380 100644
--- a/kopete/config/avdevice/IdGuiElements.h
+++ b/kopete/config/avdevice/IdGuiElements.h
@@ -32,9 +32,9 @@ public:
IdPushButton(unsigned int id, const QIcon &icon, const QString &text, QWidget *parent = nullptr);
private:
unsigned int _id;
-private slots:
+private Q_SLOTS:
void emitPressed();
-signals:
+Q_SIGNALS:
void pressed(unsigned int id);
};
@@ -46,9 +46,9 @@ public:
IdComboBox(unsigned int id, bool rw, QWidget *parent = nullptr);
private:
unsigned int _id;
-private slots:
+private Q_SLOTS:
void emitCurrentIndexChanged(int index);
-signals:
+Q_SIGNALS:
void currentIndexChanged(unsigned int id, int index);
};
@@ -60,9 +60,9 @@ public:
IdCheckBox(unsigned int id, const QString &text, QWidget *parent = nullptr);
private:
unsigned int _id;
-private slots:
+private Q_SLOTS:
void emitStateChanged(int state);
-signals:
+Q_SIGNALS:
void stateChanged(unsigned int id, int state);
};
@@ -74,9 +74,9 @@ public:
IdSlider(unsigned int id, Qt::Orientation orientation, QWidget *parent = nullptr);
private:
unsigned int _id;
-private slots:
+private Q_SLOTS:
void emitValueChanged(int value);
-signals:
+Q_SIGNALS:
void valueChanged(unsigned int id, int value);
};
diff --git a/kopete/config/avdevice/avdeviceconfig.h b/kopete/config/avdevice/avdeviceconfig.h
index ca1c634..07b5fed 100644
--- a/kopete/config/avdevice/avdeviceconfig.h
+++ b/kopete/config/avdevice/avdeviceconfig.h
@@ -44,7 +44,7 @@ public:
//virtual void save();
//virtual void load();
-private slots:
+private Q_SLOTS:
void slotSettingsChanged(bool);
void slotValueChanged(int);
void slotDeviceKComboBoxChanged(int);
diff --git a/kopete/config/behavior/behaviorconfig.h b/kopete/config/behavior/behaviorconfig.h
index 4ac482f..b1c651b 100644
--- a/kopete/config/behavior/behaviorconfig.h
+++ b/kopete/config/behavior/behaviorconfig.h
@@ -36,7 +36,7 @@ public:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotSettingsChanged(bool);
void slotValueChanged(int);
void slotTextChanged();
diff --git a/kopete/config/behavior/behaviorconfig_general.h b/kopete/config/behavior/behaviorconfig_general.h
index b059a11..8fd2f84 100644
--- a/kopete/config/behavior/behaviorconfig_general.h
+++ b/kopete/config/behavior/behaviorconfig_general.h
@@ -27,7 +27,7 @@ class BehaviorConfig_General : public QWidget, public Ui::BehaviorConfig_General
public:
BehaviorConfig_General(QWidget *parent = nullptr);
-private slots:
+private Q_SLOTS:
void queueToggled(bool checked);
};
diff --git a/kopete/config/chatwindow/chatwindowconfig.h b/kopete/config/chatwindow/chatwindowconfig.h
index b26dc71..96aef29 100644
--- a/kopete/config/chatwindow/chatwindowconfig.h
+++ b/kopete/config/chatwindow/chatwindowconfig.h
@@ -53,7 +53,7 @@ public:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
//----- Style TAB ---------------------
void slotInstallChatStyle();
int installChatStyle(const QUrl &styleToInstall);
diff --git a/kopete/config/plugins/kopetepluginconfig.h b/kopete/config/plugins/kopetepluginconfig.h
index 9ae3791..124b791 100644
--- a/kopete/config/plugins/kopetepluginconfig.h
+++ b/kopete/config/plugins/kopetepluginconfig.h
@@ -38,7 +38,7 @@ public:
KopetePluginConfig(QWidget *parent, const QVariantList &args);
~KopetePluginConfig();
-public slots:
+public Q_SLOTS:
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
diff --git a/kopete/config/status/statusconfig.h b/kopete/config/status/statusconfig.h
index 5aee5c5..ab9f3e7 100644
--- a/kopete/config/status/statusconfig.h
+++ b/kopete/config/status/statusconfig.h
@@ -33,7 +33,7 @@ class StatusConfig : public KCModule
public:
StatusConfig(QWidget *parent, const QVariantList &args);
-public slots:
+public Q_SLOTS:
void save() Q_DECL_OVERRIDE;
void load() Q_DECL_OVERRIDE;
diff --git a/kopete/config/status/statusconfig_manager.h b/kopete/config/status/statusconfig_manager.h
index fa91837..d9a2865 100644
--- a/kopete/config/status/statusconfig_manager.h
+++ b/kopete/config/status/statusconfig_manager.h
@@ -27,7 +27,7 @@ public:
StatusConfig_Manager(QWidget *parent = nullptr);
~StatusConfig_Manager();
-public slots:
+public Q_SLOTS:
void load();
void save();
@@ -35,10 +35,10 @@ public slots:
void addGroup();
void removeStatus();
-signals:
+Q_SIGNALS:
void changed();
-private slots:
+private Q_SLOTS:
void currentRowChanged(const QModelIndex &current, const QModelIndex &previous);
void editTitleEdited(const QString &text);
diff --git a/kopete/contactlist/contactlistlayoutmanager.h b/kopete/contactlist/contactlistlayoutmanager.h
index e8020b1..0342256 100644
--- a/kopete/contactlist/contactlistlayoutmanager.h
+++ b/kopete/contactlist/contactlistlayoutmanager.h
@@ -93,7 +93,7 @@ public:
return m_tokens.value(tokenType);
}
-signals:
+Q_SIGNALS:
void activeLayoutChanged();
void layoutListChanged();
diff --git a/kopete/contactlist/contactlistproxymodel.h b/kopete/contactlist/contactlistproxymodel.h
index b83d826..0718e3d 100644
--- a/kopete/contactlist/contactlistproxymodel.h
+++ b/kopete/contactlist/contactlistproxymodel.h
@@ -38,7 +38,7 @@ public:
ContactListProxyModel(QObject *parent = nullptr);
~ContactListProxyModel();
-public slots:
+public Q_SLOTS:
void slotConfigChanged();
protected:
bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
@@ -47,7 +47,7 @@ protected:
bool showEmptyFolders;
int rootRowCount;
bool sortScheduled;
-private slots:
+private Q_SLOTS:
// Workaround Qt sorting bug
void proxyRowsInserted(const QModelIndex &parent, int start, int end);
void proxyRowsRemoved(const QModelIndex &parent, int start, int end);
diff --git a/kopete/contactlist/kabcexport.h b/kopete/contactlist/kabcexport.h
index b39d913..54b63a9 100644
--- a/kopete/contactlist/kabcexport.h
+++ b/kopete/contactlist/kabcexport.h
@@ -44,9 +44,9 @@ class KOPETE_CONTACT_LIST_EXPORT KabcExportWizard : public KAssistantDialog
public:
KabcExportWizard(QWidget *parent = nullptr);
~KabcExportWizard();
-public slots:
+public Q_SLOTS:
void accept() Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void slotDeselectAll();
void slotSelectAll();
void slotResourceSelectionChanged(QListWidgetItem *lbi);
diff --git a/kopete/contactlist/kopetecontactlistview.h b/kopete/contactlist/kopetecontactlistview.h
index 818f2bf..060ef48 100644
--- a/kopete/contactlist/kopetecontactlistview.h
+++ b/kopete/contactlist/kopetecontactlistview.h
@@ -99,11 +99,11 @@ protected:
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE;
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void reexpandGroups();
void itemExpanded(const QModelIndex &index);
void itemCollapsed(const QModelIndex &index);
diff --git a/kopete/contactlist/kopetegrouplistaction.h b/kopete/contactlist/kopetegrouplistaction.h
index b550f6a..fea7fbf 100644
--- a/kopete/contactlist/kopetegrouplistaction.h
+++ b/kopete/contactlist/kopetegrouplistaction.h
@@ -31,7 +31,7 @@ public:
KopeteGroupListAction(const QString &, const QString &, const QKeySequence &, const QObject *, const char *, QObject *);
~KopeteGroupListAction();
-protected slots:
+protected Q_SLOTS:
void slotUpdateList();
};
diff --git a/kopete/contactlist/kopeteitemdelegate.h b/kopete/contactlist/kopeteitemdelegate.h
index b85ab08..98ba2e9 100644
--- a/kopete/contactlist/kopeteitemdelegate.h
+++ b/kopete/contactlist/kopeteitemdelegate.h
@@ -48,7 +48,7 @@ public:
Kopete::Contact *contactAt(const QStyleOptionViewItem &option, const QModelIndex &index, const QPoint &point) const;
-public slots:
+public Q_SLOTS:
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
private:
diff --git a/kopete/contactlist/kopetelviprops.h b/kopete/contactlist/kopetelviprops.h
index 769c2ee..6feb828 100644
--- a/kopete/contactlist/kopetelviprops.h
+++ b/kopete/contactlist/kopetelviprops.h
@@ -56,7 +56,7 @@ private:
Kopete::Group *mGroup;
bool m_dirty;
-private slots:
+private Q_SLOTS:
void slotOkClicked();
void slotUseCustomIconsToggled(bool on);
void slotIconChanged();
@@ -90,7 +90,7 @@ private:
Kopete::MetaContact::PropertySource selectedPhotoSource() const;
Kopete::Contact *selectedNameSourceContact() const;
Kopete::Contact *selectedPhotoSourceContact() const;
-private slots:
+private Q_SLOTS:
void slotOkClicked();
void slotUseCustomIconsToggled(bool on);
void slotClearPhotoClicked();
diff --git a/kopete/identity/accountidentitydialog.h b/kopete/identity/accountidentitydialog.h
index dbfb807..0f3ad74 100644
--- a/kopete/identity/accountidentitydialog.h
+++ b/kopete/identity/accountidentitydialog.h
@@ -98,13 +98,13 @@ public:
*/
static bool changeAccountIdentity(QWidget *parent, QList<Kopete::Account *> accountList, Kopete::Identity *hidden_ident = 0, const QString &message = QString());
-private slots:
+private Q_SLOTS:
void slotValidate();
void slotIdentityListDoubleClicked();
void slotLoadIdentities();
void slotLoadAccounts();
-protected slots:
+protected Q_SLOTS:
void accept() Q_DECL_OVERRIDE;
void reject() Q_DECL_OVERRIDE;
diff --git a/kopete/identity/identitydialog.h b/kopete/identity/identitydialog.h
index b0fbc06..5a85683 100644
--- a/kopete/identity/identitydialog.h
+++ b/kopete/identity/identitydialog.h
@@ -32,11 +32,11 @@ public:
explicit IdentityDialog(Kopete::Identity *identity, QWidget *parent = nullptr);
~IdentityDialog();
-protected slots:
+protected Q_SLOTS:
void load();
void slotSave() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotSelectPhoto();
void slotClearPhoto();
diff --git a/kopete/identity/identitystatuswidget.h b/kopete/identity/identitystatuswidget.h
index 430a3ee..fa74c04 100644
--- a/kopete/identity/identitystatuswidget.h
+++ b/kopete/identity/identitystatuswidget.h
@@ -63,7 +63,7 @@ private:
*/
void load();
-private slots:
+private Q_SLOTS:
void slotAnimate(qreal amount);
void showAccountContextMenu(const QPoint &);
diff --git a/kopete/kopeteaccountstatusbaricon.h b/kopete/kopeteaccountstatusbaricon.h
index 48d22dd..17dba77 100644
--- a/kopete/kopeteaccountstatusbaricon.h
+++ b/kopete/kopeteaccountstatusbaricon.h
@@ -44,7 +44,7 @@ protected:
void mousePressEvent(QMouseEvent *me) Q_DECL_OVERRIDE;
bool event(QEvent *event) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void statusIconChanged();
private:
diff --git a/kopete/kopeteapplication.h b/kopete/kopeteapplication.h
index 74e0a2b..45713e1 100644
--- a/kopete/kopeteapplication.h
+++ b/kopete/kopeteapplication.h
@@ -54,7 +54,7 @@ public:
//FIXME int newInstance() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* Quit Kopete, closing all the windows, which causes application shutdown
* This method marks Kopete as 'shutting down' to avoid
@@ -69,7 +69,7 @@ public slots:
*/
void slotLoadPlugins();
-private slots:
+private Q_SLOTS:
/**
* auto-connect
*/
diff --git a/kopete/kopeteidentitystatusbaricon.h b/kopete/kopeteidentitystatusbaricon.h
index c3a96bb..d0d615b 100644
--- a/kopete/kopeteidentitystatusbaricon.h
+++ b/kopete/kopeteidentitystatusbaricon.h
@@ -42,13 +42,13 @@ public:
*/
KopeteIdentityStatusBarIcon(Kopete::Identity *identity, QWidget *parent);
-signals:
+Q_SIGNALS:
void leftClicked(Kopete::Identity *identity, const QPoint &p);
protected:
void mousePressEvent(QMouseEvent *me) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void updateMessage(Kopete::StatusRootAction *statusRootAction);
private:
diff --git a/kopete/kopetewindow.h b/kopete/kopetewindow.h
index 97596d0..d06fa6a 100644
--- a/kopete/kopetewindow.h
+++ b/kopete/kopetewindow.h
@@ -60,7 +60,7 @@ protected:
void showEvent(QShowEvent *ev) Q_DECL_OVERRIDE;
void hideEvent(QHideEvent *ev) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotToggleShowAllOfflineEmpty(bool toggled);
void slotToggleShowOfflineUsers();
void slotToggleShowEmptyGroups();
@@ -238,7 +238,7 @@ public:
protected:
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void iconClicked(const QPoint &position);
};
@@ -251,10 +251,10 @@ public:
protected:
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void clicked();
-private slots:
+private Q_SLOTS:
void updateIcon();
};
diff --git a/kopete/statusmenu/kopeteonlinestatusaction.h b/kopete/statusmenu/kopeteonlinestatusaction.h
index 516dafd..9a215a9 100644
--- a/kopete/statusmenu/kopeteonlinestatusaction.h
+++ b/kopete/statusmenu/kopeteonlinestatusaction.h
@@ -33,9 +33,9 @@ public:
OnlineStatusAction (const OnlineStatus &status, const QString &text, const QIcon &pix, QObject *parent);
~OnlineStatusAction();
-signals:
+Q_SIGNALS:
void activated(const Kopete::OnlineStatus &status);
-private slots:
+private Q_SLOTS:
void slotActivated();
private:
class Private;
diff --git a/libkopete/avdevice/videodevicepool.h b/libkopete/avdevice/videodevicepool.h
index f67a94d..c9b42e5 100644
--- a/libkopete/avdevice/videodevicepool.h
+++ b/libkopete/avdevice/videodevicepool.h
@@ -98,14 +98,14 @@ private:
VideoDevicePool();
-protected slots:
+protected Q_SLOTS:
/**
* Slot called when a new device is added to the system
*/
void deviceAdded(const QString &udi);
void deviceRemoved(const QString &udi);
-signals:
+Q_SIGNALS:
/**
* Provisional signatures, probably more useful to indicate which device was registered
*/
diff --git a/libkopete/chatsessionmemberslistmodel.h b/libkopete/chatsessionmemberslistmodel.h
index c8af397..ad18a2b 100644
--- a/libkopete/chatsessionmemberslistmodel.h
+++ b/libkopete/chatsessionmemberslistmodel.h
@@ -43,13 +43,13 @@ public:
Kopete::ChatSession *session();
Kopete::Contact *contactAt(const QModelIndex &index) const;
-public slots:
+public Q_SLOTS:
/**
* Called when the ChatSession change for this list (eg. when the tab in the KopeteChatWindow is changing)
*/
void setChatSession(Kopete::ChatSession *session);
-private slots:
+private Q_SLOTS:
/**
* Called when a contact is added to the chat session.
* Adds this contact to the contact list view.
diff --git a/libkopete/connectionmanager.h b/libkopete/connectionmanager.h
index 98eff5c..de34bfe 100644
--- a/libkopete/connectionmanager.h
+++ b/libkopete/connectionmanager.h
@@ -40,7 +40,7 @@ public:
NetworkStatus::EnumRequestResult requestConnection(QWidget *mainWidget, const QString &host, bool userInitiated);
// method to relinquish a connection
void relinquishConnection(const QString &host);
-signals:
+Q_SIGNALS:
// signal that the network for a hostname is up/down
void statusChanged(const QString &host, NetworkStatus::EnumStatus status);
protected:
diff --git a/libkopete/kabcpersistence.h b/libkopete/kabcpersistence.h
index 7509308..b5b1950 100644
--- a/libkopete/kabcpersistence.h
+++ b/libkopete/kabcpersistence.h
@@ -90,7 +90,7 @@ public:
protected:
static void splitField(const QString &str, QString &app, QString &name, QString &value);
-protected slots:
+protected Q_SLOTS:
/**
* Perform a delayed address book write
*/
diff --git a/libkopete/kopeteaccount.h b/libkopete/kopeteaccount.h
index 7d61460..da16f3c 100644
--- a/libkopete/kopeteaccount.h
+++ b/libkopete/kopeteaccount.h
@@ -459,7 +459,7 @@ protected:
*/
void setAccountLabel(const QString &label);
-protected slots:
+protected Q_SLOTS:
/**
* \brief The service has been disconnected
*
@@ -494,7 +494,7 @@ protected slots:
*/
void networkingStatusChanged(const Solid::Networking::Status status);
-signals:
+Q_SIGNALS:
/**
* The color of the account has been changed
*
@@ -529,7 +529,7 @@ public:
*/
bool registerContact(Contact *c);
-public slots:
+public Q_SLOTS:
/**
* @brief Go online for this service.
*
@@ -549,7 +549,7 @@ public slots:
*/
virtual void disconnect() = 0;
-public slots:
+public Q_SLOTS:
/**
* Reimplement this function to set the online status
* @param status is the new status
@@ -600,7 +600,7 @@ public slots:
*/
virtual void unblock(const QString &contactId);
-private slots:
+private Q_SLOTS:
/**
* Restore online status and status message on reconnect.
*/
diff --git a/libkopete/kopeteaccountmanager.h b/libkopete/kopeteaccountmanager.h
index b8f5b53..4b39a54 100644
--- a/libkopete/kopeteaccountmanager.h
+++ b/libkopete/kopeteaccountmanager.h
@@ -126,7 +126,7 @@ public:
ConnectIfOffline = 0x01
};
-public slots:
+public Q_SLOTS:
/**
* @brief Set all accounts a status in the specified category
*
@@ -173,7 +173,7 @@ public slots:
*/
void load();
-signals:
+Q_SIGNALS:
/**
* \brief Signals when an account is ready for use
*/
@@ -201,7 +201,7 @@ private:
*/
AccountManager();
-private slots:
+private Q_SLOTS:
/**
* Try to connect every account that should be connected automatically
*/
diff --git a/libkopete/kopeteblacklister.h b/libkopete/kopeteblacklister.h
index 5c741f4..84630e3 100644
--- a/libkopete/kopeteblacklister.h
+++ b/libkopete/kopeteblacklister.h
@@ -68,7 +68,7 @@ public:
*/
bool isBlocked(const QString &contactId);
-public slots:
+public Q_SLOTS:
/**
* Add a contact to the blacklist.
*
@@ -96,7 +96,7 @@ public slots:
*/
void removeContact(const QString &contactId);
-signals:
+Q_SIGNALS:
/**
* \brief A new contact has been added to the list
*
diff --git a/libkopete/kopetechatsession.h b/libkopete/kopetechatsession.h
index 2d83c8d..af08471 100644
--- a/libkopete/kopetechatsession.h
+++ b/libkopete/kopetechatsession.h
@@ -228,7 +228,7 @@ public:
*/
QStringList findUrls(const Kopete::Message &msg);
-signals:
+Q_SIGNALS:
/**
* @brief the KMM will be deleted
* Used by a Kopete::ChatSession to signal that it is closing.
@@ -337,7 +337,7 @@ signals:
*/
void toggleGraphicOverride(bool enable);
-public slots:
+public Q_SLOTS:
/**
* @brief Got a typing notification from a user
*/
@@ -454,7 +454,7 @@ public slots:
*/
void raiseView();
-private slots:
+private Q_SLOTS:
void clearChains();
void slotUpdateDisplayName();
void slotViewDestroyed();
diff --git a/libkopete/kopetechatsessionmanager.h b/libkopete/kopetechatsessionmanager.h
index ba537b0..389cac5 100644
--- a/libkopete/kopetechatsessionmanager.h
+++ b/libkopete/kopetechatsessionmanager.h
@@ -104,7 +104,7 @@ public:
*/
KopeteView *activeView();
-signals:
+Q_SIGNALS:
/**
* This signal is emitted whenever a message
* is about to be displayed by the KopeteChatWindow.
@@ -166,7 +166,7 @@ signals:
*/
void readMessage();
-public slots:
+public Q_SLOTS:
void slotReadMessage();
private:
diff --git a/libkopete/kopetecommand.h b/libkopete/kopetecommand.h
index b4372e5..caafd10 100644
--- a/libkopete/kopetecommand.h
+++ b/libkopete/kopetecommand.h
@@ -96,7 +96,7 @@ public:
return m_type;
}
-signals:
+Q_SIGNALS:
/**
* Emitted whenever a command is handled by this object. When a command
* has been handled, all processing on it stops by the command handler
@@ -104,7 +104,7 @@ signals:
*/
void handleCommand(const QString &args, Kopete::ChatSession *manager);
-private slots:
+private Q_SLOTS:
/**
* Connected to our activated() signal
*/
diff --git a/libkopete/kopetecommandhandler.h b/libkopete/kopetecommandhandler.h
index 49e0c42..958994f 100644
--- a/libkopete/kopetecommandhandler.h
+++ b/libkopete/kopetecommandhandler.h
@@ -180,7 +180,7 @@ public:
*/
bool commandHandledByProtocol(const QString &command, Protocol *protocol);
-private slots:
+private Q_SLOTS:
void slotPluginLoaded(Kopete::Plugin *);
void slotPluginDestroyed(QObject *);
void slotExecError(QProcess::ProcessError error);
diff --git a/libkopete/kopetecontact.h b/libkopete/kopetecontact.h
index d637e99..9fa0f63 100644
--- a/libkopete/kopetecontact.h
+++ b/libkopete/kopetecontact.h
@@ -414,7 +414,7 @@ public:
*/
void setPhoto(const QString &photoPath);
-public slots:
+public Q_SLOTS:
/**
* This should typically pop up a KopeteChatWindow
*/
@@ -491,7 +491,7 @@ public slots:
* file size (such as over asocket
*/
virtual void sendFile(const QUrl &sourceURL = QUrl(), const QString &fileName = QString(), uint fileSize = 0L);
-private slots:
+private Q_SLOTS:
/**
* This add the contact totally in the list if it was a temporary contact
*/
@@ -526,7 +526,7 @@ private slots:
* slot to handle changing display name
*/
void slotPropertyChanged(Kopete::PropertyContainer *, const QString &key, const QVariant &oldValue, const QVariant &newValue);
-signals:
+Q_SIGNALS:
/**
* The contact's online status changed
*/
diff --git a/libkopete/kopetecontactlist.h b/libkopete/kopetecontactlist.h
index 880fb7a..3e02316 100644
--- a/libkopete/kopetecontactlist.h
+++ b/libkopete/kopetecontactlist.h
@@ -132,7 +132,7 @@ public:
*/
MetaContact *myself();
-public slots:
+public Q_SLOTS:
/**
* Add metacontacts into the contact list
* When calling this method, contacts have to be already placed in the correct group.
@@ -201,7 +201,7 @@ public slots:
*/
void shutdown();
-signals:
+Q_SIGNALS:
/**
* A meta contact was added to the contact list. Interested classes
* ( like the listview widgets ) can connect to this signal to receive
@@ -257,7 +257,7 @@ signals:
void contactListLoaded();
-private slots:
+private Q_SLOTS:
/**
* Called when the contact list changes. Flags the list dirty and schedules a save for a little while later.
*/
diff --git a/libkopete/kopetecontactlistelement.h b/libkopete/kopetecontactlistelement.h
index 7787c00..38f6015 100644
--- a/libkopete/kopetecontactlistelement.h
+++ b/libkopete/kopetecontactlistelement.h
@@ -186,7 +186,7 @@ public:
*/
void setUseCustomIcon(bool useCustomIcon);
-signals:
+Q_SIGNALS:
/**
* The plugin data was changed (by a plugin)
*/
diff --git a/libkopete/kopetegroup.h b/libkopete/kopetegroup.h
index 512f6a0..f26d91e 100644
--- a/libkopete/kopetegroup.h
+++ b/libkopete/kopetegroup.h
@@ -141,19 +141,19 @@ public:
*/
void setUniqueGroupId(uint uniqueGroupId);
-public slots:
+public Q_SLOTS:
/**
* Send a message to all contacts in the group
*/
void sendMessage();
-signals:
+Q_SIGNALS:
/**
* \brief Emitted when the group has been renamed
*/
void displayNameChanged(Kopete::Group *group, const QString &oldName);
-private slots:
+private Q_SLOTS:
void sendMessage(Kopete::Message &);
private:
diff --git a/libkopete/kopeteidentity.h b/libkopete/kopeteidentity.h
index 8e5c8ab..c0df05f 100644
--- a/libkopete/kopeteidentity.h
+++ b/libkopete/kopeteidentity.h
@@ -138,7 +138,7 @@ public:
*/
void save();
-public slots:
+public Q_SLOTS:
/**
* @brief Sets the online status for this identity
* Sets the online status for each account in this identity, except those which are set to
@@ -165,10 +165,10 @@ public slots:
void updateOnlineStatus();
-protected slots:
+protected Q_SLOTS:
void slotSaveProperty(Kopete::PropertyContainer *container, const QString &key, const QVariant &oldValue, const QVariant &newValue);
-signals:
+Q_SIGNALS:
void onlineStatusChanged(Kopete::Identity *);
void toolTipChanged(Kopete::Identity *);
void identityDestroyed(const Kopete::Identity *identity);
diff --git a/libkopete/kopeteidentitymanager.h b/libkopete/kopeteidentitymanager.h
index f91ca4c..d17fa62 100644
--- a/libkopete/kopeteidentitymanager.h
+++ b/libkopete/kopeteidentitymanager.h
@@ -104,7 +104,7 @@ public:
*/
Identity *registerIdentity(Identity *identity);
-public slots:
+public Q_SLOTS:
/**
* @brief Set all identities a status in the specified category
@@ -127,7 +127,7 @@ public slots:
*/
void load();
-signals:
+Q_SIGNALS:
/**
* \brief Signals when an identity is ready for use
*/
@@ -153,7 +153,7 @@ private:
*/
IdentityManager();
-private slots:
+private Q_SLOTS:
void slotIdentityOnlineStatusChanged(Kopete::Identity *i);
/**
diff --git a/libkopete/kopeteidletimer.h b/libkopete/kopeteidletimer.h
index 4b2832a..3527507 100644
--- a/libkopete/kopeteidletimer.h
+++ b/libkopete/kopeteidletimer.h
@@ -61,7 +61,7 @@ public Q_SLOTS:
*/
void unregisterTimeout(QObject *receiver);
-private slots:
+private Q_SLOTS:
void updateIdleTime();
private:
diff --git a/libkopete/kopetemessageevent.h b/libkopete/kopetemessageevent.h
index a39f2f7..187362b 100644
--- a/libkopete/kopetemessageevent.h
+++ b/libkopete/kopetemessageevent.h
@@ -67,7 +67,7 @@ public:
EventState state();
-public slots:
+public Q_SLOTS:
/**
* @deprecated Use accept() instead to continue the processing of this event once the caller has moved to using MessageHandlers
*
@@ -97,7 +97,7 @@ public slots:
*/
void discard();
-signals:
+Q_SIGNALS:
/**
* The event has been processed
*/
diff --git a/libkopete/kopetemessagehandler.h b/libkopete/kopetemessagehandler.h
index 55f2f3f..4122bcc 100644
--- a/libkopete/kopetemessagehandler.h
+++ b/libkopete/kopetemessagehandler.h
@@ -81,7 +81,7 @@ public:
/** @internal */
void handleMessageInternal(MessageEvent *event);
-private slots:
+private Q_SLOTS:
/**
* @internal The message has been accepted. Pass it on to the next handler.
*/
diff --git a/libkopete/kopetemessagehandlerchain.h b/libkopete/kopetemessagehandlerchain.h
index 47ed870..c6a7103 100644
--- a/libkopete/kopetemessagehandlerchain.h
+++ b/libkopete/kopetemessagehandlerchain.h
@@ -77,7 +77,7 @@ class ProcessMessageTask : public Task
public:
MessageEvent *event();
-public slots:
+public Q_SLOTS:
void start() Q_DECL_OVERRIDE;
void slotDone();
void kill(bool);
diff --git a/libkopete/kopetemetacontact.h b/libkopete/kopetemetacontact.h
index 3abad86..442566d 100644
--- a/libkopete/kopetemetacontact.h
+++ b/libkopete/kopetemetacontact.h
@@ -402,7 +402,7 @@ public:
*/
StatusMessage statusMessage() const;
-public slots:
+public Q_SLOTS:
/**
* @brief Send a file to this metacontact
@@ -426,7 +426,7 @@ public slots:
*/
void serialize();
-signals:
+Q_SIGNALS:
/**
* One of the subcontacts' idle status has changed. As with online status,
* this can occur without the metacontact changing idle state
@@ -438,7 +438,7 @@ signals:
*/
void statusMessageChanged(Kopete::MetaContact *metaContact);
-public slots:
+public Q_SLOTS:
/**
* @brief Move a contact from one group to another.
@@ -512,7 +512,7 @@ public slots:
*/
void slotProtocolLoaded(Kopete::Protocol *p);
-signals:
+Q_SIGNALS:
/**
* @brief The MetaContact online status changed
*/
@@ -571,7 +571,7 @@ signals:
*/
void persistentDataChanged();
-private slots:
+private Q_SLOTS:
/**
* Update the contact's online status and emit onlineStatusChanged
* when appropriate
diff --git a/libkopete/kopeteonlinestatusmanager.h b/libkopete/kopeteonlinestatusmanager.h
index 84ff630..21fa087 100644
--- a/libkopete/kopeteonlinestatusmanager.h
+++ b/libkopete/kopeteonlinestatusmanager.h
@@ -134,10 +134,10 @@ private:
QString fingerprint(const OnlineStatus &statusFor, const QString &icon, int size, QColor color, bool idle = false);
QPixmap *renderIcon(const OnlineStatus &statusFor, const QString &baseicon, int size, QColor color, bool idle = false) const;
-signals:
+Q_SIGNALS:
void iconsChanged();
-private slots:
+private Q_SLOTS:
void slotIconsChanged();
private:
diff --git a/libkopete/kopetepassword.h b/libkopete/kopetepassword.h
index f2b7ade..3906534 100644
--- a/libkopete/kopetepassword.h
+++ b/libkopete/kopetepassword.h
@@ -148,7 +148,7 @@ public:
*/
QString cachedValue();
-public slots:
+public Q_SLOTS:
/**
* Set the password for this account.
* @param pass If set to QString(), the password is forgotten unless you
@@ -192,9 +192,9 @@ public:
{
}
-signals:
+Q_SIGNALS:
void requestFinished(const QString &password);
-public slots:
+public Q_SLOTS:
virtual void walletReceived(KWallet::Wallet *wallet) = 0;
virtual void gotPassword(const QString &, bool) = 0;
virtual void slotCancelPressed() = 0;
diff --git a/libkopete/kopetepasswordedaccount.h b/libkopete/kopetepasswordedaccount.h
index 4c9c4c8..ee2d420 100644
--- a/libkopete/kopetepasswordedaccount.h
+++ b/libkopete/kopetepasswordedaccount.h
@@ -79,7 +79,7 @@ public:
*/
bool removeAccount() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* Called when your account should attempt to connect.
* @param password The password to connect with, or QString()
@@ -95,7 +95,7 @@ protected:
*/
virtual QString passwordPrompt();
-protected slots:
+protected Q_SLOTS:
/**
* @internal
* Reimplemented to set the password wrong if the reason is BadPassword
diff --git a/libkopete/kopeteplugin.h b/libkopete/kopeteplugin.h
index 2857093..cad588b 100644
--- a/libkopete/kopeteplugin.h
+++ b/libkopete/kopeteplugin.h
@@ -201,7 +201,7 @@ public:
*/
Q_INVOKABLE bool shouldExitOnclose();
-signals:
+Q_SIGNALS:
/**
* Notify that the settings of a plugin were changed.
* These changes are passed on from the new KCDialog code in kdelibs/kutils.
@@ -214,7 +214,7 @@ signals:
*/
void readyForUnload();
-public slots:
+public Q_SLOTS:
/**
* deserialize() and tell the plugin
diff --git a/libkopete/kopetepluginmanager.h b/libkopete/kopetepluginmanager.h
index 1484677..b936dec 100644
--- a/libkopete/kopetepluginmanager.h
+++ b/libkopete/kopetepluginmanager.h
@@ -127,7 +127,7 @@ public:
LoadSync, LoadAsync
};
-public slots:
+public Q_SLOTS:
/**
* @brief Load a single plugin by plugin name. Returns an existing plugin
* if one is already loaded in memory.
@@ -151,7 +151,7 @@ public slots:
*/
void loadAllPlugins();
-signals:
+Q_SIGNALS:
/**
* @brief Signals a new plugin has just been loaded.
*/
@@ -189,7 +189,7 @@ signals:
*/
void allPluginsLoaded();
-private slots:
+private Q_SLOTS:
/**
* @brief Cleans up some references if the plugin is destroyed
*/
diff --git a/libkopete/kopetepropertycontainer.h b/libkopete/kopetepropertycontainer.h
index babb91c..b45d44c 100644
--- a/libkopete/kopetepropertycontainer.h
+++ b/libkopete/kopetepropertycontainer.h
@@ -110,7 +110,7 @@ public:
**/
void removeProperty(const Kopete::PropertyTmpl &tmpl);
-signals:
+Q_SIGNALS:
void propertyChanged(Kopete::PropertyContainer *container, const QString &key, const QVariant &oldValue, const QVariant &newValue);
private:
diff --git a/libkopete/kopeteprotocol.h b/libkopete/kopeteprotocol.h
index f55361c..1e77895 100644
--- a/libkopete/kopeteprotocol.h
+++ b/libkopete/kopeteprotocol.h
@@ -200,7 +200,7 @@ public:
*/
void aboutToUnload() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
/**
* @internal
* The account changed online status. Used while unloading the protocol.
diff --git a/libkopete/kopetesimplemessagehandler.h b/libkopete/kopetesimplemessagehandler.h
index 3c49349..a65479a 100644
--- a/libkopete/kopetesimplemessagehandler.h
+++ b/libkopete/kopetesimplemessagehandler.h
@@ -72,7 +72,7 @@ public:
void handleMessage(MessageEvent *event) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void handle(Kopete::Message &message);
private:
diff --git a/libkopete/kopetesockettimeoutwatcher.h b/libkopete/kopetesockettimeoutwatcher.h
index eb981b8..05574b2 100644
--- a/libkopete/kopetesockettimeoutwatcher.h
+++ b/libkopete/kopetesockettimeoutwatcher.h
@@ -44,7 +44,7 @@ public:
~SocketTimeoutWatcher();
-signals:
+Q_SIGNALS:
/**
* Emitted when timeout is reached.
* @note socketError is always QAbstractSocket::RemoteHostClosedError
@@ -52,7 +52,7 @@ signals:
void error(QAbstractSocket::SocketError socketError);
void errorInt(int socketError);
-private slots:
+private Q_SLOTS:
void bytesWritten();
void ackTimeoutCheck();
diff --git a/libkopete/kopetetransfermanager.h b/libkopete/kopetetransfermanager.h
index 456534f..135b59d 100644
--- a/libkopete/kopetetransfermanager.h
+++ b/libkopete/kopetetransfermanager.h
@@ -190,7 +190,7 @@ public:
*/
void sendFile(const QUrl &file, const QString &localFile, unsigned long fileSize, bool mustBeLocal, QObject *sendTo, const char *slot);
-signals:
+Q_SIGNALS:
/** @brief Signals the transfer is done. */
void done(Kopete::Transfer *);
@@ -211,7 +211,7 @@ signals:
/** @brief Send a file */
void sendFile(const QUrl &file, const QString &localFile, unsigned int fileSize);
-private slots:
+private Q_SLOTS:
void slotComplete(KJob *);
private:
@@ -270,7 +270,7 @@ protected:
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* @brief Set the source and destination file names of currently processed file.
*/
@@ -302,7 +302,7 @@ public slots:
/** display a message in the chatwindow if it exists */
bool showMessage(QString text) const;
-signals:
+Q_SIGNALS:
/**
* @deprecated Use result() and check error() for ERR_USER_CANCELED
*/
@@ -321,7 +321,7 @@ private:
class Private;
Private *d;
-private slots:
+private Q_SLOTS:
void slotResultEmitted();
void slotContactDestroyed();
};
diff --git a/libkopete/kopetewalletmanager.h b/libkopete/kopetewalletmanager.h
index 19ed626..c714907 100644
--- a/libkopete/kopetewalletmanager.h
+++ b/libkopete/kopetewalletmanager.h
@@ -61,19 +61,19 @@ public:
*/
void openWallet(QObject *object, const char *slot);
-public slots:
+public Q_SLOTS:
/**
* Close the connection to the wallet. Will cause walletLost() to be emitted.
*/
void closeWallet();
-signals:
+Q_SIGNALS:
/**
* Emitted when the connection to the wallet is lost.
*/
void walletLost();
-private slots:
+private Q_SLOTS:
/**
* Called by the stored wallet pointer when it is successfully opened or
* when it fails.
@@ -106,7 +106,7 @@ class KopeteWalletSignal : public QObject
{
Q_OBJECT
friend class Kopete::WalletManager;
-signals:
+Q_SIGNALS:
void walletOpened(KWallet::Wallet *wallet);
};
diff --git a/libkopete/managedconnectionaccount.h b/libkopete/managedconnectionaccount.h
index d4bcf37..ea2c17a 100644
--- a/libkopete/managedconnectionaccount.h
+++ b/libkopete/managedconnectionaccount.h
@@ -43,7 +43,7 @@ public:
* @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit
*/
ManagedConnectionAccount(Protocol *parent, const QString &acctId);
-public slots:
+public Q_SLOTS:
/**
* @brief Begin the connection process, by checking if the connection is available with the ConnectionManager.
* This method is called by PasswordedAccount::connect()
@@ -57,7 +57,7 @@ protected:
* network connection and connect to the server.
*/
virtual void performConnectWithPassword(const QString &password) = 0;
-protected slots:
+protected Q_SLOTS:
/**
* @brief Handle a change in the network connection
* Called by the ConnectionManager when the network comes up or fails.
diff --git a/libkopete/private/kopeteutils_private.h b/libkopete/private/kopeteutils_private.h
index 859d0dd..cecac73 100644
--- a/libkopete/private/kopeteutils_private.h
+++ b/libkopete/private/kopeteutils_private.h
@@ -41,7 +41,7 @@ public:
static NotifyHelper *self();
void registerNotification(const KNotification *event, ErrorNotificationInfo error);
void unregisterNotification(const KNotification *event);
-public slots:
+public Q_SLOTS:
void slotEventActivated(unsigned int action);
void slotEventClosed();
private:
diff --git a/libkopete/private/kopeteviewmanager.h b/libkopete/private/kopeteviewmanager.h
index 108025a..877ecbb 100644
--- a/libkopete/private/kopeteviewmanager.h
+++ b/libkopete/private/kopeteviewmanager.h
@@ -66,7 +66,7 @@ public:
*/
QList<Kopete::MessageEvent *> pendingMessages(Kopete::Contact *contact);
-public slots:
+public Q_SLOTS:
/**
* Make a view visible and on top.
* @param manager The originating Kopete::ChatSession.
@@ -87,11 +87,11 @@ public slots:
void nextEvent();
-private slots:
+private Q_SLOTS:
void slotViewDestroyed(KopeteView *);
void slotChatSessionDestroyed(Kopete::ChatSession *);
-public slots:
+public Q_SLOTS:
/**
* An event has been deleted.
*/
diff --git a/libkopete/tests/kopetecontactlist_test.h b/libkopete/tests/kopetecontactlist_test.h
index e1ab75d..f495e76 100644
--- a/libkopete/tests/kopetecontactlist_test.h
+++ b/libkopete/tests/kopetecontactlist_test.h
@@ -25,7 +25,7 @@ class KopeteContactList_Test : public KUnitTest::Tester
{
public:
void allTests();
-public slots:
+public Q_SLOTS:
void testSomething();
private:
};
diff --git a/libkopete/tests/kopetemessage_test.h b/libkopete/tests/kopetemessage_test.h
index 281e068..1184957 100644
--- a/libkopete/tests/kopetemessage_test.h
+++ b/libkopete/tests/kopetemessage_test.h
@@ -39,7 +39,7 @@ class KopeteMessage_Test : public QObject
public:
KopeteMessage_Test();
-private slots:
+private Q_SLOTS:
void testPrimitives();
void testLinkParser();
diff --git a/libkopete/tests/kopetepasswordtest_program.h b/libkopete/tests/kopetepasswordtest_program.h
index 173bb3e..81cbc9b 100644
--- a/libkopete/tests/kopetepasswordtest_program.h
+++ b/libkopete/tests/kopetepasswordtest_program.h
@@ -8,7 +8,7 @@ class PasswordRetriever : public QObject
Q_OBJECT
public:
QString password;
-public slots:
+public Q_SLOTS:
void timer();
void gotPassword(const QString &);
};
diff --git a/libkopete/tests/kopetepropertiestest.h b/libkopete/tests/kopetepropertiestest.h
index 364e2c5..3c78606 100644
--- a/libkopete/tests/kopetepropertiestest.h
+++ b/libkopete/tests/kopetepropertiestest.h
@@ -26,7 +26,7 @@ class KopetePropertiesTest : public KUnitTest::Tester
{
public:
void allTests();
-public slots:
+public Q_SLOTS:
private:
};
diff --git a/libkopete/tests/kopetetask_test.h b/libkopete/tests/kopetetask_test.h
index c22d830..3518761 100644
--- a/libkopete/tests/kopetetask_test.h
+++ b/libkopete/tests/kopetetask_test.h
@@ -32,7 +32,7 @@ public:
return m_parsed;
}
-private slots:
+private Q_SLOTS:
void start();
private:
@@ -45,7 +45,7 @@ private:
class KopeteTaskTest : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testEmoticonTask();
};
diff --git a/libkopete/tests/kopetewallettest_program.h b/libkopete/tests/kopetewallettest_program.h
index 88ea56b..a2ef3d4 100644
--- a/libkopete/tests/kopetewallettest_program.h
+++ b/libkopete/tests/kopetewallettest_program.h
@@ -10,9 +10,9 @@ class Wallet;
class WalletReciever : public QObject
{
Q_OBJECT
-public slots:
+public Q_SLOTS:
void timer();
-private slots:
+private Q_SLOTS:
void gotWallet(KWallet::Wallet *w);
};
diff --git a/libkopete/tests/statusmessage_test.h b/libkopete/tests/statusmessage_test.h
index ab9a38a..30b37bc 100644
--- a/libkopete/tests/statusmessage_test.h
+++ b/libkopete/tests/statusmessage_test.h
@@ -22,7 +22,7 @@
class StatusMessage_Test : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testNormalStatus();
void testMusicMetaData();
void testAppendHash();
diff --git a/libkopete/tests/template_test.h b/libkopete/tests/template_test.h
index 5403bae..6ff9bbe 100644
--- a/libkopete/tests/template_test.h
+++ b/libkopete/tests/template_test.h
@@ -25,7 +25,7 @@ class Template_Test : public KUnitTest::Tester
{
public:
void allTests();
-public slots:
+public Q_SLOTS:
void testSomething();
private:
};
diff --git a/libkopete/tests/xmlcontactstorage_test.h b/libkopete/tests/xmlcontactstorage_test.h
index 023e796..8932c88 100644
--- a/libkopete/tests/xmlcontactstorage_test.h
+++ b/libkopete/tests/xmlcontactstorage_test.h
@@ -22,7 +22,7 @@
class XmlContactStorage_Test : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testLoad();
};
diff --git a/libkopete/ui/accountselector.h b/libkopete/ui/accountselector.h
index e0a2b0f..2e62a89 100644
--- a/libkopete/ui/accountselector.h
+++ b/libkopete/ui/accountselector.h
@@ -71,14 +71,14 @@ public:
*/
Kopete::Account *selectedItem();
-signals:
+Q_SIGNALS:
/**
* Emitted whenever the selection changed, @p acc is a pointer to the
* newly selected account
*/
void selectionChanged(Kopete::Account *acc);
-private slots:
+private Q_SLOTS:
void slotSelectionChanged(QTreeWidgetItem *item);
private:
diff --git a/libkopete/ui/addcontactpage.h b/libkopete/ui/addcontactpage.h
index 22f1c17..f212175 100644
--- a/libkopete/ui/addcontactpage.h
+++ b/libkopete/ui/addcontactpage.h
@@ -55,7 +55,7 @@ public:
*/
virtual bool apply(Kopete::Account *, Kopete::MetaContact *) = 0;
-signals:
+Q_SIGNALS:
/**
* New incarnation of validateData, emit it every time you think the current data is valid/invalid
*/
diff --git a/libkopete/ui/addressbooklinkwidget.h b/libkopete/ui/addressbooklinkwidget.h
index 716aa36..11c1d43 100644
--- a/libkopete/ui/addressbooklinkwidget.h
+++ b/libkopete/ui/addressbooklinkwidget.h
@@ -61,7 +61,7 @@ public:
* Return the selected addressbook UID.
*/
QString uid() const;
-signals:
+Q_SIGNALS:
/**
* Emitted when the selected addressee changed. addr is the KContacts::Addressee that was selected. If addr.isEmpty() is empty, the clear button was clicked.
*/
@@ -72,7 +72,7 @@ signals:
* To do so, QObject::disconnect() btnSelectAddressee and connect your own slot to this signal
*/
void selectAddresseeClicked();
-protected slots:
+protected Q_SLOTS:
void slotClearAddressee();
void slotSelectAddressee();
private:
diff --git a/libkopete/ui/addressbookselectordialog.h b/libkopete/ui/addressbookselectordialog.h
index 4dbc7cf..e207de4 100644
--- a/libkopete/ui/addressbookselectordialog.h
+++ b/libkopete/ui/addressbookselectordialog.h
@@ -73,7 +73,7 @@ public:
*/
static KContacts::Addressee getAddressee(const QString &title, const QString &message, const QString &preSelectUid, QWidget *parent = nullptr);
-protected slots:
+protected Q_SLOTS:
void accept() Q_DECL_OVERRIDE;
void reject() Q_DECL_OVERRIDE;
void slotWidgetAddresseeListClicked(QTreeWidgetItem *addressee);
diff --git a/libkopete/ui/addressbookselectorwidget.h b/libkopete/ui/addressbookselectorwidget.h
index 67c846d..ec7d998 100644
--- a/libkopete/ui/addressbookselectorwidget.h
+++ b/libkopete/ui/addressbookselectorwidget.h
@@ -71,13 +71,13 @@ private:
//KContacts::AddressBook * m_addressBook;
KContacts::Addressee m_addressee;
-protected slots:
+protected Q_SLOTS:
void slotAddAddresseeClicked();
/**
* Utility function, populates the addressee list
*/
void slotLoadAddressees();
-signals:
+Q_SIGNALS:
void addresseeListClicked(QTreeWidgetItem *addressee);
void addAddresseeClicked();
};
diff --git a/libkopete/ui/collapsiblewidget.h b/libkopete/ui/collapsiblewidget.h
index e765ab0..c15de21 100644
--- a/libkopete/ui/collapsiblewidget.h
+++ b/libkopete/ui/collapsiblewidget.h
@@ -41,7 +41,7 @@ public:
void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void clicked();
};
@@ -80,14 +80,14 @@ public:
QWidget *innerWidget() const;
void setInnerWidget(QWidget *w);
-public slots:
+public Q_SLOTS:
void setExpanded(bool collapsed);
void setWindowTitle(const QString &caption);
protected:
void init();
-private slots:
+private Q_SLOTS:
void animateCollapse(qreal);
private:
diff --git a/libkopete/ui/contactaddednotifydialog.h b/libkopete/ui/contactaddednotifydialog.h
index f14c4a2..37e66ce 100644
--- a/libkopete/ui/contactaddednotifydialog.h
+++ b/libkopete/ui/contactaddednotifydialog.h
@@ -122,7 +122,7 @@ public:
*/
Group *group() const;
-public slots:
+public Q_SLOTS:
/**
* @brief create a metacontact.
@@ -136,7 +136,7 @@ public slots:
*/
MetaContact *addContact() const;
-signals:
+Q_SIGNALS:
/**
* @brief the dialog has been applied
* @param contactId is the id of the contact passed in the constructor.
@@ -154,7 +154,7 @@ signals:
*/
void infoClicked(const QString &contactId);
-private slots:
+private Q_SLOTS:
void slotAddresseeSelected(const KContacts::Addressee &);
void slotInfoClicked();
void slotFinished();
diff --git a/libkopete/ui/kopetecontactaction.h b/libkopete/ui/kopetecontactaction.h
index 41aa8b9..0cdb584 100644
--- a/libkopete/ui/kopetecontactaction.h
+++ b/libkopete/ui/kopetecontactaction.h
@@ -46,7 +46,7 @@ public:
*/
ContactAction(Kopete::Contact *contact, KActionCollection *parent);
-signals:
+Q_SIGNALS:
/**
* Emitted when the action is triggered. Connect to this slot when
* you need to know which contact the action was triggered for
@@ -54,7 +54,7 @@ signals:
void triggered(Kopete::Contact *, bool checked);
void triggered(const QString &, bool checked);
-private slots:
+private Q_SLOTS:
/**
* @internal
* Reimplemented to emit triggered with a Kopete::Contact object
diff --git a/libkopete/ui/kopeteinfodialog.h b/libkopete/ui/kopeteinfodialog.h
index 1c4b11d..fe993da 100644
--- a/libkopete/ui/kopeteinfodialog.h
+++ b/libkopete/ui/kopeteinfodialog.h
@@ -62,7 +62,7 @@ public:
void addWidget(QWidget *w, const QString &caption);
-protected slots:
+protected Q_SLOTS:
/**
* This should be reimplemented in derived dialogs to enable saving info
*/
diff --git a/libkopete/ui/kopetelistview.h b/libkopete/ui/kopetelistview.h
index dcaeca2..6f692f4 100644
--- a/libkopete/ui/kopetelistview.h
+++ b/libkopete/ui/kopetelistview.h
@@ -127,7 +127,7 @@ public:
* Gets the mouse navigation status
*/
bool mouseNavigation() const;
-public slots:
+public Q_SLOTS:
/**
* Calls QListView::sort()
*/
@@ -150,10 +150,10 @@ protected:
*/
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void visibleSizeChanged();
-private slots:
+private Q_SLOTS:
void slotContextMenu(QTreeWidget *, QTreeWidgetItem *item, const QPoint &point);
void slotDoubleClicked(QTreeWidgetItem *item);
/**
diff --git a/libkopete/ui/kopetelistviewitem.h b/libkopete/ui/kopetelistviewitem.h
index e9ef162..d189875 100644
--- a/libkopete/ui/kopetelistviewitem.h
+++ b/libkopete/ui/kopetelistviewitem.h
@@ -467,7 +467,7 @@ protected:
void setHeight(int);
-signals:
+Q_SIGNALS:
void visibilityChanged(bool visibility);
private:
@@ -476,7 +476,7 @@ private:
void scheduleLayout();
void mySetVisible(bool b);
-private slots:
+private Q_SLOTS:
void slotColumnResized();
void slotLayoutItems();
void slotLayoutAnimateItems();
diff --git a/libkopete/ui/kopetepasswordwidget.h b/libkopete/ui/kopetepasswordwidget.h
index 295aac8..a0ef898 100644
--- a/libkopete/ui/kopetepasswordwidget.h
+++ b/libkopete/ui/kopetepasswordwidget.h
@@ -88,17 +88,17 @@ public:
*/
void setPassword(const QString &pass);
-signals:
+Q_SIGNALS:
/**
* Emitted when the information stored in this widget changes
*/
void changed();
-public slots:
+public Q_SLOTS:
/** @internal */
void receivePassword(const QString &);
-private slots:
+private Q_SLOTS:
void slotRememberChanged();
void passwordTextChanged();
diff --git a/libkopete/ui/kopetestdaction.h b/libkopete/ui/kopetestdaction.h
index 243474c..bd4708a 100644
--- a/libkopete/ui/kopetestdaction.h
+++ b/libkopete/ui/kopetestdaction.h
@@ -108,7 +108,7 @@ public:
explicit KopetePreferencesAction(KActionCollection *parent, const char *name = 0);
~KopetePreferencesAction();
-protected slots:
+protected Q_SLOTS:
void slotShowPreferences();
private:
static KSettings::Dialog *s_settingsDialog;
diff --git a/libkopete/ui/metacontactselectorwidget.h b/libkopete/ui/metacontactselectorwidget.h
index a087e8b..c699df3 100644
--- a/libkopete/ui/metacontactselectorwidget.h
+++ b/libkopete/ui/metacontactselectorwidget.h
@@ -58,12 +58,12 @@ public:
* @return true if there is a contact selected
*/
bool metaContactSelected();
-protected slots:
+protected Q_SLOTS:
/**
* Utility function, populates the metacontact list
*/
void slotLoadMetaContacts();
-signals:
+Q_SIGNALS:
void metaContactListClicked(QTreeWidgetItem *mc);
private:
class Private;
@@ -82,7 +82,7 @@ public:
virtual ~MetaContactSelectorWidgetLVI();
Kopete::MetaContact *metaContact();
virtual QString text(int column) const;
-protected slots:
+protected Q_SLOTS:
void slotPhotoChanged();
void slotDisplayNameChanged();
void buildVisualComponents();
diff --git a/libkopete/ui/webcamwidget.h b/libkopete/ui/webcamwidget.h
index 8b1f838..8876abb 100644
--- a/libkopete/ui/webcamwidget.h
+++ b/libkopete/ui/webcamwidget.h
@@ -54,7 +54,7 @@ public:
* @param text The text to be displayed
*/
void setText(const QString &text);
-protected slots:
+protected Q_SLOTS:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
private:
diff --git a/plugins/addbookmarks/addbookmarksplugin.h b/plugins/addbookmarks/addbookmarksplugin.h
index 1ad7c0f..2ed1866 100644
--- a/plugins/addbookmarks/addbookmarksplugin.h
+++ b/plugins/addbookmarks/addbookmarksplugin.h
@@ -52,11 +52,11 @@ private:
KBookmarkGroup getFolder(KBookmarkGroup group, QString folder);
bool isURLInGroup(const KUrl &url, KBookmarkGroup group);
QTextCodec *getPageEncoding(const QByteArray &data);
-public slots:
+public Q_SLOTS:
void slotBookmarkURLsInMessage(Kopete::Message &msg);
void slotReloadSettings();
-private slots:
+private Q_SLOTS:
void slotAddKopeteBookmark(KIO::Job *transfer, const QByteArray &data);
};
diff --git a/plugins/addbookmarks/addbookmarkspreferences.h b/plugins/addbookmarks/addbookmarkspreferences.h
index 8c3f34f..0e6963f 100644
--- a/plugins/addbookmarks/addbookmarkspreferences.h
+++ b/plugins/addbookmarks/addbookmarkspreferences.h
@@ -36,7 +36,7 @@ public:
void load() Q_DECL_OVERRIDE;
void save() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void PreferencesChanged();
private:
@@ -45,7 +45,7 @@ private:
QStringListModel *p_contactsListModel;
BookmarksPrefsSettings m_settings;
-private slots:
+private Q_SLOTS:
void slotSetStatusChanged();
};
diff --git a/plugins/autoreplace/autoreplaceplugin.h b/plugins/autoreplace/autoreplaceplugin.h
index 4837622..bf36659 100644
--- a/plugins/autoreplace/autoreplaceplugin.h
+++ b/plugins/autoreplace/autoreplaceplugin.h
@@ -45,7 +45,7 @@ public:
AutoReplacePlugin(QObject *parent, const QVariantList &args);
~AutoReplacePlugin();
-private slots:
+private Q_SLOTS:
void slotInterceptMessage(Kopete::Message &msg);
void slotSettingsChanged();
diff --git a/plugins/autoreplace/autoreplacepreferences.h b/plugins/autoreplace/autoreplacepreferences.h
index a745401..c57eeb2 100644
--- a/plugins/autoreplace/autoreplacepreferences.h
+++ b/plugins/autoreplace/autoreplacepreferences.h
@@ -43,7 +43,7 @@ public:
void load() Q_DECL_OVERRIDE;
void defaults() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
//void slotSettingsDirty();
void slotAddCouple();
void slotEditCouple();
@@ -51,7 +51,7 @@ private slots:
void slotEnableAddEdit(const QString &);
void slotSelectionChanged();
-protected slots:
+protected Q_SLOTS:
virtual void slotWidgetModified();
private:
Ui::AutoReplacePrefsUI *preferencesDialog;
diff --git a/plugins/contactnotes/contactnotesedit.h b/plugins/contactnotes/contactnotesedit.h
index 61477e9..3f8d99a 100644
--- a/plugins/contactnotes/contactnotesedit.h
+++ b/plugins/contactnotes/contactnotesedit.h
@@ -48,9 +48,9 @@ private:
QLabel *m_label;
QTextEdit *m_linesEdit;
-protected slots: // Protected slots
+protected Q_SLOTS: // Protected slots
void slotButtonClicked(int buttonCode) Q_DECL_OVERRIDE;
-signals: // Signals
+Q_SIGNALS: // Signals
void notesChanged(const QString &, Kopete::MetaContact *);
};
diff --git a/plugins/contactnotes/contactnotesplugin.h b/plugins/contactnotes/contactnotesplugin.h
index 0db2bb9..e041591 100644
--- a/plugins/contactnotes/contactnotesplugin.h
+++ b/plugins/contactnotes/contactnotesplugin.h
@@ -51,13 +51,13 @@ public:
QString notes(Kopete::MetaContact *m);
-public slots:
+public Q_SLOTS:
void setNotes(const QString &n, Kopete::MetaContact *m);
private:
static ContactNotesPlugin *pluginStatic_;
-private slots: // Private slots
+private Q_SLOTS: // Private slots
/** No descriptions */
void slotEditInfo();
};
diff --git a/plugins/highlight/highlightplugin.h b/plugins/highlight/highlightplugin.h
index bf5b380..c4c8791 100644
--- a/plugins/highlight/highlightplugin.h
+++ b/plugins/highlight/highlightplugin.h
@@ -55,7 +55,7 @@ public:
HighlightPlugin(QObject *parent, const QVariantList &args);
~HighlightPlugin();
-public slots:
+public Q_SLOTS:
void slotIncomingMessage(Kopete::Message &msg);
void slotSettingsChanged();
diff --git a/plugins/highlight/highlightpreferences.h b/plugins/highlight/highlightpreferences.h
index 68470a4..2cdb156 100644
--- a/plugins/highlight/highlightpreferences.h
+++ b/plugins/highlight/highlightpreferences.h
@@ -51,7 +51,7 @@ private:
bool donttouch;
-private slots:
+private Q_SLOTS:
void slotCurrentFilterChanged();
void slotAddFilter();
void slotRemoveFilter();
diff --git a/plugins/latex/latexguiclient.h b/plugins/latex/latexguiclient.h
index 27b3578..6b5e289 100644
--- a/plugins/latex/latexguiclient.h
+++ b/plugins/latex/latexguiclient.h
@@ -42,7 +42,7 @@ public:
explicit LatexGUIClient(Kopete::ChatSession *parent);
~LatexGUIClient();
-private slots:
+private Q_SLOTS:
void slotPreview();
private:
diff --git a/plugins/latex/latexplugin.h b/plugins/latex/latexplugin.h
index 1a6a536..0911f12 100644
--- a/plugins/latex/latexplugin.h
+++ b/plugins/latex/latexplugin.h
@@ -53,7 +53,7 @@ public:
LatexPlugin(QObject *parent, const QVariantList &args);
~LatexPlugin();
-public slots:
+public Q_SLOTS:
void slotMessageAboutToShow(Kopete::Message &msg);
void slotMessageAboutToSend(Kopete::Message &msg);
void slotNewChatSession(Kopete::ChatSession *KMM);
diff --git a/plugins/latex/latexpreferences.h b/plugins/latex/latexpreferences.h
index b50c735..5148aa9 100644
--- a/plugins/latex/latexpreferences.h
+++ b/plugins/latex/latexpreferences.h
@@ -43,7 +43,7 @@ public:
private:
Ui::LatexPrefsUI *m_preferencesDialog;
-private slots:
+private Q_SLOTS:
void slotModified();
};
diff --git a/plugins/otr/authenticationwizard.h b/plugins/otr/authenticationwizard.h
index d4148ce..54d5244 100644
--- a/plugins/otr/authenticationwizard.h
+++ b/plugins/otr/authenticationwizard.h
@@ -89,7 +89,7 @@ private:
QWizardPage *createMVPage();
QWizardPage *createFinalPage();
-private slots:
+private Q_SLOTS:
void cancelVerification();
void updateInfoBox();
void notificationActivated(unsigned int);
diff --git a/plugins/otr/otrguiclient.h b/plugins/otr/otrguiclient.h
index c51e079..e0b713b 100644
--- a/plugins/otr/otrguiclient.h
+++ b/plugins/otr/otrguiclient.h
@@ -57,13 +57,13 @@ private:
QAction *actionDisableOtr;
QAction *actionVerifyFingerprint;
-private slots:
+private Q_SLOTS:
void slotEnableOtr();
void slotDisableOtr();
void encryptionEnabled(Kopete::ChatSession *session, int state);
void slotVerifyFingerprint();
-signals:
+Q_SIGNALS:
void signalOtrChatsession(Kopete::ChatSession *session, bool enable);
void signalVerifyFingerprint(Kopete::ChatSession *session);
};
diff --git a/plugins/otr/otrlchatinterface.h b/plugins/otr/otrlchatinterface.h
index fdbb5f1..d912f68 100644
--- a/plugins/otr/otrlchatinterface.h
+++ b/plugins/otr/otrlchatinterface.h
@@ -107,12 +107,12 @@ private:
static void create_instag(void *opdata, const char *accountname, const char *protocol);
static void timer_control(void *opdata, unsigned int interval);
-private slots:
+private Q_SLOTS:
void otrlMessagePoll();
void replayStoredMessages();
void chatSessionDestroyed(Kopete::ChatSession *chatSession);
-signals:
+Q_SIGNALS:
void goneSecure(Kopete::ChatSession *session, int state);
};
diff --git a/plugins/otr/otrplugin.h b/plugins/otr/otrplugin.h
index 950102e..eedee8f 100644
--- a/plugins/otr/otrplugin.h
+++ b/plugins/otr/otrplugin.h
@@ -91,14 +91,14 @@ public:
void emitGoneSecure(Kopete::ChatSession *session, int status);
QMap<QString, QPair<QString, bool> > getMessageCache();
-public slots:
+public Q_SLOTS:
void slotOutgoingMessage(Kopete::Message &msg);
void slotEnableOtr(Kopete::ChatSession *session, bool enable);
void slotSettingsChanged();
void slotVerifyFingerprint(Kopete::ChatSession *session);
-private slots:
+private Q_SLOTS:
void slotNewChatSessionWindow(Kopete::ChatSession *);
void slotSelectionChanged(bool single);
void slotSetPolicy();
@@ -110,18 +110,7 @@ private:
OtrlChatInterface *otrlChatInterface;
QMap<QString, QPair<QString, bool> > messageCache;
KSelectAction *otrPolicyMenu;
-
-/* KActionMenu *otrPolicyMenuBar;
- KActionMenu *otrPolicyPopup;
- KAction *otrPolicyDefault;
- KAction *otrPolicyAlways;
- KAction *otrPolicyOpportunistic;
- KAction *otrPolicyManual;
- KAction *otrPolicyNever;
-// SessionManager manager
-*/
-
-signals:
+Q_SIGNALS:
void goneSecure(Kopete::ChatSession *session, int state);
};
diff --git a/plugins/otr/otrpreferences.h b/plugins/otr/otrpreferences.h
index 86301ae..f49e260 100644
--- a/plugins/otr/otrpreferences.h
+++ b/plugins/otr/otrpreferences.h
@@ -44,7 +44,7 @@ private:
OtrlConfInterface *otrlConfInterface;
QMap<int, int> privKeys;
-private slots: // Public slots
+private Q_SLOTS: // Public slots
void generateFingerprint();
void showPrivFingerprint(int accountnr);
void verifyFingerprint();
diff --git a/plugins/privacy/privacyguiclient.h b/plugins/privacy/privacyguiclient.h
index b6b93df..7901960 100644
--- a/plugins/privacy/privacyguiclient.h
+++ b/plugins/privacy/privacyguiclient.h
@@ -30,7 +30,7 @@ class PrivacyGUIClient : public QObject, public KXMLGUIClient
public:
PrivacyGUIClient(Kopete::ChatSession *parent = nullptr);
~PrivacyGUIClient();
-private slots:
+private Q_SLOTS:
void slotAddToWhiteList();
void slotAddToBlackList();
diff --git a/plugins/statistics/statisticsdialog.h b/plugins/statistics/statisticsdialog.h
index 412c3e1..0c11d50 100644
--- a/plugins/statistics/statisticsdialog.h
+++ b/plugins/statistics/statisticsdialog.h
@@ -84,7 +84,7 @@ private:
void generatePageForDay(const int dayOfWeek);
void generatePageForMonth(const int monthOfYear);
-private slots:
+private Q_SLOTS:
/**
* We manage the openUrlRequestDelayed signal from the generalHTMLPart->browserExtension() in order to
* generate requested pages on the fly.
diff --git a/plugins/statistics/statisticsplugin.h b/plugins/statistics/statisticsplugin.h
index 0df879a..a517a25 100644
--- a/plugins/statistics/statisticsplugin.h
+++ b/plugins/statistics/statisticsplugin.h
@@ -104,12 +104,12 @@ public:
}
void aboutToUnload() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
// Do the initializations
void slotInitialize();
void slotInitialize2();
-public slots:
+public Q_SLOTS:
/** \brief This slot is called when the status of a contact changed.
*
diff --git a/plugins/texteffect/texteffectplugin.h b/plugins/texteffect/texteffectplugin.h
index cbd11b9..840c43c 100644
--- a/plugins/texteffect/texteffectplugin.h
+++ b/plugins/texteffect/texteffectplugin.h
@@ -54,7 +54,7 @@ public:
TextEffectPlugin(QObject *parent, const QVariantList &args);
~TextEffectPlugin();
-public slots:
+public Q_SLOTS:
void slotOutgoingMessage(Kopete::Message &msg);
void slotSettingsChanged();
diff --git a/plugins/texteffect/texteffectpreferences.h b/plugins/texteffect/texteffectpreferences.h
index f4f6f90..0873044 100644
--- a/plugins/texteffect/texteffectpreferences.h
+++ b/plugins/texteffect/texteffectpreferences.h
@@ -48,7 +48,7 @@ private:
Ui::TextEffectPrefs *preferencesDialog;
TextEffectConfig *config;
-private slots: // Public slots
+private Q_SLOTS: // Public slots
void slotAddPressed();
void slotRemovePressed();
void slotUpPressed();
diff --git a/plugins/translator/translatordialog.h b/plugins/translator/translatordialog.h
index f8d371f..44c7821 100644
--- a/plugins/translator/translatordialog.h
+++ b/plugins/translator/translatordialog.h
@@ -41,7 +41,7 @@ public:
private:
KTextEdit *m_textEdit;
-private slots: // Public slots
+private Q_SLOTS: // Public slots
// void slotFinished();
};
diff --git a/plugins/translator/translatorguiclient.h b/plugins/translator/translatorguiclient.h
index 17ccaf8..15b8845 100644
--- a/plugins/translator/translatorguiclient.h
+++ b/plugins/translator/translatorguiclient.h
@@ -44,7 +44,7 @@ public:
explicit TranslatorGUIClient(Kopete::ChatSession *parent);
~TranslatorGUIClient();
-private slots:
+private Q_SLOTS:
void slotTranslateChat();
void messageTranslated(const QVariant &);
diff --git a/plugins/translator/translatorplugin.h b/plugins/translator/translatorplugin.h
index c11879b..4f312e5 100644
--- a/plugins/translator/translatorplugin.h
+++ b/plugins/translator/translatorplugin.h
@@ -70,7 +70,7 @@ public:
ShowDialog = 3
};
-private slots:
+private Q_SLOTS:
void slotIncomingMessage(Kopete::Message &msg);
void slotOutgoingMessage(Kopete::Message &msg);
void slotDataReceived(KIO::Job *, const QByteArray &data);
diff --git a/plugins/translator/translatorpreferences.h b/plugins/translator/translatorpreferences.h
index 1aa864d..4560210 100644
--- a/plugins/translator/translatorpreferences.h
+++ b/plugins/translator/translatorpreferences.h
@@ -41,12 +41,12 @@ public:
virtual void save();
virtual void load();
-private slots:
+private Q_SLOTS:
void updateLanguageList();
void slotModified();
void slotShowPreviousChanged(bool);
-signals:
+Q_SIGNALS:
void preferencesChanged();
private:
diff --git a/plugins/urlpicpreview/linkpreview.h b/plugins/urlpicpreview/linkpreview.h
index add0722..13455c7 100644
--- a/plugins/urlpicpreview/linkpreview.h
+++ b/plugins/urlpicpreview/linkpreview.h
@@ -42,7 +42,7 @@ public:
private:
LinkPreview();
-protected slots:
+protected Q_SLOTS:
void completed();
private:
diff --git a/plugins/urlpicpreview/urlpicpreviewplugin.h b/plugins/urlpicpreview/urlpicpreviewplugin.h
index 1f5235c..5d7dfd6 100644
--- a/plugins/urlpicpreview/urlpicpreviewplugin.h
+++ b/plugins/urlpicpreview/urlpicpreviewplugin.h
@@ -38,7 +38,7 @@ class URLPicPreviewPlugin : public Kopete::Plugin
URLPicPreviewPlugin(const URLPicPreviewPlugin &);
URLPicPreviewPlugin &operator=(const URLPicPreviewPlugin &);
-signals:
+Q_SIGNALS:
void abortAllOperations();
public:
@@ -49,7 +49,7 @@ private:
QString prepareBody(const QString &parsedBody, uint previewCount = 0);
QString createPreviewPicture(const KUrl &url);
-protected slots:
+protected Q_SLOTS:
void aboutToDisplay(Kopete::Message &message);
void readyForUnload();
diff --git a/plugins/webpresence/webpresenceplugin.h b/plugins/webpresence/webpresenceplugin.h
index 4908a2a..76805d4 100644
--- a/plugins/webpresence/webpresenceplugin.h
+++ b/plugins/webpresence/webpresenceplugin.h
@@ -69,7 +69,7 @@ public:
void aboutToUnload() Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
/**
* Called when settings were changed
*/
diff --git a/protocols/bonjour/bonjouraccount.h b/protocols/bonjour/bonjouraccount.h
index b6fc210..90be8a2 100644
--- a/protocols/bonjour/bonjouraccount.h
+++ b/protocols/bonjour/bonjouraccount.h
@@ -165,7 +165,7 @@ public:
const QByteArray getlastName() const;
const QByteArray getemailAddress() const;
-public slots:
+public Q_SLOTS:
/**
* @brief Slots Called When a Contact Comes Online
@@ -301,7 +301,7 @@ private:
*/
void wipeOutContact(Kopete::Contact *c);
-protected slots:
+protected Q_SLOTS:
/**
* @brief Change the account's status. Called by KActions and internally.
*/
diff --git a/protocols/bonjour/bonjourcontact.h b/protocols/bonjour/bonjourcontact.h
index ed6ee78..6ed2bb8 100644
--- a/protocols/bonjour/bonjourcontact.h
+++ b/protocols/bonjour/bonjourcontact.h
@@ -129,7 +129,7 @@ public:
*/
void setConnection(BonjourContactConnection *conn);
-public slots:
+public Q_SLOTS:
/**
* @brief Send an Outgoing message
*
@@ -161,7 +161,7 @@ public slots:
*/
void connectionDisconnected(BonjourContactConnection *conn);
-protected slots:
+protected Q_SLOTS:
/**
* @brief Show the settings dialog
*
diff --git a/protocols/bonjour/bonjourcontactconnection.h b/protocols/bonjour/bonjourcontactconnection.h
index a657d0b..479072e 100644
--- a/protocols/bonjour/bonjourcontactconnection.h
+++ b/protocols/bonjour/bonjourcontactconnection.h
@@ -289,7 +289,7 @@ public:
*/
void setRemoteAndLocal(const QString &remote, const QString &local);
-signals:
+Q_SIGNALS:
/**
* @brief This Signal is Emitted when there is new data
@@ -332,7 +332,7 @@ signals:
*/
void errorCouldNotConnect();
-public slots:
+public Q_SLOTS:
/**
* @brief This slot is called by the socket, to signify new data
diff --git a/protocols/groupwise/gwaccount.h b/protocols/groupwise/gwaccount.h
index 100bfd4..e3579ac 100644
--- a/protocols/groupwise/gwaccount.h
+++ b/protocols/groupwise/gwaccount.h
@@ -147,7 +147,7 @@ public:
void syncContact( GroupWiseContact * contact );
-public slots:
+public Q_SLOTS:
void slotTestRTFize();
@@ -166,14 +166,14 @@ public slots:
*/
void setStatusMessage( const Kopete::StatusMessage &statusMessage ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void conferenceCreated( const int mmId, const GroupWise::ConferenceGuid & guid );
void conferenceCreationFailed( const int mmId, const int statusCode );
void contactTyping( const ConferenceEvent & );
void contactNotTyping( const ConferenceEvent & );
void privacyChanged( const QString & dn, bool allowed );
-protected slots:
+protected Q_SLOTS:
void slotMessageSendingFailed();
/**
* Set an auto reply message for use when the account is away
@@ -361,9 +361,9 @@ private:
Q_OBJECT
public:
OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const QString &text, const QString &message, const QIcon &pix, QObject *parent=0, const char *name=0);
- signals:
+ Q_SIGNALS:
void activated( const Kopete::OnlineStatus& status, const QString & );
- private slots:
+ private Q_SLOTS:
void slotActivated();
private:
Kopete::OnlineStatus m_status;
diff --git a/protocols/groupwise/gwbytestream.h b/protocols/groupwise/gwbytestream.h
index b39033d..7b0c1b4 100644
--- a/protocols/groupwise/gwbytestream.h
+++ b/protocols/groupwise/gwbytestream.h
@@ -46,13 +46,13 @@ public:
QTcpSocket *socket () const;
-signals:
+Q_SIGNALS:
void connected ();
protected:
int tryWrite () Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotConnected ();
void slotConnectionClosed ();
void slotReadyRead ();
diff --git a/protocols/groupwise/gwconnector.h b/protocols/groupwise/gwconnector.h
index 0683f47..fa4ec8f 100644
--- a/protocols/groupwise/gwconnector.h
+++ b/protocols/groupwise/gwconnector.h
@@ -49,7 +49,7 @@ public:
int errorCode ();
-private slots:
+private Q_SLOTS:
void slotConnected ();
void slotError ( int );
diff --git a/protocols/groupwise/gwcontact.h b/protocols/groupwise/gwcontact.h
index 50ff907..42d7dfc 100644
--- a/protocols/groupwise/gwcontact.h
+++ b/protocols/groupwise/gwcontact.h
@@ -139,7 +139,7 @@ public:
*/
bool messageReceivedOffline() const;
-public slots:
+public Q_SLOTS:
/**
* Transmits an outgoing message to the server
* Called when the chat window send button has been pressed
@@ -158,7 +158,7 @@ public slots:
protected:
// debug function to see what message managers we have on the server
void dumpManagers();
-protected slots:
+protected Q_SLOTS:
/**
* Show the contact's properties
*/
diff --git a/protocols/groupwise/gwmessagemanager.h b/protocols/groupwise/gwmessagemanager.h
index 2e01d02..23d1ebe 100644
--- a/protocols/groupwise/gwmessagemanager.h
+++ b/protocols/groupwise/gwmessagemanager.h
@@ -99,7 +99,7 @@ public:
* Reimplemented from Kopete::ChatSession - invites contacts via DND
*/
void inviteContact(const QString& ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
/**
* Tell the contact we got a GUID so it can route incoming messages here.
*/
@@ -117,7 +117,7 @@ protected:
* Sends any messages and invitations that were queued while waiting for the conference to be created
*/
void dequeueMessagesAndInvites();
-protected slots:
+protected Q_SLOTS:
/**
* Receive the GUID returned by the server when we start a chat.
* @param mmId Message Manager ID, used to determine if this GUID is meant for this message manager
diff --git a/protocols/groupwise/libgroupwise/bytestream.h b/protocols/groupwise/libgroupwise/bytestream.h
index 20efef7..b57b844 100644
--- a/protocols/groupwise/libgroupwise/bytestream.h
+++ b/protocols/groupwise/libgroupwise/bytestream.h
@@ -48,7 +48,7 @@ public:
static void appendArray(QByteArray *a, const QByteArray &b);
static QByteArray takeArray(QByteArray *from, int size = 0, bool del = true);
-signals:
+Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void readyRead();
diff --git a/protocols/groupwise/libgroupwise/chatroommanager.h b/protocols/groupwise/libgroupwise/chatroommanager.h
index 2a1c14d..d7a57ff 100644
--- a/protocols/groupwise/libgroupwise/chatroommanager.h
+++ b/protocols/groupwise/libgroupwise/chatroommanager.h
@@ -42,12 +42,12 @@ public:
void requestProperties(const QString &displayName);
void updateRooms();
void updateCounts();
-signals:
+Q_SIGNALS:
void gotProperties(const GroupWise::Chatroom &);
void updated();
protected:
void getChatrooms(bool refresh);
-protected slots:
+protected Q_SLOTS:
/**
* Used to initialise the list of chatrooms in response to a SearchChatTask.
*/
diff --git a/protocols/groupwise/libgroupwise/client.h b/protocols/groupwise/libgroupwise/client.h
index 544c698..b22d844 100644
--- a/protocols/groupwise/libgroupwise/client.h
+++ b/protocols/groupwise/libgroupwise/client.h
@@ -244,7 +244,7 @@ fd * @param password
*/
Task* rootTask();
- signals:
+ Q_SIGNALS:
/** CONNECTION EVENTS */
/**
* Notifies that the login process has succeeded.
@@ -361,7 +361,7 @@ fd * @param password
* Instantiate all the event handling tasks
*/
void initialiseEventTasks();
- protected slots:
+ protected Q_SLOTS:
// INTERNAL, FOR USE BY TASKS' finished() SIGNALS //
void lt_loginFinished();
void sst_statusChanged();
diff --git a/protocols/groupwise/libgroupwise/compress.h b/protocols/groupwise/libgroupwise/compress.h
index ccc98d9..cb4ca34 100644
--- a/protocols/groupwise/libgroupwise/compress.h
+++ b/protocols/groupwise/libgroupwise/compress.h
@@ -17,7 +17,7 @@ public:
int write(const QByteArray&);
-protected slots:
+protected Q_SLOTS:
void flush();
protected:
@@ -39,7 +39,7 @@ public:
int write(const QByteArray&);
-protected slots:
+protected Q_SLOTS:
void flush();
protected:
diff --git a/protocols/groupwise/libgroupwise/compressionhandler.h b/protocols/groupwise/libgroupwise/compressionhandler.h
index 056aafd..9f1d78e 100644
--- a/protocols/groupwise/libgroupwise/compressionhandler.h
+++ b/protocols/groupwise/libgroupwise/compressionhandler.h
@@ -19,7 +19,7 @@ public:
QByteArray readOutgoing(int*);
int errorCode();
-signals:
+Q_SIGNALS:
void readyRead();
void readyReadOutgoing();
void error();
diff --git a/protocols/groupwise/libgroupwise/connector.h b/protocols/groupwise/libgroupwise/connector.h
index 40543bb..7d837b1 100644
--- a/protocols/groupwise/libgroupwise/connector.h
+++ b/protocols/groupwise/libgroupwise/connector.h
@@ -43,7 +43,7 @@ public:
QHostAddress peerAddress() const;
quint16 peerPort() const;
-signals:
+Q_SIGNALS:
void connected();
void error();
diff --git a/protocols/groupwise/libgroupwise/coreprotocol.h b/protocols/groupwise/libgroupwise/coreprotocol.h
index 59fe68b..9e1ad66 100644
--- a/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -152,7 +152,7 @@ public:
*/
int state();
-signals:
+Q_SIGNALS:
/**
* Emitted as the core protocol converts fields to wire ready data
*/
@@ -161,7 +161,7 @@ signals:
* Emitted when there is incoming data, parsed into a Transfer
*/
void incomingData();
-protected slots:
+protected Q_SLOTS:
/**
* Just a debug method to test emitting to the socket, atm - should go to the ClientStream
*/
diff --git a/protocols/groupwise/libgroupwise/gwclientstream.h b/protocols/groupwise/libgroupwise/gwclientstream.h
index 9d2ac6c..492b2b7 100644
--- a/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -131,7 +131,7 @@ public:
/*# void writeDirect(const QString &s); // must be for debug testing*/
void setNoopTime(int mills);
-signals:
+Q_SIGNALS:
void connected();
void securityLayerActivated(int);
//void needAuthParams(bool user, bool pass, bool realm);
@@ -140,10 +140,10 @@ signals:
// # void incomingXml(const QString &s); // signals emitted in processNext but don't seem to go anywhere...
// # void outgoingXml(const QString &s); //
// void readyRead(); //signals that there is a transfer ready to be read - defined in stream
-public slots:
+public Q_SLOTS:
void continueAfterWarning();
-private slots:
+private Q_SLOTS:
void cr_connected();
void cr_error();
/**
diff --git a/protocols/groupwise/libgroupwise/privacymanager.h b/protocols/groupwise/libgroupwise/privacymanager.h
index bef34a3..20d83be 100644
--- a/protocols/groupwise/libgroupwise/privacymanager.h
+++ b/protocols/groupwise/libgroupwise/privacymanager.h
@@ -54,9 +54,9 @@ public:
// change everything at once
void setPrivacy( bool defaultIsDeny, const QStringList & allowList, const QStringList & denyList );
-signals:
+Q_SIGNALS:
void privacyChanged( const QString &dn, bool allowed );
-public slots:
+public Q_SLOTS:
/**
* Used to initialise the privacy manager using the server side privacy list
*/
@@ -73,7 +73,7 @@ protected:
* @return The difference between the two sets
*/
QStringList difference( const QStringList & lhs, const QStringList & rhs );
-protected slots:
+protected Q_SLOTS:
// Receive the results of Tasks manipulating the privacy lists
void slotDefaultPolicyChanged();
void slotAllowAdded();
diff --git a/protocols/groupwise/libgroupwise/qcatlshandler.h b/protocols/groupwise/libgroupwise/qcatlshandler.h
index 918258a..e67397c 100644
--- a/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -44,13 +44,13 @@ public:
void write(const QByteArray &a) Q_DECL_OVERRIDE;
void writeIncoming(const QByteArray &a) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void tlsHandshaken();
-public slots:
+public Q_SLOTS:
void continueAfterHandshake();
-private slots:
+private Q_SLOTS:
void tls_handshaken();
void tls_readyRead();
void tls_readyReadOutgoing();
diff --git a/protocols/groupwise/libgroupwise/safedelete.h b/protocols/groupwise/libgroupwise/safedelete.h
index c41b131..a359b64 100644
--- a/protocols/groupwise/libgroupwise/safedelete.h
+++ b/protocols/groupwise/libgroupwise/safedelete.h
@@ -63,7 +63,7 @@ public:
static SafeDeleteLater *ensureExists();
void deleteItLater(QObject *o);
-private slots:
+private Q_SLOTS:
void explode();
private:
diff --git a/protocols/groupwise/libgroupwise/securestream.h b/protocols/groupwise/libgroupwise/securestream.h
index c3f4c9e..ebad938 100644
--- a/protocols/groupwise/libgroupwise/securestream.h
+++ b/protocols/groupwise/libgroupwise/securestream.h
@@ -57,11 +57,11 @@ public:
void write(const QByteArray &) Q_DECL_OVERRIDE;
int bytesToWrite() const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void tlsHandshaken();
void tlsClosed();
-private slots:
+private Q_SLOTS:
void bs_readyRead();
void bs_bytesWritten(int);
@@ -131,14 +131,14 @@ public:
bool tls_done;
int prebytes;
-signals:
+Q_SIGNALS:
void tlsHandshaken();
void tlsClosed(const QByteArray &);
void readyRead(const QByteArray &);
void needWrite(const QByteArray &);
void error(int);
-private slots:
+private Q_SLOTS:
void tls_handshaken();
void tls_readyRead();
void tls_readyReadOutgoing(int plainBytes);
diff --git a/protocols/groupwise/libgroupwise/stream.h b/protocols/groupwise/libgroupwise/stream.h
index ca6d38e..3071235 100644
--- a/protocols/groupwise/libgroupwise/stream.h
+++ b/protocols/groupwise/libgroupwise/stream.h
@@ -80,7 +80,7 @@ public:
// static QString xmlToString(const static XmlProtocol *foo = 0;
//QDomElement &e, bool clip=false);
-signals:
+Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void readyRead();
diff --git a/protocols/groupwise/libgroupwise/task.h b/protocols/groupwise/libgroupwise/task.h
index ee35ad5..1bb5e14 100644
--- a/protocols/groupwise/libgroupwise/task.h
+++ b/protocols/groupwise/libgroupwise/task.h
@@ -59,7 +59,7 @@ public:
virtual bool take( Transfer* transfer );
void safeDelete();
-signals:
+Q_SIGNALS:
void finished();
protected:
@@ -86,7 +86,7 @@ protected:
* Direct setter for Tasks which don't have any fields
*/
void setTransfer( Transfer * transfer );
-private slots:
+private Q_SLOTS:
void clientDisconnected();
void done();
diff --git a/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index dedac0c..f1afc93 100644
--- a/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -41,7 +41,7 @@ public:
ConferenceTask( Task* parent );
~ConferenceTask();
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void typing( const ConferenceEvent & );
void notTyping( const ConferenceEvent & );
void joined( const ConferenceEvent & );
@@ -55,7 +55,7 @@ signals:
// GW7
void broadcast( const ConferenceEvent &);
void systemBroadcast( const ConferenceEvent &);
-protected slots:
+protected Q_SLOTS:
void slotReceiveUserDetails( const GroupWise::ContactDetails & );
protected:
quint32 readFlags( QDataStream & din );
diff --git a/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index 3584063..57bdef7 100644
--- a/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -35,7 +35,7 @@ public:
ConnectionTask(Task* parent);
~ConnectionTask();
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void connectedElsewhere();
void serverDisconnect();
};
diff --git a/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index 56f7650..68e44ce 100644
--- a/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -45,7 +45,7 @@ public:
int clientConfId() const;
GroupWise::ConferenceGuid conferenceGUID() const;
-signals:
+Q_SIGNALS:
void created( const GroupWise::ConferenceGuid & guid );
private:
int m_confId; // the conference id given us before making the request
diff --git a/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index 6bc6899..77245e2 100644
--- a/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -74,7 +74,7 @@ public:
* Starts off the whole process
*/
void onGo() Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void slotContactAdded( const ContactItem & );
void slotCheckContactInstanceCreated();
private:
diff --git a/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index e96985f..05d967c 100644
--- a/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -39,7 +39,7 @@ public:
~GetDetailsTask();
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
void userDNs( const QStringList & userDNs );
-signals:
+Q_SIGNALS:
void gotContactUserDetails( const GroupWise::ContactDetails & );
protected:
GroupWise::ContactDetails extractUserDetails( Field::MultiField * details );
diff --git a/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index fe26afe..80dbee6 100644
--- a/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -35,7 +35,7 @@ public:
~GetStatusTask();
void userDN( const QString & dn );
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void gotStatus( const QString & contactId, quint16 status, const QString & statusText );
private:
QString m_userDN;
diff --git a/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index 2ecc0cd..b0f1aad 100644
--- a/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -43,7 +43,7 @@ public:
QStringList participants() const;
QStringList invitees() const;
ConferenceGuid guid() const;
-public slots:
+public Q_SLOTS:
void slotReceiveUserDetails( const GroupWise::ContactDetails & details );
private:
ConferenceGuid m_guid;
diff --git a/protocols/groupwise/libgroupwise/tasks/logintask.h b/protocols/groupwise/libgroupwise/tasks/logintask.h
index 269a7a4..d7eb910 100644
--- a/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -52,7 +52,7 @@ protected:
QStringList readPrivacyItems( const QByteArray & tag, Field::FieldList & fields );
void extractCustomStatuses( Field::FieldList & fields );
void extractKeepalivePeriod( Field::FieldList & fields );
-signals:
+Q_SIGNALS:
void gotMyself( const GroupWise::ContactDetails & );
void gotFolder( const FolderItem & );
void gotContact( const ContactItem & );
diff --git a/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index b643022..b8a783f 100644
--- a/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -40,7 +40,7 @@ public:
ModifyContactListTask(Task* parent);
~ModifyContactListTask();
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void gotFolderAdded( const FolderItem &);
void gotFolderDeleted( const FolderItem & );
void gotContactAdded( const ContactItem & );
diff --git a/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
index 8d6278d..9fa43b7 100644
--- a/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
+++ b/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
@@ -27,7 +27,7 @@ public:
~NeedFolderTask();
void createFolder();
virtual void onFolderCreated() = 0;
-protected slots:
+protected Q_SLOTS:
void slotFolderAdded( const FolderItem & );
void slotFolderTaskFinished();
protected:
diff --git a/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index 1d8bd69..4a0d566 100644
--- a/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -55,7 +55,7 @@ class LIBGROUPWISE_EXPORT SearchChatTask : public RequestTask
* Access the results of the search
*/
QList< GroupWise::ChatroomSearchResult > results();
- protected slots:
+ protected Q_SLOTS:
void slotPollForResults();
void slotGotPollResults();
private:
diff --git a/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index 578f5c8..bff7448 100644
--- a/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -51,7 +51,7 @@ public:
* Access the results of the search
*/
QList< GroupWise::ContactDetails > results();
-protected slots:
+protected Q_SLOTS:
void slotPollForResults();
void slotGotPollResults();
private:
diff --git a/protocols/groupwise/libgroupwise/tasks/statustask.h b/protocols/groupwise/libgroupwise/tasks/statustask.h
index 57ad968..b04e7ed 100644
--- a/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -33,7 +33,7 @@ public:
StatusTask(Task* parent);
~StatusTask();
bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void gotStatus( const QString & contactId, quint16 status, const QString & statusText );
};
diff --git a/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index fbd6e00..8215ca9 100644
--- a/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -37,7 +37,7 @@ public:
~ClientStreamTest();
-public slots:
+public Q_SLOTS:
void slotDoTest();
void slotConnected();
diff --git a/protocols/groupwise/libgroupwise/tlshandler.h b/protocols/groupwise/libgroupwise/tlshandler.h
index 492a7d4..8f652ca 100644
--- a/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/protocols/groupwise/libgroupwise/tlshandler.h
@@ -40,7 +40,7 @@ public:
virtual void write(const QByteArray &a)=0;
virtual void writeIncoming(const QByteArray &a)=0;
-signals:
+Q_SIGNALS:
void success();
void fail();
void closed();
diff --git a/protocols/groupwise/libgroupwise/userdetailsmanager.h b/protocols/groupwise/libgroupwise/userdetailsmanager.h
index 488f121..4d19d80 100644
--- a/protocols/groupwise/libgroupwise/userdetailsmanager.h
+++ b/protocols/groupwise/libgroupwise/userdetailsmanager.h
@@ -74,9 +74,9 @@ public:
*/
void requestDetails( const QString & dn, bool onlyUnknown = true );
-signals:
+Q_SIGNALS:
void gotContactDetails( const GroupWise::ContactDetails & );
-protected slots:
+protected Q_SLOTS:
void slotReceiveContactDetails( const GroupWise::ContactDetails & );
protected:
void dump( const QStringList & list );
diff --git a/protocols/groupwise/ui/gwaddcontactpage.h b/protocols/groupwise/ui/gwaddcontactpage.h
index 46472e8..a4e17af 100644
--- a/protocols/groupwise/ui/gwaddcontactpage.h
+++ b/protocols/groupwise/ui/gwaddcontactpage.h
@@ -55,7 +55,7 @@ public:
* Is the data correct?
*/
bool validateData() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void searchResult(bool valid);
protected:
unsigned char searchOperation( int comboIndex );
diff --git a/protocols/groupwise/ui/gwchatpropsdialog.h b/protocols/groupwise/ui/gwchatpropsdialog.h
index cfedecd..52f0960 100644
--- a/protocols/groupwise/ui/gwchatpropsdialog.h
+++ b/protocols/groupwise/ui/gwchatpropsdialog.h
@@ -59,7 +59,7 @@ class GroupWiseChatPropsDialog : public KDialog
GroupWise::Chatroom room();
protected:
void initialise();
- protected slots:
+ protected Q_SLOTS:
void slotWidgetChanged();
private:
Ui::GroupWiseChatProps m_ui;
diff --git a/protocols/groupwise/ui/gwchatsearchdialog.h b/protocols/groupwise/ui/gwchatsearchdialog.h
index 0640f0f..204bc00 100644
--- a/protocols/groupwise/ui/gwchatsearchdialog.h
+++ b/protocols/groupwise/ui/gwchatsearchdialog.h
@@ -36,7 +36,7 @@ class GroupWiseChatSearchDialog : public KDialog
~GroupWiseChatSearchDialog();
protected:
void populateWidget();
- protected slots:
+ protected Q_SLOTS:
/* Button handlers */
void slotPropertiesClicked();
void slotUpdateClicked();
diff --git a/protocols/groupwise/ui/gwcontactproperties.h b/protocols/groupwise/ui/gwcontactproperties.h
index 714a892..40d6d02 100644
--- a/protocols/groupwise/ui/gwcontactproperties.h
+++ b/protocols/groupwise/ui/gwcontactproperties.h
@@ -50,7 +50,7 @@ public:
protected:
void setupProperties( QMap< QString, QVariant > serverProps );
void init();
-protected slots:
+protected Q_SLOTS:
void copy();
private:
Ui::GroupWiseContactProps m_ui;
diff --git a/protocols/groupwise/ui/gweditaccountwidget.h b/protocols/groupwise/ui/gweditaccountwidget.h
index 4fc0fb8..f182ca7 100644
--- a/protocols/groupwise/ui/gweditaccountwidget.h
+++ b/protocols/groupwise/ui/gweditaccountwidget.h
@@ -51,7 +51,7 @@ public:
* Is the data correct?
*/
bool validateData() Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void configChanged();
protected:
bool settings_changed;
diff --git a/protocols/groupwise/ui/gwprivacydialog.h b/protocols/groupwise/ui/gwprivacydialog.h
index 58c749e..9d8fd13 100644
--- a/protocols/groupwise/ui/gwprivacydialog.h
+++ b/protocols/groupwise/ui/gwprivacydialog.h
@@ -44,7 +44,7 @@ protected:
void disableWidgets();
void populateWidgets();
void updateButtonState();
-protected slots:
+protected Q_SLOTS:
void slotAllowClicked();
void slotBlockClicked();
void slotAddClicked();
diff --git a/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/protocols/groupwise/ui/gwreceiveinvitationdialog.h
index b081cc2..d7462f8 100644
--- a/protocols/groupwise/ui/gwreceiveinvitationdialog.h
+++ b/protocols/groupwise/ui/gwreceiveinvitationdialog.h
@@ -36,9 +36,9 @@ Q_OBJECT
public:
ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, QWidget *parent, const char *name );
~ReceiveInvitationDialog();
-signals:
+Q_SIGNALS:
void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid );
-protected slots:
+protected Q_SLOTS:
void slotYesClicked();
void slotNoClicked();
private:
diff --git a/protocols/groupwise/ui/gwsearch.h b/protocols/groupwise/ui/gwsearch.h
index fe11f84..8f061bb 100644
--- a/protocols/groupwise/ui/gwsearch.h
+++ b/protocols/groupwise/ui/gwsearch.h
@@ -41,11 +41,11 @@ public:
QWidget *parent = 0 );
virtual ~GroupWiseContactSearch();
QList< GroupWise::ContactDetails > selectedResults();
-signals:
+Q_SIGNALS:
void selectionValidates( bool );
protected:
unsigned char searchOperation( int comboIndex );
-protected slots:
+protected Q_SLOTS:
void slotClear();
void slotDoSearch();
void slotGotSearchResults();
diff --git a/protocols/jabber/jabberaccount.h b/protocols/jabber/jabberaccount.h
index 1dd75dd..20c54c3 100644
--- a/protocols/jabber/jabberaccount.h
+++ b/protocols/jabber/jabberaccount.h
@@ -165,7 +165,7 @@ public:
#endif
-public slots:
+public Q_SLOTS:
/* Connects to the server. */
void connectWithPassword(const QString &password) Q_DECL_OVERRIDE;
@@ -257,7 +257,7 @@ private:
#ifdef JINGLE_SUPPORT
JingleCallsManager *m_jcm;
#endif
-private slots:
+private Q_SLOTS:
/* Connects to the server. */
void slotConnect();
@@ -357,10 +357,10 @@ private slots:
public:
JabberMoodAction(const Mood::Type type, QObject *parent);
-public slots:
+public Q_SLOTS:
void triggered();
-signals:
+Q_SIGNALS:
void triggered(const Mood::Type type);
private:
diff --git a/protocols/jabber/jabberbasecontact.h b/protocols/jabber/jabberbasecontact.h
index 8832cb6..2c2dea4 100644
--- a/protocols/jabber/jabberbasecontact.h
+++ b/protocols/jabber/jabberbasecontact.h
@@ -147,7 +147,7 @@ public:
virtual QString lastReceivedMessageId () const { return QString(); }
-public slots:
+public Q_SLOTS:
/**
* Retrieve a vCard for the contact
diff --git a/protocols/jabber/jabberbookmarks.h b/protocols/jabber/jabberbookmarks.h
index 788537e..564ec38 100644
--- a/protocols/jabber/jabberbookmarks.h
+++ b/protocols/jabber/jabberbookmarks.h
@@ -82,7 +82,7 @@ class JabberBookmarks : public QObject
* return an action that will be added in the jabber popup menu
*/
QAction *bookmarksAction(QObject * parent);
- private slots:
+ private Q_SLOTS:
void accountConnected();
void slotReceivedBookmarks();
void slotJoinChatBookmark(const QString&);
diff --git a/protocols/jabber/jabbercapabilitiesmanager.h b/protocols/jabber/jabbercapabilitiesmanager.h
index 349d5d3..c3c7569 100644
--- a/protocols/jabber/jabbercapabilitiesmanager.h
+++ b/protocols/jabber/jabbercapabilitiesmanager.h
@@ -80,10 +80,10 @@ public:
*/
QString clientVersion(const Jid &jid) const;
-signals:
+Q_SIGNALS:
void capabilitiesChanged(const XMPP::Jid &jid);
-public slots:
+public Q_SLOTS:
/**
* Update if necessary the capabities for the JID passed in args.
* Caps are received in Presence messages so that's why we are
@@ -94,7 +94,7 @@ public slots:
*/
void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status);
-private slots:
+private Q_SLOTS:
/**
* @brief Called when a reply to disco#info request was received.
* If the result was successful, the resulting features are recorded in the
diff --git a/protocols/jabber/jabberchatsession.h b/protocols/jabber/jabberchatsession.h
index 66f0c95..9e34e3b 100644
--- a/protocols/jabber/jabberchatsession.h
+++ b/protocols/jabber/jabberchatsession.h
@@ -60,7 +60,7 @@ public:
*/
const QString &resource() const;
-public slots:
+public Q_SLOTS:
/**
* Show a message to the chatwindow, or append it to the queue.
* This is the function protocols HAVE TO call for both incoming and outgoing messages
@@ -75,7 +75,7 @@ public slots:
*/
void appendMessage(Kopete::Message &msg, const QString &fromResource);
-private slots:
+private Q_SLOTS:
void slotSendTypingNotification(bool typing);
void slotMessageSent(Kopete::Message &message, Kopete::ChatSession *kmm);
diff --git a/protocols/jabber/jabberclient.h b/protocols/jabber/jabberclient.h
index a04d7e8..d621c0d 100644
--- a/protocols/jabber/jabberclient.h
+++ b/protocols/jabber/jabberclient.h
@@ -407,7 +407,7 @@ public:
*/
void requestRoster();
-signals:
+Q_SIGNALS:
/**
* Connected successfully.
*/
@@ -542,7 +542,7 @@ private:
*/
void removeS5BServerAddress(const QString &address);
-private slots:
+private Q_SLOTS:
/* S5B server object has been destroyed. */
void slotS5BServerGone();
diff --git a/protocols/jabber/jabbercontact.h b/protocols/jabber/jabbercontact.h
index 9aa7536..b85d806 100644
--- a/protocols/jabber/jabbercontact.h
+++ b/protocols/jabber/jabbercontact.h
@@ -70,7 +70,7 @@ public:
QString lastReceivedMessageId () const Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* Remove this contact from the roster
@@ -124,7 +124,7 @@ public slots:
void startJingleVideoCall();
#endif
-private slots:
+private Q_SLOTS:
/**
* Send type="subscribed" to contact
diff --git a/protocols/jabber/jabbercontactpool.h b/protocols/jabber/jabbercontactpool.h
index 1005b22..35753a6 100644
--- a/protocols/jabber/jabbercontactpool.h
+++ b/protocols/jabber/jabbercontactpool.h
@@ -96,7 +96,7 @@ public:
*/
QList<JabberBaseContact *> findRelevantSources(const XMPP::Jid &jid);
-private slots:
+private Q_SLOTS:
void slotContactDestroyed(Kopete::Contact *contact);
private:
diff --git a/protocols/jabber/jabberfiletransfer.h b/protocols/jabber/jabberfiletransfer.h
index c501384..c39a142 100644
--- a/protocols/jabber/jabberfiletransfer.h
+++ b/protocols/jabber/jabberfiletransfer.h
@@ -49,7 +49,7 @@ public:
~JabberFileTransfer ();
-private slots:
+private Q_SLOTS:
void slotIncomingTransferAccepted(Kopete::Transfer *transfer, const QString &fileName);
void slotTransferRefused(const Kopete::FileTransferInfo &transfer);
void slotTransferResult();
diff --git a/protocols/jabber/jabberformlineedit.h b/protocols/jabber/jabberformlineedit.h
index 32856fa..3e78146 100644
--- a/protocols/jabber/jabberformlineedit.h
+++ b/protocols/jabber/jabberformlineedit.h
@@ -33,7 +33,7 @@ class JabberFormLineEdit : public QLineEdit
JabberFormLineEdit (const int type, const QString &realName, const QString &value, QWidget *parent = nullptr);
~JabberFormLineEdit ();
-public slots: void slotGatherData(XMPP::Form &form);
+public Q_SLOTS: void slotGatherData(XMPP::Form &form);
private:
int fieldType;
diff --git a/protocols/jabber/jabberformtranslator.h b/protocols/jabber/jabberformtranslator.h
index 636aeaa..ff3b852 100644
--- a/protocols/jabber/jabberformtranslator.h
+++ b/protocols/jabber/jabberformtranslator.h
@@ -37,7 +37,7 @@ public:
XMPP::Form &resultData();
-signals:
+Q_SIGNALS:
void gatherData(XMPP::Form &form);
private:
diff --git a/protocols/jabber/jabbergroupchatmanager.h b/protocols/jabber/jabbergroupchatmanager.h
index 01cdb77..f408505 100644
--- a/protocols/jabber/jabbergroupchatmanager.h
+++ b/protocols/jabber/jabbergroupchatmanager.h
@@ -59,7 +59,7 @@ public:
*/
void updateDisplayName();
-public slots:
+public Q_SLOTS:
/**
* reimplemented from Kopete::ChatSession
@@ -67,7 +67,7 @@ public slots:
*/
void inviteContact(const QString &contactId) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
///Slot to show invite menu for other user to chat
void showInviteMenu();
///Slot to hide invite menu
diff --git a/protocols/jabber/jabbergroupcontact.h b/protocols/jabber/jabbergroupcontact.h
index 4a5ff5d..ec95988 100644
--- a/protocols/jabber/jabbergroupcontact.h
+++ b/protocols/jabber/jabbergroupcontact.h
@@ -61,7 +61,7 @@ public:
Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* This is the JabberContact level slot for sending files.
@@ -75,7 +75,7 @@ public slots:
void sendFile( const QUrl &sourceURL = QUrl(),
const QString &fileName = QString(), uint fileSize = 0L ) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
/**
* Catch a dying message manager and leave the room.
diff --git a/protocols/jabber/jabbergroupmembercontact.h b/protocols/jabber/jabbergroupmembercontact.h
index ffb3caa..68ae51f 100644
--- a/protocols/jabber/jabbergroupmembercontact.h
+++ b/protocols/jabber/jabbergroupmembercontact.h
@@ -57,7 +57,7 @@ public:
QString lastReceivedMessageId () const Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
/**
* This is the JabberContact level slot for sending files.
@@ -71,7 +71,7 @@ public slots:
void sendFile( const QUrl &sourceURL = QUrl(),
const QString &fileName = QString(), uint fileSize = 0L ) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
/**
* Catch a dying message manager
*/
diff --git a/protocols/jabber/jabberresource.h b/protocols/jabber/jabberresource.h
index a3767d2..c17b599 100644
--- a/protocols/jabber/jabberresource.h
+++ b/protocols/jabber/jabberresource.h
@@ -81,10 +81,10 @@ public:
*/
bool sendsDeliveredEvent() const;
-signals:
+Q_SIGNALS:
void updated ( JabberResource * );
-private slots:
+private Q_SLOTS:
void slotGetTimedClientVersion ();
void slotGotClientVersion ();
void slotGetDiscoCapabilties ();
diff --git a/protocols/jabber/jabberresourcepool.h b/protocols/jabber/jabberresourcepool.h
index a9edc5a..ef2ca51 100644
--- a/protocols/jabber/jabberresourcepool.h
+++ b/protocols/jabber/jabberresourcepool.h
@@ -124,7 +124,7 @@ public:
void findResources ( const XMPP::Jid &jid, JabberResourcePool::ResourceList &resourceList );
void findResources ( const XMPP::Jid &jid, XMPP::ResourceList &resourceList );
-private slots:
+private Q_SLOTS:
void slotResourceDestroyed ( QObject *sender );
void slotResourceUpdated ( JabberResource *resource );
diff --git a/protocols/jabber/jabbertransport.h b/protocols/jabber/jabbertransport.h
index d47edeb..28f29f9 100644
--- a/protocols/jabber/jabbertransport.h
+++ b/protocols/jabber/jabbertransport.h
@@ -98,7 +98,7 @@ public:
*/
QString legacyId(const XMPP::Jid &jid);
-public slots:
+public Q_SLOTS:
/* Reimplemented from Kopete::Account */
void setOnlineStatus(const Kopete::OnlineStatus &status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(), const OnlineStatusOptions &options = None) Q_DECL_OVERRIDE;
diff --git a/protocols/jabber/jingle/abstractio.h b/protocols/jabber/jingle/abstractio.h
index 07ed0dc..fa3ee04 100644
--- a/protocols/jabber/jingle/abstractio.h
+++ b/protocols/jabber/jingle/abstractio.h
@@ -27,7 +27,7 @@ public:
// Period Size is the size of a frame which can be decoded in one time.
virtual int frameSizeBytes();
-signals:
+Q_SIGNALS:
void encoded();
void decoded();
};
diff --git a/protocols/jabber/jingle/alsaio.h b/protocols/jabber/jingle/alsaio.h
index 8c42c3f..d18be88 100644
--- a/protocols/jabber/jingle/alsaio.h
+++ b/protocols/jabber/jingle/alsaio.h
@@ -153,11 +153,11 @@ public:
void writeData();
int frameSizeBytes();
-public slots:
+public Q_SLOTS:
void slotReadyRead(int socket);
void slotReadyWrite(int socket);
-signals:
+Q_SIGNALS:
void readyRead();
void bytesWritten();
diff --git a/protocols/jabber/jingle/jabberjinglecontent.h b/protocols/jabber/jingle/jabberjinglecontent.h
index 2c04e5d..bb3ed57 100644
--- a/protocols/jabber/jingle/jabberjinglecontent.h
+++ b/protocols/jabber/jingle/jabberjinglecontent.h
@@ -43,7 +43,7 @@ public:
QString contentName();
QString elementToSdp(const QDomElement &);
-public slots:
+public Q_SLOTS:
void slotSendRtpData();
void slotIncomingData(const QByteArray &);
void slotReadyRead();
diff --git a/protocols/jabber/jingle/jabberjinglesession.h b/protocols/jabber/jingle/jabberjinglesession.h
index f132fab..8aeee1b 100644
--- a/protocols/jabber/jingle/jabberjinglesession.h
+++ b/protocols/jabber/jingle/jabberjinglesession.h
@@ -66,12 +66,12 @@ public:
QTime upTime();
-public slots:
+public Q_SLOTS:
//void writeRtpData(XMPP::JingleContent*);
void slotSessionTerminated();
void slotStateChanged();
-signals:
+Q_SIGNALS:
void terminated();
void stateChanged();
diff --git a/protocols/jabber/jingle/jinglecallsgui.h b/protocols/jabber/jingle/jinglecallsgui.h
index 2017514..d93edb9 100644
--- a/protocols/jabber/jingle/jinglecallsgui.h
+++ b/protocols/jabber/jingle/jinglecallsgui.h
@@ -37,7 +37,7 @@ public:
void removeSession(JabberJingleSession *);
void changeState(JabberJingleSession *);
-public slots:
+public Q_SLOTS:
void slotNewSession();
void slotAddContent();
void slotTerminate();
diff --git a/protocols/jabber/jingle/jinglecallsmanager.h b/protocols/jabber/jingle/jinglecallsmanager.h
index 811920d..1dba7ca 100644
--- a/protocols/jabber/jingle/jinglecallsmanager.h
+++ b/protocols/jabber/jingle/jinglecallsmanager.h
@@ -55,7 +55,7 @@ public:
QList<JabberJingleSession *> jabberSessions();
MediaManager *mediaManager();
-public slots:
+public Q_SLOTS:
void slotNewSession(XMPP::JingleSession *);
void slotSessionTerminate(XMPP::JingleSession *);
void slotSessionTerminated();
@@ -63,7 +63,7 @@ public slots:
void slotUserRejected();
void slotStateChanged();
-signals:
+Q_SIGNALS:
//FIXME:Those signals aren't used and I don't know what they are doing here.
void newSessionCreated();
void sessionTerminated(Reason);
diff --git a/protocols/jabber/jingle/jinglertpsession.h b/protocols/jabber/jingle/jinglertpsession.h
index 2124f38..1365927 100644
--- a/protocols/jabber/jingle/jinglertpsession.h
+++ b/protocols/jabber/jingle/jinglertpsession.h
@@ -65,7 +65,7 @@ public:
void setMediaSession(MediaSession *mSession);
-private slots:
+private Q_SLOTS:
/*
* Called when rtp data is ready to be read from the socket, we then wait
* for the media data to be extracted from the RTP packet by oRTP.
@@ -73,7 +73,7 @@ private slots:
void rtpDataReady();
void rtcpDataReady(); // Maybe not used.
-signals:
+Q_SIGNALS:
void dataSent();
void readyRead(const QByteArray &);
diff --git a/protocols/jabber/jingle/mediasession.h b/protocols/jabber/jingle/mediasession.h
index e288bd0..861d899 100644
--- a/protocols/jabber/jingle/mediasession.h
+++ b/protocols/jabber/jingle/mediasession.h
@@ -34,12 +34,12 @@ public:
QByteArray read() const;
int timeStamp();
-public slots:
+public Q_SLOTS:
void slotReadyRead();
void slotEncoded();
void slotDecoded();
-signals:
+Q_SIGNALS:
void readyRead();
private:
diff --git a/protocols/jabber/kioslave/jabberdisco.h b/protocols/jabber/kioslave/jabberdisco.h
index ca04d6b..15c3d82 100644
--- a/protocols/jabber/kioslave/jabberdisco.h
+++ b/protocols/jabber/kioslave/jabberdisco.h
@@ -52,7 +52,7 @@ public:
void dispatchLoop();
-private slots:
+private Q_SLOTS:
void slotClientDebugMessage(const QString &msg);
void slotHandleTLSWarning(int validityResult);
void slotClientError(JabberClient::ErrorCode errorCode);
diff --git a/protocols/jabber/libiris/src/irisnet/appledns/qdnssd.h b/protocols/jabber/libiris/src/irisnet/appledns/qdnssd.h
index 26b4efd..f666527 100644
--- a/protocols/jabber/libiris/src/irisnet/appledns/qdnssd.h
+++ b/protocols/jabber/libiris/src/irisnet/appledns/qdnssd.h
@@ -146,7 +146,7 @@ public:
// empty and so you shouldn't call this function)
static QList<QByteArray> parseTxtRecord(const QByteArray &txtRecord);
-signals:
+Q_SIGNALS:
void queryResult(int id, const QDnsSd::QueryResult &result);
void browseResult(int id, const QDnsSd::BrowseResult &result);
void resolveResult(int id, const QDnsSd::ResolveResult &result);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/addressresolver.h b/protocols/jabber/libiris/src/irisnet/corelib/addressresolver.h
index 3efec62..b6ef84b 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/addressresolver.h
+++ b/protocols/jabber/libiris/src/irisnet/corelib/addressresolver.h
@@ -42,7 +42,7 @@ public:
void start(const QByteArray &hostName);
void stop();
-signals:
+Q_SIGNALS:
void resultsReady(const QList<QHostAddress> &results);
void error(XMPP::AddressResolver::Error e);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/irisnetplugin.h b/protocols/jabber/libiris/src/irisnet/corelib/irisnetplugin.h
index c99e7a6..498c971 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/irisnetplugin.h
+++ b/protocols/jabber/libiris/src/irisnet/corelib/irisnetplugin.h
@@ -69,7 +69,7 @@ public:
virtual void start() = 0;
virtual QList<Info> interfaces() const = 0;
-signals:
+Q_SIGNALS:
void updated();
};
@@ -88,7 +88,7 @@ public:
virtual void start() = 0;
virtual bool isAvailable() const = 0;
-signals:
+Q_SIGNALS:
void updated();
};
@@ -113,7 +113,7 @@ public:
virtual void resolve_localResultsReady(int id, const QList<XMPP::NameRecord> &results);
virtual void resolve_localError(int id, XMPP::NameResolver::Error e);
-signals:
+Q_SIGNALS:
void resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results);
void resolve_error(int id, XMPP::NameResolver::Error e);
@@ -151,7 +151,7 @@ public:
virtual void publish_extra_update(int id, const NameRecord &name) = 0;
virtual void publish_extra_stop(int id) = 0;
-signals:
+Q_SIGNALS:
void browse_instanceAvailable(int id, const XMPP::ServiceInstance &instance);
void browse_instanceUnavailable(int id, const XMPP::ServiceInstance &instance);
void browse_error(int id, XMPP::ServiceBrowser::Error e);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netavailability.h b/protocols/jabber/libiris/src/irisnet/corelib/netavailability.h
index 9def4b8..0372db4 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netavailability.h
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netavailability.h
@@ -35,7 +35,7 @@ public:
bool isAvailable() const;
-signals:
+Q_SIGNALS:
void changed(bool available);
private:
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
index 77a51d6..a9f5ba2 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
@@ -61,7 +61,7 @@ public:
delete c;
}
-signals:
+Q_SIGNALS:
void updated();
private:
@@ -74,7 +74,7 @@ private:
return out;
}
-private slots:
+private Q_SLOTS:
void c_updated() {
{
QMutexLocker locker(&m);
@@ -133,7 +133,7 @@ public:
// locked from caller
}
-signals:
+Q_SIGNALS:
void updated();
private:
NetTrackerThread() {
@@ -346,7 +346,7 @@ public:
emit q->interfaceAvailable(here_ids[n]);
}
-public slots:
+public Q_SLOTS:
void tracker_updated()
{
// collapse multiple updates by queuing up an update if there isn't any queued yet.
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.h b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.h
index 1d17327..d951ad3 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.h
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.h
@@ -106,7 +106,7 @@ public:
*/
QHostAddress gateway() const; // optional
-signals:
+Q_SIGNALS:
/**
\brief Notifies when the interface becomes unavailable
@@ -187,7 +187,7 @@ QString iface = NetInterfaceManager::interfaceForAddress(tcpSocket->localAddress
*/
static QString interfaceForAddress(const QHostAddress &a);
-signals:
+Q_SIGNALS:
/**
\brief Notifies when an interface becomes available
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
index 282eda9..ba8a4d5 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
@@ -402,7 +402,7 @@ public:
info = ifaces;
}
-public slots:
+public Q_SLOTS:
void check()
{
poll();
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netnames.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netnames.cpp
index 1d61476..a4498f4 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netnames.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netnames.cpp
@@ -898,7 +898,7 @@ public:
np->id = p_serv->publish_extra_start(np->id, rec);
}
-private slots:
+private Q_SLOTS:
void provider_resolve_resultsReady(int id, const QList<XMPP::NameRecord> &results)
{
NameResolver::Private *np = res_instances.value(id);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netnames.h b/protocols/jabber/libiris/src/irisnet/corelib/netnames.h
index b3b1456..f663a50 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netnames.h
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netnames.h
@@ -451,7 +451,7 @@ public:
*/
void stop();
-signals:
+Q_SIGNALS:
/**
\brief Notification of result records
@@ -528,7 +528,7 @@ public:
void start(const QString &type, const QString &domain = QStringLiteral("local"));
void stop();
-signals:
+Q_SIGNALS:
void instanceAvailable(const XMPP::ServiceInstance &instance);
void instanceUnavailable(const XMPP::ServiceInstance &instance);
void error();
@@ -627,7 +627,7 @@ public:
*/
ProtoSplit happySplit();
-signals:
+Q_SIGNALS:
/*!
* The lookup succeeded
* \param address Resolved IP address
@@ -640,7 +640,7 @@ signals:
void srvReady();
void srvFailed();
-private slots:
+private Q_SLOTS:
void handle_srv_ready(const QList<XMPP::NameRecord>&);
void handle_srv_error(XMPP::NameResolver::Error);
void handle_host_ready(const QList<XMPP::NameRecord>&);
@@ -681,7 +681,7 @@ public:
void addRecord(const NameRecord &rec);
void cancel();
-signals:
+Q_SIGNALS:
void published();
void error(XMPP::ServiceLocalPublisher::Error e);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
index 9f35b77..42bcba3 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
@@ -355,10 +355,10 @@ public:
return !mul_addr6.isNull();
}
-signals:
+Q_SIGNALS:
void interfacesChanged();
-private slots:
+private Q_SLOTS:
void jdns_debugReady()
{
QStringList lines = db.readDebugLines();
@@ -686,7 +686,7 @@ public:
Q_ARG(XMPP::NameResolver::Error, e));
}
-private slots:
+private Q_SLOTS:
void req_resultsReady()
{
QJDnsSharedRequest *req = (QJDnsSharedRequest *)sender();
@@ -831,7 +831,7 @@ public:
req.query(typeAndDomain, QJDns::Ptr);
}
-signals:
+Q_SIGNALS:
void available(const QByteArray &instance);
void unavailable(const QByteArray &instance);
@@ -857,7 +857,7 @@ private:
return friendlyName;
}
-private slots:
+private Q_SLOTS:
void jdns_resultsReady()
{
// ignore errors
@@ -950,7 +950,7 @@ public:
req.query(name, QJDns::Srv);
}
-signals:
+Q_SIGNALS:
void finished();
void error(QJDnsSharedRequest::Error e);
@@ -980,7 +980,7 @@ private:
return false;
}
-private slots:
+private Q_SLOTS:
void reqtxt_ready()
{
if(!reqtxt.success())
@@ -1175,10 +1175,10 @@ public:
return success_;
}
-signals:
+Q_SIGNALS:
void resultsReady();
-private slots:
+private Q_SLOTS:
void pub_addr_ready()
{
if(pub_addr.success())
@@ -1344,7 +1344,7 @@ public:
}
}
-signals:
+Q_SIGNALS:
void hostName(const QByteArray &str);
private:
@@ -1419,7 +1419,7 @@ private:
emit hostName(QByteArray());
}
-private slots:
+private Q_SLOTS:
void doDisable()
{
bool lostHost = success;
@@ -1478,7 +1478,7 @@ public:
void start(const QJDns::Record &_rec);
void update(const QJDns::Record &_rec);
-signals:
+Q_SIGNALS:
void published();
void error(QJDnsSharedRequest::Error e);
@@ -1595,7 +1595,7 @@ public:
doPublishTxt();
}
-public slots:
+public Q_SLOTS:
// pass empty host if host lost
void hostChanged(const QByteArray &_host)
{
@@ -1619,7 +1619,7 @@ public slots:
}
}
-signals:
+Q_SIGNALS:
void published();
void error(QJDnsSharedRequest::Error e);
@@ -1768,7 +1768,7 @@ private:
extra->have = false;
}
-private slots:
+private Q_SLOTS:
void pub_srv_ready()
{
if(pub_srv.success())
@@ -2459,7 +2459,7 @@ private:
publishExtraItemList.remove(i);
}
-private slots:
+private Q_SLOTS:
void interfacesChanged()
{
if(pub_addresses)
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/objectsession.cpp b/protocols/jabber/libiris/src/irisnet/corelib/objectsession.cpp
index 599c622..02c5126 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/objectsession.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/objectsession.cpp
@@ -176,7 +176,7 @@ public:
watchers.clear();
}
-private slots:
+private Q_SLOTS:
void doCall()
{
MethodCall *call = pendingCalls.takeFirst();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.cpp b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.cpp
index eaa9d9aa..d9f2666 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.cpp
@@ -55,7 +55,7 @@ public:
connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(sock_error(QAbstractSocket::SocketError)), Qt::QueuedConnection);
}
-signals:
+Q_SIGNALS:
void hostFound();
void connected();
void disconnected();
@@ -63,7 +63,7 @@ signals:
void bytesWritten(qint64);
void error(QAbstractSocket::SocketError);
-public slots:
+public Q_SLOTS:
void sock_hostFound()
{
emit hostFound();
@@ -269,7 +269,7 @@ private:
lastIndex = -1;
}
-private slots:
+private Q_SLOTS:
/*
Notice: most probably recipient should reparent socket and relay
*/
@@ -382,7 +382,7 @@ private slots:
}
}
-signals:
+Q_SIGNALS:
void connected();
void error(QAbstractSocket::SocketError);
};
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
index 204573d..8d3f576 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
@@ -76,11 +76,11 @@ protected:
qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void hostFound();
void connected();
-private slots:
+private Q_SLOTS:
void qs_connected();
void qs_closed();
void qs_readyRead();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
index a0cf41a..1fac434 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
@@ -52,7 +52,7 @@ public:
virtual QAbstractSocket* abstractSocket() const { return 0; }
-signals:
+Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void error(int);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
index 4336f00..0b26bb7 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -42,10 +42,10 @@ public:
protected:
qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void connected();
-private slots:
+private Q_SLOTS:
void sock_connected();
void sock_connectionClosed();
void sock_delayedCloseFinished();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
index 21c7a1d..4a32e6b 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
@@ -48,7 +48,7 @@ public:
bool isOpen() const;
void close() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void connected();
void syncStarted();
void syncFinished();
@@ -56,7 +56,7 @@ signals:
protected:
int tryWrite() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void http_result();
void http_error(int);
void do_sync();
@@ -89,11 +89,11 @@ public:
QByteArray body() const;
QString getHeader(const QString &) const;
-signals:
+Q_SIGNALS:
void result();
void error(int);
-private slots:
+private Q_SLOTS:
void sock_connected();
void sock_connectionClosed();
void sock_readyRead();
@@ -125,13 +125,13 @@ public:
QString getHeader(const QString &) const;
int length() const; // -1 for unknown
-signals:
+Q_SIGNALS:
void handshaken();
void dataReady(const QByteArray &buf);
void finished();
void error(int);
-private slots:
+private Q_SLOTS:
void sock_connected();
void sock_connectionClosed();
void sock_readyRead();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
index 495188c..0b040b4 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
@@ -38,10 +38,10 @@ public:
void change(const QString &host, int port);
void write(const QByteArray &data);
-signals:
+Q_SIGNALS:
void packetReady(const QByteArray &data);
-private slots:
+private Q_SLOTS:
void sd_activated();
private:
@@ -96,7 +96,7 @@ protected:
qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
// outgoing
void connected();
@@ -106,7 +106,7 @@ signals:
void incomingConnectRequest(const QString &host, int port);
void incomingUDPAssociateRequest();
-private slots:
+private Q_SLOTS:
void sock_connected();
void sock_connectionClosed();
void sock_delayedCloseFinished();
@@ -144,11 +144,11 @@ public:
void writeUDP(const QHostAddress &addr, int port, const QByteArray &data);
-signals:
+Q_SIGNALS:
void incomingReady();
void incomingUDP(const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data);
-private slots:
+private Q_SLOTS:
void connectionReady(qintptr);
void connectionError();
void sd_activated();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/ice176.cpp b/protocols/jabber/libiris/src/irisnet/noncore/ice176.cpp
index c0b54cd..68c4769 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/ice176.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/ice176.cpp
@@ -689,7 +689,7 @@ private:
return 0;
}
-private slots:
+private Q_SLOTS:
void postStop()
{
state = Stopped;
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/ice176.h b/protocols/jabber/libiris/src/irisnet/noncore/ice176.h
index 382223b..68a1ac7 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/ice176.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/ice176.h
@@ -164,7 +164,7 @@ public:
// FIXME: this should probably be in netinterface.h or such
static bool isIPv6LinkLocalAddress(const QHostAddress &addr);
-signals:
+Q_SIGNALS:
// indicates that the ice engine is started and is ready to receive
// peer creds and remote candidates
void started();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.cpp b/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.cpp
index 2f19e31..ba5612b 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.cpp
@@ -598,7 +598,7 @@ private:
postStop();
}
-private slots:
+private Q_SLOTS:
void doExt()
{
if(stopping)
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.h b/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.h
index 8e8a342..d2970f8 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icecomponent.h
@@ -155,7 +155,7 @@ public:
void setDebugLevel(DebugLevel level);
-signals:
+Q_SIGNALS:
// this is emitted in the same pass of the eventloop that a
// transport/path becomes ready
void candidateAdded(const XMPP::IceComponent::Candidate &c);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.cpp b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.cpp
index 2752979..284c41a 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.cpp
@@ -116,11 +116,11 @@ public:
sock->writeDatagram(buf, address, port);
}
-signals:
+Q_SIGNALS:
void readyRead();
void datagramsWritten(int count);
-private slots:
+private Q_SLOTS:
void sock_readyRead()
{
emit readyRead();
@@ -444,7 +444,7 @@ private:
return false;
}
-private slots:
+private Q_SLOTS:
void postStart()
{
if(stopping)
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
index 718f9d5..83746a6 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
@@ -84,7 +84,7 @@ public:
void addChannelPeer(const QHostAddress &addr, int port) Q_DECL_OVERRIDE;
void setDebugLevel(DebugLevel level) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
// may be emitted multiple times.
// if handling internal ErrorMismatch, then local address may change
// and server reflexive address may disappear.
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icetransport.h b/protocols/jabber/libiris/src/irisnet/noncore/icetransport.h
index 82d4c7b..585edac 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icetransport.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icetransport.h
@@ -58,7 +58,7 @@ public:
virtual void setDebugLevel(DebugLevel level) = 0;
-signals:
+Q_SIGNALS:
void started();
void stopped();
void error(int e);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.cpp b/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.cpp
index d350840..5a26234 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.cpp
@@ -72,7 +72,7 @@ public:
turn.close();
}
-private slots:
+private Q_SLOTS:
void turn_connected()
{
if(debugLevel >= IceTransport::DL_Info)
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/legacy/ndns.h b/protocols/jabber/libiris/src/irisnet/noncore/legacy/ndns.h
index 3b83af1..5331bb7 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/legacy/ndns.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/legacy/ndns.h
@@ -41,10 +41,10 @@ public:
QHostAddress result() const;
QString resultString() const;
-signals:
+Q_SIGNALS:
void resultsReady();
-private slots:
+private Q_SLOTS:
void dns_resultsReady(const QList<XMPP::NameRecord> &);
void dns_error(XMPP::NameResolver::Error);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/legacy/safedelete.h b/protocols/jabber/libiris/src/irisnet/noncore/legacy/safedelete.h
index 5417302..93baa6c 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/legacy/safedelete.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/legacy/safedelete.h
@@ -44,7 +44,7 @@ public:
static SafeDeleteLater *ensureExists();
void deleteItLater(QObject *o);
-private slots:
+private Q_SLOTS:
void explode();
private:
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h b/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
index f968d13..26dd33f 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
@@ -43,10 +43,10 @@ public:
int port() const;
QHostAddress address() const;
-signals:
+Q_SIGNALS:
void connectionReady(qintptr);
-private slots:
+private Q_SLOTS:
void sss_connectionReady(qintptr);
private:
@@ -60,7 +60,7 @@ class ServSockSignal : public QTcpServer
public:
ServSockSignal(QObject *parent = nullptr);
-signals:
+Q_SIGNALS:
void connectionReady(qintptr);
protected:
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/legacy/srvresolver.h b/protocols/jabber/libiris/src/irisnet/noncore/legacy/srvresolver.h
index 991716f..71cbfb1 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/legacy/srvresolver.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/legacy/srvresolver.h
@@ -62,10 +62,10 @@ public:
QHostAddress resultAddress() const;
quint16 resultPort() const;
-signals:
+Q_SIGNALS:
void resultsReady();
-private slots:
+private Q_SLOTS:
void nndns_resultsReady(const QList<XMPP::NameRecord> &);
void nndns_error(XMPP::NameResolver::Error);
void ndns_done();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/processquit.cpp b/protocols/jabber/libiris/src/irisnet/noncore/processquit.cpp
index 5ff0a68..1de41be 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/processquit.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/processquit.cpp
@@ -70,10 +70,10 @@ public:
int socket() const { return sn->socket(); }
QSocketNotifier::Type type() const { return sn->type(); }
-public slots:
+public Q_SLOTS:
void setEnabled(bool enable) { sn->setEnabled(enable); }
-signals:
+Q_SIGNALS:
void activated(int socket);
private:
@@ -206,7 +206,7 @@ public:
}
#endif
-public slots:
+public Q_SLOTS:
void ctrl_ready()
{
#ifdef Q_OS_WIN
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/processquit.h b/protocols/jabber/libiris/src/irisnet/noncore/processquit.h
index 3b10cbd..0cca660 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/processquit.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/processquit.h
@@ -81,7 +81,7 @@ public:
*/
static void cleanup();
-signals:
+Q_SIGNALS:
/**
\brief Notification of termination request
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.cpp b/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.cpp
index 8ca4634..dcf5ef8 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.cpp
@@ -143,7 +143,7 @@ public:
}
}
-signals:
+Q_SIGNALS:
void ready();
void error(XMPP::StunAllocatePermission::Error e, const QString &reason);
@@ -173,7 +173,7 @@ private:
timer->start();
}
-private slots:
+private Q_SLOTS:
void trans_createMessage(const QByteArray &transactionId)
{
// CreatePermission
@@ -333,7 +333,7 @@ public:
}
}
-signals:
+Q_SIGNALS:
void ready();
void error(XMPP::StunAllocateChannel::Error e, const QString &reason);
@@ -364,7 +364,7 @@ private:
timer->start();
}
-private slots:
+private Q_SLOTS:
void trans_createMessage(const QByteArray &transactionId)
{
// ChannelBind
@@ -862,7 +862,7 @@ private:
return true;
}
-private slots:
+private Q_SLOTS:
void refresh()
{
Q_ASSERT(state == Started);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.h b/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.h
index e2cf56d..9d4bc4d 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stunallocate.h
@@ -108,7 +108,7 @@ public:
static bool containsChannelData(const quint8 *data, int size);
static QByteArray readChannelData(const quint8 *data, int size);
-signals:
+Q_SIGNALS:
void started();
void stopped();
void error(XMPP::StunAllocate::Error e);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.cpp b/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.cpp
index dcc2179..9fcc2a4 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.cpp
@@ -88,7 +88,7 @@ public:
trans->start(pool, stunAddr, stunPort);
}
-private slots:
+private Q_SLOTS:
void trans_createMessage(const QByteArray &transactionId)
{
StunMessage message;
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.h b/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.h
index 4fa4065..c1b3585 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stunbinding.h
@@ -66,7 +66,7 @@ public:
// non-translatable diagnostic string for convenience
QString errorString() const;
-signals:
+Q_SIGNALS:
void success();
void error(XMPP::StunBinding::Error e);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.cpp b/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.cpp
index fea07c2..6c841a6 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.cpp
@@ -305,7 +305,7 @@ public:
transmit();
}
-private slots:
+private Q_SLOTS:
void t_timeout()
{
if(mode == StunTransaction::Tcp || tries == rc)
@@ -473,7 +473,7 @@ public:
return true;
}
-public slots:
+public Q_SLOTS:
void continueAfterParams()
{
retry();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.h b/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.h
index 128fc55..dce37d1 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/stuntransaction.h
@@ -106,7 +106,7 @@ public:
// required to provide a fingerprint.
void setFingerprintRequired(bool enabled);
-signals:
+Q_SIGNALS:
// you must use a direct connection with this signal and call
// setMessage() in the slot. this signal may occur many times
// before the StunTransaction completes, and you must recreate the
@@ -174,7 +174,7 @@ public:
void setDebugLevel(DebugLevel level); // default DL_None
-signals:
+Q_SIGNALS:
// note: not DOR-SS safe. writeIncomingMessage() must not be called
// during this signal.
//
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/turnclient.cpp b/protocols/jabber/libiris/src/irisnet/noncore/turnclient.cpp
index b84d973..0210066 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/turnclient.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/turnclient.cpp
@@ -713,7 +713,7 @@ public:
return false;
}
-private slots:
+private Q_SLOTS:
void bs_connected()
{
ObjectSessionWatcher watch(&sess);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/turnclient.h b/protocols/jabber/libiris/src/irisnet/noncore/turnclient.h
index aae7417..b19c847 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/turnclient.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/turnclient.h
@@ -163,7 +163,7 @@ public:
void setDebugLevel(DebugLevel level); // default DL_None
-signals:
+Q_SIGNALS:
void connected(); // tcp connected
void tlsHandshaken();
void closed();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/udpportreserver.cpp b/protocols/jabber/libiris/src/irisnet/noncore/udpportreserver.cpp
index 3bbcf6f..5b273ef 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/udpportreserver.cpp
+++ b/protocols/jabber/libiris/src/irisnet/noncore/udpportreserver.cpp
@@ -247,7 +247,7 @@ public:
tryCleanup();
}
-private slots:
+private Q_SLOTS:
void sock_readyRead()
{
QUdpSocket *sock = (QUdpSocket *)sender();
diff --git a/protocols/jabber/libiris/src/jdns/include/jdns/qjdns.h b/protocols/jabber/libiris/src/jdns/include/jdns/qjdns.h
index e5312a5..fbaf329 100644
--- a/protocols/jabber/libiris/src/jdns/include/jdns/qjdns.h
+++ b/protocols/jabber/libiris/src/jdns/include/jdns/qjdns.h
@@ -143,7 +143,7 @@ public:
void publishUpdate(int id, const Record &record);
void publishCancel(int id);
-signals:
+Q_SIGNALS:
void resultsReady(int id, const QJDns::Response &results);
void published(int id);
void error(int id, QJDns::Error e);
diff --git a/protocols/jabber/libiris/src/jdns/include/jdns/qjdnsshared.h b/protocols/jabber/libiris/src/jdns/include/jdns/qjdnsshared.h
index ac42331..cf036a3 100644
--- a/protocols/jabber/libiris/src/jdns/include/jdns/qjdnsshared.h
+++ b/protocols/jabber/libiris/src/jdns/include/jdns/qjdnsshared.h
@@ -87,7 +87,7 @@ public:
*/
QStringList readDebugLines();
-signals:
+Q_SIGNALS:
/**
\brief Emitted when there is debug information to report
@@ -274,7 +274,7 @@ public:
*/
QList<QJDns::Record> results() const;
-signals:
+Q_SIGNALS:
/**
\brief Indicates that the operation has something to report
@@ -499,7 +499,7 @@ QStringList finalDebugLines = jdnsSharedDebug.readDebugLines();
*/
static void waitForShutdown(const QList<QJDnsShared*> &instances);
-signals:
+Q_SIGNALS:
/**
\brief Indicates the object has been shut down
*/
diff --git a/protocols/jabber/libiris/src/jdns/src/qjdns/qjdns_p.h b/protocols/jabber/libiris/src/jdns/src/qjdns/qjdns_p.h
index 8cf4e86..520aced 100644
--- a/protocols/jabber/libiris/src/jdns/src/qjdns/qjdns_p.h
+++ b/protocols/jabber/libiris/src/jdns/src/qjdns/qjdns_p.h
@@ -48,12 +48,12 @@ public:
void setSingleShot(bool singleShot);
int timerId() const;
-public slots:
+public Q_SLOTS:
void start(int msec);
void start();
void stop();
-signals:
+Q_SIGNALS:
void timeout();
private:
@@ -114,7 +114,7 @@ public:
void doNextStep();
void removeCancelled(int id);
-private slots:
+private Q_SLOTS:
void udp_readyRead();
void udp_bytesWritten(qint64);
void st_timeout();
diff --git a/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h b/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h
index 500f4ac..a4ca894 100644
--- a/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h
+++ b/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h
@@ -41,7 +41,7 @@ class JDnsShutdownAgent : public QObject
public:
void start();
-signals:
+Q_SIGNALS:
void started();
};
@@ -53,10 +53,10 @@ public:
JDnsShutdownWorker(const QList<QJDnsShared*> &_list);
-signals:
+Q_SIGNALS:
void finished();
-private slots:
+private Q_SLOTS:
void jdns_shutdownFinished();
};
@@ -76,7 +76,7 @@ public:
protected:
void run() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void agent_started();
void worker_finished();
};
@@ -93,7 +93,7 @@ public:
QJDnsSharedDebugPrivate(QJDnsSharedDebug *_q);
void addDebug(const QString &name, const QStringList &_lines);
-private slots:
+private Q_SLOTS:
void doUpdate();
};
@@ -184,10 +184,10 @@ public:
void publishUpdate(QJDnsSharedRequest *obj, const QJDns::Record &record);
void publishCancel(QJDnsSharedRequest *obj);
-public slots:
+public Q_SLOTS:
void late_shutdown();
-private slots:
+private Q_SLOTS:
void jdns_resultsReady(int id, const QJDns::Response &results);
void jdns_published(int id);
void jdns_error(int id, QJDns::Error e);
@@ -226,7 +226,7 @@ public:
QJDnsSharedRequestPrivate(QJDnsSharedRequest *_q);
void resetSession();
-private slots:
+private Q_SLOTS:
void lateTimer_timeout();
};
diff --git a/protocols/jabber/libiris/src/jdns/tools/jdns/main.h b/protocols/jabber/libiris/src/jdns/tools/jdns/main.h
index 5ff1ee0..b0b122b 100644
--- a/protocols/jabber/libiris/src/jdns/tools/jdns/main.h
+++ b/protocols/jabber/libiris/src/jdns/tools/jdns/main.h
@@ -43,13 +43,13 @@ public:
App();
~App();
-public slots:
+public Q_SLOTS:
void start();
-signals:
+Q_SIGNALS:
void quit();
-private slots:
+private Q_SLOTS:
void jdns_resultsReady(int id, const QJDns::Response &results);
void jdns_published(int id);
void jdns_error(int id, QJDns::Error e);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/compressionhandler.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/compressionhandler.h
index 847a184..47c4833 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/compressionhandler.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/compressionhandler.h
@@ -20,7 +20,7 @@ public:
QByteArray readOutgoing(int*);
int errorCode();
-signals:
+Q_SIGNALS:
void readyRead();
void readyReadOutgoing();
void error();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.cpp
index a8fdb5c..1c845f6 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.cpp
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.cpp
@@ -231,14 +231,14 @@ public:
return written;
}
-signals:
+Q_SIGNALS:
void tlsHandshaken();
void tlsClosed(const QByteArray &);
void readyRead(const QByteArray &);
void needWrite(const QByteArray &);
void error(int);
-private slots:
+private Q_SLOTS:
void tls_handshaken()
{
tls_done = true;
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
index bd385f1..c5308df 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
@@ -59,11 +59,11 @@ public:
void write(const QByteArray &);
qint64 bytesToWrite() const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void tlsHandshaken();
void tlsClosed();
-private slots:
+private Q_SLOTS:
void bs_readyRead();
void bs_bytesWritten(qint64);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
index ea42cac..f9997a2 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
@@ -87,7 +87,7 @@ namespace XMPP
virtual QString host() const;
- signals:
+ Q_SIGNALS:
void connected();
void error();
@@ -156,13 +156,13 @@ namespace XMPP
QString host() const Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void srvLookup(const QString &server);
void srvResult(bool success);
void httpSyncStarted();
void httpSyncFinished();
- private slots:
+ private Q_SLOTS:
void bs_connected();
void bs_error(int);
void http_syncStarted();
@@ -188,7 +188,7 @@ namespace XMPP
virtual void write(const QByteArray &a)=0;
virtual void writeIncoming(const QByteArray &a)=0;
- signals:
+ Q_SIGNALS:
void success();
void fail();
void closed();
@@ -215,13 +215,13 @@ namespace XMPP
void write(const QByteArray &a) Q_DECL_OVERRIDE;
void writeIncoming(const QByteArray &a) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void tlsHandshaken();
- public slots:
+ public Q_SLOTS:
void continueAfterHandshake();
- private slots:
+ private Q_SLOTS:
void tls_handshaken();
void tls_readyRead();
void tls_readyReadOutgoing();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h
index 702588c..9699848 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h
@@ -165,7 +165,7 @@ namespace XMPP
const StreamFeatures &streamFeatures() const;
QList<QDomElement> unhandledFeatures() const;
- signals:
+ Q_SIGNALS:
void connected();
void securityLayerActivated(int);
void needAuthParams(bool user, bool pass, bool realm);
@@ -176,10 +176,10 @@ namespace XMPP
void outgoingXml(const QString &s);
void stanzasAcked(int);
- public slots:
+ public Q_SLOTS:
void continueAfterWarning();
- private slots:
+ private Q_SLOTS:
void cr_connected();
void cr_error();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_stream.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_stream.h
index 896cd6f..b5329ce 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_stream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_stream.h
@@ -71,7 +71,7 @@ namespace XMPP
static void cleanup();
- signals:
+ Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void readyRead();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
index b94663d..a79ce6c 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
@@ -92,14 +92,14 @@ namespace XMPP
void close(); // reject, or stop sending/receiving
BSConnection *bsConnection() const; // active link
- signals:
+ Q_SIGNALS:
void accepted(); // indicates BSConnection has started
void connected();
void readyRead(const QByteArray &a);
void bytesWritten(qint64);
void error(int);
- private slots:
+ private Q_SLOTS:
void ft_finished();
void stream_connected();
void stream_connectionClosed();
@@ -134,10 +134,10 @@ namespace XMPP
FileTransfer *createTransfer();
FileTransfer *takeIncoming();
- signals:
+ Q_SIGNALS:
void incomingReady();
- private slots:
+ private Q_SLOTS:
void pft_incoming(const FTRequest &req);
private:
@@ -202,7 +202,7 @@ namespace XMPP
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void incoming(const FTRequest &req);
};
}
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp
index c1d6351..9268299 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.cpp
@@ -107,7 +107,7 @@ public:
void setIncomingClient(SocksClient *sc);
void incomingActivate(const Jid &streamHost);
-signals:
+Q_SIGNALS:
void accepted();
void tryingHosts(const StreamHostList &list);
void proxyConnect();
@@ -115,7 +115,7 @@ signals:
void connected();
void error(int);
-private slots:
+private Q_SLOTS:
void jt_finished();
void conn_result(bool b);
void proxy_result(bool b);
@@ -1783,10 +1783,10 @@ public:
success();
}
-signals:
+Q_SIGNALS:
void result(bool);
-private slots:
+private Q_SLOTS:
void sc_connected()
{
// if udp, need to send init packet before we are good
@@ -2001,10 +2001,10 @@ public:
expire.start(30000);
}
-signals:
+Q_SIGNALS:
void result(bool);
-private slots:
+private Q_SLOTS:
void doError()
{
expire.stop();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
index 646a7c0..ab2a19e 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
@@ -97,7 +97,7 @@ namespace XMPP
qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char * data, qint64 maxSize) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void proxyQuery(); // querying proxy for streamhost information
void proxyResult(bool b); // query success / fail
void requesting(); // sent actual S5B request (requester only)
@@ -108,7 +108,7 @@ namespace XMPP
void connected(); // connection active
void datagramReady();
- private slots:
+ private Q_SLOTS:
void doPending();
void sc_connectionClosed();
@@ -158,7 +158,7 @@ namespace XMPP
protected:
const char* sidPrefix() const Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void ps_incoming(const S5BRequest &req);
void ps_incomingUDPSuccess(const Jid &from, const QString &dstaddr);
void ps_incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
@@ -219,10 +219,10 @@ namespace XMPP
class Item;
- signals:
+ Q_SIGNALS:
void result(bool);
- private slots:
+ private Q_SLOTS:
void item_result(bool);
void t_timeout();
@@ -251,7 +251,7 @@ namespace XMPP
class Item;
- private slots:
+ private Q_SLOTS:
void ss_incomingReady();
void ss_incomingUDP(const QString &host, int port, const QHostAddress &addr, int sourcePort, const QByteArray &data);
void item_result(bool);
@@ -287,7 +287,7 @@ namespace XMPP
Jid streamHostUsed() const;
StreamHost proxyInfo() const;
- private slots:
+ private Q_SLOTS:
void t_timeout();
private:
@@ -320,7 +320,7 @@ namespace XMPP
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void incoming(const S5BRequest &req);
void incomingUDPSuccess(const Jid &from, const QString &dstaddr);
void incomingActivate(const Jid &from, const QString &sid, const Jid &streamHost);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bytestream.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bytestream.h
index a89e858..5d8c4ba 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bytestream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_bytestream.h
@@ -62,7 +62,7 @@ namespace XMPP
protected:
virtual const char* sidPrefix() const = 0;
- signals:
+ Q_SIGNALS:
void incomingReady();
};
}
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_caps.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_caps.h
index d0dad4e..47732cf 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_caps.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_caps.h
@@ -60,10 +60,10 @@ public:
bool isRegistered(const QString &) const;
DiscoItem disco(const QString&) const;
-signals:
+Q_SIGNALS:
void registered(const XMPP::CapsSpec&);
-public slots:
+public Q_SLOTS:
void load();
void save();
@@ -100,13 +100,13 @@ public:
QString osVersion(const Jid& jid) const;
CapsSpec capsSpec(const Jid &jid) const;
-signals:
+Q_SIGNALS:
/**
* This signal is emitted when the feature list of a given JID have changed.
*/
void capsChanged(const Jid& jid);
-protected slots:
+protected Q_SLOTS:
void discoFinished();
void capsRegistered(const CapsSpec&);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_client.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_client.h
index a55e415..7f9cbfe 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_client.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_client.h
@@ -132,7 +132,7 @@ namespace XMPP
void groupChatLeaveAll(const QString &statusStr = QString());
QString groupChatNick(const QString &host, const QString &room) const;
- signals:
+ Q_SIGNALS:
void activated();
void disconnected();
//void authFinished(bool, int, const QString &);
@@ -159,7 +159,7 @@ namespace XMPP
void beginImportRoster();
void endImportRoster();
- private slots:
+ private Q_SLOTS:
//void streamConnected();
//void streamHandshaken();
//void streamError(const StreamError &);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h
index c79e518..22cbdfe 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -51,7 +51,7 @@ namespace XMPP
void onGo() Q_DECL_OVERRIDE;
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void cachedReady();
private:
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h
index 92974d5..5675567 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -77,10 +77,10 @@ namespace XMPP
protected:
qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void connected();
- private slots:
+ private Q_SLOTS:
void ibb_finished();
void trySend();
@@ -113,14 +113,14 @@ namespace XMPP
BSConnection *createConnection() Q_DECL_OVERRIDE;
IBBConnection *takeIncoming();
- public slots:
+ public Q_SLOTS:
void takeIncomingData(const Jid &from, const QString &id,
const IBBData &data, Stanza::Kind);
protected:
const char* sidPrefix() const Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void ibb_incomingRequest(const Jid &from, const QString &id,
const QString &sid, int blockSize,
const QString &stanza);
@@ -162,7 +162,7 @@ namespace XMPP
int mode() const;
int bytesWritten() const;
- signals:
+ Q_SIGNALS:
void incomingRequest(const Jid &from, const QString &id,
const QString &sid, int blockSize,
const QString &stanza);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_task.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_task.h
index e16d27d..1c8fbb4 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_task.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_task.h
@@ -56,7 +56,7 @@ namespace XMPP {
virtual bool take(const QDomElement &);
void safeDelete();
- signals:
+ Q_SIGNALS:
void finished();
protected:
@@ -71,7 +71,7 @@ namespace XMPP {
void debug(const QString &);
bool iqVerify(const QDomElement &x, const Jid &to, const QString &id, const QString &xmlns=QLatin1String(""));
- private slots:
+ private Q_SLOTS:
void clientDisconnected();
void timeoutFinished();
void done();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h
index 97b8f60..a761db0 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -78,7 +78,7 @@ namespace XMPP
void onGo() Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void getFormFinished();
void unregFinished();
@@ -124,7 +124,7 @@ namespace XMPP
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void roster(const Roster &);
private:
@@ -163,7 +163,7 @@ namespace XMPP
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void presence(const Jid &, const Status &);
void subscription(const Jid &, const QString &, const QString&);
@@ -205,7 +205,7 @@ namespace XMPP
bool take(const QDomElement &) Q_DECL_OVERRIDE;
- signals:
+ Q_SIGNALS:
void message(const Message &);
private:
diff --git a/protocols/jabber/libiris/src/xmpp/zlib/zlibcompressor.h b/protocols/jabber/libiris/src/xmpp/zlib/zlibcompressor.h
index 19235d9..358cb16 100644
--- a/protocols/jabber/libiris/src/xmpp/zlib/zlibcompressor.h
+++ b/protocols/jabber/libiris/src/xmpp/zlib/zlibcompressor.h
@@ -17,7 +17,7 @@ public:
int write(const QByteArray&);
-protected slots:
+protected Q_SLOTS:
void flush();
protected:
diff --git a/protocols/jabber/libiris/src/xmpp/zlib/zlibdecompressor.h b/protocols/jabber/libiris/src/xmpp/zlib/zlibdecompressor.h
index 0f7ff2e..763f5a9 100644
--- a/protocols/jabber/libiris/src/xmpp/zlib/zlibdecompressor.h
+++ b/protocols/jabber/libiris/src/xmpp/zlib/zlibdecompressor.h
@@ -17,7 +17,7 @@ public:
qint64 write(const QByteArray&);
-protected slots:
+protected Q_SLOTS:
void flush();
protected:
diff --git a/protocols/jabber/libjingle.h b/protocols/jabber/libjingle.h
index e5ce359..2bc53a6 100644
--- a/protocols/jabber/libjingle.h
+++ b/protocols/jabber/libjingle.h
@@ -90,7 +90,7 @@ class Libjingle : public QObject
*/
void setStatus(const QString &status);
- public slots:
+ public Q_SLOTS:
/**
* Start and login to jabber server using libjingle example libjingle-call application for voice call support
@@ -168,7 +168,7 @@ class Libjingle : public QObject
/// restart timer
QTimer * timer;
- private slots:
+ private Q_SLOTS:
/// slot for read all available data from libjingle example libjingle-call application
void read();
@@ -181,7 +181,7 @@ class Libjingle : public QObject
/// slot for restart libjingle example libjingle-call application
void restart();
- signals:
+ Q_SIGNALS:
/**
* This signal is emitted when we are succesfull login to jabber server
diff --git a/protocols/jabber/libjinglecalldialog.h b/protocols/jabber/libjinglecalldialog.h
index d10a34b..c25beb3 100644
--- a/protocols/jabber/libjinglecalldialog.h
+++ b/protocols/jabber/libjinglecalldialog.h
@@ -47,7 +47,7 @@ class LibjingleCallDialog : public QDialog, public Ui::LibjingleCallDialog
*/
virtual void closeEvent(QCloseEvent * e);
- signals:
+ Q_SIGNALS:
void closed();
diff --git a/protocols/jabber/tasks/privacymanager.h b/protocols/jabber/tasks/privacymanager.h
index a7731b3..af2fa8b 100644
--- a/protocols/jabber/tasks/privacymanager.h
+++ b/protocols/jabber/tasks/privacymanager.h
@@ -120,7 +120,7 @@ class PrivacyManager : public QObject
protected:
static QStringList blockedContacts ( const PrivacyList&, bool* allBlocked );
- private slots:
+ private Q_SLOTS:
void receiveLists();
void receiveList();
void changeDefaultList_finished();
@@ -134,7 +134,7 @@ class PrivacyManager : public QObject
void block_getDefaultList_success ( const PrivacyList& );
void block_getDefaultList_error();
- signals:
+ Q_SIGNALS:
void changeDefaultList_success();
void changeDefaultList_error();
void changeActiveList_success();
diff --git a/protocols/jabber/ui/dlgahclist.h b/protocols/jabber/ui/dlgahclist.h
index ac6e3e9..6f76b67 100644
--- a/protocols/jabber/ui/dlgahclist.h
+++ b/protocols/jabber/ui/dlgahclist.h
@@ -32,7 +32,7 @@ public:
dlgAHCList(const XMPP::Jid &jid, XMPP::Client *client, QWidget *parent = nullptr);
~dlgAHCList();
-protected slots:
+protected Q_SLOTS:
void slotGetList();
void slotListReceived();
void slotExecuteCommand();
diff --git a/protocols/jabber/ui/dlgahcommand.h b/protocols/jabber/ui/dlgahcommand.h
index 395099b..b9833e7 100644
--- a/protocols/jabber/ui/dlgahcommand.h
+++ b/protocols/jabber/ui/dlgahcommand.h
@@ -31,7 +31,7 @@ public:
dlgAHCommand(const AHCommand &r, const XMPP::Jid &jid, XMPP::Client *client, bool final = false, QWidget *parent = nullptr);
~dlgAHCommand();
-protected slots:
+protected Q_SLOTS:
void slotPrev();
void slotNext();
void slotComplete();
diff --git a/protocols/jabber/ui/dlgjabberchangepassword.h b/protocols/jabber/ui/dlgjabberchangepassword.h
index 29f4d9b..0e88b9d 100644
--- a/protocols/jabber/ui/dlgjabberchangepassword.h
+++ b/protocols/jabber/ui/dlgjabberchangepassword.h
@@ -37,7 +37,7 @@ public:
explicit DlgJabberChangePassword ( JabberAccount *account, QWidget *parent = nullptr );
~DlgJabberChangePassword();
-private slots:
+private Q_SLOTS:
void slotOk ();
void slotCancel ();
void slotChangePassword ();
diff --git a/protocols/jabber/ui/dlgjabberchatjoin.h b/protocols/jabber/ui/dlgjabberchatjoin.h
index 39ce45a..4117897 100644
--- a/protocols/jabber/ui/dlgjabberchatjoin.h
+++ b/protocols/jabber/ui/dlgjabberchatjoin.h
@@ -33,7 +33,7 @@ public:
~dlgJabberChatJoin();
/*$PUBLIC_FUNCTIONS$*/
-public slots:
+public Q_SLOTS:
/*$PUBLIC_SLOTS$*/
virtual void slotJoin();
virtual void slotQuery();
@@ -41,7 +41,7 @@ public slots:
protected:
/*$PROTECTED_FUNCTIONS$*/
-protected slots:
+protected Q_SLOTS:
/*$PROTECTED_SLOTS$*/
private:
@@ -53,7 +53,7 @@ private:
should be merged elsewhere !
*/
void checkDefaultChatroomServer();
-private slots:
+private Q_SLOTS:
void slotQueryFinished();
void slotDiscoFinished();
void slotChatRooomsQueryFinished();
diff --git a/protocols/jabber/ui/dlgjabberchatroomslist.h b/protocols/jabber/ui/dlgjabberchatroomslist.h
index 5e265d8..aa6c231 100644
--- a/protocols/jabber/ui/dlgjabberchatroomslist.h
+++ b/protocols/jabber/ui/dlgjabberchatroomslist.h
@@ -29,7 +29,7 @@ public:
~dlgJabberChatRoomsList();
/*$PUBLIC_FUNCTIONS$*/
-public slots:
+public Q_SLOTS:
/*$PUBLIC_SLOTS$*/
virtual void slotJoin();
virtual void slotQuery();
@@ -39,7 +39,7 @@ public slots:
protected:
/*$PROTECTED_FUNCTIONS$*/
-protected slots:
+protected Q_SLOTS:
/*$PROTECTED_SLOTS$*/
void slotQueryFinished();
diff --git a/protocols/jabber/ui/dlgjabberregister.h b/protocols/jabber/ui/dlgjabberregister.h
index a4a10e7..daeff07 100644
--- a/protocols/jabber/ui/dlgjabberregister.h
+++ b/protocols/jabber/ui/dlgjabberregister.h
@@ -43,7 +43,7 @@ public:
dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, QWidget * parent = 0);
~dlgJabberRegister ();
-private slots:
+private Q_SLOTS:
void slotGotForm ();
void slotSendForm ();
void slotSentForm ();
diff --git a/protocols/jabber/ui/dlgjabberservices.h b/protocols/jabber/ui/dlgjabberservices.h
index 0692287..45e5375 100644
--- a/protocols/jabber/ui/dlgjabberservices.h
+++ b/protocols/jabber/ui/dlgjabberservices.h
@@ -44,7 +44,7 @@ protected:
void initTree();
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
//void slotSetSelection (Q3ListViewItem *);
void slotItemExpanded(QTreeWidgetItem *item);
void slotService();
@@ -76,7 +76,7 @@ public:
void startDisco();
-private slots:
+private Q_SLOTS:
void slotDiscoFinished();
void slotDiscoInfoFinished();
diff --git a/protocols/jabber/ui/dlgjabbervcard.h b/protocols/jabber/ui/dlgjabbervcard.h
index 510f3bb..47208ea 100644
--- a/protocols/jabber/ui/dlgjabbervcard.h
+++ b/protocols/jabber/ui/dlgjabbervcard.h
@@ -57,7 +57,7 @@ public:
dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, QWidget * parent = nullptr);
~dlgJabberVCard ();
-private slots:
+private Q_SLOTS:
/**
* Show the KFileDialog for image to select a photo for the contact.
*/
diff --git a/protocols/jabber/ui/dlgjabberxoauth2.h b/protocols/jabber/ui/dlgjabberxoauth2.h
index 25b01b3..7a6822c 100644
--- a/protocols/jabber/ui/dlgjabberxoauth2.h
+++ b/protocols/jabber/ui/dlgjabberxoauth2.h
@@ -31,7 +31,7 @@ public:
DlgJabberXOAuth2(JabberAccount *account, QWidget *parent = NULL);
virtual ~DlgJabberXOAuth2();
-private slots:
+private Q_SLOTS:
void slotOk();
void slotCancel();
diff --git a/protocols/jabber/ui/dlgregister.h b/protocols/jabber/ui/dlgregister.h
index 9f2fa05..7798163 100644
--- a/protocols/jabber/ui/dlgregister.h
+++ b/protocols/jabber/ui/dlgregister.h
@@ -36,7 +36,7 @@ public:
dlgRegister(JabberAccount *account, const XMPP::Jid &jid, QWidget *parent = nullptr);
~dlgRegister();
-private slots:
+private Q_SLOTS:
void slotGotForm();
void slotSendForm();
void slotSentForm();
diff --git a/protocols/jabber/ui/dlgsearch.h b/protocols/jabber/ui/dlgsearch.h
index 8359097..ce01f24 100644
--- a/protocols/jabber/ui/dlgsearch.h
+++ b/protocols/jabber/ui/dlgsearch.h
@@ -37,7 +37,7 @@ public:
dlgSearch(JabberAccount *account, const XMPP::Jid &jid, QWidget *parent = nullptr);
~dlgSearch();
-private slots:
+private Q_SLOTS:
void slotGotForm();
void slotSendForm();
void slotSentForm();
diff --git a/protocols/jabber/ui/dlgxmppconsole.h b/protocols/jabber/ui/dlgxmppconsole.h
index 31881cc..e9d7f00 100644
--- a/protocols/jabber/ui/dlgxmppconsole.h
+++ b/protocols/jabber/ui/dlgxmppconsole.h
@@ -29,11 +29,11 @@ public:
explicit dlgXMPPConsole(JabberClient *client, QWidget *parent = nullptr);
virtual ~dlgXMPPConsole();
-public slots:
+public Q_SLOTS:
void slotIncomingXML(const QString &msg);
void slotOutgoingXML(const QString &msg);
-private slots:
+private Q_SLOTS:
void slotSend();
void slotClear();
diff --git a/protocols/jabber/ui/jabberaddcontactpage.h b/protocols/jabber/ui/jabberaddcontactpage.h
index a5a00df..c6988c2 100644
--- a/protocols/jabber/ui/jabberaddcontactpage.h
+++ b/protocols/jabber/ui/jabberaddcontactpage.h
@@ -42,7 +42,7 @@ public:
QLabel *noaddMsg1;
QLabel *noaddMsg2;
bool canadd;
-public slots:
+public Q_SLOTS:
void slotPromtReceived();
};
@@ -58,7 +58,7 @@ class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : p
JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, QObject *parent);
Kopete::MetaContact *metacontact;
JabberTransport *transport;
- public slots:
+ public Q_SLOTS:
void slotJidReceived();
};
diff --git a/protocols/jabber/ui/jabberchooseserver.h b/protocols/jabber/ui/jabberchooseserver.h
index dc3903d..2467826 100644
--- a/protocols/jabber/ui/jabberchooseserver.h
+++ b/protocols/jabber/ui/jabberchooseserver.h
@@ -45,7 +45,7 @@ public:
~JabberChooseServer();
-private slots:
+private Q_SLOTS:
void slotOk ();
void slotCancel ();
void slotTransferData ( KIO::Job *job, const QByteArray &data );
diff --git a/protocols/jabber/ui/jabbereditaccountwidget.h b/protocols/jabber/ui/jabbereditaccountwidget.h
index 36c6d0b..00a67f5 100644
--- a/protocols/jabber/ui/jabbereditaccountwidget.h
+++ b/protocols/jabber/ui/jabbereditaccountwidget.h
@@ -46,7 +46,7 @@ public:
Kopete::Account *apply () Q_DECL_OVERRIDE;
JabberAccount *account ();
-private slots:
+private Q_SLOTS:
void registerClicked ();
void slotChangePasswordClicked ();
void slotChangePasswordFinished ();
diff --git a/protocols/jabber/ui/jabberregisteraccount.h b/protocols/jabber/ui/jabberregisteraccount.h
index d27cf64..6362b49 100644
--- a/protocols/jabber/ui/jabberregisteraccount.h
+++ b/protocols/jabber/ui/jabberregisteraccount.h
@@ -46,10 +46,10 @@ public:
void setServer ( const QString &server );
-public slots:
+public Q_SLOTS:
void accept () Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotChooseServer ();
void slotJIDInformation ();
void slotSSLToggled ();
diff --git a/protocols/jabber/ui/privacydlg.h b/protocols/jabber/ui/privacydlg.h
index a3e6b39..a0c8def 100644
--- a/protocols/jabber/ui/privacydlg.h
+++ b/protocols/jabber/ui/privacydlg.h
@@ -45,7 +45,7 @@ protected:
void revertSettings();
void listChanged();
-protected slots:
+protected Q_SLOTS:
void setWidgetsEnabled(bool);
void setEditRuleEnabled(bool);
void updateLists(const QString&, const QString&, const QStringList&);
diff --git a/protocols/jabber/ui/privacyruledlg.h b/protocols/jabber/ui/privacyruledlg.h
index 1cf6c23..dc434e2 100644
--- a/protocols/jabber/ui/privacyruledlg.h
+++ b/protocols/jabber/ui/privacyruledlg.h
@@ -38,7 +38,7 @@ public:
void setRule(const PrivacyListItem&);
PrivacyListItem rule() const;
-protected slots:
+protected Q_SLOTS:
void type_selected(const QString&);
private:
diff --git a/protocols/jabber/xoauth2provider.cpp b/protocols/jabber/xoauth2provider.cpp
index af29043..e1849ae 100644
--- a/protocols/jabber/xoauth2provider.cpp
+++ b/protocols/jabber/xoauth2provider.cpp
@@ -287,7 +287,7 @@ private:
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
-private slots:
+private Q_SLOTS:
void accessTokenReceived()
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
diff --git a/protocols/oscar/aim/aimaccount.h b/protocols/oscar/aim/aimaccount.h
index c99a01d..ed5668f 100644
--- a/protocols/oscar/aim/aimaccount.h
+++ b/protocols/oscar/aim/aimaccount.h
@@ -61,7 +61,7 @@ public:
virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags canCreate,
Oscar::WORD exchange, const QString& room );
-public slots:
+public Q_SLOTS:
void sendMessage( Kopete::Message&, Kopete::ChatSession* session );
void chatSessionDestroyed( Kopete::ChatSession* );
@@ -94,7 +94,7 @@ public:
void setPrivacySettings( int privacy );
-public slots:
+public Q_SLOTS:
/** Reimplementation from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
@@ -105,7 +105,7 @@ public slots:
void slotJoinChat();
-protected slots:
+protected Q_SLOTS:
void joinChatDialogClosed( int );
void loginActions() Q_DECL_OVERRIDE;
diff --git a/protocols/oscar/aim/aimcontact.h b/protocols/oscar/aim/aimcontact.h
index ea8ae59..623b0bd 100644
--- a/protocols/oscar/aim/aimcontact.h
+++ b/protocols/oscar/aim/aimcontact.h
@@ -42,7 +42,7 @@ public:
void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void slotUserInfo() Q_DECL_OVERRIDE;
void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
void userOnline( const QString& userId ) Q_DECL_OVERRIDE;
@@ -50,10 +50,10 @@ public slots:
void updateProfile( const QString& contact, const QString& profile );
void gotWarning( const QString& contact, quint16, quint16 );
-signals:
+Q_SIGNALS:
void updatedProfile();
-private slots:
+private Q_SLOTS:
void closeUserInfoDialog();
void warnUser();
diff --git a/protocols/oscar/aim/aimjoinchat.h b/protocols/oscar/aim/aimjoinchat.h
index 53ad6ad..c658975 100644
--- a/protocols/oscar/aim/aimjoinchat.h
+++ b/protocols/oscar/aim/aimjoinchat.h
@@ -40,11 +40,11 @@ public:
QString roomName() const;
QString exchange() const;
-protected slots:
+protected Q_SLOTS:
void joinChat();
void closeClicked();
-signals:
+Q_SIGNALS:
void closing( int );
private:
diff --git a/protocols/oscar/aim/aimuserinfo.h b/protocols/oscar/aim/aimuserinfo.h
index c087259..02ec439 100644
--- a/protocols/oscar/aim/aimuserinfo.h
+++ b/protocols/oscar/aim/aimuserinfo.h
@@ -40,7 +40,7 @@ class AIMUserInfoDialog : public KDialog
QTextBrowser *userInfoView;
KTextEdit *userInfoEdit;
- private slots:
+ private Q_SLOTS:
void slotSaveClicked();
void slotCloseClicked();
void slotUpdateClicked();
@@ -48,7 +48,7 @@ class AIMUserInfoDialog : public KDialog
void slotUrlClicked(const QString&);
void slotMailClicked(const QString&, const QString&);
- signals:
+ Q_SIGNALS:
// void updateNickname(const QString &);
void closing();
};
diff --git a/protocols/oscar/aim/icqcontact.h b/protocols/oscar/aim/icqcontact.h
index 402d278..6b3adbb 100644
--- a/protocols/oscar/aim/icqcontact.h
+++ b/protocols/oscar/aim/icqcontact.h
@@ -58,7 +58,7 @@ public:
void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
void userOnline( const QString& userId ) Q_DECL_OVERRIDE;
@@ -71,7 +71,7 @@ private:
KToggleAction *m_actionVisibleTo;
KToggleAction *m_actionInvisibleTo;
-private slots:
+private Q_SLOTS:
void slotVisibleTo();
void slotInvisibleTo();
};
diff --git a/protocols/oscar/aim/ui/aimeditaccountwidget.h b/protocols/oscar/aim/ui/aimeditaccountwidget.h
index b1816b6..e48fa06 100644
--- a/protocols/oscar/aim/ui/aimeditaccountwidget.h
+++ b/protocols/oscar/aim/ui/aimeditaccountwidget.h
@@ -46,7 +46,7 @@ public:
bool validateData() Q_DECL_OVERRIDE;
Kopete::Account *apply() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotOpenRegister();
protected:
diff --git a/protocols/oscar/icq/aimcontact.h b/protocols/oscar/icq/aimcontact.h
index a929c56..0dbac3a 100644
--- a/protocols/oscar/icq/aimcontact.h
+++ b/protocols/oscar/icq/aimcontact.h
@@ -45,12 +45,12 @@ public:
void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
void userOnline( const QString& userId ) Q_DECL_OVERRIDE;
void userOffline( const QString& userId ) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotIgnore();
void slotVisibleTo();
diff --git a/protocols/oscar/icq/icqaccount.h b/protocols/oscar/icq/icqaccount.h
index 8d5c6f1..9577f20 100644
--- a/protocols/oscar/icq/icqaccount.h
+++ b/protocols/oscar/icq/icqaccount.h
@@ -41,7 +41,7 @@ public:
ICQMyselfContact( ICQAccount *acct );
void userInfoUpdated() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void receivedShortInfo( const QString& );
void fetchShortInfo();
};
@@ -71,7 +71,7 @@ public:
protected:
OscarContact *createNewContact( const QString &contactId, Kopete::MetaContact *parentContact, const OContact& ssiItem ) Q_DECL_OVERRIDE;
-protected slots:
+protected Q_SLOTS:
void loginActions() Q_DECL_OVERRIDE;
void disconnected( DisconnectReason reason ) Q_DECL_OVERRIDE;
@@ -82,7 +82,7 @@ private:
//const unsigned long fullStatus( const unsigned long plainStatus );
-private slots:
+private Q_SLOTS:
void setPresenceTarget( const Oscar::Presence &presence, const Kopete::StatusMessage &reason = Kopete::StatusMessage() );
void setPresenceXStatus( const Xtraz::Status &xStatus );
diff --git a/protocols/oscar/icq/icqcontact.h b/protocols/oscar/icq/icqcontact.h
index 4cf39aa..18cdcd2 100644
--- a/protocols/oscar/icq/icqcontact.h
+++ b/protocols/oscar/icq/icqcontact.h
@@ -58,7 +58,7 @@ public:
/** Set encoding for this contact */
void setEncoding( int mib ) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void slotUserInfo() Q_DECL_OVERRIDE;
void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
@@ -66,7 +66,7 @@ public slots:
void userOffline( const QString& userID ) Q_DECL_OVERRIDE;
void loggedIn();
-signals:
+Q_SIGNALS:
void haveBasicInfo( const ICQGeneralUserInfo& );
void haveWorkInfo( const ICQWorkUserInfo& );
void haveEmailInfo( const ICQEmailInfo& );
@@ -89,7 +89,7 @@ private:
enum { InfoNone = 0, InfoShort, InfoMediumTlv } m_requestingInfo;
-private slots:
+private Q_SLOTS:
/** Refresh status from this contact */
void refreshStatus( const UserDetails& details, Oscar::Presence presence );
diff --git a/protocols/oscar/icq/icqreadaway.h b/protocols/oscar/icq/icqreadaway.h
index caba345..ea4e866 100644
--- a/protocols/oscar/icq/icqreadaway.h
+++ b/protocols/oscar/icq/icqreadaway.h
@@ -34,14 +34,14 @@ class ICQReadAway : public KDialog
public:
explicit ICQReadAway(ICQContact *, QWidget *parent = 0, const char* name = "ICQReadAway");
- private slots:
+ private Q_SLOTS:
void slotFetchAwayMessage();
void slotAwayMessageChanged();
void slotCloseClicked();
void slotUrlClicked(const QString &url);
void slotMailClicked(const QString&, const QString &address);
- signals:
+ Q_SIGNALS:
void closing();
private:
diff --git a/protocols/oscar/icq/ui/editorwithicon.h b/protocols/oscar/icq/ui/editorwithicon.h
index 16bc1ae..41fc524 100644
--- a/protocols/oscar/icq/ui/editorwithicon.h
+++ b/protocols/oscar/icq/ui/editorwithicon.h
@@ -54,11 +54,11 @@ public:
/** Returns selected icon index */
int iconIndex() const { return mIconIndex; }
-public slots:
+public Q_SLOTS:
/** Sets selected icon index */
void setIconIndex( int index );
-private slots:
+private Q_SLOTS:
/** Popups widget with icons */
void popupIcons();
diff --git a/protocols/oscar/icq/ui/iconcells.h b/protocols/oscar/icq/ui/iconcells.h
index a3f1cbd..ba04da3 100644
--- a/protocols/oscar/icq/ui/iconcells.h
+++ b/protocols/oscar/icq/ui/iconcells.h
@@ -55,11 +55,11 @@ public:
QSize sizeHint () const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
/** Emitted when a icon is selected in the table */
void selected( int index );
-protected slots:
+protected Q_SLOTS:
void selected( int row, int column );
protected:
diff --git a/protocols/oscar/icq/ui/icqaddcontactpage.h b/protocols/oscar/icq/ui/icqaddcontactpage.h
index 07809eb..aa4661f 100644
--- a/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -47,7 +47,7 @@ public:
protected:
void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void showSearchDialog();
void searchDialogDestroyed();
private:
diff --git a/protocols/oscar/icq/ui/icqchangepassworddialog.h b/protocols/oscar/icq/ui/icqchangepassworddialog.h
index bb0e2e0..1053d3b 100644
--- a/protocols/oscar/icq/ui/icqchangepassworddialog.h
+++ b/protocols/oscar/icq/ui/icqchangepassworddialog.h
@@ -34,10 +34,10 @@ public:
explicit ICQChangePasswordDialog( ICQAccount* account, QWidget* parent = nullptr );
~ICQChangePasswordDialog();
-protected slots:
+protected Q_SLOTS:
void slotButtonClicked( int button ) Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotPasswordChanged( bool error );
private:
diff --git a/protocols/oscar/icq/ui/icqeditaccountwidget.h b/protocols/oscar/icq/ui/icqeditaccountwidget.h
index cef425e..61c128b 100644
--- a/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -43,7 +43,7 @@ public:
bool validateData() Q_DECL_OVERRIDE;
Kopete::Account *apply() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotOpenRegister();
void slotChangePassword();
diff --git a/protocols/oscar/icq/ui/icqsearchdialog.h b/protocols/oscar/icq/ui/icqsearchdialog.h
index 7221776..9aa1dbe 100644
--- a/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -42,7 +42,7 @@ public:
explicit ICQSearchDialog( ICQAccount* account, QWidget* parent = nullptr );
~ICQSearchDialog();
-private slots:
+private Q_SLOTS:
void startSearch();
void stopSearch();
void clearResults();
@@ -59,7 +59,7 @@ private slots:
/// The search is finished
void searchFinished( int numLeft );
-protected slots:
+protected Q_SLOTS:
void slotButtonClicked( int button ) Q_DECL_OVERRIDE;
private:
diff --git a/protocols/oscar/icq/ui/icquserinfowidget.h b/protocols/oscar/icq/ui/icquserinfowidget.h
index 6c53ade..b733a0e 100644
--- a/protocols/oscar/icq/ui/icquserinfowidget.h
+++ b/protocols/oscar/icq/ui/icquserinfowidget.h
@@ -49,7 +49,7 @@ public:
QList<ICQInfoBase*> getInfoData() const;
QString getAlias() const;
-public slots:
+public Q_SLOTS:
void fillBasicInfo( const ICQGeneralUserInfo& );
void fillWorkInfo( const ICQWorkUserInfo& );
void fillEmailInfo( const ICQEmailInfo& );
@@ -58,7 +58,7 @@ public slots:
void fillInterestInfo( const ICQInterestInfo& );
void fillOrgAffInfo( const ICQOrgAffInfo& info);
-private slots:
+private Q_SLOTS:
void receivedLongInfo( const QString& contact );
void slotUpdateDay();
diff --git a/protocols/oscar/icq/ui/xtrazicqstatuseditor.h b/protocols/oscar/icq/ui/xtrazicqstatuseditor.h
index 35b2ddc..655c38f 100644
--- a/protocols/oscar/icq/ui/xtrazicqstatuseditor.h
+++ b/protocols/oscar/icq/ui/xtrazicqstatuseditor.h
@@ -40,7 +40,7 @@ public:
explicit ICQStatusEditor( ICQStatusManager *statusManager, QWidget *parent = nullptr );
~ICQStatusEditor();
-public slots:
+public Q_SLOTS:
void save();
void moveUp();
@@ -49,7 +49,7 @@ public slots:
void addStatus();
void deleteStatus();
-private slots:
+private Q_SLOTS:
void updateButtons();
private:
diff --git a/protocols/oscar/icq/xtrazstatusaction.h b/protocols/oscar/icq/xtrazstatusaction.h
index 4cd34b3..514f70d 100644
--- a/protocols/oscar/icq/xtrazstatusaction.h
+++ b/protocols/oscar/icq/xtrazstatusaction.h
@@ -30,10 +30,10 @@ class StatusAction: public QAction
public:
StatusAction( const Xtraz::Status &status, QObject *parent );
-public slots:
+public Q_SLOTS:
void triggered();
-signals:
+Q_SIGNALS:
void triggered( const Xtraz::Status &status );
private:
diff --git a/protocols/oscar/icqcontactbase.h b/protocols/oscar/icqcontactbase.h
index 66c048a..7e51f40 100644
--- a/protocols/oscar/icqcontactbase.h
+++ b/protocols/oscar/icqcontactbase.h
@@ -41,7 +41,7 @@ public:
const QString& icon = QString() );
virtual ~ICQContactBase();
-private slots:
+private Q_SLOTS:
void receivedXStatusMessage( const QString& contact, int icon, const QString& description, const QString& message );
};
diff --git a/protocols/oscar/liboscar/chatroomhandler.h b/protocols/oscar/liboscar/chatroomhandler.h
index 73273b1..dc996ad 100644
--- a/protocols/oscar/liboscar/chatroomhandler.h
+++ b/protocols/oscar/liboscar/chatroomhandler.h
@@ -45,7 +45,7 @@ public Q_SLOTS:
void reject();
void accept();
-signals:
+Q_SIGNALS:
void joinChatRoom( const QString& roomName, int exchange );
private:
diff --git a/protocols/oscar/liboscar/client.h b/protocols/oscar/liboscar/client.h
index adcf0b7..9da4dd9 100644
--- a/protocols/oscar/liboscar/client.h
+++ b/protocols/oscar/liboscar/client.h
@@ -460,10 +460,10 @@ public:
/** Notify that a socket error has occurred */
void notifySocketError( int errCode, const QString& msg );
-public slots:
+public Q_SLOTS:
void joinChatRoom( const QString& roomName, int exchange );
-signals:
+Q_SIGNALS:
/** CONNECTION EVENTS */
/** Notifies that we want to create new stream.
@@ -563,7 +563,7 @@ signals:
/** incoming filetransfer */
void incomingFileTransfer( FileTransferHandler* handler );
-protected slots:
+protected Q_SLOTS:
// INTERNAL, FOR USE BY TASKS' finished() SIGNALS //
/** Singleshot timer to start stage two login */
diff --git a/protocols/oscar/liboscar/connection.h b/protocols/oscar/liboscar/connection.h
index 1d75f56..209bc6b 100644
--- a/protocols/oscar/liboscar/connection.h
+++ b/protocols/oscar/liboscar/connection.h
@@ -184,7 +184,7 @@ public:
void send( Transfer* t ) const;
void forcedSend( Transfer* t ) const;
-signals:
+Q_SIGNALS:
/** There's data ready to read */
void readyRead();
@@ -212,7 +212,7 @@ private:
/** Distribute the transfer among the connection's tasks */
void distribute( Transfer* t ) const;
-private slots:
+private Q_SLOTS:
/** Reset the data for the connection.*/
void reset();
diff --git a/protocols/oscar/liboscar/contactmanager.h b/protocols/oscar/liboscar/contactmanager.h
index bf070d1..07c80f7 100644
--- a/protocols/oscar/liboscar/contactmanager.h
+++ b/protocols/oscar/liboscar/contactmanager.h
@@ -102,7 +102,7 @@ public:
void setListComplete( bool complete );
bool listComplete() const;
-public slots:
+public Q_SLOTS:
bool newGroup( const OContact& group );
bool updateGroup( const OContact& group );
bool removeGroup( const OContact& group );
@@ -120,7 +120,7 @@ public slots:
void addID( const OContact& item );
void removeID( const OContact& item );
-signals:
+Q_SIGNALS:
//! Emitted when we've added a new contact to the list
void contactAdded( const OContact& );
diff --git a/protocols/oscar/liboscar/coreprotocol.h b/protocols/oscar/liboscar/coreprotocol.h
index 1efe621..4ff615d 100644
--- a/protocols/oscar/liboscar/coreprotocol.h
+++ b/protocols/oscar/liboscar/coreprotocol.h
@@ -65,7 +65,7 @@ public:
*/
int state();
-signals:
+Q_SIGNALS:
/**
* Emitted as the core protocol converts fields to wire ready data
*/
@@ -75,7 +75,7 @@ signals:
* Emitted when there is incoming data, parsed into a Transfer
*/
void incomingData();
-protected slots:
+protected Q_SLOTS:
/**
* Just a debug method to test emitting to the socket, atm - should go to the ClientStream
*/
diff --git a/protocols/oscar/liboscar/oftmetatransfer.h b/protocols/oscar/liboscar/oftmetatransfer.h
index d95e5af..e29d981 100644
--- a/protocols/oscar/liboscar/oftmetatransfer.h
+++ b/protocols/oscar/liboscar/oftmetatransfer.h
@@ -44,10 +44,10 @@ public:
void start(); //start sending file
-public slots:
+public Q_SLOTS:
void doCancel(); //one of the users is cancelling us
-signals:
+Q_SIGNALS:
void fileStarted( const QString& sourceFile, const QString& destinationFile );
void fileStarted( const QString& fileName, unsigned int fileSize );
void fileProcessed( unsigned int bytesSent, unsigned int fileSize );
@@ -56,7 +56,7 @@ signals:
void transferCompleted();
void transferError( int errorCode, const QString &error );
-private slots:
+private Q_SLOTS:
//bool validFile();
void socketError( QAbstractSocket::SocketError );
void socketRead();
diff --git a/protocols/oscar/liboscar/rateclass.h b/protocols/oscar/liboscar/rateclass.h
index 027f642..c63d89d 100644
--- a/protocols/oscar/liboscar/rateclass.h
+++ b/protocols/oscar/liboscar/rateclass.h
@@ -101,7 +101,7 @@ public:
*/
void dumpQueue();
-signals:
+Q_SIGNALS:
/** Tell the rate class manager we're ready to send */
void dataReady( Transfer* );
@@ -114,7 +114,7 @@ private:
/** sets up the timer for the transfer just added to the queue */
void setupTimer();
-private slots:
+private Q_SLOTS:
/**
* Send the packet. Basically emits dataReady for the first transfer
*/
diff --git a/protocols/oscar/liboscar/rateclassmanager.h b/protocols/oscar/liboscar/rateclassmanager.h
index b01354e..6917aeb 100644
--- a/protocols/oscar/liboscar/rateclassmanager.h
+++ b/protocols/oscar/liboscar/rateclassmanager.h
@@ -62,7 +62,7 @@ public:
*/
int timeToInitialLevel( Oscar::SNAC s );
-public slots:
+public Q_SLOTS:
void transferReady( Transfer* );
diff --git a/protocols/oscar/liboscar/safedelete.h b/protocols/oscar/liboscar/safedelete.h
index c41b131..a359b64 100644
--- a/protocols/oscar/liboscar/safedelete.h
+++ b/protocols/oscar/liboscar/safedelete.h
@@ -63,7 +63,7 @@ public:
static SafeDeleteLater *ensureExists();
void deleteItLater(QObject *o);
-private slots:
+private Q_SLOTS:
void explode();
private:
diff --git a/protocols/oscar/liboscar/stream.h b/protocols/oscar/liboscar/stream.h
index e4b118a..137d205 100644
--- a/protocols/oscar/liboscar/stream.h
+++ b/protocols/oscar/liboscar/stream.h
@@ -51,7 +51,7 @@ public:
*/
virtual void write( Transfer *request ) = 0;
-signals:
+Q_SIGNALS:
void disconnected();
void readyRead(); //signals that there is a transfer ready to be read
void error( int );
diff --git a/protocols/oscar/liboscar/tasks/buddyicontask.h b/protocols/oscar/liboscar/tasks/buddyicontask.h
index ce6736b..9011031 100644
--- a/protocols/oscar/liboscar/tasks/buddyicontask.h
+++ b/protocols/oscar/liboscar/tasks/buddyicontask.h
@@ -43,7 +43,7 @@ public:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void haveIcon( const QString&, QByteArray );
private:
diff --git a/protocols/oscar/liboscar/tasks/chatnavservicetask.h b/protocols/oscar/liboscar/tasks/chatnavservicetask.h
index 540efe2..9fb69e4 100644
--- a/protocols/oscar/liboscar/tasks/chatnavservicetask.h
+++ b/protocols/oscar/liboscar/tasks/chatnavservicetask.h
@@ -47,7 +47,7 @@ public:
QList<int> exchangeList() const;
-signals:
+Q_SIGNALS:
void haveChatExchanges( const QList<int>& );
void connectChat( Oscar::WORD, QByteArray, Oscar::WORD, const QString& );
diff --git a/protocols/oscar/liboscar/tasks/chatroomtask.h b/protocols/oscar/liboscar/tasks/chatroomtask.h
index 83bd52c..bec3df4 100644
--- a/protocols/oscar/liboscar/tasks/chatroomtask.h
+++ b/protocols/oscar/liboscar/tasks/chatroomtask.h
@@ -59,12 +59,12 @@ public:
protected:
void onGo() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void doInvite();
void doReject();
void doAccept();
-signals:
+Q_SIGNALS:
void joinChatRoom( const QString& roomName, int exchange );
private:
diff --git a/protocols/oscar/liboscar/tasks/chatservicetask.h b/protocols/oscar/liboscar/tasks/chatservicetask.h
index c22e3b4..68a88b6 100644
--- a/protocols/oscar/liboscar/tasks/chatservicetask.h
+++ b/protocols/oscar/liboscar/tasks/chatservicetask.h
@@ -47,7 +47,7 @@ public:
void setMessage( const Oscar::Message& msg );
void setEncoding( const QByteArray &enc );
-signals:
+Q_SIGNALS:
void userJoinedChat( Oscar::WORD, const QString& r, const QString& u );
void userLeftChat( Oscar::WORD, const QString& r, const QString& u );
void newChatMessage( const Oscar::Message& msg );
diff --git a/protocols/oscar/liboscar/tasks/errortask.h b/protocols/oscar/liboscar/tasks/errortask.h
index 048567f..cf4d874 100644
--- a/protocols/oscar/liboscar/tasks/errortask.h
+++ b/protocols/oscar/liboscar/tasks/errortask.h
@@ -32,7 +32,7 @@ public:
~ErrorTask();
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void messageError( const QString& contact, uint messageId );
protected:
diff --git a/protocols/oscar/liboscar/tasks/filetransfertask.h b/protocols/oscar/liboscar/tasks/filetransfertask.h
index 2a240db..0b79304 100644
--- a/protocols/oscar/liboscar/tasks/filetransfertask.h
+++ b/protocols/oscar/liboscar/tasks/filetransfertask.h
@@ -61,13 +61,13 @@ public:
bool take( int type, QByteArray cookie, Buffer b );
bool takeAutoResponse( int type, QByteArray cookie, Buffer* b );
-public slots:
+public Q_SLOTS:
void doCancel();
void doAccept( const QString &localDirecotry );
void doAccept( const QStringList &localFileNames );
void timeout();
-signals:
+Q_SIGNALS:
void transferCancelled();
void transferError( int errorCode, const QString &error );
void transferProcessed( unsigned int totalSent );
@@ -81,7 +81,7 @@ signals:
void cancelOft();
-private slots:
+private Q_SLOTS:
void readyAccept(); //serversocket got connection
void socketError( QAbstractSocket::SocketError );
void proxyRead();
diff --git a/protocols/oscar/liboscar/tasks/icquserinfotask.h b/protocols/oscar/liboscar/tasks/icquserinfotask.h
index ac32250..4cbb67c 100644
--- a/protocols/oscar/liboscar/tasks/icquserinfotask.h
+++ b/protocols/oscar/liboscar/tasks/icquserinfotask.h
@@ -56,7 +56,7 @@ public:
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
void onGo() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void receivedInfoFor( const QString& contact, unsigned int type );
private:
diff --git a/protocols/oscar/liboscar/tasks/logintask.h b/protocols/oscar/liboscar/tasks/logintask.h
index c1ab9d3..c31fed8 100644
--- a/protocols/oscar/liboscar/tasks/logintask.h
+++ b/protocols/oscar/liboscar/tasks/logintask.h
@@ -68,7 +68,7 @@ public:
//! Get the error reason so it can be displayed
const QString& errorReason() const;
-public slots:
+public Q_SLOTS:
void closeTaskFinished();
void loginTaskFinished();
@@ -121,7 +121,7 @@ public:
QString host() const;
QString port() const;
-public slots:
+public Q_SLOTS:
//! Start the rate info task
void versionTaskFinished();
diff --git a/protocols/oscar/liboscar/tasks/messageacktask.h b/protocols/oscar/liboscar/tasks/messageacktask.h
index 87d8045..daf476c 100644
--- a/protocols/oscar/liboscar/tasks/messageacktask.h
+++ b/protocols/oscar/liboscar/tasks/messageacktask.h
@@ -31,7 +31,7 @@ public:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void messageAck( const QString& contact, uint messageId );
};
diff --git a/protocols/oscar/liboscar/tasks/messagereceivertask.h b/protocols/oscar/liboscar/tasks/messagereceivertask.h
index d614995..8f52cd7 100644
--- a/protocols/oscar/liboscar/tasks/messagereceivertask.h
+++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h
@@ -39,7 +39,7 @@ public:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void receivedMessage( const Oscar::Message& );
void chatroomMessage( const Oscar::Message&, const QByteArray & );
diff --git a/protocols/oscar/liboscar/tasks/onlinenotifiertask.h b/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
index a4c4be1..48c9a4b 100644
--- a/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
+++ b/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
@@ -45,7 +45,7 @@ public:
protected:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void userIsOnline( const QString& user, const UserDetails& ud );
void userIsOffline( const QString& user, const UserDetails& ud );
diff --git a/protocols/oscar/liboscar/tasks/oscarlogintask.h b/protocols/oscar/liboscar/tasks/oscarlogintask.h
index a50c815..02b5f15 100644
--- a/protocols/oscar/liboscar/tasks/oscarlogintask.h
+++ b/protocols/oscar/liboscar/tasks/oscarlogintask.h
@@ -43,7 +43,7 @@ public:
protected:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void haveAuthKey();
private:
@@ -63,7 +63,7 @@ private:
//Massive code duplication with CloseConnectionTask
bool parseDisconnectCode( int error, QString& reason );
-private slots:
+private Q_SLOTS:
//! Send SNAC 0x17, 0x02
void sendLoginRequest();
diff --git a/protocols/oscar/liboscar/tasks/ownuserinfotask.h b/protocols/oscar/liboscar/tasks/ownuserinfotask.h
index 86a3c68..c15f790 100644
--- a/protocols/oscar/liboscar/tasks/ownuserinfotask.h
+++ b/protocols/oscar/liboscar/tasks/ownuserinfotask.h
@@ -40,7 +40,7 @@ public:
UserDetails getInfo() const;
-signals:
+Q_SIGNALS:
/** Emitted when user info is received. Needed because succeeded() is only emitted once. */
void gotInfo();
diff --git a/protocols/oscar/liboscar/tasks/rateinfotask.h b/protocols/oscar/liboscar/tasks/rateinfotask.h
index e290786..d030177 100644
--- a/protocols/oscar/liboscar/tasks/rateinfotask.h
+++ b/protocols/oscar/liboscar/tasks/rateinfotask.h
@@ -43,10 +43,10 @@ protected:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
void onGo() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void gotRateLimits();
-private slots:
+private Q_SLOTS:
//! Send the rate info request (SNAC 0x01, 0x06)
void sendRateInfoRequest();
diff --git a/protocols/oscar/liboscar/tasks/serverredirecttask.h b/protocols/oscar/liboscar/tasks/serverredirecttask.h
index 65644e4..649e043 100644
--- a/protocols/oscar/liboscar/tasks/serverredirecttask.h
+++ b/protocols/oscar/liboscar/tasks/serverredirecttask.h
@@ -50,7 +50,7 @@ public:
QString newHost() const;
Oscar::WORD service() const;
-signals:
+Q_SIGNALS:
void haveServer( const QString&, const QByteArray&, Oscar::WORD );
private:
diff --git a/protocols/oscar/liboscar/tasks/servicesetuptask.h b/protocols/oscar/liboscar/tasks/servicesetuptask.h
index 2ad0bc1..5d12ffb 100644
--- a/protocols/oscar/liboscar/tasks/servicesetuptask.h
+++ b/protocols/oscar/liboscar/tasks/servicesetuptask.h
@@ -45,7 +45,7 @@ public:
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
void onGo() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void childTaskFinished();
private:
diff --git a/protocols/oscar/liboscar/tasks/ssiauthtask.h b/protocols/oscar/liboscar/tasks/ssiauthtask.h
index 22f57ac..e37521f 100644
--- a/protocols/oscar/liboscar/tasks/ssiauthtask.h
+++ b/protocols/oscar/liboscar/tasks/ssiauthtask.h
@@ -40,7 +40,7 @@ public:
void grantFutureAuth( const QString& uin, const QString& reason );
void sendAuthRequest( const QString& uin, const QString& reason );
void sendAuthReply( const QString& uin, const QString& reason, bool auth );
-signals:
+Q_SIGNALS:
void futureAuthGranted( const QString& uin, const QString& reason );
void authRequested( const QString& uin, const QString& reason );
void authReplied( const QString& uin, const QString& reason, bool auth );
diff --git a/protocols/oscar/liboscar/tasks/ssilisttask.h b/protocols/oscar/liboscar/tasks/ssilisttask.h
index b8d8e00..10f4d31 100644
--- a/protocols/oscar/liboscar/tasks/ssilisttask.h
+++ b/protocols/oscar/liboscar/tasks/ssilisttask.h
@@ -45,7 +45,7 @@ protected:
bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
void onGo() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
/** We have a new group */
void newGroup( const OContact& );
diff --git a/protocols/oscar/liboscar/tasks/task.h b/protocols/oscar/liboscar/tasks/task.h
index 8a86df6..1be7b10 100644
--- a/protocols/oscar/liboscar/tasks/task.h
+++ b/protocols/oscar/liboscar/tasks/task.h
@@ -66,7 +66,7 @@ public:
*/
void setTransfer( Transfer * transfer );
-signals:
+Q_SIGNALS:
void finished();
protected:
@@ -98,7 +98,7 @@ protected:
*/
Transfer* createTransfer( Buffer* buffer );
-private slots:
+private Q_SLOTS:
void clientDisconnected();
void done();
diff --git a/protocols/oscar/liboscar/tasks/typingnotifytask.h b/protocols/oscar/liboscar/tasks/typingnotifytask.h
index b6bd2a3..46bc47d 100644
--- a/protocols/oscar/liboscar/tasks/typingnotifytask.h
+++ b/protocols/oscar/liboscar/tasks/typingnotifytask.h
@@ -40,7 +40,7 @@ public:
void setParams( const QString & contact, int notifyType );
-signals:
+Q_SIGNALS:
//! somebody started typing on the other end
void typingStarted( const QString& contact );
diff --git a/protocols/oscar/liboscar/tasks/userinfotask.h b/protocols/oscar/liboscar/tasks/userinfotask.h
index bff0bb1..6cdbd72 100644
--- a/protocols/oscar/liboscar/tasks/userinfotask.h
+++ b/protocols/oscar/liboscar/tasks/userinfotask.h
@@ -47,7 +47,7 @@ public:
void requestInfoFor( const QString& userId, unsigned int types );
UserDetails getInfoFor( Oscar::DWORD sequence ) const;
-signals:
+Q_SIGNALS:
void gotInfo( Oscar::DWORD seqNumber );
void receivedProfile( const QString& contact, const QString& profile );
void receivedAwayMessage( const QString& contact, const QString& message );
diff --git a/protocols/oscar/liboscar/tasks/usersearchtask.h b/protocols/oscar/liboscar/tasks/usersearchtask.h
index 2d78832..168bbda 100644
--- a/protocols/oscar/liboscar/tasks/usersearchtask.h
+++ b/protocols/oscar/liboscar/tasks/usersearchtask.h
@@ -48,7 +48,7 @@ public:
void searchWhitePages( const ICQWPSearchInfo& info );
-signals:
+Q_SIGNALS:
void foundUser( const ICQSearchResult& result );
void searchFinished( int );
diff --git a/protocols/oscar/liboscar/tasks/warningtask.h b/protocols/oscar/liboscar/tasks/warningtask.h
index c898862..803a9fa 100644
--- a/protocols/oscar/liboscar/tasks/warningtask.h
+++ b/protocols/oscar/liboscar/tasks/warningtask.h
@@ -43,7 +43,7 @@ public:
bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
void onGo() Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void userWarned( const QString&, quint16, quint16 );
private:
diff --git a/protocols/oscar/liboscar/tests/aimlogintasktest.h b/protocols/oscar/liboscar/tests/aimlogintasktest.h
index 0bdc303..fa9cf3d 100644
--- a/protocols/oscar/liboscar/tests/aimlogintasktest.h
+++ b/protocols/oscar/liboscar/tests/aimlogintasktest.h
@@ -23,7 +23,7 @@
class AimLoginTaskTest : public OscarTestBase
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testAuthString();
};
diff --git a/protocols/oscar/liboscar/tests/buffertest.h b/protocols/oscar/liboscar/tests/buffertest.h
index 4e52f7a..d0610c8 100644
--- a/protocols/oscar/liboscar/tests/buffertest.h
+++ b/protocols/oscar/liboscar/tests/buffertest.h
@@ -6,7 +6,7 @@
class BufferTest : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testAddByte();
void testAddWord();
void testAddDWord();
diff --git a/protocols/oscar/liboscar/tests/filetransfertest.h b/protocols/oscar/liboscar/tests/filetransfertest.h
index 54259f5..22fc712 100644
--- a/protocols/oscar/liboscar/tests/filetransfertest.h
+++ b/protocols/oscar/liboscar/tests/filetransfertest.h
@@ -23,7 +23,7 @@
class FileTransferTest : public OscarTestBase
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testRRequest();
};
diff --git a/protocols/oscar/liboscar/tests/guidtest.h b/protocols/oscar/liboscar/tests/guidtest.h
index 3fbf897..a442432 100644
--- a/protocols/oscar/liboscar/tests/guidtest.h
+++ b/protocols/oscar/liboscar/tests/guidtest.h
@@ -6,7 +6,7 @@
class GuidTest : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testConstructors();
void testSetData();
void testIsVaild();
diff --git a/protocols/oscar/liboscar/tests/logintest.h b/protocols/oscar/liboscar/tests/logintest.h
index 580ff20..9339473 100644
--- a/protocols/oscar/liboscar/tests/logintest.h
+++ b/protocols/oscar/liboscar/tests/logintest.h
@@ -29,7 +29,7 @@ public:
bool isConnected() { return connected; }
-public slots:
+public Q_SLOTS:
void slotDoTest();
void slotConnected();
diff --git a/protocols/oscar/liboscar/tests/rateinfotest.h b/protocols/oscar/liboscar/tests/rateinfotest.h
index 5633728..ad2aec9 100644
--- a/protocols/oscar/liboscar/tests/rateinfotest.h
+++ b/protocols/oscar/liboscar/tests/rateinfotest.h
@@ -23,7 +23,7 @@
class RateInfoTest : public OscarTestBase
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testRateClasses();
};
diff --git a/protocols/oscar/liboscar/tests/serverversionstest.h b/protocols/oscar/liboscar/tests/serverversionstest.h
index 7a4158a..47c7704 100644
--- a/protocols/oscar/liboscar/tests/serverversionstest.h
+++ b/protocols/oscar/liboscar/tests/serverversionstest.h
@@ -23,7 +23,7 @@
class ServerVersionsTest : public OscarTestBase
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void testSupportedFamilies();
};
diff --git a/protocols/oscar/oscaraccount.h b/protocols/oscar/oscaraccount.h
index 6c034b6..a4ad771 100644
--- a/protocols/oscar/oscaraccount.h
+++ b/protocols/oscar/oscaraccount.h
@@ -138,7 +138,7 @@ public:
*/
bool changeContactGroupInSSI( const QString& contact, const QString& newGroupName, bool autoAddGroup );
-public slots:
+public Q_SLOTS:
void slotGoOffline();
void slotGoOnline();
@@ -164,7 +164,7 @@ protected:
virtual QString sanitizedMessage( const QString& message ) const;
-protected slots:
+protected Q_SLOTS:
//! do stuff on login
virtual void loginActions();
@@ -200,7 +200,7 @@ protected slots:
void chatroomRequest( ChatRoomHandler* handler );
-signals:
+Q_SIGNALS:
void accountDisconnected( Kopete::Account::DisconnectReason reason );
@@ -218,7 +218,7 @@ private:
QList<QDomNode> getElementsByTagNameCI( const QDomNode& node, const QString& tagName ) const;
-private slots:
+private Q_SLOTS:
/** Handler from socket errors from a connection */
void slotSocketError( int, const QString& );
diff --git a/protocols/oscar/oscarcontact.h b/protocols/oscar/oscarcontact.h
index c310b39..d0f4448 100644
--- a/protocols/oscar/oscarcontact.h
+++ b/protocols/oscar/oscarcontact.h
@@ -114,7 +114,7 @@ public:
*/
virtual void setEncoding( int mib );
-public slots:
+public Q_SLOTS:
/** Remove this contact from the server. Reimplemented from Kopete::Contact */
void deleteContact() Q_DECL_OVERRIDE;
@@ -141,7 +141,7 @@ public slots:
void requestAuthorization();
-protected slots:
+protected Q_SLOTS:
void slotTyping( bool typing );
void messageAck( const QString& contact, uint messageId );
void messageError( const QString& contact, uint messageId );
@@ -155,10 +155,10 @@ protected:
int m_warningLevel;
QString m_clientFeatures;
-protected slots:
+protected Q_SLOTS:
virtual void slotSendMsg( Kopete::Message& msg, Kopete::ChatSession* session);
-private slots:
+private Q_SLOTS:
void changeEncodingDialogClosed( int );
void chatSessionDestroyed();
void requestBuddyIcon();
diff --git a/protocols/oscar/oscarencodingselectiondialog.h b/protocols/oscar/oscarencodingselectiondialog.h
index 5b7e6ed..65e06bc 100644
--- a/protocols/oscar/oscarencodingselectiondialog.h
+++ b/protocols/oscar/oscarencodingselectiondialog.h
@@ -33,10 +33,10 @@ public:
int selectedEncoding() const;
-signals:
+Q_SIGNALS:
void closing( int );
-protected slots:
+protected Q_SLOTS:
void slotOk();
void slotCancel();
diff --git a/protocols/oscar/oscarlistnonservercontacts.h b/protocols/oscar/oscarlistnonservercontacts.h
index ffce6bd..c391243 100644
--- a/protocols/oscar/oscarlistnonservercontacts.h
+++ b/protocols/oscar/oscarlistnonservercontacts.h
@@ -40,7 +40,7 @@ public:
protected:
void slotButtonClicked( int buttonCode ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void closing();
private:
diff --git a/protocols/oscar/oscarmyselfcontact.h b/protocols/oscar/oscarmyselfcontact.h
index 5c5a6a3..e00359b 100644
--- a/protocols/oscar/oscarmyselfcontact.h
+++ b/protocols/oscar/oscarmyselfcontact.h
@@ -45,7 +45,7 @@ public:
UserDetails details();
-public slots:
+public Q_SLOTS:
/** our user info has been updated */
virtual void userInfoUpdated() = 0;
diff --git a/protocols/oscar/oscarprivacyengine.h b/protocols/oscar/oscarprivacyengine.h
index 6bbacf4..7dcfc07 100644
--- a/protocols/oscar/oscarprivacyengine.h
+++ b/protocols/oscar/oscarprivacyengine.h
@@ -48,7 +48,7 @@ public:
void setContactsView( QAbstractItemView* view );
void setAllContactsView( QComboBox* combo );
-public slots:
+public Q_SLOTS:
void slotAdd();
void slotRemove();
void storeChanges();
diff --git a/protocols/oscar/oscarversionupdater.h b/protocols/oscar/oscarversionupdater.h
index 2e6b9e7..10e98fb 100644
--- a/protocols/oscar/oscarversionupdater.h
+++ b/protocols/oscar/oscarversionupdater.h
@@ -86,7 +86,7 @@ public:
*/
void printDebug();
-private slots:
+private Q_SLOTS:
void slotTransferData( KIO::Job *job, const QByteArray &data );
void slotTransferResult( KJob *job );
diff --git a/protocols/qq/qqaccount.h b/protocols/qq/qqaccount.h
index f0948c8..d3c099f 100644
--- a/protocols/qq/qqaccount.h
+++ b/protocols/qq/qqaccount.h
@@ -106,7 +106,7 @@ public:
void sendMessage(const QString& guid, Kopete::Message& message );
void getVCard( QQContact* contact );
-public slots:
+public Q_SLOTS:
/**
* Called by the server when it has a message for us.
* This identifies the sending Kopete::Contact and passes it a Kopete::Message
@@ -126,7 +126,7 @@ protected:
*/
void updateContactStatus();
-protected slots:
+protected Q_SLOTS:
/**
* Show webcam. Called by KActions and internally.
*/
diff --git a/protocols/qq/qqchatsession.h b/protocols/qq/qqchatsession.h
index 9731293..974ade6 100644
--- a/protocols/qq/qqchatsession.h
+++ b/protocols/qq/qqchatsession.h
@@ -89,7 +89,7 @@ public:
* Reimplemented from Kopete::ChatSession - invites contacts via DND
*/
void inviteContact(const QString& ) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
/**
* Tell the contact we got a GUID so it can route incoming messages here.
*/
@@ -107,7 +107,7 @@ protected:
* Sends any messages and invitations that were queued while waiting for the conference to be created
*/
void dequeueMessagesAndInvites();
-protected slots:
+protected Q_SLOTS:
/**
* Receive the GUID returned by the server when we start a chat.
* @param mmId Message Manager ID, used to determine if this GUID is meant for this message manager
diff --git a/protocols/qq/qqcontact.h b/protocols/qq/qqcontact.h
index e959636..417f63e 100644
--- a/protocols/qq/qqcontact.h
+++ b/protocols/qq/qqcontact.h
@@ -129,7 +129,7 @@ public:
void setDetail(const QMap<const char*, QByteArray>& map)
{ m_contactDetail = map; }
-public slots:
+public Q_SLOTS:
void slotUserInfo() Q_DECL_OVERRIDE;
void deleteContact() Q_DECL_OVERRIDE;
virtual void sendFile( const KUrl &sourceURL = KUrl(),
@@ -142,10 +142,10 @@ public slots:
void setDisplayPicture(KTemporaryFile *f) ;
-signals:
+Q_SIGNALS:
void displayPictureChanged();
-private slots:
+private Q_SLOTS:
void slotBlockUser();
void slotShowProfile();
void slotSendMail();
diff --git a/protocols/qq/qqnotifysocket.h b/protocols/qq/qqnotifysocket.h
index 40acc01..c614f17 100644
--- a/protocols/qq/qqnotifysocket.h
+++ b/protocols/qq/qqnotifysocket.h
@@ -62,7 +62,7 @@ public:
void sendTextMessage( const uint toId, const QByteArray& message );
-signals:
+Q_SIGNALS:
void statusChanged( const Kopete::OnlineStatus &newStatus );
void newContactList();
void contactList( const Eva::ContactInfo& ci );
diff --git a/protocols/qq/qqsocket.h b/protocols/qq/qqsocket.h
index 9676c82..ecc9b6b 100644
--- a/protocols/qq/qqsocket.h
+++ b/protocols/qq/qqsocket.h
@@ -56,11 +56,11 @@ public:
*/
QString getLocalIP();
-public slots:
+public Q_SLOTS:
void connect( const QString &server, uint port );
virtual void disconnect();
-signals:
+Q_SIGNALS:
/**
* The online status has changed
*/
@@ -125,7 +125,7 @@ protected:
const QString &server() { return m_server; }
uint port() { return m_port; }
-private slots:
+private Q_SLOTS:
void slotDataReceived();
/**
* If the socket emits a connectionFailed() then this slot is called
@@ -148,7 +148,7 @@ private slots:
*/
void slotSocketClosed();
-protected slots:
+protected Q_SLOTS:
virtual void slotReadyWrite();
protected:
diff --git a/protocols/qq/ui/dlgqqvcard.h b/protocols/qq/ui/dlgqqvcard.h
index 67baa0c..8417a4f 100644
--- a/protocols/qq/ui/dlgqqvcard.h
+++ b/protocols/qq/ui/dlgqqvcard.h
@@ -57,7 +57,7 @@ public:
dlgQQVCard (QQAccount *account, QQContact *contact, QWidget * parent = 0);
~dlgQQVCard ();
-private slots:
+private Q_SLOTS:
/**
* Show the KFileDialog for image to select a photo for the contact.
*/
diff --git a/protocols/qq/ui/qqeditaccountwidget.h b/protocols/qq/ui/qqeditaccountwidget.h
index b191d3e..e68d373 100644
--- a/protocols/qq/ui/qqeditaccountwidget.h
+++ b/protocols/qq/ui/qqeditaccountwidget.h
@@ -44,7 +44,7 @@ public:
*/
bool validateData() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotOpenRegister();
private:
diff --git a/protocols/qq/ui/qqwebcamdialog.h b/protocols/qq/ui/qqwebcamdialog.h
index c6dd388..15a3887 100644
--- a/protocols/qq/ui/qqwebcamdialog.h
+++ b/protocols/qq/ui/qqwebcamdialog.h
@@ -43,9 +43,9 @@ public:
explicit QQWebcamDialog( const QString &, QWidget* parent = 0 );
~QQWebcamDialog();
-public slots:
+public Q_SLOTS:
void slotUpdateImage();
-//signals:
+//Q_SIGNALS:
// void closingWebcamDialog();
private:
diff --git a/protocols/testbed/testbedaccount.h b/protocols/testbed/testbedaccount.h
index cd7072f..697fada 100644
--- a/protocols/testbed/testbedaccount.h
+++ b/protocols/testbed/testbedaccount.h
@@ -73,7 +73,7 @@ public:
* Return a reference to the server stub
*/
TestbedFakeServer* server();
-public slots:
+public Q_SLOTS:
/**
* Called by the server when it has a message for us.
* This identifies the sending Kopete::Contact and passes it a Kopete::Message
@@ -87,7 +87,7 @@ protected:
void updateContactStatus();
TestbedFakeServer* m_server;
-protected slots:
+protected Q_SLOTS:
/**
* Change the account's status. Called by KActions and internally.
*/
diff --git a/protocols/testbed/testbedcontact.h b/protocols/testbed/testbedcontact.h
index 2796c4c..88b80a4 100644
--- a/protocols/testbed/testbedcontact.h
+++ b/protocols/testbed/testbedcontact.h
@@ -69,7 +69,7 @@ public:
* Set the Type of this contact
*/
void setType( Type type );
-public slots:
+public Q_SLOTS:
/**
* Transmits an outgoing message to the server
* Called when the chat window send button has been pressed
@@ -82,7 +82,7 @@ public slots:
*/
void receivedMessage( const QString &message );
-protected slots:
+protected Q_SLOTS:
/**
* Show the settings dialog
*/
diff --git a/protocols/testbed/testbedfakeserver.h b/protocols/testbed/testbedfakeserver.h
index 106e006..ca1e308 100644
--- a/protocols/testbed/testbedfakeserver.h
+++ b/protocols/testbed/testbedfakeserver.h
@@ -37,7 +37,7 @@ public:
*/
void sendMessage( const QString &contactId, const QString &message );
-public slots:
+public Q_SLOTS:
/**
* A message came in off the simulated wire.
* In reality, a message on the incoming message list
@@ -45,7 +45,7 @@ public slots:
*/
void incomingMessage( QString message );
-signals:
+Q_SIGNALS:
/**
* Tells the account that a message arrived
*/
diff --git a/protocols/testbed/testbedincomingmessage.h b/protocols/testbed/testbedincomingmessage.h
index 226368d..75f98ed 100644
--- a/protocols/testbed/testbedincomingmessage.h
+++ b/protocols/testbed/testbedincomingmessage.h
@@ -40,7 +40,7 @@ public:
* Has this message already been delivered?
*/
bool delivered() { return m_delivered; }
-public slots:
+public Q_SLOTS:
/**
* 'Deliver' the message to Kopete by calling TestbedFakeServer::incomingMessage().
* This marks the message as delivered so it can be purged from the incoming list.
diff --git a/protocols/testbed/ui/testbedwebcamdialog.h b/protocols/testbed/ui/testbedwebcamdialog.h
index 1db34b7..9a564d4 100644
--- a/protocols/testbed/ui/testbedwebcamdialog.h
+++ b/protocols/testbed/ui/testbedwebcamdialog.h
@@ -43,9 +43,9 @@ public:
explicit TestbedWebcamDialog( const QString &, QWidget* parent = nullptr );
~TestbedWebcamDialog();
-public slots:
+public Q_SLOTS:
void slotUpdateImage();
-//signals:
+//Q_SIGNALS:
// void closingWebcamDialog();
private:
diff --git a/protocols/winpopup/libwinpopup/libwinpopup.h b/protocols/winpopup/libwinpopup/libwinpopup.h
index 02737c9..adeb404 100644
--- a/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -80,7 +80,7 @@ private:
bool checkMessageDir();
-private slots:
+private Q_SLOTS:
void slotUpdateGroupData();
void startReadProcess();
void slotReadIpProcessExited(int i = 1, QProcess::ExitStatus status = QProcess::CrashExit);
@@ -89,7 +89,7 @@ private slots:
void slotStartDirLister();
void slotReadMessages(const KFileItemList &items);
-signals:
+Q_SIGNALS:
void signalNewMessage(const QString &, const QDateTime &, const QString &);
};
diff --git a/protocols/winpopup/wpaccount.h b/protocols/winpopup/wpaccount.h
index 30bcd61..7b6d643 100644
--- a/protocols/winpopup/wpaccount.h
+++ b/protocols/winpopup/wpaccount.h
@@ -58,7 +58,7 @@ public:
virtual bool hasCustomStatusMenu() const; //Has custom status menu
virtual void setAway(bool status, const QString &); // Set user away
-public slots:
+public Q_SLOTS:
virtual void connect(const Kopete::OnlineStatus &); // Connect to server
virtual void disconnect(); // Disconnect from server
@@ -84,7 +84,7 @@ public:
*/
bool checkHost(const QString &Name);
-public slots:
+public Q_SLOTS:
/**
* Dispatches said message to the destination.
*/
@@ -102,7 +102,7 @@ public slots:
protected:
virtual bool createContact(const QString &contactId, Kopete::MetaContact *parentContact);
-private slots:
+private Q_SLOTS:
// void updateAccountId();
private:
diff --git a/protocols/winpopup/wpaddcontact.h b/protocols/winpopup/wpaddcontact.h
index abdc472..d09b15f 100644
--- a/protocols/winpopup/wpaddcontact.h
+++ b/protocols/winpopup/wpaddcontact.h
@@ -49,7 +49,7 @@ public:
bool validateData() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact) Q_DECL_OVERRIDE;
void slotSelected(const QString &Group);
diff --git a/protocols/winpopup/wpcontact.h b/protocols/winpopup/wpcontact.h
index 0d7849d..e6a7f6e 100644
--- a/protocols/winpopup/wpcontact.h
+++ b/protocols/winpopup/wpcontact.h
@@ -59,12 +59,12 @@ public:
Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate) Q_DECL_OVERRIDE;
void serialize(QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData) Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
void slotUserInfo() Q_DECL_OVERRIDE;
void slotCheckStatus(); // the call back for the checkStatus timer
void slotNewMessage(const QString &Body, const QDateTime &Arrival);
-private slots:
+private Q_SLOTS:
void slotChatSessionDestroyed();
void slotSendMessage(Kopete::Message &message);
void slotCloseUserInfoDialog(); // Called when the userinfo dialog is getting closed
diff --git a/protocols/winpopup/wpeditaccount.h b/protocols/winpopup/wpeditaccount.h
index ee7d4c7..2707f61 100644
--- a/protocols/winpopup/wpeditaccount.h
+++ b/protocols/winpopup/wpeditaccount.h
@@ -48,7 +48,7 @@ public:
bool validateData() Q_DECL_OVERRIDE;
void writeConfig();
-public slots:
+public Q_SLOTS:
Kopete::Account *apply() Q_DECL_OVERRIDE;
virtual void installSamba();
};
diff --git a/protocols/winpopup/wpprotocol.h b/protocols/winpopup/wpprotocol.h
index af7d654..fe9cd34 100644
--- a/protocols/winpopup/wpprotocol.h
+++ b/protocols/winpopup/wpprotocol.h
@@ -86,7 +86,7 @@ public:
void sendMessage(const QString &Body, const QString &Destination);
void settingsChanged(void); // Callback when settings changed
-public slots:
+public Q_SLOTS:
void installSamba(); // Modify smb.conf to use winpopup-send script
void slotReceivedMessage(const QString &Body, const QDateTime &Time, const QString &From);
diff --git a/protocols/winpopup/wpuserinfo.h b/protocols/winpopup/wpuserinfo.h
index d368c38..87959b7 100644
--- a/protocols/winpopup/wpuserinfo.h
+++ b/protocols/winpopup/wpuserinfo.h
@@ -40,12 +40,12 @@ public:
void startDetailsProcess(const QString &host);
-private slots:
+private Q_SLOTS:
void slotDetailsProcess(int i = 1, QProcess::ExitStatus status = QProcess::CrashExit);
void slotDetailsProcessFinished(int, QProcess::ExitStatus);
void slotCloseClicked();
-signals:
+Q_SIGNALS:
void closing();
private:
diff --git a/protocols/yahoo/libkyahoo/bytestream.h b/protocols/yahoo/libkyahoo/bytestream.h
index 571e9c7..1feda5d 100644
--- a/protocols/yahoo/libkyahoo/bytestream.h
+++ b/protocols/yahoo/libkyahoo/bytestream.h
@@ -45,7 +45,7 @@ public:
static void appendArray(QByteArray *a, const QByteArray &b);
static QByteArray takeArray(QByteArray *from, int size=0, bool del=true);
-signals:
+Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void readyRead();
diff --git a/protocols/yahoo/libkyahoo/client.h b/protocols/yahoo/libkyahoo/client.h
index c62a1e0..2505468 100644
--- a/protocols/yahoo/libkyahoo/client.h
+++ b/protocols/yahoo/libkyahoo/client.h
@@ -464,7 +464,7 @@ Q_OBJECT
*/
void notifyError( const QString &info, const QString &errorString, LogLevel level );
- signals:
+ Q_SIGNALS:
/** CONNECTION EVENTS */
/**
* Notifies that the login process has succeeded.
@@ -687,7 +687,7 @@ Q_OBJECT
* We have received a message in a chatroom
*/
void chatMessageReceived( const QString &, const QString &, const QString & );
- protected slots:
+ protected Q_SLOTS:
// INTERNAL, FOR USE BY TASKS' finished() SIGNALS //
void lt_loginFinished();
void lt_gotSessionID( uint );
diff --git a/protocols/yahoo/libkyahoo/conferencetask.h b/protocols/yahoo/libkyahoo/conferencetask.h
index e620292..a252831 100644
--- a/protocols/yahoo/libkyahoo/conferencetask.h
+++ b/protocols/yahoo/libkyahoo/conferencetask.h
@@ -40,7 +40,7 @@ public:
void sendMessage( const QString &room, const QStringList &members, const QString &msg );
void inviteConference( const QString &room, const QStringList &members, const QString &msg );
void addInvite( const QString &room, const QStringList &who, const QStringList &members, const QString &msg );
-signals:
+Q_SIGNALS:
void gotInvite( const QString &who, const QString &room, const QString &msg, const QStringList &members);
void gotMessage( const QString &who, const QString &room, const QString &msg );
void userJoined( const QString &who, const QString &room );
diff --git a/protocols/yahoo/libkyahoo/connector.h b/protocols/yahoo/libkyahoo/connector.h
index 26bf9c8..63d763f 100644
--- a/protocols/yahoo/libkyahoo/connector.h
+++ b/protocols/yahoo/libkyahoo/connector.h
@@ -41,7 +41,7 @@ public:
QHostAddress peerAddress() const;
quint16 peerPort() const;
-signals:
+Q_SIGNALS:
void connected();
void error();
diff --git a/protocols/yahoo/libkyahoo/coreprotocol.h b/protocols/yahoo/libkyahoo/coreprotocol.h
index fa8c5be..2eae65a 100644
--- a/protocols/yahoo/libkyahoo/coreprotocol.h
+++ b/protocols/yahoo/libkyahoo/coreprotocol.h
@@ -68,7 +68,7 @@ public:
*/
int state();
-signals:
+Q_SIGNALS:
/**
* Emitted as the core protocol converts fields to wire ready data
*/
@@ -78,7 +78,7 @@ signals:
* Emitted when there is incoming data, parsed into a Transfer
*/
void incomingData();
-protected slots:
+protected Q_SLOTS:
/**
* Just a debug method to test emitting to the socket, atm - should go to the ClientStream
*/
diff --git a/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
index ae88e68..d044eab 100644
--- a/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
+++ b/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
@@ -38,7 +38,7 @@ public:
protected:
bool forMe(const Transfer *transfer) const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void incomingFileTransfer(const QString &who, const QString &url, long expires, const QString &msg, const QString &fname, unsigned long size, const QPixmap &preview);
private:
void parseFileTransfer(YMSGTransfer *transfer);
diff --git a/protocols/yahoo/libkyahoo/listtask.h b/protocols/yahoo/libkyahoo/listtask.h
index 35005c6..24021c4 100644
--- a/protocols/yahoo/libkyahoo/listtask.h
+++ b/protocols/yahoo/libkyahoo/listtask.h
@@ -38,7 +38,7 @@ protected:
bool forMe(const Transfer *transfer) const Q_DECL_OVERRIDE;
void parseBuddyList(YMSGTransfer *transfer);
-signals:
+Q_SIGNALS:
void gotBuddy(const QString &, const QString &, const QString &);
void stealthStatusChanged(const QString &, Yahoo::StealthStatus);
};
diff --git a/protocols/yahoo/libkyahoo/logintask.h b/protocols/yahoo/libkyahoo/logintask.h
index bd91e50..5e8e292 100644
--- a/protocols/yahoo/libkyahoo/logintask.h
+++ b/protocols/yahoo/libkyahoo/logintask.h
@@ -73,7 +73,7 @@ protected Q_SLOTS:
void handleAuthSixteenStage2Data(KIO::Job*, const QByteArray& data);
void handleAuthSixteenStage2Result(KJob*);
-signals:
+Q_SIGNALS:
void haveSessionID( uint );
void haveCookies();
void loginResponse( int, const QString& );
diff --git a/protocols/yahoo/libkyahoo/mailnotifiertask.h b/protocols/yahoo/libkyahoo/mailnotifiertask.h
index 6cc90cd..4e961d2 100644
--- a/protocols/yahoo/libkyahoo/mailnotifiertask.h
+++ b/protocols/yahoo/libkyahoo/mailnotifiertask.h
@@ -37,7 +37,7 @@ public:
protected:
bool forMe(const Transfer *transfer) const Q_DECL_OVERRIDE;
void parseMail(YMSGTransfer *transfer);
-signals:
+Q_SIGNALS:
void mailNotify(const QString &, const QString &, int);
};
diff --git a/protocols/yahoo/libkyahoo/messagereceivertask.h b/protocols/yahoo/libkyahoo/messagereceivertask.h
index 32076d3..3c4637f 100644
--- a/protocols/yahoo/libkyahoo/messagereceivertask.h
+++ b/protocols/yahoo/libkyahoo/messagereceivertask.h
@@ -39,7 +39,7 @@ protected:
void parseMessage( YMSGTransfer *transfer );
void parseAnimatedAudibleIcon( YMSGTransfer *transfer );
void parseNotify( YMSGTransfer *transfer );
-signals:
+Q_SIGNALS:
void gotIm(const QString&, const QString&, long, int);
void gotBuzz( const QString &who, long tm );
void systemMessage(const QString&);
diff --git a/protocols/yahoo/libkyahoo/modifybuddytask.h b/protocols/yahoo/libkyahoo/modifybuddytask.h
index 071cf28..479d02f 100644
--- a/protocols/yahoo/libkyahoo/modifybuddytask.h
+++ b/protocols/yahoo/libkyahoo/modifybuddytask.h
@@ -42,7 +42,7 @@ public:
void setGroup( const QString &group );
void setOldGroup( const QString &group );
-signals:
+Q_SIGNALS:
void buddyAddResult( const QString &, const QString &, bool );
void buddyRemoveResult( const QString &, const QString &, bool );
void buddyChangeGroupResult( const QString &, const QString &, bool );
diff --git a/protocols/yahoo/libkyahoo/modifyyabtask.h b/protocols/yahoo/libkyahoo/modifyyabtask.h
index f5e152f..a6f5222 100644
--- a/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -43,11 +43,11 @@ public:
void onGo() Q_DECL_OVERRIDE;
void setAction( Action action );
void setEntry( const YABEntry & );
-signals:
+Q_SIGNALS:
void gotEntry( YABEntry * );
void gotRevision( long rev, bool merged );
void error( YABEntry *, const QString &);
-private slots:
+private Q_SLOTS:
void connectSucceeded();
void connectFailed( int );
void slotRead();
diff --git a/protocols/yahoo/libkyahoo/picturenotifiertask.h b/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 0de08e3..8a00de5 100644
--- a/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -41,7 +41,7 @@ protected:
void parsePictureStatus( YMSGTransfer *transfer );
void parsePicture( YMSGTransfer *transfer );
void parsePictureUploadResponse( YMSGTransfer *transfer );
-signals:
+Q_SIGNALS:
void pictureStatusNotify( const QString &, int );
void pictureChecksumNotify( const QString &, int );
void pictureInfoNotify( const QString &, KUrl, int );
diff --git a/protocols/yahoo/libkyahoo/receivefiletask.h b/protocols/yahoo/libkyahoo/receivefiletask.h
index ac78886..cb60033 100644
--- a/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -55,12 +55,12 @@ public:
protected:
bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void bytesProcessed( unsigned int, unsigned int );
void complete( unsigned int );
void error( unsigned int, int, const QString & );
-private slots:
+private Q_SLOTS:
void slotData( KIO::Job *job, const QByteArray &data );
void slotHeadComplete( KJob *job );
void slotComplete( KJob *job );
diff --git a/protocols/yahoo/libkyahoo/safedelete.h b/protocols/yahoo/libkyahoo/safedelete.h
index c41b131..a359b64 100644
--- a/protocols/yahoo/libkyahoo/safedelete.h
+++ b/protocols/yahoo/libkyahoo/safedelete.h
@@ -63,7 +63,7 @@ public:
static SafeDeleteLater *ensureExists();
void deleteItLater(QObject *o);
-private slots:
+private Q_SLOTS:
void explode();
private:
diff --git a/protocols/yahoo/libkyahoo/sendfiletask.h b/protocols/yahoo/libkyahoo/sendfiletask.h
index 965e643..5357386 100644
--- a/protocols/yahoo/libkyahoo/sendfiletask.h
+++ b/protocols/yahoo/libkyahoo/sendfiletask.h
@@ -45,7 +45,7 @@ public:
void setFileUrl( KUrl url );
void setTransferId( unsigned int transferId );
-signals:
+Q_SIGNALS:
void bytesProcessed( unsigned int, unsigned int );
void complete( unsigned int );
void error( unsigned int, int, const QString & );
@@ -66,7 +66,7 @@ protected:
/** returns true if file transfer completed */
bool checkTransferEnd();
-private slots:
+private Q_SLOTS:
void connectSucceeded();
void connectFailed( int );
void transmitData();
diff --git a/protocols/yahoo/libkyahoo/sendpicturetask.h b/protocols/yahoo/libkyahoo/sendpicturetask.h
index a58c585..153c7ca 100644
--- a/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -56,7 +56,7 @@ private:
void sendChecksum();
void sendInformation();
void sendStatus();
-private slots:
+private Q_SLOTS:
void connectSucceeded();
void connectFailed( int );
void readResult();
diff --git a/protocols/yahoo/libkyahoo/statusnotifiertask.h b/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 4ea47a3..7fe993d 100644
--- a/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -40,7 +40,7 @@ protected:
void parseStatus( YMSGTransfer *transfer );
void parseStealthStatus( YMSGTransfer *transfer );
void parseAuthorization( YMSGTransfer *transfer );
-signals:
+Q_SIGNALS:
void statusChanged( const QString &nick, int state, const QString &message, int away, int idle, int pictureChecksum );
void stealthStatusChanged( const QString&, Yahoo::StealthStatus );
void loginResponse( int, const QString& );
diff --git a/protocols/yahoo/libkyahoo/stream.h b/protocols/yahoo/libkyahoo/stream.h
index 7b910c3..641a2b7 100644
--- a/protocols/yahoo/libkyahoo/stream.h
+++ b/protocols/yahoo/libkyahoo/stream.h
@@ -64,7 +64,7 @@ public:
*/
virtual void write( Transfer *request) = 0;
-signals:
+Q_SIGNALS:
void connectionClosed();
void delayedCloseFinished();
void readyRead();
diff --git a/protocols/yahoo/libkyahoo/task.h b/protocols/yahoo/libkyahoo/task.h
index 286df3e..abb6181 100644
--- a/protocols/yahoo/libkyahoo/task.h
+++ b/protocols/yahoo/libkyahoo/task.h
@@ -57,7 +57,7 @@ public:
virtual bool take( Transfer* transfer );
void safeDelete();
-signals:
+Q_SIGNALS:
void finished();
protected:
@@ -81,7 +81,7 @@ protected:
* Direct setter for Tasks which don't have any fields
*/
void setTransfer( Transfer * transfer );
-private slots:
+private Q_SLOTS:
void clientDisconnected();
void done();
diff --git a/protocols/yahoo/libkyahoo/tests/clientstream_test.h b/protocols/yahoo/libkyahoo/tests/clientstream_test.h
index ef367ce..306b8f1 100644
--- a/protocols/yahoo/libkyahoo/tests/clientstream_test.h
+++ b/protocols/yahoo/libkyahoo/tests/clientstream_test.h
@@ -31,7 +31,7 @@ public:
bool isConnected();
-public slots:
+public Q_SLOTS:
void slotDoTest();
void slotConnected();
diff --git a/protocols/yahoo/libkyahoo/tests/logintest.h b/protocols/yahoo/libkyahoo/tests/logintest.h
index 76c0066..7d7ae0e 100644
--- a/protocols/yahoo/libkyahoo/tests/logintest.h
+++ b/protocols/yahoo/libkyahoo/tests/logintest.h
@@ -42,7 +42,7 @@ public:
bool isConnected() { return connected; }
-public slots:
+public Q_SLOTS:
void slotDoTest();
void slotConnected();
diff --git a/protocols/yahoo/libkyahoo/webcamtask.h b/protocols/yahoo/libkyahoo/webcamtask.h
index 10f2390..c32f203 100644
--- a/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/protocols/yahoo/libkyahoo/webcamtask.h
@@ -82,7 +82,7 @@ public:
void addPendingInvitation(const QString &userId);
void grantAccess(const QString &userId);
void closeOutgoingWebcam();
-signals:
+Q_SIGNALS:
void webcamNotAvailable(const QString &);
void webcamClosed(const QString &, int);
void webcamPaused(const QString &);
@@ -92,7 +92,7 @@ signals:
void viewerJoined(const QString &);
void viewerLeft(const QString &);
void viewerRequest(const QString &);
-private slots:
+private Q_SLOTS:
void slotConnectionStage1Established();
void slotConnectionStage2Established();
void slotConnectionFailed(int);
diff --git a/protocols/yahoo/libkyahoo/yabtask.h b/protocols/yahoo/libkyahoo/yabtask.h
index eaa7ee3..67cf565 100644
--- a/protocols/yahoo/libkyahoo/yabtask.h
+++ b/protocols/yahoo/libkyahoo/yabtask.h
@@ -43,13 +43,13 @@ public:
void getAllEntries(long lastMerge, long lastRemoteRevision);
void saveEntry(const YABEntry &);
-signals:
+Q_SIGNALS:
void gotEntry(YABEntry *);
void gotRevision(long rev, bool merged);
protected:
bool forMe(const Transfer *transfer) const Q_DECL_OVERRIDE;
void parseContactDetails(YMSGTransfer *t);
-private slots:
+private Q_SLOTS:
void slotData(KIO::Job *, const QByteArray &);
void slotResult(KJob *);
private:
diff --git a/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
index 29f69cc..1736511 100644
--- a/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
+++ b/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
@@ -59,14 +59,14 @@ public:
*/
void fetchBuddyIcon( const QString &who, KUrl url, int checksum );
-signals:
+Q_SIGNALS:
/**
* The account can connect to this signal and append the icon
* stored in 'file' to the appropriate contact
*/
void fetchedBuddyIcon( const QString &who, const QByteArray &icon, int checksum );
-private slots:
+private Q_SLOTS:
void slotData( KIO::Job *job, const QByteArray &data );
void slotComplete( KJob *job );
diff --git a/protocols/yahoo/libkyahoo/yahoobytestream.h b/protocols/yahoo/libkyahoo/yahoobytestream.h
index d445e80..856c297 100644
--- a/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -43,13 +43,13 @@ public:
KNetwork::KBufferedSocket *socket () const;
-signals:
+Q_SIGNALS:
void connected ();
protected:
int tryWrite () Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotConnected ();
void slotConnectionClosed ();
void slotReadyRead ();
diff --git a/protocols/yahoo/libkyahoo/yahooclientstream.h b/protocols/yahoo/libkyahoo/yahooclientstream.h
index befe4b3..0b0941a 100644
--- a/protocols/yahoo/libkyahoo/yahooclientstream.h
+++ b/protocols/yahoo/libkyahoo/yahooclientstream.h
@@ -111,16 +111,16 @@ public:
/*# void writeDirect(const QString &s); // must be for debug testing*/
void setNoopTime(int mills);
-signals:
+Q_SIGNALS:
void connected();
void securityLayerActivated(int);
void authenticated(); // this signal is ordinarily emitted in processNext
void warning(int);
void readyRead(); //signals that there is a transfer ready to be read
-public slots:
+public Q_SLOTS:
void continueAfterWarning();
-private slots:
+private Q_SLOTS:
void cr_connected();
void cr_error();
/**
diff --git a/protocols/yahoo/libkyahoo/yahooconnector.h b/protocols/yahoo/libkyahoo/yahooconnector.h
index 25652df..b8ad3d1 100644
--- a/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -49,7 +49,7 @@ public:
int errorCode();
-private slots:
+private Q_SLOTS:
void slotConnected();
void slotError( int );
diff --git a/protocols/yahoo/ui/yahooinvitelistimpl.h b/protocols/yahoo/ui/yahooinvitelistimpl.h
index 12acd6c..6a7f275 100644
--- a/protocols/yahoo/ui/yahooinvitelistimpl.h
+++ b/protocols/yahoo/ui/yahooinvitelistimpl.h
@@ -36,11 +36,11 @@ public:
void addParticipant( const QString &participant );
private:
-signals:
+Q_SIGNALS:
void readyToInvite( const QString &room, const QStringList &buddies, const QStringList &participants, const QString &msg );
-protected slots:
+protected Q_SLOTS:
-public slots:
+public Q_SLOTS:
virtual void slotInvite();
virtual void slotCancel();
virtual void slotAddCustom();
diff --git a/protocols/yahoo/ui/yahoouserinfodialog.h b/protocols/yahoo/ui/yahoouserinfodialog.h
index b4c7199..ce3e1e9 100644
--- a/protocols/yahoo/ui/yahoouserinfodialog.h
+++ b/protocols/yahoo/ui/yahoouserinfodialog.h
@@ -38,11 +38,11 @@ public:
explicit YahooUserInfoDialog( YahooContact *c, QWidget* parent = nullptr );
~YahooUserInfoDialog();
void setAccountConnected( bool isOnline );
-signals:
+Q_SIGNALS:
void saveYABEntry( YABEntry & );
-public slots:
+public Q_SLOTS:
void setData( const YABEntry &yab );
-private slots:
+private Q_SLOTS:
void slotSaveAndCloseClicked();
void slotUser2();
private:
diff --git a/protocols/yahoo/ui/yahoowebcamdialog.h b/protocols/yahoo/ui/yahoowebcamdialog.h
index f20d6c2..05e1f90 100644
--- a/protocols/yahoo/ui/yahoowebcamdialog.h
+++ b/protocols/yahoo/ui/yahoowebcamdialog.h
@@ -36,11 +36,11 @@ public:
~YahooWebcamDialog();
void setViewer( const QStringList & );
-public slots:
+public Q_SLOTS:
void newImage( const QPixmap &image );
void webcamClosed( int );
void webcamPaused();
-signals:
+Q_SIGNALS:
void closingWebcamDialog();
private:
diff --git a/protocols/yahoo/yahooaccount.h b/protocols/yahoo/yahooaccount.h
index d845df9..a3c2558 100644
--- a/protocols/yahoo/yahooaccount.h
+++ b/protocols/yahoo/yahooaccount.h
@@ -125,7 +125,7 @@ public:
void sendChatMessage( const Kopete::Message &msg, const QString &handle );
void prepareConference( const QString &who );
void sendFile( YahooContact *to, const KUrl &url );
-public slots:
+public Q_SLOTS:
/**
* Connect to the Yahoo service
*/
@@ -139,7 +139,7 @@ public slots:
void setOnlineStatus( const Kopete::OnlineStatus&, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
void setStatusMessage(const Kopete::StatusMessage&) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
/**
* Emitted when we receive notification that the person we're talking to is typing
*/
@@ -167,7 +167,7 @@ protected:
*/
QString stripMsgColorCodes(const QString& msg);
-protected slots:
+protected Q_SLOTS:
void slotConnected();
void slotGoOnline();
void slotGoOffline();
diff --git a/protocols/yahoo/yahooaddcontact.h b/protocols/yahoo/yahooaddcontact.h
index 39666bd..ea8807b 100644
--- a/protocols/yahoo/yahooaddcontact.h
+++ b/protocols/yahoo/yahooaddcontact.h
@@ -45,7 +45,7 @@ public:
bool validateData() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact) Q_DECL_OVERRIDE;
};
diff --git a/protocols/yahoo/yahoochatchatsession.h b/protocols/yahoo/yahoochatchatsession.h
index 4307688..d253af4 100644
--- a/protocols/yahoo/yahoochatchatsession.h
+++ b/protocols/yahoo/yahoochatchatsession.h
@@ -43,9 +43,9 @@ public:
QString handle() { return m_handle; }
void removeAllContacts();
-signals:
+Q_SIGNALS:
void leavingChat( YahooChatChatSession *s );
-protected slots:
+protected Q_SLOTS:
void slotMessageSent( Kopete::Message &message, Kopete::ChatSession * );
private:
QString m_topic;
diff --git a/protocols/yahoo/yahoochatsession.h b/protocols/yahoo/yahoochatsession.h
index 6f5e298..3488cbe 100644
--- a/protocols/yahoo/yahoochatsession.h
+++ b/protocols/yahoo/yahoochatsession.h
@@ -32,7 +32,7 @@ public:
YahooChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others );
~YahooChatSession();
-private slots:
+private Q_SLOTS:
void slotDisplayPictureChanged();
void slotBuzzContact();
diff --git a/protocols/yahoo/yahooconferencemessagemanager.h b/protocols/yahoo/yahooconferencemessagemanager.h
index 1641552..291097d 100644
--- a/protocols/yahoo/yahooconferencemessagemanager.h
+++ b/protocols/yahoo/yahooconferencemessagemanager.h
@@ -40,9 +40,9 @@ public:
void left( YahooContact *c );
const QString &room();
YahooAccount *account();
-signals:
+Q_SIGNALS:
void leavingConference( YahooConferenceChatSession *s );
-protected slots:
+protected Q_SLOTS:
void slotMessageSent( Kopete::Message &message, Kopete::ChatSession * );
void slotInviteOthers();
private:
diff --git a/protocols/yahoo/yahoocontact.h b/protocols/yahoo/yahoocontact.h
index 18dc702..a9f03fa 100644
--- a/protocols/yahoo/yahoocontact.h
+++ b/protocols/yahoo/yahoocontact.h
@@ -74,7 +74,7 @@ public:
static QString prepareMessage( const QString &messageText );
-public slots:
+public Q_SLOTS:
void slotUserInfo() Q_DECL_OVERRIDE;
virtual void slotSendFile( const KUrl &file );
void deleteContact() Q_DECL_OVERRIDE;
@@ -95,13 +95,13 @@ public slots:
void sync(unsigned int flags) Q_DECL_OVERRIDE;
-signals:
+Q_SIGNALS:
void signalReceivedWebcamImage( const QPixmap &pic );
void signalWebcamClosed( int reason );
void signalWebcamPaused();
void displayPictureChanged();
-private slots:
+private Q_SLOTS:
void slotChatSessionDestroyed();
void slotSendMessage( Kopete::Message& );
void slotTyping( bool );
diff --git a/protocols/yahoo/yahooeditaccount.h b/protocols/yahoo/yahooeditaccount.h
index 3edfacf..ab69ecd 100644
--- a/protocols/yahoo/yahooeditaccount.h
+++ b/protocols/yahoo/yahooeditaccount.h
@@ -46,10 +46,10 @@ public:
bool validateData() Q_DECL_OVERRIDE;
-public slots:
+public Q_SLOTS:
Kopete::Account *apply() Q_DECL_OVERRIDE;
-private slots:
+private Q_SLOTS:
void slotOpenRegister();
void slotSelectPicture();
};
diff --git a/protocols/yahoo/yahooprotocol.h b/protocols/yahoo/yahooprotocol.h
index 07f65cc..88cf938 100644
--- a/protocols/yahoo/yahooprotocol.h
+++ b/protocols/yahoo/yahooprotocol.h
@@ -126,7 +126,7 @@ public:
Kopete::OnlineStatus statusFromYahoo( int status );
-public slots:
+public Q_SLOTS:
AddContactPage *createAddContactWidget(QWidget * parent, Kopete::Account* a) Q_DECL_OVERRIDE;
KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent) Q_DECL_OVERRIDE;
Kopete::Account *createNewAccount(const QString &accountId) Q_DECL_OVERRIDE;
diff --git a/protocols/yahoo/yahooverifyaccount.h b/protocols/yahoo/yahooverifyaccount.h
index 47d4022..6a669cb 100644
--- a/protocols/yahoo/yahooverifyaccount.h
+++ b/protocols/yahoo/yahooverifyaccount.h
@@ -45,10 +45,10 @@ public:
void setUrl( const KUrl &url );
-protected slots:
+protected Q_SLOTS:
virtual void slotClose();
virtual void slotApply();
-public slots:
+public Q_SLOTS:
void slotData( KIO::Job *job, const QByteArray& data );
void slotComplete( KJob *job );
};
diff --git a/protocols/yahoo/yahoowebcam.h b/protocols/yahoo/yahoowebcam.h
index 380e473..b9d2909 100644
--- a/protocols/yahoo/yahoowebcam.h
+++ b/protocols/yahoo/yahoowebcam.h
@@ -36,7 +36,7 @@ class YahooWebcam : public QObject
public:
explicit YahooWebcam( YahooAccount *account );
~YahooWebcam();
-public slots:
+public Q_SLOTS:
void startTransmission();
void stopTransmission();
void sendImage();
@@ -44,7 +44,7 @@ public slots:
void webcamDialogClosing();
void addViewer( const QString & );
void removeViewer( const QString & );
-signals:
+Q_SIGNALS:
void webcamClosing();
private:
YahooAccount *theAccount;