summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-03-24 08:03:04 +0100
committerPali Roh├ír <[email protected]>2017-12-22 09:10:23 +0100
commit952f8c2a78d36eb2641ffb334c65665df58a1297 (patch)
tree4ff2b424b67647e526860b8c27e817ea287ac200
parent177caa5ac2967f29915ba7e721d2a3cc69362359 (diff)
Add Q_DECL_OVERRIDE
-rw-r--r--kopete/addaccountwizard/addaccountwizard.h8
-rw-r--r--kopete/chatwindow/a11y/accessiblechatmessagepart.h2
-rw-r--r--kopete/chatwindow/a11y/chatwindowaccessiblewidgetfactory.h2
-rw-r--r--kopete/chatwindow/chatmessagepart.h4
-rw-r--r--kopete/chatwindow/chattexteditpart.h2
-rw-r--r--kopete/chatwindow/chatview.h32
-rw-r--r--kopete/chatwindow/emoticonselector.h4
-rw-r--r--kopete/chatwindow/kopetechatwindow.h10
-rw-r--r--kopete/chatwindow/kopeteemailwindow.h24
-rw-r--r--kopete/chatwindow/kopeterichtextwidget.h4
-rw-r--r--kopete/config/accounts/accounttreewidget.h4
-rw-r--r--kopete/config/accounts/kopeteaccountconfig.h6
-rw-r--r--kopete/config/appearance/appearanceconfig.h4
-rw-r--r--kopete/config/appearance/contactlisttoken.h6
-rw-r--r--kopete/config/appearance/layout/Token.h2
-rw-r--r--kopete/config/appearance/layout/TokenDropTarget.cpp2
-rw-r--r--kopete/config/appearance/layout/TokenDropTarget.h2
-rw-r--r--kopete/config/appearance/layout/TokenPool.h12
-rw-r--r--kopete/config/appearance/layout/TokenWithLayout.h4
-rw-r--r--kopete/config/behavior/behaviorconfig.h4
-rw-r--r--kopete/config/chatwindow/chatwindowconfig.cpp20
-rw-r--r--kopete/config/chatwindow/chatwindowconfig.h4
-rw-r--r--kopete/config/chatwindow/emoticonthemedelegate.h4
-rw-r--r--kopete/config/plugins/kopetepluginconfig.h6
-rw-r--r--kopete/config/status/statusconfig.h4
-rw-r--r--kopete/config/status/statusmodel.h26
-rw-r--r--kopete/config/status/statustreeview.h2
-rw-r--r--kopete/contactlist/contactlistmodel.h10
-rw-r--r--kopete/contactlist/contactlistplainmodel.h32
-rw-r--r--kopete/contactlist/contactlistproxymodel.h4
-rw-r--r--kopete/contactlist/contactlisttreemodel.h42
-rw-r--r--kopete/contactlist/contactlisttreemodel_p.h10
-rw-r--r--kopete/contactlist/kabcexport.h2
-rw-r--r--kopete/contactlist/kopetecontactlistview.h24
-rw-r--r--kopete/contactlist/kopeteitemdelegate.h10
-rw-r--r--kopete/identity/accountidentitydialog.h4
-rw-r--r--kopete/identity/identitydialog.h2
-rw-r--r--kopete/identity/identitystatuswidget.h4
-rw-r--r--kopete/infoeventwidget.h2
-rw-r--r--kopete/kopeteaccountstatusbaricon.h4
-rw-r--r--kopete/kopeteapplication.h2
-rw-r--r--kopete/kopeteidentitystatusbaricon.h2
-rw-r--r--kopete/kopetewindow.h16
-rw-r--r--kopete/statusmenu/kopetestatuseditaction.h4
-rw-r--r--kopete/systemtray.h2
-rw-r--r--libkopete/chatsessionmemberslistmodel.h6
-rw-r--r--libkopete/contactlist/xmlcontactstorage.h10
-rw-r--r--libkopete/kopeteaddedinfoevent.h4
-rw-r--r--libkopete/kopeteavatarmanager.h2
-rw-r--r--libkopete/kopetechatsession.cpp6
-rw-r--r--libkopete/kopetemessagehandlerchain.cpp4
-rw-r--r--libkopete/kopetemessagehandlerchain.h2
-rw-r--r--libkopete/kopetemimetypehandler.h4
-rw-r--r--libkopete/kopeteonlinestatus.cpp8
-rw-r--r--libkopete/kopetepassword.cpp18
-rw-r--r--libkopete/kopetepasswordedaccount.h6
-rw-r--r--libkopete/kopeteprotocol.h4
-rw-r--r--libkopete/kopetesimplemessagehandler.h6
-rw-r--r--libkopete/kopetestatusitems.h16
-rw-r--r--libkopete/kopetetransfermanager.h2
-rw-r--r--libkopete/tasks/kopetedeletecontacttask.h6
-rw-r--r--libkopete/tasks/kopetetask.h2
-rw-r--r--libkopete/ui/addressbookselectordialog.h4
-rw-r--r--libkopete/ui/collapsiblewidget.h6
-rw-r--r--libkopete/ui/contactaddednotifywidget.ui2
-rw-r--r--libkopete/ui/kopetelistview.h6
-rw-r--r--libkopete/ui/kopetelistviewitem.h58
-rw-r--r--libkopete/ui/kopetelistviewsearchline.h2
-rw-r--r--libkopete/ui/kopeteviewplugin.h2
-rw-r--r--libkopete/ui/webcamwidget.h2
-rw-r--r--plugins/addbookmarks/addbookmarkspreferences.h4
-rw-r--r--plugins/autoreplace/autoreplacepreferences.h6
-rw-r--r--plugins/contactnotes/contactnotesedit.h2
-rw-r--r--plugins/highlight/highlightpreferences.h4
-rw-r--r--plugins/latex/latexpreferences.h6
-rw-r--r--plugins/otr/authenticationwizard.h6
-rw-r--r--plugins/otr/otrlchatinterface.h2
-rw-r--r--plugins/otr/otrplugin.h6
-rw-r--r--plugins/otr/privkeypopup.h2
-rw-r--r--plugins/privacy/privacyaccountlistmodel.h8
-rw-r--r--plugins/privacy/privacymessagehandler.h6
-rw-r--r--plugins/privacy/privacypreferences.h4
-rw-r--r--plugins/statistics/statisticsdialog.h2
-rw-r--r--plugins/statistics/statisticsplugin.h2
-rw-r--r--plugins/texteffect/texteffectpreferences.h6
-rw-r--r--plugins/urlpicpreview/urlpicpreviewpreferences.h6
-rw-r--r--plugins/webpresence/webpresenceplugin.h2
-rw-r--r--protocols/bonjour/bonjouraccount.h12
-rw-r--r--protocols/bonjour/bonjouraddcontactpage.h4
-rw-r--r--protocols/bonjour/bonjourcontact.h8
-rw-r--r--protocols/bonjour/bonjoureditaccountwidget.h4
-rw-r--r--protocols/bonjour/bonjourprotocol.h10
-rw-r--r--protocols/groupwise/gwaccount.h12
-rw-r--r--protocols/groupwise/gwbytestream.h6
-rw-r--r--protocols/groupwise/gwconnector.h6
-rw-r--r--protocols/groupwise/gwcontact.h16
-rw-r--r--protocols/groupwise/gwmessagemanager.h2
-rw-r--r--protocols/groupwise/gwprotocol.h10
-rw-r--r--protocols/groupwise/libgroupwise/eventprotocol.h2
-rw-r--r--protocols/groupwise/libgroupwise/eventtransfer.h2
-rw-r--r--protocols/groupwise/libgroupwise/gwclientstream.h12
-rw-r--r--protocols/groupwise/libgroupwise/qcatlshandler.h8
-rw-r--r--protocols/groupwise/libgroupwise/request.h2
-rw-r--r--protocols/groupwise/libgroupwise/response.h2
-rw-r--r--protocols/groupwise/libgroupwise/responseprotocol.h2
-rw-r--r--protocols/groupwise/libgroupwise/securestream.h6
-rw-r--r--protocols/groupwise/libgroupwise/tasks/chatcountstask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/conferencetask.h2
-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/createcontactinstancetask.h4
-rw-r--r--protocols/groupwise/libgroupwise/tasks/createcontacttask.h4
-rw-r--r--protocols/groupwise/libgroupwise/tasks/eventtask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.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/joinchattask.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/movecontacttask.h4
-rw-r--r--protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h2
-rw-r--r--protocols/groupwise/libgroupwise/tasks/requesttask.h6
-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/ui/gwaddcontactpage.h4
-rw-r--r--protocols/groupwise/ui/gweditaccountwidget.h4
-rw-r--r--protocols/groupwise/ui/gwsearch.cpp18
-rw-r--r--protocols/jabber/jabberaccount.h14
-rw-r--r--protocols/jabber/jabberbasecontact.h8
-rw-r--r--protocols/jabber/jabberbobcache.h4
-rw-r--r--protocols/jabber/jabbercontact.h20
-rw-r--r--protocols/jabber/jabbergroupchatmanager.h2
-rw-r--r--protocols/jabber/jabbergroupcontact.h10
-rw-r--r--protocols/jabber/jabbergroupmembercontact.h16
-rw-r--r--protocols/jabber/jabberprotocol.h12
-rw-r--r--protocols/jabber/jabbertransport.h16
-rw-r--r--protocols/jabber/jabberxdatawidget.cpp14
-rw-r--r--protocols/jabber/kioslave/jabberdisco.h8
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp2
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp6
-rw-r--r--protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp40
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h10
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h6
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h6
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.h12
-rw-r--r--protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h2
-rw-r--r--protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/base/randrandomnumbergenerator.h4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/parser.cpp16
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.h36
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h2
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp62
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h18
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h24
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h6
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h34
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h4
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h24
-rw-r--r--protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h82
-rw-r--r--protocols/jabber/tasks/jt_ahcommand.h8
-rw-r--r--protocols/jabber/tasks/jt_getlastactivity.h4
-rw-r--r--protocols/jabber/tasks/jt_privatestorage.h4
-rw-r--r--protocols/jabber/tasks/jt_pubsub.h4
-rw-r--r--protocols/jabber/tasks/jt_xregister.h4
-rw-r--r--protocols/jabber/tasks/jt_xsearch.h4
-rw-r--r--protocols/jabber/tasks/privacymanager.h14
-rw-r--r--protocols/jabber/ui/dlgjabberbookmarkeditor.cpp8
-rw-r--r--protocols/jabber/ui/dlgjabberservices.h2
-rw-r--r--protocols/jabber/ui/jabberaddcontactpage.h4
-rw-r--r--protocols/jabber/ui/jabbereditaccountwidget.h4
-rw-r--r--protocols/jabber/ui/jabberregisteraccount.h2
-rw-r--r--protocols/jabber/ui/privacylistblockedmodel.h6
-rw-r--r--protocols/jabber/ui/privacylistmodel.h8
-rw-r--r--protocols/jabber/xoauth2provider.cpp62
-rw-r--r--protocols/oscar/aim/aimaccount.h20
-rw-r--r--protocols/oscar/aim/aimchatsession.h2
-rw-r--r--protocols/oscar/aim/aimcontact.h14
-rw-r--r--protocols/oscar/aim/aimprotocol.h10
-rw-r--r--protocols/oscar/aim/aimstatusmanager.h6
-rw-r--r--protocols/oscar/aim/icqcontact.h12
-rw-r--r--protocols/oscar/aim/ui/aimaddcontactpage.h4
-rw-r--r--protocols/oscar/aim/ui/aimeditaccountwidget.h4
-rw-r--r--protocols/oscar/icq/aimcontact.h12
-rw-r--r--protocols/oscar/icq/icqaccount.h16
-rw-r--r--protocols/oscar/icq/icqcontact.h16
-rw-r--r--protocols/oscar/icq/icqprotocol.h10
-rw-r--r--protocols/oscar/icq/icqstatusmanager.h6
-rw-r--r--protocols/oscar/icq/ui/iconcells.h8
-rw-r--r--protocols/oscar/icq/ui/icqaddcontactpage.h6
-rw-r--r--protocols/oscar/icq/ui/icqchangepassworddialog.h2
-rw-r--r--protocols/oscar/icq/ui/icqeditaccountwidget.h4
-rw-r--r--protocols/oscar/icq/ui/icqsearchdialog.h2
-rw-r--r--protocols/oscar/icq/ui/infocombobox.h2
-rw-r--r--protocols/oscar/icq/ui/xtrazstatusdelegate.h8
-rw-r--r--protocols/oscar/icq/xtrazstatusmodel.h16
-rw-r--r--protocols/oscar/liboscar/client.cpp4
-rw-r--r--protocols/oscar/liboscar/flapprotocol.h2
-rw-r--r--protocols/oscar/liboscar/icquserinfo.h36
-rw-r--r--protocols/oscar/liboscar/oftprotocol.h2
-rw-r--r--protocols/oscar/liboscar/ofttransfer.h4
-rw-r--r--protocols/oscar/liboscar/oscarclientstream.h12
-rw-r--r--protocols/oscar/liboscar/snacprotocol.h2
-rw-r--r--protocols/oscar/liboscar/tasks/blmlimitstask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/buddyicontask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/chatnavservicetask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/chatroomtask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/chatservicetask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/clientreadytask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/closeconnectiontask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/errortask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/filetransfertask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/icbmparamstask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icqchangepasswordtask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icqtask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icqtlvinforequesttask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icqtlvinfoupdatetask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icquserinfotask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/icquserinfoupdatetask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/locationrightstask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/logintask.h10
-rw-r--r--protocols/oscar/liboscar/tasks/messageacktask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/messagereceivertask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/offlinemessagestask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/onlinenotifiertask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/oscarlogintask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/ownuserinfotask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/prmparamstask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/profiletask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/rateinfotask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/senddcinfotask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/sendidletimetask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/sendmessagetask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/serverredirecttask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/serverversionstask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/servicesetuptask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/ssiactivatetask.h2
-rw-r--r--protocols/oscar/liboscar/tasks/ssiauthtask.h4
-rw-r--r--protocols/oscar/liboscar/tasks/ssilisttask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/ssimodifytask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/ssiparamstask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/typingnotifytask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/userinfotask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/usersearchtask.h6
-rw-r--r--protocols/oscar/liboscar/tasks/warningtask.h6
-rw-r--r--protocols/oscar/liboscar/transfer.h8
-rw-r--r--protocols/oscar/liboscar/xtrazxawayservice.h10
-rw-r--r--protocols/oscar/liboscar/xtrazxrandomizerservice.h2
-rw-r--r--protocols/oscar/oscaraccount.cpp4
-rw-r--r--protocols/oscar/oscaraccount.h10
-rw-r--r--protocols/oscar/oscarcontact.h8
-rw-r--r--protocols/oscar/oscarlistnonservercontacts.h2
-rw-r--r--protocols/oscar/oscarmyselfcontact.h6
-rw-r--r--protocols/oscar/oscarprotocol.h4
-rw-r--r--protocols/qq/qqaccount.h16
-rw-r--r--protocols/qq/qqaddcontactpage.h4
-rw-r--r--protocols/qq/qqchatsession.h2
-rw-r--r--protocols/qq/qqcontact.h14
-rw-r--r--protocols/qq/qqnotifysocket.h8
-rw-r--r--protocols/qq/qqprotocol.h10
-rw-r--r--protocols/qq/ui/qqeditaccountwidget.h4
-rw-r--r--protocols/testbed/testbedaccount.h14
-rw-r--r--protocols/testbed/testbedaddcontactpage.h4
-rw-r--r--protocols/testbed/testbedcontact.h8
-rw-r--r--protocols/testbed/testbededitaccountwidget.h4
-rw-r--r--protocols/testbed/testbedprotocol.h10
-rw-r--r--protocols/winpopup/wpaddcontact.h4
-rw-r--r--protocols/winpopup/wpcontact.h10
-rw-r--r--protocols/winpopup/wpeditaccount.h4
-rw-r--r--protocols/winpopup/wpprotocol.h8
-rw-r--r--protocols/yahoo/libkyahoo/alivetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/changestatustask.h2
-rw-r--r--protocols/yahoo/libkyahoo/chatsessiontask.h2
-rw-r--r--protocols/yahoo/libkyahoo/conferencetask.h4
-rw-r--r--protocols/yahoo/libkyahoo/filetransfernotifiertask.h4
-rw-r--r--protocols/yahoo/libkyahoo/listtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/logintask.h6
-rw-r--r--protocols/yahoo/libkyahoo/logofftask.h2
-rw-r--r--protocols/yahoo/libkyahoo/mailnotifiertask.h4
-rw-r--r--protocols/yahoo/libkyahoo/messagereceivertask.h4
-rw-r--r--protocols/yahoo/libkyahoo/modifybuddytask.h6
-rw-r--r--protocols/yahoo/libkyahoo/modifyyabtask.h2
-rw-r--r--protocols/yahoo/libkyahoo/picturenotifiertask.h4
-rw-r--r--protocols/yahoo/libkyahoo/pingtask.h2
-rw-r--r--protocols/yahoo/libkyahoo/receivefiletask.h6
-rw-r--r--protocols/yahoo/libkyahoo/requestpicturetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/sendauthresptask.h2
-rw-r--r--protocols/yahoo/libkyahoo/sendfiletask.h6
-rw-r--r--protocols/yahoo/libkyahoo/sendmessagetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/sendnotifytask.h2
-rw-r--r--protocols/yahoo/libkyahoo/sendpicturetask.h2
-rw-r--r--protocols/yahoo/libkyahoo/statusnotifiertask.h4
-rw-r--r--protocols/yahoo/libkyahoo/stealthtask.h2
-rw-r--r--protocols/yahoo/libkyahoo/webcamtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/yabtask.h4
-rw-r--r--protocols/yahoo/libkyahoo/yahoobytestream.h6
-rw-r--r--protocols/yahoo/libkyahoo/yahoochattask.h6
-rw-r--r--protocols/yahoo/libkyahoo/yahooclientstream.h12
-rw-r--r--protocols/yahoo/libkyahoo/yahooconnector.h6
-rw-r--r--protocols/yahoo/libkyahoo/ymsgprotocol.h2
-rw-r--r--protocols/yahoo/libkyahoo/ymsgtransfer.h2
-rw-r--r--protocols/yahoo/yahooaccount.h12
-rw-r--r--protocols/yahoo/yahooaddcontact.h4
-rw-r--r--protocols/yahoo/yahoocontact.h14
-rw-r--r--protocols/yahoo/yahooeditaccount.h4
-rw-r--r--protocols/yahoo/yahooprotocol.h10
311 files changed, 1172 insertions, 1172 deletions
diff --git a/kopete/addaccountwizard/addaccountwizard.h b/kopete/addaccountwizard/addaccountwizard.h
index 6716992..03bafec 100644
--- a/kopete/addaccountwizard/addaccountwizard.h
+++ b/kopete/addaccountwizard/addaccountwizard.h
@@ -58,10 +58,10 @@ private slots:
void slotProtocolListDoubleClicked();
protected slots:
- virtual void back();
- virtual void next();
- virtual void accept();
- virtual void reject();
+ void back() Q_DECL_OVERRIDE;
+ void next() Q_DECL_OVERRIDE;
+ void accept() Q_DECL_OVERRIDE;
+ void reject() Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/kopete/chatwindow/a11y/accessiblechatmessagepart.h b/kopete/chatwindow/a11y/accessiblechatmessagepart.h
index 89660cd..9f659ae 100644
--- a/kopete/chatwindow/a11y/accessiblechatmessagepart.h
+++ b/kopete/chatwindow/a11y/accessiblechatmessagepart.h
@@ -46,7 +46,7 @@ public:
virtual QString attributes( int offset, int* startOffset, int* endOffset );
- virtual int childCount() const;
+ int childCount() const Q_DECL_OVERRIDE;
//DEPRECATED: virtual int navigate(QAccessible::RelationFlag rel, int entry, QAccessibleInterface** target) const;
virtual void selection( int selectionIndex, int* startOffset, int* endOffset );
diff --git a/kopete/chatwindow/a11y/chatwindowaccessiblewidgetfactory.h b/kopete/chatwindow/a11y/chatwindowaccessiblewidgetfactory.h
index 4ba643f..95b347b 100644
--- a/kopete/chatwindow/a11y/chatwindowaccessiblewidgetfactory.h
+++ b/kopete/chatwindow/a11y/chatwindowaccessiblewidgetfactory.h
@@ -24,7 +24,7 @@
class ChatWindowAccessibleWidgetFactory: public QAccessiblePlugin {
public:
ChatWindowAccessibleWidgetFactory( QObject *parent = nullptr );
- virtual QAccessibleInterface *create( const QString &key, QObject *object );
+ QAccessibleInterface *create( const QString &key, QObject *object ) Q_DECL_OVERRIDE;
virtual QStringList keys() const;
};
diff --git a/kopete/chatwindow/chatmessagepart.h b/kopete/chatwindow/chatmessagepart.h
index 6b7a542..e344700 100644
--- a/kopete/chatwindow/chatmessagepart.h
+++ b/kopete/chatwindow/chatmessagepart.h
@@ -208,7 +208,7 @@ private slots:
void saveVoiceClip( uint messageId );
protected:
- virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
+ void khtmlDrawContentsEvent( khtml::DrawContentsEvent * ) Q_DECL_OVERRIDE;
private:
void readOverrides();
@@ -308,7 +308,7 @@ class HTMLEventListener: public QObject, public DOM::EventListener
{
Q_OBJECT
public:
- virtual void handleEvent( DOM::Event &event );
+ void handleEvent( DOM::Event &event ) Q_DECL_OVERRIDE;
Q_SIGNALS:
void resendMessage( uint messageId );
void playVoiceClip( uint messageId );
diff --git a/kopete/chatwindow/chattexteditpart.h b/kopete/chatwindow/chattexteditpart.h
index df896e3..24c6ff6 100644
--- a/kopete/chatwindow/chattexteditpart.h
+++ b/kopete/chatwindow/chattexteditpart.h
@@ -96,7 +96,7 @@ public:
/**
* @brief Disable file open, because it's not used by this part.
*/
- virtual bool openFile() {
+ bool openFile() Q_DECL_OVERRIDE {
return false;
}
diff --git a/kopete/chatwindow/chatview.h b/kopete/chatwindow/chatview.h
index 8db255a..b5aca25 100644
--- a/kopete/chatwindow/chatview.h
+++ b/kopete/chatwindow/chatview.h
@@ -102,7 +102,7 @@ public:
*
* Reimplemented from KopeteView
*/
- virtual void clear();
+ void clear() Q_DECL_OVERRIDE;
/**
* Sets the text to be displayed on tab label and window caption
@@ -121,7 +121,7 @@ public:
*
* Reimplemented from KopeteView
*/
- virtual Kopete::Message currentMessage();
+ Kopete::Message currentMessage() Q_DECL_OVERRIDE;
/**
* Sets the current message in the chat window
@@ -129,7 +129,7 @@ public:
*
* Reimplemented from KopeteView
*/
- virtual void setCurrentMessage( const Kopete::Message &newMessage );
+ void setCurrentMessage( const Kopete::Message &newMessage ) Q_DECL_OVERRIDE;
/**
* Returns the chat window this view is in
@@ -144,16 +144,16 @@ public:
bool sendInProgress() const;
/** Reimplemented from KopeteView **/
- virtual void raise( bool activate=false );
+ void raise( bool activate=false ) Q_DECL_OVERRIDE;
/** Reimplemented from KopeteView **/
- virtual void makeVisible();
+ void makeVisible() Q_DECL_OVERRIDE;
/** Reimplemented from KopeteView **/
- virtual bool isVisible();
+ bool isVisible() Q_DECL_OVERRIDE;
/** Reimplemented from KopeteView **/
- virtual QWidget *mainWidget();
+ QWidget *mainWidget() Q_DECL_OVERRIDE;
KTextEdit *editWidget();
@@ -161,10 +161,10 @@ public:
bool canSendFile() const;
/** Reimplemented from KopeteView **/
- virtual void registerContextMenuHandler( QObject *target, const char* slot );
+ void registerContextMenuHandler( QObject *target, const char* slot ) Q_DECL_OVERRIDE;
/** Reimplemented from KopeteView **/
- virtual void registerTooltipHandler( QObject *target, const char* slot );
+ void registerTooltipHandler( QObject *target, const char* slot ) Q_DECL_OVERRIDE;
public slots:
/**
@@ -200,7 +200,7 @@ public slots:
* Called when a message is received from someone
* @param message The message received
*/
- virtual void appendMessage( Kopete::Message &message );
+ void appendMessage( Kopete::Message &message ) Q_DECL_OVERRIDE;
/**
* Send file (opens file dialog)
@@ -228,11 +228,11 @@ public slots:
void slotRecalculateSize(int difference);
/** Reimplemented from KopeteView **/
- virtual void messageSentSuccessfully();
+ void messageSentSuccessfully() Q_DECL_OVERRIDE;
- virtual bool closeView( bool force = false );
+ bool closeView( bool force = false ) Q_DECL_OVERRIDE;
- virtual void dropEvent ( QDropEvent * );
+ void dropEvent ( QDropEvent * ) Q_DECL_OVERRIDE;
bool isDragEventAccepted( const QDragMoveEvent * ) const;
/** Retrieves the tab state. */
@@ -339,8 +339,8 @@ private slots:
void slotDisplayNameChanged(const QString &oldValue, const QString &newValue);
protected:
- virtual void dragEnterEvent ( QDragEnterEvent * );
- virtual void dragMoveEvent ( QDragMoveEvent * );
+ void dragEnterEvent ( QDragEnterEvent * ) Q_DECL_OVERRIDE;
+ void dragMoveEvent ( QDragMoveEvent * ) Q_DECL_OVERRIDE;
private:
// widget stuff
@@ -380,7 +380,7 @@ class ChatWindowPlugin : public Kopete::ViewPlugin
{
public:
ChatWindowPlugin(QObject *parent, const QVariantList &args);
- KopeteView* createView( Kopete::ChatSession *manager );
+ KopeteView* createView( Kopete::ChatSession *manager ) Q_DECL_OVERRIDE;
};
#endif
diff --git a/kopete/chatwindow/emoticonselector.h b/kopete/chatwindow/emoticonselector.h
index e32ca21..e14bd17 100644
--- a/kopete/chatwindow/emoticonselector.h
+++ b/kopete/chatwindow/emoticonselector.h
@@ -67,8 +67,8 @@ public slots:
void prepareList();
protected:
- virtual void hideEvent( QHideEvent* );
- virtual void showEvent( QShowEvent* );
+ void hideEvent( QHideEvent* ) Q_DECL_OVERRIDE;
+ void showEvent( QShowEvent* ) Q_DECL_OVERRIDE;
protected slots:
void emoticonClicked( QListWidgetItem* );
diff --git a/kopete/chatwindow/kopetechatwindow.h b/kopete/chatwindow/kopetechatwindow.h
index 9322ce1..f13df59 100644
--- a/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/chatwindow/kopetechatwindow.h
@@ -105,7 +105,7 @@ public:
* Reimplemented from KXmlGuiWindow - asks each ChatView in the window if it is ok to close the window
* @return true if no ChatView objects to closing.
*/
- virtual bool queryClose();
+ bool queryClose() Q_DECL_OVERRIDE;
virtual bool queryExit();
KTemporaryFile *backgroundFile;
@@ -247,10 +247,10 @@ private:
void updateSpellCheckAction();
protected:
- virtual void closeEvent( QCloseEvent *e );
- virtual void changeEvent( QEvent *e );
- virtual void resizeEvent( QResizeEvent *e);
- virtual bool eventFilter( QObject *obj, QEvent *event );
+ void closeEvent( QCloseEvent *e ) Q_DECL_OVERRIDE;
+ void changeEvent( QEvent *e ) Q_DECL_OVERRIDE;
+ void resizeEvent( QResizeEvent *e) Q_DECL_OVERRIDE;
+ bool eventFilter( QObject *obj, QEvent *event ) Q_DECL_OVERRIDE;
};
#endif
diff --git a/kopete/chatwindow/kopeteemailwindow.h b/kopete/chatwindow/kopeteemailwindow.h
index 2ca1092..4d7da18 100644
--- a/kopete/chatwindow/kopeteemailwindow.h
+++ b/kopete/chatwindow/kopeteemailwindow.h
@@ -38,18 +38,18 @@ public:
KopeteEmailWindow( Kopete::ChatSession *, EmailWindowPlugin *parent, bool foreignMessage );
~KopeteEmailWindow();
- virtual Kopete::Message currentMessage();
- virtual void setCurrentMessage( const Kopete::Message &newMessage );
- virtual void raise(bool activate=false);
- virtual void makeVisible();
- virtual bool closeView( bool force = false );
- virtual bool isVisible();
- virtual QWidget *mainWidget() { return this; }
+ Kopete::Message currentMessage() Q_DECL_OVERRIDE;
+ void setCurrentMessage( const Kopete::Message &newMessage ) Q_DECL_OVERRIDE;
+ void raise(bool activate=false) Q_DECL_OVERRIDE;
+ void makeVisible() Q_DECL_OVERRIDE;
+ bool closeView( bool force = false ) Q_DECL_OVERRIDE;
+ bool isVisible() Q_DECL_OVERRIDE;
+ QWidget *mainWidget() Q_DECL_OVERRIDE { return this; }
public slots:
virtual void sendMessage();
- virtual void appendMessage( Kopete::Message &message );
- virtual void messageSentSuccessfully();
+ void appendMessage( Kopete::Message &message ) Q_DECL_OVERRIDE;
+ void messageSentSuccessfully() Q_DECL_OVERRIDE;
signals:
void shown();
@@ -58,8 +58,8 @@ signals:
void activated( KopeteView *view );
protected:
- virtual void closeEvent( QCloseEvent *e );
- virtual void changeEvent( QEvent *e );
+ void closeEvent( QCloseEvent *e ) Q_DECL_OVERRIDE;
+ void changeEvent( QEvent *e ) Q_DECL_OVERRIDE;
private slots:
void slotReplySend();
@@ -95,7 +95,7 @@ class EmailWindowPlugin : public Kopete::ViewPlugin
{
public:
EmailWindowPlugin(QObject *parent, const QVariantList &args);
- KopeteView* createView( Kopete::ChatSession *manager );
+ KopeteView* createView( Kopete::ChatSession *manager ) Q_DECL_OVERRIDE;
};
#endif // __KOPETEEMAILWINDOW_H__
diff --git a/kopete/chatwindow/kopeterichtextwidget.h b/kopete/chatwindow/kopeterichtextwidget.h
index f2139dc..c403ebf 100644
--- a/kopete/chatwindow/kopeterichtextwidget.h
+++ b/kopete/chatwindow/kopeterichtextwidget.h
@@ -87,8 +87,8 @@ signals:
void documentSizeUpdated(int difference);
protected:
- virtual void insertFromMimeData(const QMimeData * source);
- virtual bool event(QEvent *event);
+ void insertFromMimeData(const QMimeData * source) Q_DECL_OVERRIDE;
+ bool event(QEvent *event) Q_DECL_OVERRIDE;
protected slots:
void updateTextFormat();
diff --git a/kopete/config/accounts/accounttreewidget.h b/kopete/config/accounts/accounttreewidget.h
index fa64b5e..999f2e3 100644
--- a/kopete/config/accounts/accounttreewidget.h
+++ b/kopete/config/accounts/accounttreewidget.h
@@ -31,8 +31,8 @@ signals:
void itemPositionChanged();
protected:
- void dragEnterEvent( QDragEnterEvent *event );
- void dropEvent( QDropEvent *event );
+ void dragEnterEvent( QDragEnterEvent *event ) Q_DECL_OVERRIDE;
+ void dropEvent( QDropEvent *event ) Q_DECL_OVERRIDE;
};
diff --git a/kopete/config/accounts/kopeteaccountconfig.h b/kopete/config/accounts/kopeteaccountconfig.h
index 478b5da..0a09932 100644
--- a/kopete/config/accounts/kopeteaccountconfig.h
+++ b/kopete/config/accounts/kopeteaccountconfig.h
@@ -50,11 +50,11 @@ public:
KopeteAccountConfig(QWidget *parent, const QVariantList &args );
protected:
- virtual bool eventFilter( QObject *obj, QEvent *event );
+ bool eventFilter( QObject *obj, QEvent *event ) Q_DECL_OVERRIDE;
public slots:
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private:
KopeteAccountLVI* selectedAccount();
diff --git a/kopete/config/appearance/appearanceconfig.h b/kopete/config/appearance/appearanceconfig.h
index 9429ff8..c2e955e 100644
--- a/kopete/config/appearance/appearanceconfig.h
+++ b/kopete/config/appearance/appearanceconfig.h
@@ -34,8 +34,8 @@ public:
AppearanceConfig( QWidget *parent, const QVariantList &args );
~AppearanceConfig();
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private slots:
void slotHighlightChanged();
diff --git a/kopete/config/appearance/contactlisttoken.h b/kopete/config/appearance/contactlisttoken.h
index 3e1ba1d..bb260f9 100644
--- a/kopete/config/appearance/contactlisttoken.h
+++ b/kopete/config/appearance/contactlisttoken.h
@@ -23,7 +23,7 @@
class ContactListTokenFactory : public TokenFactory
{
public:
- virtual Token * createToken( const QString &text, const QString &iconName, int value, QWidget *parent = nullptr );
+ Token * createToken( const QString &text, const QString &iconName, int value, QWidget *parent = nullptr ) Q_DECL_OVERRIDE;
};
class ContactListToken : public TokenWithLayout
@@ -39,8 +39,8 @@ public:
void setOptimalSize( bool optimalSize );
protected:
- virtual void fillMenu( QMenu * menu );
- virtual void menuExecuted( const QAction* action );
+ void fillMenu( QMenu * menu ) Q_DECL_OVERRIDE;
+ void menuExecuted( const QAction* action ) Q_DECL_OVERRIDE;
private:
bool m_small;
diff --git a/kopete/config/appearance/layout/Token.h b/kopete/config/appearance/layout/Token.h
index 412a226..7687726 100644
--- a/kopete/config/appearance/layout/Token.h
+++ b/kopete/config/appearance/layout/Token.h
@@ -52,7 +52,7 @@ class Token : public QWidget
void changed();
protected:
- virtual void paintEvent(QPaintEvent *pe);
+ void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE;
protected:
diff --git a/kopete/config/appearance/layout/TokenDropTarget.cpp b/kopete/config/appearance/layout/TokenDropTarget.cpp
index 0418fb0..94a5d41 100644
--- a/kopete/config/appearance/layout/TokenDropTarget.cpp
+++ b/kopete/config/appearance/layout/TokenDropTarget.cpp
@@ -37,7 +37,7 @@ public:
TokenDragger( const QString &mimeType, TokenDropTarget *parent ) : QObject(parent), m_mimeType( mimeType )
{}
protected:
- bool eventFilter( QObject *o, QEvent *e )
+ bool eventFilter( QObject *o, QEvent *e ) Q_DECL_OVERRIDE
{
if ( e->type() == QEvent::MouseMove )
{
diff --git a/kopete/config/appearance/layout/TokenDropTarget.h b/kopete/config/appearance/layout/TokenDropTarget.h
index e081528..d543483 100644
--- a/kopete/config/appearance/layout/TokenDropTarget.h
+++ b/kopete/config/appearance/layout/TokenDropTarget.h
@@ -54,7 +54,7 @@ signals:
void focussed( QWidget* );
protected:
- bool eventFilter( QObject *, QEvent * );
+ bool eventFilter( QObject *, QEvent * ) Q_DECL_OVERRIDE;
QBoxLayout *rowBox( QWidget *w, QPoint *idx = 0 ) const;
QBoxLayout *rowBox( const QPoint &pt ) const;
protected:
diff --git a/kopete/config/appearance/layout/TokenPool.h b/kopete/config/appearance/layout/TokenPool.h
index b9f8c18..82eb365 100644
--- a/kopete/config/appearance/layout/TokenPool.h
+++ b/kopete/config/appearance/layout/TokenPool.h
@@ -37,12 +37,12 @@ class TokenPool : public KListWidget
QString mimeType() const;
void setMimeType( const QString& mimeType );
protected:
- void mouseDoubleClickEvent( QMouseEvent *event );
- void mousePressEvent( QMouseEvent *event );
- void mouseMoveEvent( QMouseEvent *event );
- void dragEnterEvent( QDragEnterEvent *event );
- void dragMoveEvent( QDragMoveEvent *event );
- void dropEvent( QDropEvent *event );
+ void mouseDoubleClickEvent( QMouseEvent *event ) Q_DECL_OVERRIDE;
+ void mousePressEvent( QMouseEvent *event ) Q_DECL_OVERRIDE;
+ void mouseMoveEvent( QMouseEvent *event ) Q_DECL_OVERRIDE;
+ void dragEnterEvent( QDragEnterEvent *event ) Q_DECL_OVERRIDE;
+ void dragMoveEvent( QDragMoveEvent *event ) Q_DECL_OVERRIDE;
+ void dropEvent( QDropEvent *event ) Q_DECL_OVERRIDE;
signals:
void onDoubleClick( Token *token ); //connects to TokenLayoutWidget::addToken( QString )
diff --git a/kopete/config/appearance/layout/TokenWithLayout.h b/kopete/config/appearance/layout/TokenWithLayout.h
index 68ed8a1..625d62d 100644
--- a/kopete/config/appearance/layout/TokenWithLayout.h
+++ b/kopete/config/appearance/layout/TokenWithLayout.h
@@ -27,7 +27,7 @@ class QMenu;
class TokenWithLayoutFactory : public TokenFactory
{
public:
- virtual Token * createToken( const QString &text, const QString &iconName, int value, QWidget *parent = nullptr );
+ Token * createToken( const QString &text, const QString &iconName, int value, QWidget *parent = nullptr ) Q_DECL_OVERRIDE;
};
/**
@@ -67,7 +67,7 @@ public slots:
protected:
virtual void fillMenu( QMenu * menu );
virtual void menuExecuted( const QAction* action );
- virtual void contextMenuEvent( QContextMenuEvent * event );
+ void contextMenuEvent( QContextMenuEvent * event ) Q_DECL_OVERRIDE;
private:
diff --git a/kopete/config/behavior/behaviorconfig.h b/kopete/config/behavior/behaviorconfig.h
index 91b9da4..d6bb47e 100644
--- a/kopete/config/behavior/behaviorconfig.h
+++ b/kopete/config/behavior/behaviorconfig.h
@@ -33,8 +33,8 @@ class BehaviorConfig : public KCModule
public:
BehaviorConfig(QWidget *parent, const QVariantList &args) ;
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private slots:
void slotSettingsChanged(bool);
diff --git a/kopete/config/chatwindow/chatwindowconfig.cpp b/kopete/config/chatwindow/chatwindowconfig.cpp
index e78d3fb..5e1f37a 100644
--- a/kopete/config/chatwindow/chatwindowconfig.cpp
+++ b/kopete/config/chatwindow/chatwindowconfig.cpp
@@ -92,8 +92,8 @@ class FakeContact : public Kopete::Contact
{
public:
FakeContact (Kopete::Account *account, const QString &id, Kopete::MetaContact *mc ) : Kopete::Contact( account, id, mc ) {}
- virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags /*c*/) { return 0L; }
- virtual void slotUserInfo() {}
+ Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags /*c*/) Q_DECL_OVERRIDE { return 0L; }
+ void slotUserInfo() Q_DECL_OVERRIDE {}
};
// This is for style preview.
@@ -101,9 +101,9 @@ class FakeProtocol : public Kopete::Protocol
{
public:
FakeProtocol( QObject *parent ) : Kopete::Protocol(parent){}
-Kopete::Account* createNewAccount( const QString &/*accountId*/ ){return 0L;}
-AddContactPage* createAddContactWidget( QWidget */*parent*/, Kopete::Account */*account*/){return 0L;}
-KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, QWidget */*parent */){return 0L;}
+Kopete::Account* createNewAccount( const QString &/*accountId*/ )Q_DECL_OVERRIDE {return 0L;}
+AddContactPage* createAddContactWidget( QWidget */*parent*/, Kopete::Account */*account*/)Q_DECL_OVERRIDE {return 0L;}
+KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, QWidget */*parent */)Q_DECL_OVERRIDE {return 0L;}
};
// This is for style preview.
@@ -133,11 +133,11 @@ public:
delete m_identity;
}
-bool createContact( const QString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;}
-void connect( const Kopete::OnlineStatus& /*initialStatus*/){}
-void disconnect(){}
-void setOnlineStatus( const Kopete::OnlineStatus& /*status*/, const Kopete::StatusMessage &/*reason*/, const OnlineStatusOptions&/*options*/){}
-void setStatusMessage(const Kopete::StatusMessage& /*statusMessage*/){}
+bool createContact( const QString &/*contactId*/, Kopete::MetaContact */*parentContact*/ )Q_DECL_OVERRIDE {return true;}
+void connect( const Kopete::OnlineStatus& /*initialStatus*/)Q_DECL_OVERRIDE {}
+void disconnect()Q_DECL_OVERRIDE {}
+void setOnlineStatus( const Kopete::OnlineStatus& /*status*/, const Kopete::StatusMessage &/*reason*/, const OnlineStatusOptions&/*options*/)Q_DECL_OVERRIDE {}
+void setStatusMessage(const Kopete::StatusMessage& /*statusMessage*/)Q_DECL_OVERRIDE {}
private:
FakeIdentity *m_identity;
diff --git a/kopete/config/chatwindow/chatwindowconfig.h b/kopete/config/chatwindow/chatwindowconfig.h
index 20b88e0..bbd0055 100644
--- a/kopete/config/chatwindow/chatwindowconfig.h
+++ b/kopete/config/chatwindow/chatwindowconfig.h
@@ -47,8 +47,8 @@ public:
ChatWindowConfig( QWidget *parent, const QVariantList &args );
~ChatWindowConfig();
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private slots:
//----- Style TAB ---------------------
diff --git a/kopete/config/chatwindow/emoticonthemedelegate.h b/kopete/config/chatwindow/emoticonthemedelegate.h
index f71df8d..0bfe1ac 100644
--- a/kopete/config/chatwindow/emoticonthemedelegate.h
+++ b/kopete/config/chatwindow/emoticonthemedelegate.h
@@ -25,8 +25,8 @@ class EmoticonThemeDelegate : public QStyledItemDelegate
Q_OBJECT
public:
EmoticonThemeDelegate(QObject *parent = nullptr);
- void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
- QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+ void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
};
#endif
diff --git a/kopete/config/plugins/kopetepluginconfig.h b/kopete/config/plugins/kopetepluginconfig.h
index 732a591..09c693e 100644
--- a/kopete/config/plugins/kopetepluginconfig.h
+++ b/kopete/config/plugins/kopetepluginconfig.h
@@ -39,10 +39,10 @@ public:
~KopetePluginConfig();
public slots:
- virtual void load();
- virtual void save();
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
- virtual void defaults();
+ void defaults() Q_DECL_OVERRIDE;
void reparseConfiguration(const QByteArray&conf);
private:
KPluginSelector *m_pluginSelector;
diff --git a/kopete/config/status/statusconfig.h b/kopete/config/status/statusconfig.h
index a8371bc..2296b65 100644
--- a/kopete/config/status/statusconfig.h
+++ b/kopete/config/status/statusconfig.h
@@ -34,8 +34,8 @@ class StatusConfig : public KCModule
StatusConfig( QWidget *parent, const QVariantList &args );
public slots:
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private:
QTabWidget* mStatusTabCtl;
diff --git a/kopete/config/status/statusmodel.h b/kopete/config/status/statusmodel.h
index 42734da..cfbf570 100644
--- a/kopete/config/status/statusmodel.h
+++ b/kopete/config/status/statusmodel.h
@@ -45,23 +45,23 @@ public:
Group
};
- virtual QVariant data( const QModelIndex &index, int role ) const;
- virtual bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole );
- virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
- virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
- virtual QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
- virtual QModelIndex parent( const QModelIndex &index ) const;
- virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
- virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
+ QVariant data( const QModelIndex &index, int role ) const Q_DECL_OVERRIDE;
+ bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole ) Q_DECL_OVERRIDE;
+ Qt::ItemFlags flags( const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
+ QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual Qt::DropActions supportedDropActions() const;
+ Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
QModelIndex insertItem( const QModelIndex &index, Kopete::Status::StatusItem *item );
- virtual bool removeRows ( int row, int count, const QModelIndex &parent = QModelIndex() );
+ bool removeRows ( int row, int count, const QModelIndex &parent = QModelIndex() ) Q_DECL_OVERRIDE;
- QStringList mimeTypes() const;
- QMimeData *mimeData( const QModelIndexList &indexes ) const;
- bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent );
+ QStringList mimeTypes() const Q_DECL_OVERRIDE;
+ QMimeData *mimeData( const QModelIndexList &indexes ) const Q_DECL_OVERRIDE;
+ bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) Q_DECL_OVERRIDE;
Q_SIGNALS:
void changed();
diff --git a/kopete/config/status/statustreeview.h b/kopete/config/status/statustreeview.h
index 8045e6b..af500fe 100644
--- a/kopete/config/status/statustreeview.h
+++ b/kopete/config/status/statustreeview.h
@@ -27,7 +27,7 @@ public:
protected:
// FIXME: is there an easier way to set default action of QDrag to Qt::MoveAction
- virtual void startDrag( Qt::DropActions supportedActions )
+ void startDrag( Qt::DropActions supportedActions ) Q_DECL_OVERRIDE
{
QModelIndexList indexes = selectedIndexes();
if ( indexes.count() > 0 )
diff --git a/kopete/contactlist/contactlistmodel.h b/kopete/contactlist/contactlistmodel.h
index 3f9168a..b62cf7d 100644
--- a/kopete/contactlist/contactlistmodel.h
+++ b/kopete/contactlist/contactlistmodel.h
@@ -47,13 +47,13 @@ public:
void init();
- virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const;
+ int columnCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
/* drag-n-drop stuff */
- virtual Qt::DropActions supportedDropActions() const;
- virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
- virtual QStringList mimeTypes() const;
- virtual bool setData(const QModelIndex &index, const QVariant &value, const int role);
+ Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
+ QMimeData* mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
+ QStringList mimeTypes() const Q_DECL_OVERRIDE;
+ bool setData(const QModelIndex &index, const QVariant &value, const int role) Q_DECL_OVERRIDE;
bool loadModelSettings( const QString& modelType );
bool saveModelSettings( const QString& modelType );
diff --git a/kopete/contactlist/contactlistplainmodel.h b/kopete/contactlist/contactlistplainmodel.h
index 8464621..7054964 100644
--- a/kopete/contactlist/contactlistplainmodel.h
+++ b/kopete/contactlist/contactlistplainmodel.h
@@ -45,32 +45,32 @@ public:
ContactListPlainModel(QObject* parent = nullptr);
~ContactListPlainModel();
- virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
- virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const;
+ QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
+ QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual QModelIndex parent ( const QModelIndex & index ) const;
- virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
- virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const;
+ QModelIndex parent ( const QModelIndex & index ) const Q_DECL_OVERRIDE;
+ int rowCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
- virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent);
+ bool dropMimeData(const QMimeData *data, Qt::DropAction action,
+ int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
public Q_SLOTS:
- virtual void addMetaContact( Kopete::MetaContact* );
- virtual void removeMetaContact( Kopete::MetaContact* );
+ void addMetaContact( Kopete::MetaContact* ) Q_DECL_OVERRIDE;
+ void removeMetaContact( Kopete::MetaContact* ) Q_DECL_OVERRIDE;
protected Q_SLOTS:
- virtual void handleContactDataChange(Kopete::MetaContact*);
- virtual void appearanceConfigChanged();
- virtual void loadContactList();
+ void handleContactDataChange(Kopete::MetaContact*) Q_DECL_OVERRIDE;
+ void appearanceConfigChanged() Q_DECL_OVERRIDE;
+ void loadContactList() Q_DECL_OVERRIDE;
protected:
- virtual void loadModelSettingsImpl( QDomElement& rootElement );
- virtual void saveModelSettingsImpl( QDomDocument& doc, QDomElement& rootElement );
+ void loadModelSettingsImpl( QDomElement& rootElement ) Q_DECL_OVERRIDE;
+ void saveModelSettingsImpl( QDomDocument& doc, QDomElement& rootElement ) Q_DECL_OVERRIDE;
- virtual bool dropMetaContacts( int row, const QModelIndex &parent, Qt::DropAction action, const QList<GroupMetaContactPair> &items );
+ bool dropMetaContacts( int row, const QModelIndex &parent, Qt::DropAction action, const QList<GroupMetaContactPair> &items ) Q_DECL_OVERRIDE;
private:
void addMetaContactImpl( Kopete::MetaContact *mc );
diff --git a/kopete/contactlist/contactlistproxymodel.h b/kopete/contactlist/contactlistproxymodel.h
index 70cd385..95c16f9 100644
--- a/kopete/contactlist/contactlistproxymodel.h
+++ b/kopete/contactlist/contactlistproxymodel.h
@@ -43,8 +43,8 @@ Q_OBJECT
public slots:
void slotConfigChanged();
protected:
- bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
- bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const;
+ bool lessThan(const QModelIndex &left, const QModelIndex &right) const Q_DECL_OVERRIDE;
+ bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE;
bool showOffline;
bool showEmptyFolders;
int rootRowCount;
diff --git a/kopete/contactlist/contactlisttreemodel.h b/kopete/contactlist/contactlisttreemodel.h
index 0d34de1..a3d0a74 100644
--- a/kopete/contactlist/contactlisttreemodel.h
+++ b/kopete/contactlist/contactlisttreemodel.h
@@ -44,39 +44,39 @@ public:
ContactListTreeModel(QObject* parent = nullptr);
~ContactListTreeModel();
- virtual bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
- virtual QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
- virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const;
+ bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole ) Q_DECL_OVERRIDE;
+ QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
+ QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual QModelIndex parent ( const QModelIndex & index ) const;
- virtual int rowCount ( const QModelIndex & parent = QModelIndex() ) const;
- virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const;
+ QModelIndex parent ( const QModelIndex & index ) const Q_DECL_OVERRIDE;
+ int rowCount ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ bool hasChildren ( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
- virtual bool dropMimeData( const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &parent );
+ bool dropMimeData( const QMimeData *data, Qt::DropAction action,
+ int row, int column, const QModelIndex &parent ) Q_DECL_OVERRIDE;
public Q_SLOTS:
- virtual void addMetaContact( Kopete::MetaContact* );
- virtual void removeMetaContact( Kopete::MetaContact* );
+ void addMetaContact( Kopete::MetaContact* ) Q_DECL_OVERRIDE;
+ void removeMetaContact( Kopete::MetaContact* ) Q_DECL_OVERRIDE;
- virtual void addGroup( Kopete::Group* );
- virtual void removeGroup( Kopete::Group* );
+ void addGroup( Kopete::Group* ) Q_DECL_OVERRIDE;
+ void removeGroup( Kopete::Group* ) Q_DECL_OVERRIDE;
- virtual void addMetaContactToGroup( Kopete::MetaContact*, Kopete::Group* );
- virtual void removeMetaContactFromGroup( Kopete::MetaContact*, Kopete::Group* );
+ void addMetaContactToGroup( Kopete::MetaContact*, Kopete::Group* ) Q_DECL_OVERRIDE;
+ void removeMetaContactFromGroup( Kopete::MetaContact*, Kopete::Group* ) Q_DECL_OVERRIDE;
protected Q_SLOTS:
- virtual void handleContactDataChange(Kopete::MetaContact*);
- virtual void appearanceConfigChanged();
- virtual void loadContactList();
+ void handleContactDataChange(Kopete::MetaContact*) Q_DECL_OVERRIDE;
+ void appearanceConfigChanged() Q_DECL_OVERRIDE;
+ void loadContactList() Q_DECL_OVERRIDE;
protected:
- virtual void loadModelSettingsImpl( QDomElement& rootElement );
- virtual void saveModelSettingsImpl( QDomDocument& doc, QDomElement& rootElement );
+ void loadModelSettingsImpl( QDomElement& rootElement ) Q_DECL_OVERRIDE;
+ void saveModelSettingsImpl( QDomDocument& doc, QDomElement& rootElement ) Q_DECL_OVERRIDE;
- virtual bool dropMetaContacts( int row, const QModelIndex &parent, Qt::DropAction action, const QList<GroupMetaContactPair> &items );
+ bool dropMetaContacts( int row, const QModelIndex &parent, Qt::DropAction action, const QList<GroupMetaContactPair> &items ) Q_DECL_OVERRIDE;
private:
ContactListModelItem* itemFor( const QModelIndex& index ) const;
diff --git a/kopete/contactlist/contactlisttreemodel_p.h b/kopete/contactlist/contactlisttreemodel_p.h
index 8501584..7ebdd80 100644
--- a/kopete/contactlist/contactlisttreemodel_p.h
+++ b/kopete/contactlist/contactlisttreemodel_p.h
@@ -104,19 +104,19 @@ public:
qDeleteAll( mItems );
}
- virtual bool isGroup() const
+ bool isGroup() const Q_DECL_OVERRIDE
{
return true;
}
- virtual int count() const
+ int count() const Q_DECL_OVERRIDE
{
return mItems.count();
}
- virtual int metaContactCount() const;
+ int metaContactCount() const Q_DECL_OVERRIDE;
- virtual bool hasChildren() const
+ bool hasChildren() const Q_DECL_OVERRIDE
{
return !mItems.isEmpty();
}
@@ -148,7 +148,7 @@ public:
return mItems;
}
- virtual void sort( bool (*lessThan)(const ContactListModelItem*, const ContactListModelItem*) );
+ void sort( bool (*lessThan)(const ContactListModelItem*, const ContactListModelItem*) ) Q_DECL_OVERRIDE;
protected:
friend class ContactListModelItem;
diff --git a/kopete/contactlist/kabcexport.h b/kopete/contactlist/kabcexport.h
index ad2d19a..05ce2f8 100644
--- a/kopete/contactlist/kabcexport.h
+++ b/kopete/contactlist/kabcexport.h
@@ -47,7 +47,7 @@ Q_OBJECT
KabcExportWizard( QWidget *parent = nullptr );
~KabcExportWizard();
public slots:
- void accept();
+ void accept() Q_DECL_OVERRIDE;
protected slots:
void slotDeselectAll();
void slotSelectAll();
diff --git a/kopete/contactlist/kopetecontactlistview.h b/kopete/contactlist/kopetecontactlistview.h
index 8b00c44..4000b65 100644
--- a/kopete/contactlist/kopetecontactlistview.h
+++ b/kopete/contactlist/kopetecontactlistview.h
@@ -65,14 +65,14 @@ public:
~KopeteContactListView();
void initActions( KActionCollection *ac );
- virtual void setModel( QAbstractItemModel *newModel );
+ void setModel( QAbstractItemModel *newModel ) Q_DECL_OVERRIDE;
int visibleContentHeight() const;
- virtual void keyboardSearch( const QString &search );
+ void keyboardSearch( const QString &search ) Q_DECL_OVERRIDE;
public Q_SLOTS:
- virtual void reset();
+ void reset() Q_DECL_OVERRIDE;
void contactActivated( const QModelIndex& index );
void showItemProperties();
@@ -92,17 +92,17 @@ Q_SIGNALS:
void visibleContentHeightChanged();
protected:
- virtual void contextMenuEvent( QContextMenuEvent* event );
- virtual void mouseReleaseEvent( QMouseEvent *event );
- virtual void startDrag( Qt::DropActions supportedActions );
- virtual void dragMoveEvent( QDragMoveEvent *event );
- virtual void timerEvent( QTimerEvent *event );
- virtual bool eventFilter( QObject *object, QEvent *event );
- virtual bool viewportEvent( QEvent *event );
+ void contextMenuEvent( QContextMenuEvent* event ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent *event ) Q_DECL_OVERRIDE;
+ void startDrag( Qt::DropActions supportedActions ) Q_DECL_OVERRIDE;
+ void dragMoveEvent( QDragMoveEvent *event ) Q_DECL_OVERRIDE;
+ void timerEvent( QTimerEvent *event ) Q_DECL_OVERRIDE;
+ bool eventFilter( QObject *object, QEvent *event ) Q_DECL_OVERRIDE;
+ bool viewportEvent( QEvent *event ) Q_DECL_OVERRIDE;
protected slots:
- virtual void rowsInserted( const QModelIndex &parent, int start, int end );
- virtual void selectionChanged( const QItemSelection& selected, const QItemSelection& deselected );
+ 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:
void reexpandGroups();
diff --git a/kopete/contactlist/kopeteitemdelegate.h b/kopete/contactlist/kopeteitemdelegate.h
index 454de4e..6b96a23 100644
--- a/kopete/contactlist/kopeteitemdelegate.h
+++ b/kopete/contactlist/kopeteitemdelegate.h
@@ -41,16 +41,16 @@ public:
static QFont normalFont( const QFont& naturalFont );
static QFont smallFont( const QFont& naturalFont );
- virtual void paint ( QPainter * painter,
+ void paint ( QPainter * painter,
const QStyleOptionViewItem & option,
- const QModelIndex & index ) const;
- virtual QSize sizeHint ( const QStyleOptionViewItem & option,
- const QModelIndex & index ) const;
+ const QModelIndex & index ) const Q_DECL_OVERRIDE;
+ QSize sizeHint ( const QStyleOptionViewItem & option,
+ const QModelIndex & index ) const Q_DECL_OVERRIDE;
Kopete::Contact* contactAt( const QStyleOptionViewItem& option, const QModelIndex& index, const QPoint& point ) const;
public slots:
- bool helpEvent( QHelpEvent* event, QAbstractItemView* view, const QStyleOptionViewItem& option, const QModelIndex& index );
+ bool helpEvent( QHelpEvent* event, QAbstractItemView* view, const QStyleOptionViewItem& option, const QModelIndex& index ) Q_DECL_OVERRIDE;
private:
void paintItem( ContactList::LayoutItemConfig config, QPainter* painter,
diff --git a/kopete/identity/accountidentitydialog.h b/kopete/identity/accountidentitydialog.h
index 29ace4e..a39fdf6 100644
--- a/kopete/identity/accountidentitydialog.h
+++ b/kopete/identity/accountidentitydialog.h
@@ -110,8 +110,8 @@ private slots:
void slotLoadAccounts();
protected slots:
- virtual void accept();
- virtual void reject();
+ void accept() Q_DECL_OVERRIDE;
+ void reject() Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/kopete/identity/identitydialog.h b/kopete/identity/identitydialog.h
index e4e62d0..005ecb4 100644
--- a/kopete/identity/identitydialog.h
+++ b/kopete/identity/identitydialog.h
@@ -35,7 +35,7 @@ public:
protected slots:
void load();
- virtual void slotSave();
+ void slotSave() Q_DECL_OVERRIDE;
private slots:
void slotSelectPhoto();
diff --git a/kopete/identity/identitystatuswidget.h b/kopete/identity/identitystatuswidget.h
index 27b2ee3..3f713cf 100644
--- a/kopete/identity/identitystatuswidget.h
+++ b/kopete/identity/identitystatuswidget.h
@@ -53,10 +53,10 @@ public:
Kopete::Identity *identity() const;
void setIdentity(Kopete::Identity *identity);
- virtual void setVisible(bool visible);
+ void setVisible(bool visible) Q_DECL_OVERRIDE;
protected:
- bool eventFilter( QObject *watched, QEvent *event );
+ bool eventFilter( QObject *watched, QEvent *event ) Q_DECL_OVERRIDE;
private:
/**
diff --git a/kopete/infoeventwidget.h b/kopete/infoeventwidget.h
index a30a7a1..f787e0c 100644
--- a/kopete/infoeventwidget.h
+++ b/kopete/infoeventwidget.h
@@ -35,7 +35,7 @@ public:
~InfoEventWidget();
- virtual void setVisible( bool visible );
+ void setVisible( bool visible ) Q_DECL_OVERRIDE;
Q_SIGNALS:
void showRequest();
diff --git a/kopete/kopeteaccountstatusbaricon.h b/kopete/kopeteaccountstatusbaricon.h
index 4d8e734..d4154e5 100644
--- a/kopete/kopeteaccountstatusbaricon.h
+++ b/kopete/kopeteaccountstatusbaricon.h
@@ -42,8 +42,8 @@ public:
virtual ~KopeteAccountStatusBarIcon();
protected:
- virtual void mousePressEvent( QMouseEvent *me );
- virtual bool event( QEvent *event );
+ void mousePressEvent( QMouseEvent *me ) Q_DECL_OVERRIDE;
+ bool event( QEvent *event ) Q_DECL_OVERRIDE;
private slots:
void statusIconChanged();
diff --git a/kopete/kopeteapplication.h b/kopete/kopeteapplication.h
index abdfe19..029800d 100644
--- a/kopete/kopeteapplication.h
+++ b/kopete/kopeteapplication.h
@@ -50,7 +50,7 @@ public:
*/
bool isShuttingDown() const { return m_isShuttingDown; }
- virtual int newInstance();
+ int newInstance() Q_DECL_OVERRIDE;
public slots:
/**
diff --git a/kopete/kopeteidentitystatusbaricon.h b/kopete/kopeteidentitystatusbaricon.h
index 8c3f554..4cb002d 100644
--- a/kopete/kopeteidentitystatusbaricon.h
+++ b/kopete/kopeteidentitystatusbaricon.h
@@ -47,7 +47,7 @@ signals:
void leftClicked( Kopete::Identity *identity, const QPoint &p );
protected:
- virtual void mousePressEvent( QMouseEvent *me );
+ void mousePressEvent( QMouseEvent *me ) Q_DECL_OVERRIDE;
private slots:
void updateMessage( Kopete::StatusRootAction *statusRootAction );
diff --git a/kopete/kopetewindow.h b/kopete/kopetewindow.h
index 1eb94ba..ada959e 100644
--- a/kopete/kopetewindow.h
+++ b/kopete/kopetewindow.h
@@ -53,13 +53,13 @@ public:
explicit KopeteWindow ( QWidget *parent = nullptr );
~KopeteWindow();
- virtual bool eventFilter( QObject* o, QEvent* e );
+ bool eventFilter( QObject* o, QEvent* e ) Q_DECL_OVERRIDE;
protected:
- virtual void closeEvent( QCloseEvent *ev );
- virtual void leaveEvent( QEvent* ev );
- virtual void showEvent( QShowEvent* ev );
- virtual void hideEvent( QHideEvent* ev );
+ void closeEvent( QCloseEvent *ev ) Q_DECL_OVERRIDE;
+ void leaveEvent( QEvent* ev ) Q_DECL_OVERRIDE;
+ void showEvent( QShowEvent* ev ) Q_DECL_OVERRIDE;
+ void hideEvent( QHideEvent* ev ) Q_DECL_OVERRIDE;
private slots:
void slotToggleShowAllOfflineEmpty( bool toggled );
@@ -218,7 +218,7 @@ private:
void makeTrayToolTip();
void startAutoHideTimer();
- virtual bool queryClose();
+ bool queryClose() Q_DECL_OVERRIDE;
virtual bool queryExit();
/**
@@ -240,7 +240,7 @@ public:
GlobalStatusMessageIconLabel(QWidget *parent = nullptr);
protected:
- void mouseReleaseEvent(QMouseEvent *event);
+ void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
signals:
void iconClicked(const QPoint &position);
@@ -254,7 +254,7 @@ public:
InfoEventIconLabel( QWidget *parent = nullptr );
protected:
- void mouseReleaseEvent( QMouseEvent *event );
+ void mouseReleaseEvent( QMouseEvent *event ) Q_DECL_OVERRIDE;
signals:
void clicked();
diff --git a/kopete/statusmenu/kopetestatuseditaction.h b/kopete/statusmenu/kopetestatuseditaction.h
index 878aabb..55be7aa 100644
--- a/kopete/statusmenu/kopetestatuseditaction.h
+++ b/kopete/statusmenu/kopetestatuseditaction.h
@@ -61,8 +61,8 @@ namespace Kopete
void statusChanged( const Kopete::StatusMessage& statusMessage );
protected:
- virtual void mouseReleaseEvent( QMouseEvent * );
- virtual void keyPressEvent( QKeyEvent* event );
+ void mouseReleaseEvent( QMouseEvent * ) Q_DECL_OVERRIDE;
+ void keyPressEvent( QKeyEvent* event ) Q_DECL_OVERRIDE;
private Q_SLOTS:
void changeClicked();
diff --git a/kopete/systemtray.h b/kopete/systemtray.h
index e83a62a..2ed067c 100644
--- a/kopete/systemtray.h
+++ b/kopete/systemtray.h
@@ -57,7 +57,7 @@ Q_SIGNALS:
private Q_SLOTS:
void slotAboutToShowMenu();
- void activate(const QPoint &pos=QPoint());
+ void activate(const QPoint &pos=QPoint()) Q_DECL_OVERRIDE;
void slotBlink();
void slotNewEvent(Kopete::MessageEvent*);
diff --git a/libkopete/chatsessionmemberslistmodel.h b/libkopete/chatsessionmemberslistmodel.h
index ac58d7f..14190c4 100644
--- a/libkopete/chatsessionmemberslistmodel.h
+++ b/libkopete/chatsessionmemberslistmodel.h
@@ -39,9 +39,9 @@ public:
~ChatSessionMembersListModel();
// Model methods
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role) const;
- QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+ QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
Kopete::ChatSession *session();
Kopete::Contact *contactAt( const QModelIndex &index ) const;
diff --git a/libkopete/contactlist/xmlcontactstorage.h b/libkopete/contactlist/xmlcontactstorage.h
index ca1eb8c..edbbfbd 100644
--- a/libkopete/contactlist/xmlcontactstorage.h
+++ b/libkopete/contactlist/xmlcontactstorage.h
@@ -49,11 +49,11 @@ public:
explicit XmlContactStorage(const QString &fileName);
~XmlContactStorage();
- virtual bool isValid() const;
- virtual QString errorMessage() const;
- virtual bool isBusy() const;
- virtual void load();
- virtual void save();
+ bool isValid() const Q_DECL_OVERRIDE;
+ QString errorMessage() const Q_DECL_OVERRIDE;
+ bool isBusy() const Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
protected:
bool parseMetaContact( Kopete::MetaContact *metaContact, const QDomElement &element );
diff --git a/libkopete/kopeteaddedinfoevent.h b/libkopete/kopeteaddedinfoevent.h
index 1607627..b72a5d4 100644
--- a/libkopete/kopeteaddedinfoevent.h
+++ b/libkopete/kopeteaddedinfoevent.h
@@ -136,12 +136,12 @@ public Q_SLOTS:
/**
* Activate the action specified action
*/
- virtual void activate( uint actionId );
+ void activate( uint actionId ) Q_DECL_OVERRIDE;
/**
* Emit the event.
*/
- virtual void sendEvent();
+ void sendEvent() Q_DECL_OVERRIDE;
private Q_SLOTS:
void addDialogOk();
diff --git a/libkopete/kopeteavatarmanager.h b/libkopete/kopeteavatarmanager.h
index e46ca26..2398c9b 100644
--- a/libkopete/kopeteavatarmanager.h
+++ b/libkopete/kopeteavatarmanager.h
@@ -266,7 +266,7 @@ public:
/**
* @copydoc KJob::start()
*/
- virtual void start();
+ void start() Q_DECL_OVERRIDE;
/**
* @brief Get the avatar list based on the query
diff --git a/libkopete/kopetechatsession.cpp b/libkopete/kopetechatsession.cpp
index b8d04ea..b8ecea4 100644
--- a/libkopete/kopetechatsession.cpp
+++ b/libkopete/kopetechatsession.cpp
@@ -237,7 +237,7 @@ public:
: manager(manager)
{
}
- void handleMessage( Kopete::MessageEvent *event )
+ void handleMessage( Kopete::MessageEvent *event ) Q_DECL_OVERRIDE
{
Kopete::Message message = event->message();
@@ -251,11 +251,11 @@ public:
class TempFactory : public Kopete::MessageHandlerFactory
{
public:
- Kopete::MessageHandler *create( Kopete::ChatSession *manager, Kopete::Message::MessageDirection )
+ Kopete::MessageHandler *create( Kopete::ChatSession *manager, Kopete::Message::MessageDirection ) Q_DECL_OVERRIDE
{
return new Kopete::TemporaryKMMCallbackAppendMessageHandler( manager );
}
- int filterPosition( Kopete::ChatSession *, Kopete::Message::MessageDirection )
+ int filterPosition( Kopete::ChatSession *, Kopete::Message::MessageDirection ) Q_DECL_OVERRIDE
{
// FIXME: somewhere after everyone else.
return 100000;
diff --git a/libkopete/kopetemessagehandlerchain.cpp b/libkopete/kopetemessagehandlerchain.cpp
index 94416ec..f3459e0 100644
--- a/libkopete/kopetemessagehandlerchain.cpp
+++ b/libkopete/kopetemessagehandlerchain.cpp
@@ -31,12 +31,12 @@ namespace Kopete
class MessageHandlerChainTerminator : public MessageHandler
{
public:
- void handleMessage( MessageEvent *event )
+ void handleMessage( MessageEvent *event ) Q_DECL_OVERRIDE
{
qCCritical(LIBKOPETE_LOG) << "message got to end of chain!" << endl;
event->discard();
}
- int capabilities()
+ int capabilities() Q_DECL_OVERRIDE
{
qCCritical(LIBKOPETE_LOG) << "request got to end of chain!" << endl;
return 0;
diff --git a/libkopete/kopetemessagehandlerchain.h b/libkopete/kopetemessagehandlerchain.h
index aabc018..db05aa6 100644
--- a/libkopete/kopetemessagehandlerchain.h
+++ b/libkopete/kopetemessagehandlerchain.h
@@ -80,7 +80,7 @@ public:
MessageEvent *event();
public slots:
- void start();
+ void start() Q_DECL_OVERRIDE;
void slotDone();
void kill( bool );
diff --git a/libkopete/kopetemimetypehandler.h b/libkopete/kopetemimetypehandler.h
index 0eb5e68..cd3002d 100644
--- a/libkopete/kopetemimetypehandler.h
+++ b/libkopete/kopetemimetypehandler.h
@@ -125,8 +125,8 @@ public:
const QStringList mimeTypes() const;
- void handleURL( const QString &mimeType, const QUrl &url ) const;
- KDE_DEPRECATED void handleURL( const QUrl &url ) const;
+ void handleURL( const QString &mimeType, const QUrl &url ) const Q_DECL_OVERRIDE;
+ KDE_DEPRECATED void handleURL( const QUrl &url ) const Q_DECL_OVERRIDE;
};
} // Kopete
diff --git a/libkopete/kopeteonlinestatus.cpp b/libkopete/kopeteonlinestatus.cpp
index 30a4f01..ac22d59 100644
--- a/libkopete/kopeteonlinestatus.cpp
+++ b/libkopete/kopeteonlinestatus.cpp
@@ -43,20 +43,20 @@ public:
const QColor &c, bool _idle )
: status(s) , icon(i), color(c), idle(_idle) {}
- virtual QIconEngineV2 *clone() const
+ QIconEngineV2 *clone() const Q_DECL_OVERRIDE
{ return new OnlineStatusIconEngine(status,icon,color,idle); }
- virtual QString key () const
+ QString key () const Q_DECL_OVERRIDE
{ return OnlineStatusManager::self()->fingerprint( status, icon, 0, color, idle ); }
- QPixmap pixmap ( const QSize & size, QIcon::Mode mode, QIcon::State state )
+ QPixmap pixmap ( const QSize & size, QIcon::Mode mode, QIcon::State state ) Q_DECL_OVERRIDE
{
const int iconSize = qMin(size.width(), size.height());
QIcon i(OnlineStatusManager::self()->cacheLookupByObject( status, icon, iconSize, color, idle ));
return i.pixmap(size, mode, state);
}
- void paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state )
+ void paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state ) Q_DECL_OVERRIDE
{
QPixmap pix = pixmap(rect.size() , mode, state);
painter->drawPixmap(rect, pix);
diff --git a/libkopete/kopetepassword.cpp b/libkopete/kopetepassword.cpp
index 43c337e..b138afa 100644
--- a/libkopete/kopetepassword.cpp
+++ b/libkopete/kopetepassword.cpp
@@ -95,7 +95,7 @@ public:
Kopete::WalletManager::self()->openWallet( this, SLOT(walletReceived(KWallet::Wallet*)) );
}
- void walletReceived( KWallet::Wallet *wallet )
+ void walletReceived( KWallet::Wallet *wallet ) Q_DECL_OVERRIDE
{
qCDebug(LIBKOPETE_LOG) ;
mWallet = wallet;
@@ -107,8 +107,8 @@ public:
*/
virtual void processRequest() = 0;
- void gotPassword(const QString&, bool) {}
- void slotCancelPressed() {}
+ void gotPassword(const QString&, bool) Q_DECL_OVERRIDE {}
+ void slotCancelPressed() Q_DECL_OVERRIDE {}
protected:
Kopete::Password mPassword;
@@ -166,7 +166,7 @@ public:
{
}
- void processRequest()
+ void processRequest() Q_DECL_OVERRIDE
{
const QString result = grabPassword();
if ( mSource == Kopete::Password::FromUser || result.isNull() )
@@ -190,7 +190,7 @@ public:
passwdDialog->show();
}
- void gotPassword(const QString& pass, bool keep)
+ void gotPassword(const QString& pass, bool keep) Q_DECL_OVERRIDE
{
if ( keep )
mPassword.set( pass );
@@ -198,7 +198,7 @@ public:
finished( pass );
}
- void slotCancelPressed()
+ void slotCancelPressed() Q_DECL_OVERRIDE
{
finished( QString() );
}
@@ -218,7 +218,7 @@ public:
{
}
- void processRequest()
+ void processRequest() Q_DECL_OVERRIDE
{
finished( grabPassword() );
}
@@ -242,7 +242,7 @@ public:
KGlobal::deref();
qCDebug(LIBKOPETE_LOG) << "job complete";
}
- void processRequest()
+ void processRequest() Q_DECL_OVERRIDE
{
if ( setPassword() )
{
@@ -304,7 +304,7 @@ public:
KGlobal::deref();
qCDebug(LIBKOPETE_LOG) << "job complete";
}
- void processRequest()
+ void processRequest() Q_DECL_OVERRIDE
{
if ( clearPassword() )
{
diff --git a/libkopete/kopetepasswordedaccount.h b/libkopete/kopetepasswordedaccount.h
index df2b55d..17ca73f 100644
--- a/libkopete/kopetepasswordedaccount.h
+++ b/libkopete/kopetepasswordedaccount.h
@@ -65,7 +65,7 @@ public:
* @param initialStatus is the status to connect with. If it is an invalid status for this
* account, the default online for the account should be used.
*/
- void connect( const OnlineStatus& initialStatus );
+ void connect( const OnlineStatus& initialStatus ) Q_DECL_OVERRIDE;
/**
* \brief Get the initial status
@@ -80,7 +80,7 @@ public:
*
* @return Always true
*/
- virtual bool removeAccount();
+ bool removeAccount() Q_DECL_OVERRIDE;
public slots:
@@ -104,7 +104,7 @@ protected slots:
* @internal
* Reimplemented to set the password wrong if the reason is BadPassword
*/
- virtual void disconnected( Kopete::Account::DisconnectReason reason );
+ void disconnected( Kopete::Account::DisconnectReason reason ) Q_DECL_OVERRIDE;
private:
diff --git a/libkopete/kopeteprotocol.h b/libkopete/kopeteprotocol.h
index 0fb4cee..03190b5 100644
--- a/libkopete/kopeteprotocol.h
+++ b/libkopete/kopeteprotocol.h
@@ -203,7 +203,7 @@ public:
* at all, so I left out the necessary hooks on purpose.
* - Martijn
*/
- virtual void aboutToUnload();
+ void aboutToUnload() Q_DECL_OVERRIDE;
private slots:
/**
@@ -234,7 +234,7 @@ public:
*
* @todo we probably should think to another way to save the contacltist.
*/
- virtual void deserialize( MetaContact *metaContact, const QMap<QString, QString> &serializedData );
+ void deserialize( MetaContact *metaContact, const QMap<QString, QString> &serializedData ) Q_DECL_OVERRIDE;
/**
* @brief Deserialize the plugin data for a meta contact's contacts.
diff --git a/libkopete/kopetesimplemessagehandler.h b/libkopete/kopetesimplemessagehandler.h
index fac1d82..c0c414b 100644
--- a/libkopete/kopetesimplemessagehandler.h
+++ b/libkopete/kopetesimplemessagehandler.h
@@ -51,12 +51,12 @@ public:
/**
* Creates and returns a SimpleMessageHandler object.
*/
- MessageHandler *create( ChatSession *manager, Message::MessageDirection direction );
+ MessageHandler *create( ChatSession *manager, Message::MessageDirection direction ) Q_DECL_OVERRIDE;
/**
* Returns the filter position passed to the constructor if @p direction matches the
* direction passed to the constructor, otherwise returns @c StageDoNotCreate.
*/
- int filterPosition( ChatSession *manager, Message::MessageDirection direction );
+ int filterPosition( ChatSession *manager, Message::MessageDirection direction ) Q_DECL_OVERRIDE;
private:
class Private;
@@ -73,7 +73,7 @@ public:
SimpleMessageHandler();
~SimpleMessageHandler();
- void handleMessage( MessageEvent *event );
+ void handleMessage( MessageEvent *event ) Q_DECL_OVERRIDE;
signals:
void handle( Kopete::Message &message );
diff --git a/libkopete/kopetestatusitems.h b/libkopete/kopetestatusitems.h
index e2a3fcc..613497a 100644
--- a/libkopete/kopetestatusitems.h
+++ b/libkopete/kopetestatusitems.h
@@ -141,17 +141,17 @@ public:
* Returns true if StatusItem is group
* @note for StatusGroup it always returns true;
**/
- virtual bool isGroup() const { return true; }
+ bool isGroup() const Q_DECL_OVERRIDE { return true; }
/**
* Returns number of childes
**/
- virtual int childCount() const { return mChildItems.count(); }
+ int childCount() const Q_DECL_OVERRIDE { return mChildItems.count(); }
/**
* Returns a StatusItem at given @p index or 0 if there is no item at given @p index
**/
- virtual StatusItem *child( int index ) const { return mChildItems.value( index, 0 ); }
+ StatusItem *child( int index ) const Q_DECL_OVERRIDE { return mChildItems.value( index, 0 ); }
/**
* Returns list of all childes
@@ -184,7 +184,7 @@ public:
* @note this copies also uid so it should only be used when we know
* that the original or copy object will be destroyed
**/
- virtual StatusItem* copy() const;
+ StatusItem* copy() const Q_DECL_OVERRIDE;
Q_SIGNALS:
/**
* This signal is emitted after new child was inserted is inserted at position @p index
@@ -223,19 +223,19 @@ public:
* Returns true if the item is group
* @note for Status it always returns false;
**/
- virtual bool isGroup() const { return false; }
+ bool isGroup() const Q_DECL_OVERRIDE { return false; }
/**
* Returns number of childes
* @note for Status it always returns 0;
**/
- virtual int childCount() const { return 0; }
+ int childCount() const Q_DECL_OVERRIDE { return 0; }
/**
* Returns the item at given @p index or 0 if there is no item at given @p index
* @note for Status it always returns 0;
**/
- virtual StatusItem *child( int ) const { return 0; }
+ StatusItem *child( int ) const Q_DECL_OVERRIDE { return 0; }
/**
* Set message
@@ -253,7 +253,7 @@ public:
* @note this copies also uid so it should only be used when we know
* that the original or copy object will be destroyed
**/
- virtual StatusItem* copy() const;
+ StatusItem* copy() const Q_DECL_OVERRIDE;
private:
QString mMessage;
diff --git a/libkopete/kopetetransfermanager.h b/libkopete/kopetetransfermanager.h
index 46b2538..6a32483 100644
--- a/libkopete/kopetetransfermanager.h
+++ b/libkopete/kopetetransfermanager.h
@@ -219,7 +219,7 @@ public:
protected:
void emitCopying(const QUrl &src, const QUrl &dest);
- virtual void timerEvent ( QTimerEvent * event );
+ void timerEvent ( QTimerEvent * event ) Q_DECL_OVERRIDE;
public slots:
/**
diff --git a/libkopete/tasks/kopetedeletecontacttask.h b/libkopete/tasks/kopetedeletecontacttask.h
index f003ed9..d71ed49 100644
--- a/libkopete/tasks/kopetedeletecontacttask.h
+++ b/libkopete/tasks/kopetedeletecontacttask.h
@@ -76,7 +76,7 @@ public:
* @brief Begin the task.
* Inherited from Kopete::Task::start()
*/
- virtual void start();
+ void start() Q_DECL_OVERRIDE;
protected Q_SLOTS:
/**
@@ -85,14 +85,14 @@ protected Q_SLOTS:
* This slot is called when a subjob has finished.
* @param subJob sub job that has been finished.
*/
- virtual void slotResult(KJob *subJob);
+ void slotResult(KJob *subJob) Q_DECL_OVERRIDE;
protected:
/**
* @brief Return Task Type
* @return DeleteContactTask
*/
- QString taskType() const;
+ QString taskType() const Q_DECL_OVERRIDE;
private:
class Private;
Private * const d;
diff --git a/libkopete/tasks/kopetetask.h b/libkopete/tasks/kopetetask.h
index 014a11a..4faebee 100644
--- a/libkopete/tasks/kopetetask.h
+++ b/libkopete/tasks/kopetetask.h
@@ -98,7 +98,7 @@ public:
* For example, for DeleteContactTask, the default behavior
* should call deleteLater() on contact instance.
*/
- virtual void start();
+ void start() Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/libkopete/ui/addressbookselectordialog.h b/libkopete/ui/addressbookselectordialog.h
index 434c021..3babcc6 100644
--- a/libkopete/ui/addressbookselectordialog.h
+++ b/libkopete/ui/addressbookselectordialog.h
@@ -78,8 +78,8 @@ public:
static KContacts::Addressee getAddressee( const QString &title, const QString &message, const QString &preSelectUid, QWidget *parent = nullptr );
protected slots:
- virtual void accept();
- virtual void reject();
+ void accept() Q_DECL_OVERRIDE;
+ void reject() Q_DECL_OVERRIDE;
void slotWidgetAddresseeListClicked( QTreeWidgetItem *addressee );
protected:
AddressBookSelectorWidget *m_addressBookSelectorWidget;
diff --git a/libkopete/ui/collapsiblewidget.h b/libkopete/ui/collapsiblewidget.h
index 0ca0c57..7bc97ed 100644
--- a/libkopete/ui/collapsiblewidget.h
+++ b/libkopete/ui/collapsiblewidget.h
@@ -39,7 +39,7 @@ class ClickableLabel : public QLabel
ClickableLabel( QWidget* parent = nullptr );
~ClickableLabel();
- void mouseReleaseEvent( QMouseEvent *e );
+ void mouseReleaseEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
signals:
void clicked();
@@ -51,10 +51,10 @@ class ArrowButton : public QAbstractButton
ArrowButton(QWidget *parent = nullptr);
~ArrowButton();
- QSize sizeHint() const { return QSize(16, 16); }
+ QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(16, 16); }
protected:
- void paintEvent( QPaintEvent* );
+ void paintEvent( QPaintEvent* ) Q_DECL_OVERRIDE;
private:
};
diff --git a/libkopete/ui/contactaddednotifywidget.ui b/libkopete/ui/contactaddednotifywidget.ui
index 286e4fe..ba71b8d 100644
--- a/libkopete/ui/contactaddednotifywidget.ui
+++ b/libkopete/ui/contactaddednotifywidget.ui
@@ -244,6 +244,6 @@ Leave it empty if you want to see the contact's nickname as their display name.<
<container>0</container>
<pixmap></pixmap>
</customwidget>
- <resources/>
+ </customwidgets>
<connections/>
</ui>
diff --git a/libkopete/ui/kopetelistview.h b/libkopete/ui/kopetelistview.h
index 7ad9232..08f14d3 100644
--- a/libkopete/ui/kopetelistview.h
+++ b/libkopete/ui/kopetelistview.h
@@ -135,18 +135,18 @@ public slots:
void slotSort() { sortItems(currentColumn(), Qt::AscendingOrder); }
protected:
- virtual void keyPressEvent( QKeyEvent *e );
+ void keyPressEvent( QKeyEvent *e ) Q_DECL_OVERRIDE;
/**
* Invoked on each timeout of a QTimer of this listview,
* This will manage the smooth scrolling animation, continuous presses to the scrollbars.
*/
- virtual void timerEvent( QTimerEvent *e );
+ void timerEvent( QTimerEvent *e ) Q_DECL_OVERRIDE;
/**
* To make smooth scrolling work well, we need extensive event intercepting.
* This event filter is suppposed to achieve that.
*/
- virtual bool eventFilter( QObject *o, QEvent *e );
+ bool eventFilter( QObject *o, QEvent *e ) Q_DECL_OVERRIDE;
signals:
void visibleSizeChanged ();
diff --git a/libkopete/ui/kopetelistviewitem.h b/libkopete/ui/kopetelistviewitem.h
index 4717274..a801562 100644
--- a/libkopete/ui/kopetelistviewitem.h
+++ b/libkopete/ui/kopetelistviewitem.h
@@ -121,8 +121,8 @@ public:
*/
virtual void paint( QPainter *painter, const QPalette &pal );
- void repaint();
- void relayout();
+ void repaint() Q_DECL_OVERRIDE;
+ void relayout() Q_DECL_OVERRIDE;
/**
* @return the rect this component was allocated last time it was laid out
@@ -178,7 +178,7 @@ public:
* @return a pair where the first element is the tooltip, and the second is
* the rectangle within the item for which the tip should be displayed.
*/
- std::pair<QString,QRect> toolTip( const QPoint &relativePos );
+ std::pair<QString,QRect> toolTip( const QPoint &relativePos ) Q_DECL_OVERRIDE;
/**
* RTTI: Runtime Type Information
@@ -214,8 +214,8 @@ protected:
*/
bool setMinHeight( int height );
- void componentAdded( Component *component );
- void componentRemoved( Component *component );
+ void componentAdded( Component *component ) Q_DECL_OVERRIDE;
+ void componentRemoved( Component *component ) Q_DECL_OVERRIDE;
private:
// calls the three functions below
@@ -237,18 +237,18 @@ public:
explicit BoxComponent( ComponentBase *parent, Direction dir = Horizontal );
~BoxComponent();
- void layout( const QRect &rect );
+ void layout( const QRect &rect ) Q_DECL_OVERRIDE;
- virtual int widthForHeight( int height );
- virtual int heightForWidth( int width );
+ int widthForHeight( int height ) Q_DECL_OVERRIDE;
+ int heightForWidth( int width ) Q_DECL_OVERRIDE;
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
protected:
- void componentAdded( Component *component );
- void componentRemoved( Component *component );
- void componentResized( Component *component );
+ void componentAdded( Component *component ) Q_DECL_OVERRIDE;
+ void componentRemoved( Component *component ) Q_DECL_OVERRIDE;
+ void componentResized( Component *component ) Q_DECL_OVERRIDE;
private:
void calcMinSize();
@@ -273,12 +273,12 @@ public:
void setColor( const QColor &color );
void setDefaultColor();
- int widthForHeight( int );
+ int widthForHeight( int ) Q_DECL_OVERRIDE;
- void paint( QPainter *painter, const QPalette &pal );
+ void paint( QPainter *painter, const QPalette &pal ) Q_DECL_OVERRIDE;
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
private:
void calcMinSize();
@@ -297,11 +297,11 @@ public:
void setPixmap( const QPixmap &img, bool adjustSize = true);
QPixmap pixmap( void );
- void paint( QPainter *painter, const QPalette &pal );
+ void paint( QPainter *painter, const QPalette &pal ) Q_DECL_OVERRIDE;
void scale( int w, int h, Qt::AspectRatioMode );
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
private:
class Private;
Private * const d;
@@ -317,7 +317,7 @@ public:
~ContactComponent();
void updatePixmap();
Kopete::Contact *contact();
- std::pair<QString,QRect> toolTip( const QPoint &relativePos );
+ std::pair<QString,QRect> toolTip( const QPoint &relativePos ) Q_DECL_OVERRIDE;
protected:
class Private;
Private * const d;
@@ -348,7 +348,7 @@ public:
* Dtor
*/
~DisplayNameComponent();
- void layout( const QRect& rect );
+ void layout( const QRect& rect ) Q_DECL_OVERRIDE;
QString text();
void setText( const QString& text );
@@ -356,7 +356,7 @@ public:
void setColor( const QColor& color );
void setDefaultColor();
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
/**
* reparse again for emoticon (call this when emoticon theme change)
*/
@@ -371,20 +371,20 @@ class KOPETE_EXPORT HSpacerComponent : public Component
{
public:
explicit HSpacerComponent( ComponentBase *parent );
- int widthForHeight( int );
+ int widthForHeight( int ) Q_DECL_OVERRIDE;
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
};
class KOPETE_EXPORT VSpacerComponent : public Component
{
public:
explicit VSpacerComponent( ComponentBase *parent );
- int heightForWidth( int );
+ int heightForWidth( int ) Q_DECL_OVERRIDE;
static int RTTI;
- virtual int rtti() const { return RTTI; }
+ int rtti() const Q_DECL_OVERRIDE { return RTTI; }
};
/**
@@ -401,8 +401,8 @@ public:
explicit Item( QTreeWidgetItem *parent, QObject *owner = 0 );
~Item();
- void repaint();
- void relayout();
+ void repaint() Q_DECL_OVERRIDE;
+ void relayout() Q_DECL_OVERRIDE;
void setup();
virtual void paintCell( QPainter *p, const QPalette &cg, int column, int width, int align );
@@ -433,9 +433,9 @@ public:
virtual void setSearchMatch( bool match, bool searching );
protected:
- void componentAdded( Component *component );
- void componentRemoved( Component *component );
- void componentResized( Component *component );
+ void componentAdded( Component *component ) Q_DECL_OVERRIDE;
+ void componentRemoved( Component *component ) Q_DECL_OVERRIDE;
+ void componentResized( Component *component ) Q_DECL_OVERRIDE;
void setHeight( int );
diff --git a/libkopete/ui/kopetelistviewsearchline.h b/libkopete/ui/kopetelistviewsearchline.h
index 3a2eff4..87e6920 100644
--- a/libkopete/ui/kopetelistviewsearchline.h
+++ b/libkopete/ui/kopetelistviewsearchline.h
@@ -44,7 +44,7 @@ public:
*/
~SearchLine();
- void updateSearch( const QString &s );
+ void updateSearch( const QString &s ) Q_DECL_OVERRIDE;
protected:
virtual void checkItemParentsNotVisible();
diff --git a/libkopete/ui/kopeteviewplugin.h b/libkopete/ui/kopeteviewplugin.h
index 2df3626..36256e7 100644
--- a/libkopete/ui/kopeteviewplugin.h
+++ b/libkopete/ui/kopeteviewplugin.h
@@ -54,7 +54,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin
/**
* @brief Reimplemented from Kopete::Plugin
*/
- virtual void aboutToUnload();
+ void aboutToUnload() Q_DECL_OVERRIDE;
};
}
diff --git a/libkopete/ui/webcamwidget.h b/libkopete/ui/webcamwidget.h
index cce8377..c943462 100644
--- a/libkopete/ui/webcamwidget.h
+++ b/libkopete/ui/webcamwidget.h
@@ -56,7 +56,7 @@ public:
*/
void setText(const QString& text);
protected slots:
- void paintEvent(QPaintEvent* event);
+ void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE;
private:
QPixmap mPixmap;
diff --git a/plugins/addbookmarks/addbookmarkspreferences.h b/plugins/addbookmarks/addbookmarkspreferences.h
index 955cd67..d034ae4 100644
--- a/plugins/addbookmarks/addbookmarkspreferences.h
+++ b/plugins/addbookmarks/addbookmarkspreferences.h
@@ -31,8 +31,8 @@ public:
~BookmarksPreferences();
- virtual void load();
- virtual void save();
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
signals:
void PreferencesChanged();
diff --git a/plugins/autoreplace/autoreplacepreferences.h b/plugins/autoreplace/autoreplacepreferences.h
index a21b430..8eaefae 100644
--- a/plugins/autoreplace/autoreplacepreferences.h
+++ b/plugins/autoreplace/autoreplacepreferences.h
@@ -37,9 +37,9 @@ public:
explicit AutoReplacePreferences( QWidget *parent = nullptr, const QVariantList &args = QVariantList() );
virtual~AutoReplacePreferences();
- virtual void save();
- virtual void load();
- virtual void defaults();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
private slots:
//void slotSettingsDirty();
diff --git a/plugins/contactnotes/contactnotesedit.h b/plugins/contactnotes/contactnotesedit.h
index b04bf77..b705bd4 100644
--- a/plugins/contactnotes/contactnotesedit.h
+++ b/plugins/contactnotes/contactnotesedit.h
@@ -46,7 +46,7 @@ private:
QTextEdit *m_linesEdit;
protected slots: // Protected slots
- virtual void slotButtonClicked(int buttonCode);
+ void slotButtonClicked(int buttonCode) Q_DECL_OVERRIDE;
signals: // Signals
void notesChanged(const QString&, Kopete::MetaContact*);
};
diff --git a/plugins/highlight/highlightpreferences.h b/plugins/highlight/highlightpreferences.h
index c9d2d44..a2475e9 100644
--- a/plugins/highlight/highlightpreferences.h
+++ b/plugins/highlight/highlightpreferences.h
@@ -37,8 +37,8 @@ public:
explicit HighlightPreferences(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
~HighlightPreferences();
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private:
Ui::HighlightPrefsUI preferencesDialog;
diff --git a/plugins/latex/latexpreferences.h b/plugins/latex/latexpreferences.h
index 1f53635..075e125 100644
--- a/plugins/latex/latexpreferences.h
+++ b/plugins/latex/latexpreferences.h
@@ -35,9 +35,9 @@ public:
explicit LatexPreferences(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
~LatexPreferences();
- void save();
- void load();
- void defaults();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
private:
Ui::LatexPrefsUI *m_preferencesDialog;
diff --git a/plugins/otr/authenticationwizard.h b/plugins/otr/authenticationwizard.h
index 244f2e0..02a7cd0 100644
--- a/plugins/otr/authenticationwizard.h
+++ b/plugins/otr/authenticationwizard.h
@@ -54,8 +54,8 @@ public:
protected:
- virtual int nextId() const;
- virtual bool validateCurrentPage();
+ int nextId() const Q_DECL_OVERRIDE;
+ bool validateCurrentPage() Q_DECL_OVERRIDE;
private:
enum { Page_SelectMethod, Page_QuestionAnswer, Page_SharedSecret, Page_ManualVerification, Page_Wait1, Page_Wait2, Page_Final };
@@ -102,7 +102,7 @@ public:
WaitPage(const QString &text);
void ready(){canContinue = true;};
protected:
- virtual bool isComplete() const{return canContinue;};
+ bool isComplete() const Q_DECL_OVERRIDE {return canContinue;};
};
#endif //AUTHENTICATIONWIZARD_H
diff --git a/plugins/otr/otrlchatinterface.h b/plugins/otr/otrlchatinterface.h
index 9ba844c..4f4cd83 100644
--- a/plugins/otr/otrlchatinterface.h
+++ b/plugins/otr/otrlchatinterface.h
@@ -124,7 +124,7 @@ private:
public:
KeyGenThread( const QString &accountname, const QString &protocol );
- virtual void run();
+ void run() Q_DECL_OVERRIDE;
};
#endif
diff --git a/plugins/otr/otrplugin.h b/plugins/otr/otrplugin.h
index c3b121e..be78cea 100644
--- a/plugins/otr/otrplugin.h
+++ b/plugins/otr/otrplugin.h
@@ -49,7 +49,7 @@ public:
~OtrMessageHandler(){
// kdDebug() << "MessageHandler destroyed" << endl;
}
- void handleMessage( Kopete::MessageEvent *event );
+ void handleMessage( Kopete::MessageEvent *event ) Q_DECL_OVERRIDE;
};
class OtrMessageHandlerFactory : public Kopete::MessageHandlerFactory
@@ -59,12 +59,12 @@ private:
OtrMessageHandler *messageHandler;
public:
OtrMessageHandlerFactory( OTRPlugin *plugin ) : plugin(plugin) {}
- Kopete::MessageHandler *create( Kopete::ChatSession *, Kopete::Message::MessageDirection direction )
+ Kopete::MessageHandler *create( Kopete::ChatSession *, Kopete::Message::MessageDirection direction ) Q_DECL_OVERRIDE
{
Q_UNUSED(direction)
return new OtrMessageHandler(plugin);
}
- int filterPosition( Kopete::ChatSession *, Kopete::Message::MessageDirection )
+ int filterPosition( Kopete::ChatSession *, Kopete::Message::MessageDirection ) Q_DECL_OVERRIDE
{
return Kopete::MessageHandlerFactory::InStageToSent+1;
}
diff --git a/plugins/otr/privkeypopup.h b/plugins/otr/privkeypopup.h
index a1b5290..b315511 100644
--- a/plugins/otr/privkeypopup.h
+++ b/plugins/otr/privkeypopup.h
@@ -38,7 +38,7 @@ public:
~PrivKeyPopup();
void setCloseLock( bool locked );
- void closeEvent( QCloseEvent *e );
+ void closeEvent( QCloseEvent *e ) Q_DECL_OVERRIDE;
private:
Ui::PrivKeyPopup ui;
diff --git a/plugins/privacy/privacyaccountlistmodel.h b/plugins/privacy/privacyaccountlistmodel.h
index f98cc82..0cf4084 100644
--- a/plugins/privacy/privacyaccountlistmodel.h
+++ b/plugins/privacy/privacyaccountlistmodel.h
@@ -37,11 +37,11 @@ public:
void addAccount(const QString &accountId, Kopete::Protocol *protocol);
void addAccount(const AccountListEntry &entry);
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
bool removeRow(int position, const QModelIndex &index = QModelIndex());
- bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
+ bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()) Q_DECL_OVERRIDE;
QStringList toStringList() const;
diff --git a/plugins/privacy/privacymessagehandler.h b/plugins/privacy/privacymessagehandler.h
index 9d90792..6905f5b 100644
--- a/plugins/privacy/privacymessagehandler.h
+++ b/plugins/privacy/privacymessagehandler.h
@@ -29,8 +29,8 @@ public:
QObject *target, const char *slot );
~PrivacyMessageHandlerFactory();
- MessageHandler *create( ChatSession *manager, Message::MessageDirection direction );
- int filterPosition( ChatSession *manager, Message::MessageDirection direction );
+ MessageHandler *create( ChatSession *manager, Message::MessageDirection direction ) Q_DECL_OVERRIDE;
+ int filterPosition( ChatSession *manager, Message::MessageDirection direction ) Q_DECL_OVERRIDE;
private:
class Private;
@@ -44,7 +44,7 @@ public:
PrivacyMessageHandler();
~PrivacyMessageHandler();
- void handleMessage( MessageEvent *event );
+ void handleMessage( MessageEvent *event ) Q_DECL_OVERRIDE;
Q_SIGNALS:
void handle( Kopete::MessageEvent *event );
diff --git a/plugins/privacy/privacypreferences.h b/plugins/privacy/privacypreferences.h
index 3bff62e..a0833cf 100644
--- a/plugins/privacy/privacypreferences.h
+++ b/plugins/privacy/privacypreferences.h
@@ -33,8 +33,8 @@ public:
explicit PrivacyPreferences(QWidget *parent=0, const QVariantList &args = QVariantList());
~PrivacyPreferences();
- virtual void save();
- virtual void load();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
private Q_SLOTS:
void slotConfigChanged();
void slotModified();
diff --git a/plugins/statistics/statisticsdialog.h b/plugins/statistics/statisticsdialog.h
index a27b2df..44c8960 100644
--- a/plugins/statistics/statisticsdialog.h
+++ b/plugins/statistics/statisticsdialog.h
@@ -46,7 +46,7 @@ class StatisticsDialog : public KDialog
StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, QWidget* parent=0);
~StatisticsDialog();
- QSize sizeHint () const { return QSize ( 800, 600 ); }
+ QSize sizeHint () const Q_DECL_OVERRIDE { return QSize ( 800, 600 ); }
private:
QString generateHTMLChart(const int *hours, const int *hours2, const int *hours3, const QString & caption, const QColor & color);
diff --git a/plugins/statistics/statisticsplugin.h b/plugins/statistics/statisticsplugin.h
index c7c5372..ae3cee8 100644
--- a/plugins/statistics/statisticsplugin.h
+++ b/plugins/statistics/statisticsplugin.h
@@ -101,7 +101,7 @@ public:
/// Method to access m_db member
StatisticsDB *db() { return m_db; }
- void aboutToUnload();
+ void aboutToUnload() Q_DECL_OVERRIDE;
private slots:
// Do the initializations
void slotInitialize();
diff --git a/plugins/texteffect/texteffectpreferences.h b/plugins/texteffect/texteffectpreferences.h
index dcdc442..5e536f8 100644
--- a/plugins/texteffect/texteffectpreferences.h
+++ b/plugins/texteffect/texteffectpreferences.h
@@ -36,9 +36,9 @@ public:
~TextEffectPreferences();
// Overloaded from parent
- virtual void save();
- virtual void load();
- virtual void defaults();
+ void save() Q_DECL_OVERRIDE;
+ void load() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
private:
QStringList colors();
diff --git a/plugins/urlpicpreview/urlpicpreviewpreferences.h b/plugins/urlpicpreview/urlpicpreviewpreferences.h
index 0dfe8b5..ce7cbc2 100644
--- a/plugins/urlpicpreview/urlpicpreviewpreferences.h
+++ b/plugins/urlpicpreview/urlpicpreviewpreferences.h
@@ -34,9 +34,9 @@ class URLPicPreviewPreferences : public KCModule
explicit URLPicPreviewPreferences ( QWidget* parent = nullptr, const QVariantList& args = QVariantList() );
virtual ~URLPicPreviewPreferences();
- virtual void load();
- virtual void save();
- virtual void defaults();
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
private:
QLayout * m_layout;
diff --git a/plugins/webpresence/webpresenceplugin.h b/plugins/webpresence/webpresenceplugin.h
index 66439c7..0cefcd9 100644
--- a/plugins/webpresence/webpresenceplugin.h
+++ b/plugins/webpresence/webpresenceplugin.h
@@ -59,7 +59,7 @@ public:
WebPresencePlugin( QObject *parent, const QVariantList &args );
virtual ~WebPresencePlugin();
- virtual void aboutToUnload();
+ void aboutToUnload() Q_DECL_OVERRIDE;
protected slots:
/**
diff --git a/protocols/bonjour/bonjouraccount.h b/protocols/bonjour/bonjouraccount.h
index db85490..c24c089 100644
--- a/protocols/bonjour/bonjouraccount.h
+++ b/protocols/bonjour/bonjouraccount.h
@@ -108,7 +108,7 @@ public:
*
* @return @c true if the contact is created, @c false otherwise
*/
- virtual bool createContact(const QString& contactId, Kopete::MetaContact* parentContact);
+ bool createContact(const QString& contactId, Kopete::MetaContact* parentContact) Q_DECL_OVERRIDE;
/**
* @brief Called when Kopete is set globally away
@@ -122,9 +122,9 @@ public:
*
* @todo FIXME: This Only Makes us go online or offline, we cannot go away
*/
- virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None);
- virtual void setStatusMessage(const Kopete::StatusMessage& statusMessage);
+ void setOnlineStatus(const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
+ const OnlineStatusOptions& options = None) Q_DECL_OVERRIDE;
+ void setStatusMessage(const Kopete::StatusMessage& statusMessage) Q_DECL_OVERRIDE;
/**
* @brief 'Connect' to the bonjour service.
@@ -135,7 +135,7 @@ public:
*
* @param initialStatus FIXME: This is pretty much ignored
*/
- virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
+ void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ) Q_DECL_OVERRIDE;
/**
* @brief Disconnect from the service.
@@ -143,7 +143,7 @@ public:
* This will disconnect from the service. It will stop everything started in connect
* It cleans out the contact list after it is finished
*/
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
/**
* Set Properties Such As username, firstName, emailAddress, lastName
diff --git a/protocols/bonjour/bonjouraddcontactpage.h b/protocols/bonjour/bonjouraddcontactpage.h
index b693705..09017d5 100644
--- a/protocols/bonjour/bonjouraddcontactpage.h
+++ b/protocols/bonjour/bonjouraddcontactpage.h
@@ -41,12 +41,12 @@ public:
/**
* Make a contact out of the entered data
*/
- virtual bool apply(Kopete::Account* a, Kopete::MetaContact* m);
+ bool apply(Kopete::Account* a, Kopete::MetaContact* m) Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected:
Ui::BonjourAddUI m_bonjourAddUI;
diff --git a/protocols/bonjour/bonjourcontact.h b/protocols/bonjour/bonjourcontact.h
index 25bc6a4..b3e12c8 100644
--- a/protocols/bonjour/bonjourcontact.h
+++ b/protocols/bonjour/bonjourcontact.h
@@ -63,15 +63,15 @@ public:
~BonjourContact();
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
/**
* Serialize the contact's data into a key-value map
* suitable for writing to a file
*
* @todo FIXME: As we don't save any contacts, this function is useless
*/
- virtual void serialize(QMap< QString, QString >& serializedData,
- QMap< QString, QString >& addressBookData);
+ void serialize(QMap< QString, QString >& serializedData,
+ QMap< QString, QString >& addressBookData) Q_DECL_OVERRIDE;
/**
* @brief Returns a Kopete::ChatSession associated with this contact
@@ -79,7 +79,7 @@ public:
* @param canCreate If @c true, then a new manager may be created
* @return The Contats's ChatSession Manager
*/
- virtual Kopete::ChatSession *manager( CanCreateFlags canCreate = CannotCreate );
+ Kopete::ChatSession *manager( CanCreateFlags canCreate = CannotCreate ) Q_DECL_OVERRIDE;
/**
* The Following Properties are For saving Each Contact's IP address, hostname and
diff --git a/protocols/bonjour/bonjoureditaccountwidget.h b/protocols/bonjour/bonjoureditaccountwidget.h
index 0578925..4ca1bb5 100644
--- a/protocols/bonjour/bonjoureditaccountwidget.h
+++ b/protocols/bonjour/bonjoureditaccountwidget.h
@@ -43,11 +43,11 @@ public:
/**
* Make an account out of the entered data
*/
- virtual Kopete::Account* apply();
+ Kopete::Account* apply() Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected:
Ui::BonjourAccountPreferences *m_preferencesWidget;
KConfigGroup *group;
diff --git a/protocols/bonjour/bonjourprotocol.h b/protocols/bonjour/bonjourprotocol.h
index a42c280..a0bbd7e 100644
--- a/protocols/bonjour/bonjourprotocol.h
+++ b/protocols/bonjour/bonjourprotocol.h
@@ -39,11 +39,11 @@ public:
* Convert the serialised data back into a BonjourContact and add this
* to its Kopete::MetaContact
*/
- virtual Kopete::Contact *deserializeContact(
+ Kopete::Contact *deserializeContact(
Kopete::MetaContact *metaContact,
const QMap< QString, QString > & serializedData,
const QMap< QString, QString > & addressBookData
- );
+ ) Q_DECL_OVERRIDE;
/**
* @brief Generate an Add Contact Page (not actually useful)
@@ -55,7 +55,7 @@ public:
*
* @return The Add Contact Page Widget
*/
- virtual AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account );
+ AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account ) Q_DECL_OVERRIDE;
/**
* @brief Generate an Edit Account Page
@@ -67,7 +67,7 @@ public:
*
* @return The Edit Account Page Widget
*/
- virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent );
+ KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent ) Q_DECL_OVERRIDE;
/**
* @brief Create a New Account
@@ -76,7 +76,7 @@ public:
* @param accountId A Unique String to identify the Account
* @return The Newly Created Account
*/
- virtual Kopete::Account * createNewAccount( const QString &accountId );
+ Kopete::Account * createNewAccount( const QString &accountId ) Q_DECL_OVERRIDE;
/**
* @brief Access the instance of this protocol
diff --git a/protocols/groupwise/gwaccount.h b/protocols/groupwise/gwaccount.h
index 1c4c38a..c56299c 100644
--- a/protocols/groupwise/gwaccount.h
+++ b/protocols/groupwise/gwaccount.h
@@ -70,7 +70,7 @@ public:
/**
* Construct the context menu used for the status bar icon
*/
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
// DEBUG ONLY
void dumpManagers();
@@ -79,7 +79,7 @@ public:
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplied
* Kopete::MetaContact
*/
- virtual bool createContact(const QString& contactId, Kopete::MetaContact* parentContact);
+ bool createContact(const QString& contactId, Kopete::MetaContact* parentContact) Q_DECL_OVERRIDE;
/**
* Delete a contact on the server
*/
@@ -152,19 +152,19 @@ public slots:
void slotTestRTFize();
/* Connects to the server. */
- void connectWithPassword ( const QString &password );
+ void connectWithPassword ( const QString &password ) Q_DECL_OVERRIDE;
/* Disconnects from the server. */
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
virtual void disconnect( Kopete::Account::DisconnectReason reason );
/** Set the online status for the account. Reimplemented from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
/**
* Set the status message for the account. Reimplemented from Kopete::Account
*/
- void setStatusMessage( const Kopete::StatusMessage &statusMessage );
+ void setStatusMessage( const Kopete::StatusMessage &statusMessage ) Q_DECL_OVERRIDE;
signals:
void conferenceCreated( const int mmId, const GroupWise::ConferenceGuid & guid );
diff --git a/protocols/groupwise/gwbytestream.h b/protocols/groupwise/gwbytestream.h
index bf42fc1..b39033d 100644
--- a/protocols/groupwise/gwbytestream.h
+++ b/protocols/groupwise/gwbytestream.h
@@ -41,8 +41,8 @@ public:
~KNetworkByteStream ();
bool connect ( QString host, QString service );
- virtual bool isOpen () const;
- virtual void close ();
+ bool isOpen () const Q_DECL_OVERRIDE;
+ void close () Q_DECL_OVERRIDE;
QTcpSocket *socket () const;
@@ -50,7 +50,7 @@ signals:
void connected ();
protected:
- virtual int tryWrite ();
+ int tryWrite () Q_DECL_OVERRIDE;
private slots:
void slotConnected ();
diff --git a/protocols/groupwise/gwconnector.h b/protocols/groupwise/gwconnector.h
index b154fa0..0683f47 100644
--- a/protocols/groupwise/gwconnector.h
+++ b/protocols/groupwise/gwconnector.h
@@ -40,9 +40,9 @@ public:
virtual ~KNetworkConnector ();
- virtual void connectToServer ( const QString &server );
- virtual ByteStream *stream () const;
- virtual void done ();
+ void connectToServer ( const QString &server ) Q_DECL_OVERRIDE;
+ ByteStream *stream () const Q_DECL_OVERRIDE;
+ void done () Q_DECL_OVERRIDE;
void setOptHostPort ( const QString &host, quint16 port );
void setOptSSL ( bool );
diff --git a/protocols/groupwise/gwcontact.h b/protocols/groupwise/gwcontact.h
index d6688ef..4a69d04 100644
--- a/protocols/groupwise/gwcontact.h
+++ b/protocols/groupwise/gwcontact.h
@@ -89,23 +89,23 @@ public:
*/
void updateDetails( const GroupWise::ContactDetails & details );
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
/**
* Serialize the contact's data into a key-value map
* suitable for writing to a file
*/
- virtual void serialize(QMap< QString, QString >& serializedData,
- QMap< QString, QString >& addressBookData);
+ void serialize(QMap< QString, QString >& serializedData,
+ QMap< QString, QString >& addressBookData) Q_DECL_OVERRIDE;
/**
* Return the actions for this contact
*/
- virtual QList<QAction *> *customContextMenuActions();
+ QList<QAction *> *customContextMenuActions() Q_DECL_OVERRIDE;
using Kopete::Contact::customContextMenuActions;
/**
* Returns a Kopete::ChatSession associated with this contact
*/
- virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate );
+ Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
/**
* Access the contact's server properties
@@ -114,7 +114,7 @@ public:
/**
* Updates this contact's group membership and display name on the server
*/
- void sync( unsigned int);
+ void sync( unsigned int) Q_DECL_OVERRIDE;
/**
* Updates this contact's online status, including blocking status
*/
@@ -150,7 +150,7 @@ public slots:
/**
* Delete this contact on the server
*/
- virtual void deleteContact();
+ void deleteContact() Q_DECL_OVERRIDE;
/**
* Called when the call to rename the contact on the server has completed
*/
@@ -163,7 +163,7 @@ protected slots:
/**
* Show the contact's properties
*/
- void slotUserInfo();
+ void slotUserInfo() Q_DECL_OVERRIDE;
/**
* Block or unblock the contact, toggle its current blocking state
*/
diff --git a/protocols/groupwise/gwmessagemanager.h b/protocols/groupwise/gwmessagemanager.h
index cd40f2e..2e01d02 100644
--- a/protocols/groupwise/gwmessagemanager.h
+++ b/protocols/groupwise/gwmessagemanager.h
@@ -98,7 +98,7 @@ public:
/**
* Reimplemented from Kopete::ChatSession - invites contacts via DND
*/
- virtual void inviteContact(const QString& );
+ void inviteContact(const QString& ) Q_DECL_OVERRIDE;
signals:
/**
* Tell the contact we got a GUID so it can route incoming messages here.
diff --git a/protocols/groupwise/gwprotocol.h b/protocols/groupwise/gwprotocol.h
index d8b07dc..0b2b1eb 100644
--- a/protocols/groupwise/gwprotocol.h
+++ b/protocols/groupwise/gwprotocol.h
@@ -42,23 +42,23 @@ public:
* Convert the serialised data back into a GroupWiseContact and add this
* to its Kopete::MetaContact
*/
- virtual Kopete::Contact *deserializeContact(
+ Kopete::Contact *deserializeContact(
Kopete::MetaContact *metaContact,
const QMap< QString, QString > & serializedData,
const QMap< QString, QString > & addressBookData
- );
+ ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add GroupWiseContacts
*/
- virtual AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account );
+ AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add/edit accounts for this protocol
*/
- virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent );
+ KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent ) Q_DECL_OVERRIDE;
/**
* Generate a GroupWiseAccount
*/
- virtual Kopete::Account * createNewAccount( const QString &accountId );
+ Kopete::Account * createNewAccount( const QString &accountId ) Q_DECL_OVERRIDE;
/**
* Access the instance of this protocol
*/
diff --git a/protocols/groupwise/libgroupwise/eventprotocol.h b/protocols/groupwise/libgroupwise/eventprotocol.h
index 62b47e0..f1f1c4b 100644
--- a/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -119,7 +119,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an EventTransfer object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( QByteArray &, uint & bytes );
+ Transfer * parse( QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
protected:
/**
* Reads a conference's flags
diff --git a/protocols/groupwise/libgroupwise/eventtransfer.h b/protocols/groupwise/libgroupwise/eventtransfer.h
index 8942a1b..8991833 100644
--- a/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -75,7 +75,7 @@ public:
/**
* Accessors for the transfer's contents
*/
- TransferType type() { return Transfer::EventTransfer; }
+ TransferType type() Q_DECL_OVERRIDE { return Transfer::EventTransfer; }
int eventType() const;
QString source();
QDateTime timeStamp();
diff --git a/protocols/groupwise/libgroupwise/gwclientstream.h b/protocols/groupwise/libgroupwise/gwclientstream.h
index 16f7c0c..9d2ac6c 100644
--- a/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -107,24 +107,24 @@ public:
void setRequireMutualAuth(bool);
void setLocalAddr(const QHostAddress &addr, quint16 port);
- void close();
+ void close() Q_DECL_OVERRIDE;
/**
* Are there any messages waiting to be read
*/
- bool transfersAvailable() const;
+ bool transfersAvailable() const Q_DECL_OVERRIDE;
/**
* Read a message received from the server
*/
- Transfer * read();
+ Transfer * read() Q_DECL_OVERRIDE;
/**
* Send a message to the server
*/
- void write( Request * request );
+ void write( Request * request ) Q_DECL_OVERRIDE;
- int errorCondition() const;
- QString errorText() const;
+ int errorCondition() const Q_DECL_OVERRIDE;
+ QString errorText() const Q_DECL_OVERRIDE;
// # QDomElement errorAppSpec() const; // redondo
// extrahttp://bugs.kde.org/show_bug.cgi?id=85158
diff --git a/protocols/groupwise/libgroupwise/qcatlshandler.h b/protocols/groupwise/libgroupwise/qcatlshandler.h
index 16827d5..918258a 100644
--- a/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -39,10 +39,10 @@ public:
QCA::TLS *tls() const;
int tlsError() const;
- void reset();
- void startClient(const QString &host);
- void write(const QByteArray &a);
- void writeIncoming(const QByteArray &a);
+ void reset() Q_DECL_OVERRIDE;
+ void startClient(const QString &host) Q_DECL_OVERRIDE;
+ void write(const QByteArray &a) Q_DECL_OVERRIDE;
+ void writeIncoming(const QByteArray &a) Q_DECL_OVERRIDE;
signals:
void tlsHandshaken();
diff --git a/protocols/groupwise/libgroupwise/request.h b/protocols/groupwise/libgroupwise/request.h
index 85a55e8..a8ea8e1 100644
--- a/protocols/groupwise/libgroupwise/request.h
+++ b/protocols/groupwise/libgroupwise/request.h
@@ -31,7 +31,7 @@ friend class RequestFactory;
public:
~Request( );
QString command();
- TransferType type() { return Transfer::RequestTransfer; }
+ TransferType type() Q_DECL_OVERRIDE { return Transfer::RequestTransfer; }
private:
Request( const int transactionId, const QString &command );
QString m_command;
diff --git a/protocols/groupwise/libgroupwise/response.h b/protocols/groupwise/libgroupwise/response.h
index 8f4fb97..05e75a4 100644
--- a/protocols/groupwise/libgroupwise/response.h
+++ b/protocols/groupwise/libgroupwise/response.h
@@ -30,7 +30,7 @@ public:
Response( int transactionId, int resultCode, Field::FieldList fields );
virtual ~Response( );
- TransferType type() { return Transfer::ResponseTransfer; }
+ TransferType type() Q_DECL_OVERRIDE { return Transfer::ResponseTransfer; }
int resultCode() const;
private:
int m_resultCode;
diff --git a/protocols/groupwise/libgroupwise/responseprotocol.h b/protocols/groupwise/libgroupwise/responseprotocol.h
index 0a7e018..4294584 100644
--- a/protocols/groupwise/libgroupwise/responseprotocol.h
+++ b/protocols/groupwise/libgroupwise/responseprotocol.h
@@ -54,7 +54,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an Response object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( QByteArray &, uint & bytes );
+ Transfer * parse( QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
protected:
/**
* read a line ending in \r\n, including the \r\n
diff --git a/protocols/groupwise/libgroupwise/securestream.h b/protocols/groupwise/libgroupwise/securestream.h
index 1799fe4..32411a9 100644
--- a/protocols/groupwise/libgroupwise/securestream.h
+++ b/protocols/groupwise/libgroupwise/securestream.h
@@ -53,9 +53,9 @@ public:
int errorCode() const;
// reimplemented
- bool isOpen() const;
- void write(const QByteArray &);
- int bytesToWrite() const;
+ bool isOpen() const Q_DECL_OVERRIDE;
+ void write(const QByteArray &) Q_DECL_OVERRIDE;
+ int bytesToWrite() const Q_DECL_OVERRIDE;
signals:
void tlsHandshaken();
diff --git a/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
index b1fddde..74853a0 100644
--- a/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
+++ b/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
@@ -37,7 +37,7 @@ class ChatCountsTask : public RequestTask
public:
ChatCountsTask(Task* parent);
~ChatCountsTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
/**
* Contains a list of all the chatrooms that have participants on the server. If a chatroom exists but is empty, this task does not return a result, so update the participants count to 0.
*/
diff --git a/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
index a75b1e6..d1d4faa 100644
--- a/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
+++ b/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
@@ -42,7 +42,7 @@ class ChatPropertiesTask : public RequestTask
* Specify which chatroom to get properties for
*/
void setChat( const QString & );
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
/**
* Contains a list of the ACL entries for the specified chatroom
*/
diff --git a/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index b3b7199..dedac0c 100644
--- a/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -40,7 +40,7 @@ Q_OBJECT
public:
ConferenceTask( Task* parent );
~ConferenceTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
signals:
void typing( const ConferenceEvent & );
void notTyping( const ConferenceEvent & );
diff --git a/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index ebc4ec9..3584063 100644
--- a/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -34,7 +34,7 @@ Q_OBJECT
public:
ConnectionTask(Task* parent);
~ConnectionTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
signals:
void connectedElsewhere();
void serverDisconnect();
diff --git a/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index 05353c0..56f7650 100644
--- a/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -41,7 +41,7 @@ public:
* @param participants A list of Novell DNs of the people taking part in the conference.
*/
void conference( const int confId, const QStringList &participants );
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
int clientConfId() const;
GroupWise::ConferenceGuid conferenceGUID() const;
diff --git a/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index 2f66f1f..338cdfa 100644
--- a/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -42,10 +42,10 @@ public:
void contactFromDN( const QString & dn, const QString & displayName, const int parentFolder );
void contactFromUserIdAndFolder( const QString & userId, const QString & displayName, const int folderSequence, const QString & folderDisplayName );
void contactFromDNAndFolder( const QString & dn, const QString & displayName, const int folderSequence, const QString & folderDisplayName );
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
protected:
void contact( Field::SingleField * id, const QString & displayName, const int parentFolder );
- void onFolderCreated();
+ void onFolderCreated() Q_DECL_OVERRIDE;
private:
QString m_userId;
QString m_dn;
diff --git a/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index fe1caa8..6bc6899 100644
--- a/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -69,11 +69,11 @@ public:
/**
* This task doesn't do any I/O itself, so this take prints an error and returns false;
*/
- bool take( Transfer * );
+ bool take( Transfer * ) Q_DECL_OVERRIDE;
/**
* Starts off the whole process
*/
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
protected slots:
void slotContactAdded( const ContactItem & );
void slotCheckContactInstanceCreated();
diff --git a/protocols/groupwise/libgroupwise/tasks/eventtask.h b/protocols/groupwise/libgroupwise/tasks/eventtask.h
index 138eabd..7d9ba43 100644
--- a/protocols/groupwise/libgroupwise/tasks/eventtask.h
+++ b/protocols/groupwise/libgroupwise/tasks/eventtask.h
@@ -32,7 +32,7 @@ Q_OBJECT
public:
EventTask( Task *parent );
protected:
- virtual bool forMe( const Transfer * transfer ) const;
+ bool forMe( const Transfer * transfer ) const Q_DECL_OVERRIDE;
void registerEvent( GroupWise::Event e );
private:
QList<int> m_eventCodes;
diff --git a/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index 4d7ec97..156f248 100644
--- a/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -40,7 +40,7 @@ class GetChatSearchResultsTask : public RequestTask
GetChatSearchResultsTask(Task* parent);
~GetChatSearchResultsTask();
void poll( int queryHandle);
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
int queryStatus();
QList< GroupWise::ChatroomSearchResult > results();
private:
diff --git a/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index 88fc824..e96985f 100644
--- a/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -37,7 +37,7 @@ Q_OBJECT
public:
GetDetailsTask( Task * parent );
~GetDetailsTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
void userDNs( const QStringList & userDNs );
signals:
void gotContactUserDetails( const GroupWise::ContactDetails & );
diff --git a/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index 4501780..fe26afe 100644
--- a/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -34,7 +34,7 @@ public:
GetStatusTask(Task* parent);
~GetStatusTask();
void userDN( const QString & dn );
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
signals:
void gotStatus( const QString & contactId, quint16 status, const QString & statusText );
private:
diff --git a/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/protocols/groupwise/libgroupwise/tasks/joinchattask.h
index 1709c01..3f5a315 100644
--- a/protocols/groupwise/libgroupwise/tasks/joinchattask.h
+++ b/protocols/groupwise/libgroupwise/tasks/joinchattask.h
@@ -39,7 +39,7 @@ class JoinChatTask : public RequestTask
JoinChatTask(Task* parent);
~JoinChatTask();
void join( const QString & displayName );
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
QStringList participants() const;
QStringList invitees() const;
QString displayName() const;
diff --git a/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index af22cf2..2ecc0cd 100644
--- a/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -39,7 +39,7 @@ public:
JoinConferenceTask(Task* parent);
~JoinConferenceTask();
void join( const ConferenceGuid & guid );
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
QStringList participants() const;
QStringList invitees() const;
ConferenceGuid guid() const;
diff --git a/protocols/groupwise/libgroupwise/tasks/logintask.h b/protocols/groupwise/libgroupwise/tasks/logintask.h
index 5e04a30..269a7a4 100644
--- a/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -43,7 +43,7 @@ public:
* Only accepts the contact list that comes back from the server,
* processes it and notifies the client of the contact list
*/
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
protected:
void extractFolder( Field::MultiField * folderContainer );
void extractContact( Field::MultiField * contactContainer );
diff --git a/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index 1040fd3..b643022 100644
--- a/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -39,7 +39,7 @@ Q_OBJECT
public:
ModifyContactListTask(Task* parent);
~ModifyContactListTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
signals:
void gotFolderAdded( const FolderItem &);
void gotFolderDeleted( const FolderItem & );
diff --git a/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
index 6c99f05..317a17c 100644
--- a/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
@@ -37,9 +37,9 @@ public:
~MoveContactTask();
void moveContact( const ContactItem & contact, const int newParent );
void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const QString & folderDisplayName );
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
protected:
- void onFolderCreated();
+ void onFolderCreated() Q_DECL_OVERRIDE;
private:
int m_targetFolder;
QString m_dn;
diff --git a/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index fa46fcf..67f79d8 100644
--- a/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -38,7 +38,7 @@ public:
PollSearchResultsTask(Task* parent);
~PollSearchResultsTask();
void poll( const QString & queryHandle);
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
int queryStatus();
QList< GroupWise::ContactDetails > results();
GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
diff --git a/protocols/groupwise/libgroupwise/tasks/requesttask.h b/protocols/groupwise/libgroupwise/tasks/requesttask.h
index 9b7b466..8856fcf 100644
--- a/protocols/groupwise/libgroupwise/tasks/requesttask.h
+++ b/protocols/groupwise/libgroupwise/tasks/requesttask.h
@@ -32,10 +32,10 @@ class LIBGROUPWISE_EXPORT RequestTask : public Task
Q_OBJECT
public:
RequestTask( Task *parent );
- bool take( Transfer * transfer );
- virtual void onGo();
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer * transfer ) const;
+ bool forMe( const Transfer * transfer ) const Q_DECL_OVERRIDE;
void createTransfer( const QString & command, const Field::FieldList & fields );
private:
int m_transactionId;
diff --git a/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index 20e3915..1d8bd69 100644
--- a/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -50,7 +50,7 @@ class LIBGROUPWISE_EXPORT SearchChatTask : public RequestTask
/**
* If the query was accepted, start a timer to poll for results using PollSearchResultsTask
*/
- virtual bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
/**
* Access the results of the search
*/
diff --git a/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index a68c063..578f5c8 100644
--- a/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -46,7 +46,7 @@ public:
/**
* If the query was accepted, start a timer to poll for results using PollSearchResultsTask
*/
- virtual bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
/**
* Access the results of the search
*/
diff --git a/protocols/groupwise/libgroupwise/tasks/statustask.h b/protocols/groupwise/libgroupwise/tasks/statustask.h
index ab44a8d..57ad968 100644
--- a/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -32,7 +32,7 @@ Q_OBJECT
public:
StatusTask(Task* parent);
~StatusTask();
- bool take( Transfer * transfer );
+ bool take( Transfer * transfer ) Q_DECL_OVERRIDE;
signals:
void gotStatus( const QString & contactId, quint16 status, const QString & statusText );
};
diff --git a/protocols/groupwise/ui/gwaddcontactpage.h b/protocols/groupwise/ui/gwaddcontactpage.h
index 6dd4fc9..46472e8 100644
--- a/protocols/groupwise/ui/gwaddcontactpage.h
+++ b/protocols/groupwise/ui/gwaddcontactpage.h
@@ -50,11 +50,11 @@ public:
/**
* Make a contact out of the entered data
*/
- virtual bool apply(Kopete::Account* a, Kopete::MetaContact* m);
+ bool apply(Kopete::Account* a, Kopete::MetaContact* m) Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
private slots:
void searchResult(bool valid);
protected:
diff --git a/protocols/groupwise/ui/gweditaccountwidget.h b/protocols/groupwise/ui/gweditaccountwidget.h
index fb607a0..4fc0fb8 100644
--- a/protocols/groupwise/ui/gweditaccountwidget.h
+++ b/protocols/groupwise/ui/gweditaccountwidget.h
@@ -46,11 +46,11 @@ public:
/**
* Make an account out of the entered data
*/
- virtual Kopete::Account* apply();
+ Kopete::Account* apply() Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected slots:
void configChanged();
protected:
diff --git a/protocols/groupwise/ui/gwsearch.cpp b/protocols/groupwise/ui/gwsearch.cpp
index 0fe55da..7b35399 100644
--- a/protocols/groupwise/ui/gwsearch.cpp
+++ b/protocols/groupwise/ui/gwsearch.cpp
@@ -54,7 +54,7 @@ public:
~GroupWiseContactSearchModel()
{
}
- QModelIndex index( int row, int column, const QModelIndex& index ) const
+ QModelIndex index( int row, int column, const QModelIndex& index ) const Q_DECL_OVERRIDE
{
if ( row >= 0 && column >= 0 &&
row < rowCount() &&
@@ -66,18 +66,18 @@ public:
return QModelIndex();
}
}
- QModelIndex parent( const QModelIndex & /*index*/ ) const
+ QModelIndex parent( const QModelIndex & /*index*/ ) const Q_DECL_OVERRIDE
{
return QModelIndex();
}
- int columnCount( const QModelIndex & parent = QModelIndex() ) const
+ int columnCount( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE
{
if ( parent.isValid() )
return 0;
else
return 4;
}
- int rowCount( const QModelIndex & parent = QModelIndex() ) const
+ int rowCount( const QModelIndex & parent = QModelIndex() ) const Q_DECL_OVERRIDE
{
if ( parent.isValid() )
return 0;
@@ -85,7 +85,7 @@ public:
return m_contents.count();
}
- QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const
+ QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE
{
if ( orientation == Qt::Horizontal && role == Qt::DisplayRole )
{
@@ -108,7 +108,7 @@ public:
return QAbstractItemModel::headerData( section, orientation, role );
}
- Qt::ItemFlags flags( const QModelIndex & index ) const
+ Qt::ItemFlags flags( const QModelIndex & index ) const Q_DECL_OVERRIDE
{
if ( !index.isValid() )
{
@@ -116,7 +116,7 @@ public:
}
return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
}
- QVariant data( const QModelIndex & index, int role = Qt::DisplayRole ) const
+ QVariant data( const QModelIndex & index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE
{
if ( !index.isValid() ) return QVariant();
GroupWise::ContactDetails contactDetails = m_contents.at( index.row() );
@@ -217,7 +217,7 @@ class GroupWiseContactSearchSortProxyModel : public QSortFilterProxyModel
public:
GroupWiseContactSearchSortProxyModel( QObject * parent = 0 ) : QSortFilterProxyModel( parent )
{}
- bool lessThan( const QModelIndex &left, const QModelIndex &right ) const
+ bool lessThan( const QModelIndex &left, const QModelIndex &right ) const Q_DECL_OVERRIDE
{
if ( left.column() == 0 && right.column() == 0 ) {
return left.data( GroupWiseContactSearchModel::StatusOrderedRole ).toInt() < right.data( GroupWiseContactSearchModel::StatusOrderedRole ).toInt();
@@ -232,7 +232,7 @@ class OnlineOnlyGroupWiseContactSearchSortProxyModel : public GroupWiseContactSe
public:
OnlineOnlyGroupWiseContactSearchSortProxyModel( QObject * parent = 0 ) : GroupWiseContactSearchSortProxyModel( parent )
{}
- bool filterAcceptsRow( int source_row, const QModelIndex & source_parent ) const
+ bool filterAcceptsRow( int source_row, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE
{
QModelIndex index = sourceModel()->index( source_row, 0, source_parent );
int statusOrdered = sourceModel()->data( index, GroupWiseContactSearchModel::StatusOrderedRole ).toInt();
diff --git a/protocols/jabber/jabberaccount.h b/protocols/jabber/jabberaccount.h
index 7905da2..8e8b83f 100644
--- a/protocols/jabber/jabberaccount.h
+++ b/protocols/jabber/jabberaccount.h
@@ -70,7 +70,7 @@ public:
~JabberAccount ();
/* Fills the menu for this account. */
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/* Return the resource of the client */
QString resource () const;
@@ -130,7 +130,7 @@ public:
/**
* called when the account is removed in the config ui
*/
- virtual bool removeAccount();
+ bool removeAccount() Q_DECL_OVERRIDE;
/**
* return if kopete show all messges from all resources to one session
@@ -165,10 +165,10 @@ public:
public slots:
/* Connects to the server. */
- void connectWithPassword ( const QString &password );
+ void connectWithPassword ( const QString &password ) Q_DECL_OVERRIDE;
/* Disconnects from the server. */
- void disconnect ();
+ void disconnect () Q_DECL_OVERRIDE;
/* Disconnect with a reason */
void disconnect ( Kopete::Account::DisconnectReason reason );
@@ -177,8 +177,8 @@ public slots:
void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status );
/* Reimplemented from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
- void setStatusMessage( const Kopete::StatusMessage &statusMessage );
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
+ void setStatusMessage( const Kopete::StatusMessage &statusMessage ) Q_DECL_OVERRIDE;
void addTransport( JabberTransport *tr , const QString &jid);
void removeTransport( const QString &jid );
@@ -202,7 +202,7 @@ protected:
* @param contactId The unique ID for this protocol
* @param parentContact The metacontact to add this contact to
*/
- virtual bool createContact (const QString & contactID, Kopete::MetaContact * parentContact);
+ bool createContact (const QString & contactID, Kopete::MetaContact * parentContact) Q_DECL_OVERRIDE;
diff --git a/protocols/jabber/jabberbasecontact.h b/protocols/jabber/jabberbasecontact.h
index cd9a132..09b6ba0 100644
--- a/protocols/jabber/jabberbasecontact.h
+++ b/protocols/jabber/jabberbasecontact.h
@@ -69,19 +69,19 @@ public:
* Return if the contact is reachable (this is true if the account
* is online)
*/
- virtual bool isReachable ();
+ bool isReachable () Q_DECL_OVERRIDE;
/**
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- virtual QList<QAction *> *customContextMenuActions () = 0;
+ QList<QAction *> *customContextMenuActions () Q_DECL_OVERRIDE = 0;
using Kopete::Contact::customContextMenuActions;
/**
* Serialize contact
*/
- virtual void serialize (QMap < QString, QString > &serializedData, QMap < QString, QString > &addressBookData);
+ void serialize (QMap < QString, QString > &serializedData, QMap < QString, QString > &addressBookData) Q_DECL_OVERRIDE;
/**
* Update contact if a roster item has been
@@ -152,7 +152,7 @@ public slots:
/**
* Retrieve a vCard for the contact
*/
- virtual void slotUserInfo ();
+ void slotUserInfo () Q_DECL_OVERRIDE;
/**
diff --git a/protocols/jabber/jabberbobcache.h b/protocols/jabber/jabberbobcache.h
index 293b199..82d16d4 100644
--- a/protocols/jabber/jabberbobcache.h
+++ b/protocols/jabber/jabberbobcache.h
@@ -25,8 +25,8 @@ class JabberBoBCache : public XMPP::BoBCache
public:
JabberBoBCache(QObject *parent = NULL);
- virtual void put(const XMPP::BoBData &data);
- virtual XMPP::BoBData get(const QString &cid);
+ void put(const XMPP::BoBData &data) Q_DECL_OVERRIDE;
+ XMPP::BoBData get(const QString &cid) Q_DECL_OVERRIDE;
private:
QHash <QString, XMPP::BoBData> mem;
diff --git a/protocols/jabber/jabbercontact.h b/protocols/jabber/jabbercontact.h
index 74d27a3..d2055ee 100644
--- a/protocols/jabber/jabbercontact.h
+++ b/protocols/jabber/jabbercontact.h
@@ -44,7 +44,7 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- QList<QAction *> *customContextMenuActions ();
+ QList<QAction *> *customContextMenuActions () Q_DECL_OVERRIDE;
using JabberBaseContact::customContextMenuActions;
/**
@@ -55,7 +55,7 @@ public:
/**
* Deal with an incoming message for this contact.
*/
- void handleIncomingMessage ( const XMPP::Message &message );
+ void handleIncomingMessage ( const XMPP::Message &message ) Q_DECL_OVERRIDE;
/**
* Create a message manager for this contact.
@@ -63,27 +63,27 @@ public:
* not suitable for groupchat, as it only looks for
* managers with ourselves in the contact list.
*/
- Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags );
+ Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags ) Q_DECL_OVERRIDE;
- virtual bool isContactRequestingEvent( XMPP::MsgEvent event );
- virtual bool isContactRequestingReceiptDelivery();
+ bool isContactRequestingEvent( XMPP::MsgEvent event ) Q_DECL_OVERRIDE;
+ bool isContactRequestingReceiptDelivery() Q_DECL_OVERRIDE;
- virtual QString lastReceivedMessageId () const;
+ QString lastReceivedMessageId () const Q_DECL_OVERRIDE;
public slots:
/**
* Remove this contact from the roster
*/
- void deleteContact ();
+ void deleteContact () Q_DECL_OVERRIDE;
/**
* Sync Groups with server
*
* operations are alctually performed in sloDelayedSync()
*/
- void sync(unsigned int);
+ void sync(unsigned int) Q_DECL_OVERRIDE;
/**
* This is the JabberContact level slot for sending files.
@@ -94,8 +94,8 @@ public slots:
* @param fileSize (Optional) Size of the file being sent. Used when sending
* a nondeterminate file size (such as over a socket)
*/
- virtual void sendFile( const QUrl &sourceURL = QUrl(),
- const QString &fileName = QString(), uint fileSize = 0L );
+ void sendFile( const QUrl &sourceURL = QUrl(),
+ const QString &fileName = QString(), uint fileSize = 0L ) Q_DECL_OVERRIDE;
/**
* Update the vCard on the server.
diff --git a/protocols/jabber/jabbergroupchatmanager.h b/protocols/jabber/jabbergroupchatmanager.h
index 03111fc..2fe55c1 100644
--- a/protocols/jabber/jabbergroupchatmanager.h
+++ b/protocols/jabber/jabbergroupchatmanager.h
@@ -64,7 +64,7 @@ public slots:
* reimplemented from Kopete::ChatSession
* called when a contact is dropped in the window
*/
- virtual void inviteContact(const QString &contactId);
+ void inviteContact(const QString &contactId) Q_DECL_OVERRIDE;
private slots:
///Slot to show invite menu for other user to chat
diff --git a/protocols/jabber/jabbergroupcontact.h b/protocols/jabber/jabbergroupcontact.h
index dfeea2f..4a5ff5d 100644
--- a/protocols/jabber/jabbergroupcontact.h
+++ b/protocols/jabber/jabbergroupcontact.h
@@ -41,13 +41,13 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- QList<QAction *> *customContextMenuActions ();
+ QList<QAction *> *customContextMenuActions () Q_DECL_OVERRIDE;
using JabberBaseContact::customContextMenuActions;
/**
* Deal with an incoming message for this contact.
*/
- void handleIncomingMessage ( const XMPP::Message &message );
+ void handleIncomingMessage ( const XMPP::Message &message ) Q_DECL_OVERRIDE;
/**
* Add a contact to this room.
@@ -59,7 +59,7 @@ public:
*/
void removeSubContact ( const XMPP::RosterItem &rosterItem );
- Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate );
+ Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
public slots:
@@ -72,8 +72,8 @@ public slots:
* @param fileSize (Optional) Size of the file being sent. Used when sending
* a nondeterminate file size (such as over a socket)
*/
- virtual void sendFile( const QUrl &sourceURL = QUrl(),
- const QString &fileName = QString(), uint fileSize = 0L );
+ void sendFile( const QUrl &sourceURL = QUrl(),
+ const QString &fileName = QString(), uint fileSize = 0L ) Q_DECL_OVERRIDE;
private slots:
diff --git a/protocols/jabber/jabbergroupmembercontact.h b/protocols/jabber/jabbergroupmembercontact.h
index 6cd7400..ffb3caa 100644
--- a/protocols/jabber/jabbergroupmembercontact.h
+++ b/protocols/jabber/jabbergroupmembercontact.h
@@ -39,23 +39,23 @@ public:
* Create custom context menu items for the contact
* FIXME: implement manager version here?
*/
- QList<QAction *> *customContextMenuActions ();
+ QList<QAction *> *customContextMenuActions () Q_DECL_OVERRIDE;
using JabberBaseContact::customContextMenuActions;
/**
* Return message manager for this instance.
*/
- Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate );
+ Kopete::ChatSession *manager ( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
/**
* Deal with incoming messages.
*/
- void handleIncomingMessage ( const XMPP::Message &message );
+ void handleIncomingMessage ( const XMPP::Message &message ) Q_DECL_OVERRIDE;
- virtual bool isContactRequestingEvent( XMPP::MsgEvent event );
- virtual bool isContactRequestingReceiptDelivery();
+ bool isContactRequestingEvent( XMPP::MsgEvent event ) Q_DECL_OVERRIDE;
+ bool isContactRequestingReceiptDelivery() Q_DECL_OVERRIDE;
- virtual QString lastReceivedMessageId () const;
+ QString lastReceivedMessageId () const Q_DECL_OVERRIDE;
public slots:
@@ -68,8 +68,8 @@ public slots:
* @param fileSize (Optional) Size of the file being sent. Used when sending
* a nondeterminate file size (such as over a socket)
*/
- virtual void sendFile( const QUrl &sourceURL = QUrl(),
- const QString &fileName = QString(), uint fileSize = 0L );
+ void sendFile( const QUrl &sourceURL = QUrl(),
+ const QString &fileName = QString(), uint fileSize = 0L ) Q_DECL_OVERRIDE;
private slots:
/**
diff --git a/protocols/jabber/jabberprotocol.h b/protocols/jabber/jabberprotocol.h
index c6f3939..09ae33b 100644
--- a/protocols/jabber/jabberprotocol.h
+++ b/protocols/jabber/jabberprotocol.h
@@ -58,15 +58,15 @@ public:
/**
* Creates the "add contact" dialog specific to this protocol
*/
- virtual AddContactPage *createAddContactWidget (QWidget * parent, Kopete::Account * i);
- virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, QWidget * parent);
- virtual Kopete::Account *createNewAccount (const QString & accountId);
+ AddContactPage *createAddContactWidget (QWidget * parent, Kopete::Account * i) Q_DECL_OVERRIDE;
+ KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, QWidget * parent) Q_DECL_OVERRIDE;
+ Kopete::Account *createNewAccount (const QString & accountId) Q_DECL_OVERRIDE;
/**
* Deserialize contact data
*/
- virtual Kopete::Contact *deserializeContact (Kopete::MetaContact * metaContact,
- const QMap < QString, QString > &serializedData, const QMap < QString, QString > &addressBookData);
+ Kopete::Contact *deserializeContact (Kopete::MetaContact * metaContact,
+ const QMap < QString, QString > &serializedData, const QMap < QString, QString > &addressBookData) Q_DECL_OVERRIDE;
enum OnlineStatus { JabberOnline, JabberFreeForChat, JabberAway, JabberXA, JabberDND,
JabberOffline, JabberInvisible, JabberConnecting };
@@ -148,7 +148,7 @@ public:
/**
* inherited from Kopete::MimeTypeHandler
*/
- virtual void handleURL(const QString&, const QUrl &url) const;
+ void handleURL(const QString&, const QUrl &url) const Q_DECL_OVERRIDE;
using Kopete::MimeTypeHandler::handleURL;
private:
diff --git a/protocols/jabber/jabbertransport.h b/protocols/jabber/jabbertransport.h
index 2a1fed6..d85cd0d 100644
--- a/protocols/jabber/jabbertransport.h
+++ b/protocols/jabber/jabbertransport.h
@@ -55,10 +55,10 @@ public:
~JabberTransport ();
/** Returns the action menu for this account. */
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/** Returns the action menu for this account. */
- virtual bool hasCustomStatusMenu() const;
+ bool hasCustomStatusMenu() const Q_DECL_OVERRIDE;
/** the parent account */
JabberAccount *account() const
@@ -67,14 +67,14 @@ public:
/* to get the protocol from the account */
JabberProtocol *protocol () const;
- void connect( const Kopete::OnlineStatus& ) {}
- virtual void disconnect( ) {}
+ void connect( const Kopete::OnlineStatus& ) Q_DECL_OVERRIDE {}
+ void disconnect( ) Q_DECL_OVERRIDE {}
/**
* called when the account is removed in the config ui
* will remove the subscription
*/
- virtual bool removeAccount();
+ bool removeAccount() Q_DECL_OVERRIDE;
enum TransportStatus { Normal , Creating, Removing , AccountRemoved };
@@ -90,8 +90,8 @@ public slots:
/* Reimplemented from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
- void setStatusMessage( const Kopete::StatusMessage &statusMessage );
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
+ void setStatusMessage( const Kopete::StatusMessage &statusMessage ) Q_DECL_OVERRIDE;
/**
* the account has been unregistered.
* loop over all contact and remove them
@@ -126,7 +126,7 @@ protected:
* @param contactId The unique ID for this protocol
* @param parentContact The metacontact to add this contact to
*/
- virtual bool createContact (const QString & contactID, Kopete::MetaContact * parentContact);
+ bool createContact (const QString & contactID, Kopete::MetaContact * parentContact) Q_DECL_OVERRIDE;
private:
JabberAccount *m_account;
diff --git a/protocols/jabber/jabberxdatawidget.cpp b/protocols/jabber/jabberxdatawidget.cpp
index d771c71..e3ca17a 100644
--- a/protocols/jabber/jabberxdatawidget.cpp
+++ b/protocols/jabber/jabberxdatawidget.cpp
@@ -89,7 +89,7 @@ public:
}
}
- virtual XMPP::XData::Field field() const
+ XMPP::XData::Field field() const Q_DECL_OVERRIDE
{
XMPP::XData::Field f = XDataWidgetField::field();
QStringList val;
@@ -177,7 +177,7 @@ public:
}
}
- virtual XMPP::XData::Field field() const
+ XMPP::XData::Field field() const Q_DECL_OVERRIDE
{
// TODO is value unique?
QString lbl = combo->currentText();
@@ -239,7 +239,7 @@ public:
}
}
- XMPP::XData::Field field() const
+ XMPP::XData::Field field() const Q_DECL_OVERRIDE
{
XMPP::XData::Field f = XDataWidgetField::field();
QStringList val;
@@ -304,7 +304,7 @@ public:
}
}
- virtual XMPP::XData::Field field() const
+ XMPP::XData::Field field() const Q_DECL_OVERRIDE
{
XMPP::XData::Field f = XDataWidgetField::field();
f.setValue(edit->toPlainText().split('\n'));
@@ -345,7 +345,7 @@ public:
}
}
- virtual XMPP::XData::Field field() const
+ XMPP::XData::Field field() const Q_DECL_OVERRIDE
{
XMPP::XData::Field f = XDataWidgetField::field();
QStringList val;
@@ -380,7 +380,7 @@ public:
{
}
- virtual bool isValid() const
+ bool isValid() const Q_DECL_OVERRIDE
{
// TODO
return true;
@@ -397,7 +397,7 @@ public:
{
}
- virtual bool isValid() const
+ bool isValid() const Q_DECL_OVERRIDE
{
// TODO
return true;
diff --git a/protocols/jabber/kioslave/jabberdisco.h b/protocols/jabber/kioslave/jabberdisco.h
index 1ed316b..7ed6d1a 100644
--- a/protocols/jabber/kioslave/jabberdisco.h
+++ b/protocols/jabber/kioslave/jabberdisco.h
@@ -41,12 +41,12 @@ public:
JabberDiscoProtocol ( const QByteArray &pool_socket, const QByteArray &app_socket );
virtual ~JabberDiscoProtocol ();
- virtual void setHost(const QString& host, quint16 port, const QString& user, const QString& pass);
+ void setHost(const QString& host, quint16 port, const QString& user, const QString& pass) Q_DECL_OVERRIDE;
- void openConnection ();
- void closeConnection ();
+ void openConnection () Q_DECL_OVERRIDE;
+ void closeConnection () Q_DECL_OVERRIDE;
- void slave_status ();
+ void slave_status () Q_DECL_OVERRIDE;
void get ( const KUrl &url );
void listDir ( const KUrl &url );
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
index 231880b..262d946 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netinterface.cpp
@@ -156,7 +156,7 @@ private:
startMutex = 0;
}
- void run() {
+ void run() Q_DECL_OVERRIDE {
{
QMutexLocker locker(startMutex);
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
index 2e45ef7..e577dea 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netinterface_unix.cpp
@@ -335,13 +335,13 @@ public:
connect(&t, SIGNAL(timeout()), SLOT(check()));
}
- void start()
+ void start() Q_DECL_OVERRIDE
{
t.start(5000);
poll();
}
- QList<Info> interfaces() const
+ QList<Info> interfaces() const Q_DECL_OVERRIDE
{
return info;
}
@@ -415,7 +415,7 @@ class UnixNetProvider : public IrisNetProvider
Q_OBJECT
Q_INTERFACES(XMPP::IrisNetProvider);
public:
- virtual NetInterfaceProvider *createNetInterfaceProvider()
+ NetInterfaceProvider *createNetInterfaceProvider() Q_DECL_OVERRIDE
{
return new UnixNet;
}
diff --git a/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp b/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
index 7167fc0..db15830 100644
--- a/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
+++ b/protocols/jabber/libiris/src/irisnet/corelib/netnames_jdns.cpp
@@ -546,12 +546,12 @@ public:
emit resolve_error(id, error);
}
- virtual bool supportsSingle() const
+ bool supportsSingle() const Q_DECL_OVERRIDE
{
return true;
}
- virtual bool supportsLongLived() const
+ bool supportsLongLived() const Q_DECL_OVERRIDE
{
if(mode == Local)
return true; // we support long-lived local queries
@@ -559,14 +559,14 @@ public:
return false; // we do NOT support long-lived internet queries
}
- virtual bool supportsRecordType(int type) const
+ bool supportsRecordType(int type) const Q_DECL_OVERRIDE
{
// all record types supported
Q_UNUSED(type);
return true;
}
- virtual int resolve_start(const QByteArray &name, int qType, bool longLived)
+ int resolve_start(const QByteArray &name, int qType, bool longLived) Q_DECL_OVERRIDE
{
if(mode == Internet)
{
@@ -654,7 +654,7 @@ public:
}
}
- virtual void resolve_stop(int id)
+ void resolve_stop(int id) Q_DECL_OVERRIDE
{
Item *i = getItemById(id);
Q_ASSERT(i);
@@ -664,7 +664,7 @@ public:
releaseItem(i);
}
- virtual void resolve_localResultsReady(int id, const QList<XMPP::NameRecord> &results)
+ void resolve_localResultsReady(int id, const QList<XMPP::NameRecord> &results) Q_DECL_OVERRIDE
{
Item *i = getItemById(id);
Q_ASSERT(i);
@@ -675,7 +675,7 @@ public:
Q_ARG(QList<XMPP::NameRecord>, results));
}
- virtual void resolve_localError(int id, XMPP::NameResolver::Error e)
+ void resolve_localError(int id, XMPP::NameResolver::Error e) Q_DECL_OVERRIDE
{
Item *i = getItemById(id);
Q_ASSERT(i);
@@ -2212,7 +2212,7 @@ public:
publishExtraItemList.clear();
}
- virtual int browse_start(const QString &_type, const QString &_domain)
+ int browse_start(const QString &_type, const QString &_domain) Q_DECL_OVERRIDE
{
QString domain;
if(_domain.isEmpty() || _domain == ".")
@@ -2267,7 +2267,7 @@ public:
return i->id;
}
- virtual void browse_stop(int id)
+ void browse_stop(int id) Q_DECL_OVERRIDE
{
BrowseItem *i = browseItemList.itemById(id);
Q_ASSERT(i);
@@ -2275,7 +2275,7 @@ public:
browseItemList.remove(i);
}
- virtual int resolve_start(const QByteArray &name)
+ int resolve_start(const QByteArray &name) Q_DECL_OVERRIDE
{
int id = resolveItemList.reserveId();
@@ -2297,7 +2297,7 @@ public:
return i->id;
}
- virtual void resolve_stop(int id)
+ void resolve_stop(int id) Q_DECL_OVERRIDE
{
ResolveItem *i = resolveItemList.itemById(id);
Q_ASSERT(i);
@@ -2305,7 +2305,7 @@ public:
resolveItemList.remove(i);
}
- virtual int publish_start(const QString &instance, const QString &_type, int port, const QMap<QString,QByteArray> &attributes)
+ int publish_start(const QString &instance, const QString &_type, int port, const QMap<QString,QByteArray> &attributes) Q_DECL_OVERRIDE
{
int id = publishItemList.reserveId();
@@ -2351,7 +2351,7 @@ public:
return i->id;
}
- virtual void publish_update(int id, const QMap<QString,QByteArray> &attributes)
+ void publish_update(int id, const QMap<QString,QByteArray> &attributes) Q_DECL_OVERRIDE
{
PublishItem *i = publishItemList.itemById(id);
Q_ASSERT(i);
@@ -2363,7 +2363,7 @@ public:
i->publish->update(attributes);
}
- virtual void publish_stop(int id)
+ void publish_stop(int id) Q_DECL_OVERRIDE
{
PublishItem *i = publishItemList.itemById(id);
Q_ASSERT(i);
@@ -2372,7 +2372,7 @@ public:
publishItemList.remove(i);
}
- virtual int publish_extra_start(int pub_id, const NameRecord &name)
+ int publish_extra_start(int pub_id, const NameRecord &name) Q_DECL_OVERRIDE
{
PublishItem *pi = publishItemList.itemById(pub_id);
Q_ASSERT(pi);
@@ -2406,7 +2406,7 @@ public:
return i->id;
}
- virtual void publish_extra_update(int id, const NameRecord &name)
+ void publish_extra_update(int id, const NameRecord &name) Q_DECL_OVERRIDE
{
PublishExtraItem *i = publishExtraItemList.itemById(id);
Q_ASSERT(i);
@@ -2435,7 +2435,7 @@ public:
i->publish->update(rec);
}
- virtual void publish_extra_stop(int id)
+ void publish_extra_stop(int id) Q_DECL_OVERRIDE
{
PublishExtraItem *i = publishExtraItemList.itemById(id);
Q_ASSERT(i);
@@ -2694,19 +2694,19 @@ public:
global = new JDnsGlobal;
}
- virtual NameProvider *createNameProviderInternet()
+ NameProvider *createNameProviderInternet() Q_DECL_OVERRIDE
{
ensure_global();
return JDnsNameProvider::create(global, JDnsNameProvider::Internet);
}
- virtual NameProvider *createNameProviderLocal()
+ NameProvider *createNameProviderLocal() Q_DECL_OVERRIDE
{
ensure_global();
return JDnsNameProvider::create(global, JDnsNameProvider::Local);
}
- virtual ServiceProvider *createServiceProvider()
+ ServiceProvider *createServiceProvider() Q_DECL_OVERRIDE
{
ensure_global();
return JDnsServiceProvider::create(global);
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
index f32d762..463daea 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bsocket.h
@@ -53,17 +53,17 @@ public:
void connectToHost(const QString &host, quint16 port, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::UnknownNetworkLayerProtocol);
/*! Connect to the hosts for the specified service */
void connectToHost(const QString &service, const QString &transport, const QString &domain, quint16 port = std::numeric_limits<quint16>::max());
- virtual QAbstractSocket* abstractSocket() const;
+ QAbstractSocket* abstractSocket() const Q_DECL_OVERRIDE;
int socket() const;
void setSocket(qintptr);
int state() const;
// from ByteStream
bool isOpen() const;
- void close();
+ void close() Q_DECL_OVERRIDE;
- qint64 bytesAvailable() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
// local
QHostAddress address() const;
@@ -74,8 +74,8 @@ public:
quint16 peerPort() const;
protected:
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
+ qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
signals:
void hostFound();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
index 9d3dd94..a0cf41a 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/bytestream.h
@@ -41,9 +41,9 @@ public:
ByteStream(QObject *parent=0);
~ByteStream()=0;
- bool isSequential() const { return true; }
- qint64 bytesAvailable() const;
- qint64 bytesToWrite() const;
+ bool isSequential() const Q_DECL_OVERRIDE { return true; }
+ qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
static QByteArray takeArray(QByteArray &from, int size=0, bool del=true);
@@ -58,8 +58,8 @@ signals:
void error(int);
protected:
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
+ qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
void setError(int code = ErrOk, const QString &text = QString());
void clearReadBuffer();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
index 7cf082d..63f1f6f 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httpconnect.h
@@ -37,10 +37,10 @@ public:
void connectToHost(const QString &proxyHost, int proxyPort, const QString &host, int port);
// from ByteStream
- void close();
- qint64 bytesToWrite() const;
+ void close() Q_DECL_OVERRIDE;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
protected:
- qint64 writeData(const char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
signals:
void connected();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
index 52a428a..763597a 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/httppoll.h
@@ -35,7 +35,7 @@ public:
HttpPoll(QObject *parent=0);
~HttpPoll();
- virtual QAbstractSocket* abstractSocket() const;
+ QAbstractSocket* abstractSocket() const Q_DECL_OVERRIDE;
void setAuth(const QString &user, const QString &pass="");
void connectToUrl(const QUrl &url);
@@ -46,7 +46,7 @@ public:
// from ByteStream
bool isOpen() const;
- void close();
+ void close() Q_DECL_OVERRIDE;
signals:
void connected();
@@ -54,7 +54,7 @@ signals:
void syncFinished();
protected:
- int tryWrite();
+ int tryWrite() Q_DECL_OVERRIDE;
private slots:
void http_result();
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
index 74e9251..1ebec72 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/cutestuff/socks.h
@@ -63,7 +63,7 @@ public:
SocksClient(qintptr, QObject *parent=0);
~SocksClient();
- virtual QAbstractSocket* abstractSocket() const;
+ QAbstractSocket* abstractSocket() const Q_DECL_OVERRIDE;
bool isIncoming() const;
@@ -79,9 +79,9 @@ public:
void grantUDPAssociate(const QString &relayHost, int relayPort);
// from ByteStream
- void close();
- qint64 bytesAvailable() const;
- qint64 bytesToWrite() const;
+ void close() Q_DECL_OVERRIDE;
+ qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
// remote address
QHostAddress peerAddress() const;
@@ -93,8 +93,8 @@ public:
SocksUDP *createUDP(const QString &host, int port, const QHostAddress &routeAddr, int routePort);
protected:
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
+ qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
signals:
// outgoing
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
index 7c9a851..718f9d5 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/icelocaltransport.h
@@ -77,12 +77,12 @@ public:
int relayedPort() const;
// reimplemented
- virtual void stop();
- virtual bool hasPendingDatagrams(int path) const;
- virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
- virtual void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
- virtual void addChannelPeer(const QHostAddress &addr, int port);
- virtual void setDebugLevel(DebugLevel level);
+ void stop() Q_DECL_OVERRIDE;
+ bool hasPendingDatagrams(int path) const Q_DECL_OVERRIDE;
+ QByteArray readDatagram(int path, QHostAddress *addr, int *port) Q_DECL_OVERRIDE;
+ void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) Q_DECL_OVERRIDE;
+ void addChannelPeer(const QHostAddress &addr, int port) Q_DECL_OVERRIDE;
+ void setDebugLevel(DebugLevel level) Q_DECL_OVERRIDE;
signals:
// may be emitted multiple times.
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.h b/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.h
index 18f4df4..a3eef30 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/iceturntransport.h
@@ -60,12 +60,12 @@ public:
TurnClient::Error turnErrorCode() const;
// reimplemented
- virtual void stop();
- virtual bool hasPendingDatagrams(int path) const;
- virtual QByteArray readDatagram(int path, QHostAddress *addr, int *port);
- virtual void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port);
- virtual void addChannelPeer(const QHostAddress &addr, int port);
- virtual void setDebugLevel(DebugLevel level);
+ void stop() Q_DECL_OVERRIDE;
+ bool hasPendingDatagrams(int path) const Q_DECL_OVERRIDE;
+ QByteArray readDatagram(int path, QHostAddress *addr, int *port) Q_DECL_OVERRIDE;
+ void writeDatagram(int path, const QByteArray &buf, const QHostAddress &addr, int port) Q_DECL_OVERRIDE;
+ void addChannelPeer(const QHostAddress &addr, int port) Q_DECL_OVERRIDE;
+ void setDebugLevel(DebugLevel level) Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h b/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
index ca8467e..f968d13 100644
--- a/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
+++ b/protocols/jabber/libiris/src/irisnet/noncore/legacy/servsock.h
@@ -68,7 +68,7 @@ protected:
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
void incomingConnection(int socketDescriptor);
#else
- void incomingConnection(qintptr socketDescriptor);
+ void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE;
#endif
};
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 97a8326..500f4ac 100644
--- a/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h
+++ b/protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared_p.h
@@ -74,7 +74,7 @@ public:
void waitForShutdown(const QList<QJDnsShared*> &_list);
protected:
- virtual void run();
+ void run() Q_DECL_OVERRIDE;
private slots:
void agent_started();
diff --git a/protocols/jabber/libiris/src/xmpp/base/randrandomnumbergenerator.h b/protocols/jabber/libiris/src/xmpp/base/randrandomnumbergenerator.h
index 5bb0cb2..69384f4 100644
--- a/protocols/jabber/libiris/src/xmpp/base/randrandomnumbergenerator.h
+++ b/protocols/jabber/libiris/src/xmpp/base/randrandomnumbergenerator.h
@@ -28,11 +28,11 @@ namespace XMPP {
public:
RandRandomNumberGenerator() {}
- virtual double generateNumber() const {
+ double generateNumber() const Q_DECL_OVERRIDE {
return rand();
}
- virtual double getMaximumGeneratedNumber() const {
+ double getMaximumGeneratedNumber() const Q_DECL_OVERRIDE {
return RAND_MAX;
}
};
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/parser.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-core/parser.cpp
index 41a6db2..92e6cf6 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/parser.cpp
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/parser.cpp
@@ -74,7 +74,7 @@ public:
delete dec;
}
- void reset()
+ void reset() Q_DECL_OVERRIDE
{
delete dec;
dec = 0;
@@ -112,7 +112,7 @@ public:
return last;
}
- QChar next()
+ QChar next() Q_DECL_OVERRIDE
{
if(paused)
return EndOfData;
@@ -371,18 +371,18 @@ namespace XMPP
}
}
- bool startDocument()
+ bool startDocument() Q_DECL_OVERRIDE
{
depth = 0;
return true;
}
- bool endDocument()
+ bool endDocument() Q_DECL_OVERRIDE
{
return true;
}
- bool startPrefixMapping(const QString &prefix, const QString &uri)
+ bool startPrefixMapping(const QString &prefix, const QString &uri) Q_DECL_OVERRIDE
{
if(depth == 0) {
nsnames += prefix;
@@ -391,7 +391,7 @@ namespace XMPP
return true;
}
- bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts)
+ bool startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts) Q_DECL_OVERRIDE
{
if(depth == 0) {
Parser::Event *e = new Parser::Event;
@@ -441,7 +441,7 @@ namespace XMPP
return true;
}
- bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName)
+ bool endElement(const QString &namespaceURI, const QString &localName, const QString &qName) Q_DECL_OVERRIDE
{
--depth;
if(depth == 0) {
@@ -475,7 +475,7 @@ namespace XMPP
return true;
}
- bool characters(const QString &str)
+ bool characters(const QString &str) Q_DECL_OVERRIDE
{
if(depth >= 1) {
QString content = str;
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.h
index 70eb7a6..e865abf 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/protocol.h
@@ -144,7 +144,7 @@ namespace XMPP
BasicProtocol();
~BasicProtocol();
- void reset();
+ void reset() Q_DECL_OVERRIDE;
// for outgoing xml
QDomDocument doc;
@@ -199,12 +199,12 @@ namespace XMPP
void delayError(int code);
// reimplemented
- QDomElement docElement();
- void handleDocOpen(const Parser::Event &pe);
- bool handleError();
- bool handleCloseFinished();
- bool doStep(const QDomElement &e);
- void itemWritten(int id, int size);
+ QDomElement docElement() Q_DECL_OVERRIDE;
+ void handleDocOpen(const Parser::Event &pe) Q_DECL_OVERRIDE;
+ bool handleError() Q_DECL_OVERRIDE;
+ bool handleCloseFinished() Q_DECL_OVERRIDE;
+ bool doStep(const QDomElement &e) Q_DECL_OVERRIDE;
+ void itemWritten(int id, int size) Q_DECL_OVERRIDE;
virtual QString defaultNamespace();
virtual QStringList extraNamespaces(); // stringlist: prefix,uri,prefix,uri, [...]
@@ -262,7 +262,7 @@ namespace XMPP
CoreProtocol();
~CoreProtocol();
- void reset();
+ void reset() Q_DECL_OVERRIDE;
void startTimer(int seconds);
// reimplemented to do SM
@@ -363,16 +363,16 @@ namespace XMPP
bool needSMRequest();
// reimplemented
- bool stepAdvancesParser() const;
- bool stepRequiresElement() const;
- void stringSend(const QString &s);
- void stringRecv(const QString &s);
- QString defaultNamespace();
- QStringList extraNamespaces();
- void handleStreamOpen(const Parser::Event &pe);
- bool doStep2(const QDomElement &e);
- void elementSend(const QDomElement &e);
- void elementRecv(const QDomElement &e);
+ bool stepAdvancesParser() const Q_DECL_OVERRIDE;
+ bool stepRequiresElement() const Q_DECL_OVERRIDE;
+ void stringSend(const QString &s) Q_DECL_OVERRIDE;
+ void stringRecv(const QString &s) Q_DECL_OVERRIDE;
+ QString defaultNamespace() Q_DECL_OVERRIDE;
+ QStringList extraNamespaces() Q_DECL_OVERRIDE;
+ void handleStreamOpen(const Parser::Event &pe) Q_DECL_OVERRIDE;
+ bool doStep2(const QDomElement &e) Q_DECL_OVERRIDE;
+ void elementSend(const QDomElement &e) Q_DECL_OVERRIDE;
+ void elementRecv(const QDomElement &e) Q_DECL_OVERRIDE;
};
}
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
index 9936fb7..bd385f1 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/securestream.h
@@ -57,7 +57,7 @@ public:
// reimplemented
bool isOpen() const;
void write(const QByteArray &);
- qint64 bytesToWrite() const;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
signals:
void tlsHandshaken();
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp b/protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp
index df1fccd..1268147 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/simplesasl.cpp
@@ -99,7 +99,7 @@ public:
reset();
}
- void reset()
+ void reset() Q_DECL_OVERRIDE
{
resetState();
@@ -126,7 +126,7 @@ public:
authCondition_ = QCA::SASL::AuthFail;
}
- virtual void setConstraints(QCA::SASL::AuthFlags flags, int ssfMin, int) {
+ void setConstraints(QCA::SASL::AuthFlags flags, int ssfMin, int) Q_DECL_OVERRIDE {
if(flags & (QCA::SASL::RequireForwardSecrecy | QCA::SASL::RequirePassCredentials | QCA::SASL::RequireMutualAuth) || ssfMin > 0)
capable = false;
else
@@ -134,12 +134,12 @@ public:
allow_plain = flags & QCA::SASL::AllowPlain;
}
- virtual void setup(const QString& _service, const QString& _host, const QCA::SASLContext::HostPort*, const QCA::SASLContext::HostPort*, const QString&, int) {
+ void setup(const QString& _service, const QString& _host, const QCA::SASLContext::HostPort*, const QCA::SASLContext::HostPort*, const QString&, int) Q_DECL_OVERRIDE {
service = _service;
host = _host;
}
- virtual void startClient(const QStringList &mechlist, bool allowClientSendFirst) {
+ void startClient(const QStringList &mechlist, bool allowClientSendFirst) Q_DECL_OVERRIDE {
Q_UNUSED(allowClientSendFirst);
mechanism_ = QString();
@@ -173,12 +173,12 @@ public:
tryAgain();
}
- virtual void nextStep(const QByteArray &from_net) {
+ void nextStep(const QByteArray &from_net) Q_DECL_OVERRIDE {
in_buf = from_net;
tryAgain();
}
- virtual void tryAgain() {
+ void tryAgain() Q_DECL_OVERRIDE {
// All exits of the method must emit the ready signal
// so all exits go through a goto ready;
if(step == 0) {
@@ -314,7 +314,7 @@ ready:
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual void update(const QByteArray &from_net, const QByteArray &from_app) {
+ void update(const QByteArray &from_net, const QByteArray &from_app) Q_DECL_OVERRIDE {
result_to_app_ = from_net;
result_to_net_ = from_app;
encoded_ = from_app.size();
@@ -322,58 +322,58 @@ ready:
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual bool waitForResultsReady(int msecs) {
+ bool waitForResultsReady(int msecs) Q_DECL_OVERRIDE {
// TODO: for now, all operations block anyway
Q_UNUSED(msecs);
return true;
}
- virtual Result result() const {
+ Result result() const Q_DECL_OVERRIDE {
return result_;
}
- virtual QStringList mechlist() const {
+ QStringList mechlist() const Q_DECL_OVERRIDE {
return QStringList();
}
- virtual QString mech() const {
+ QString mech() const Q_DECL_OVERRIDE {
return out_mech;
}
- virtual bool haveClientInit() const {
+ bool haveClientInit() const Q_DECL_OVERRIDE {
return out_mech == "PLAIN";
}
- virtual QByteArray stepData() const {
+ QByteArray stepData() const Q_DECL_OVERRIDE {
return out_buf;
}
- virtual QByteArray to_net() {
+ QByteArray to_net() Q_DECL_OVERRIDE {
return result_to_net_;
}
- virtual int encoded() const {
+ int encoded() const Q_DECL_OVERRIDE {
return encoded_;
}
- virtual QByteArray to_app() {
+ QByteArray to_app() Q_DECL_OVERRIDE {
return result_to_app_;
}
- virtual int ssf() const {
+ int ssf() const Q_DECL_OVERRIDE {
return 0;
}
- virtual QCA::SASL::AuthCondition authCondition() const {
+ QCA::SASL::AuthCondition authCondition() const Q_DECL_OVERRIDE {
return authCondition_;
}
- virtual QCA::SASL::Params clientParams() const {
+ QCA::SASL::Params clientParams() const Q_DECL_OVERRIDE {
return QCA::SASL::Params(need.user, need.authzid, need.pass, need.realm);
}
- virtual void setClientParams(const QString *_user, const QString *_authzid, const QCA::SecureArray *_pass, const QString *_realm) {
+ void setClientParams(const QString *_user, const QString *_authzid, const QCA::SecureArray *_pass, const QString *_realm) Q_DECL_OVERRIDE {
if(_user) {
user = *_user;
need.user = false;
@@ -396,31 +396,31 @@ ready:
}
}
- virtual QStringList realmlist() const
+ QStringList realmlist() const Q_DECL_OVERRIDE
{
// TODO
return QStringList();
}
- virtual QString username() const {
+ QString username() const Q_DECL_OVERRIDE {
return QString();
}
- virtual QString authzid() const {
+ QString authzid() const Q_DECL_OVERRIDE {
return QString();
}
- virtual QCA::Provider::Context* clone() const {
+ QCA::Provider::Context* clone() const Q_DECL_OVERRIDE {
SimpleSASLContext* s = new SimpleSASLContext(provider());
// TODO: Copy all the members
return s;
}
- virtual void startServer(const QString &, bool) {
+ void startServer(const QString &, bool) Q_DECL_OVERRIDE {
result_ = QCA::SASLContext::Error;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual void serverFirstStep(const QString &, const QByteArray *) {
+ void serverFirstStep(const QString &, const QByteArray *) Q_DECL_OVERRIDE {
result_ = QCA::SASLContext::Error;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
@@ -433,25 +433,25 @@ public:
QCASimpleSASL() {}
~QCASimpleSASL() {}
- void init()
+ void init() Q_DECL_OVERRIDE
{
}
- QString name() const {
+ QString name() const Q_DECL_OVERRIDE {
return "simplesasl";
}
- QStringList features() const {
+ QStringList features() const Q_DECL_OVERRIDE {
return QStringList("sasl");
}
- QCA::Provider::Context* createContext(const QString& cap)
+ QCA::Provider::Context* createContext(const QString& cap) Q_DECL_OVERRIDE
{
if(cap == "sasl")
return new SimpleSASLContext(this);
return 0;
}
- int qcaVersion() const
+ int qcaVersion() const Q_DECL_OVERRIDE
{
return QCA_VERSION;
}
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
index d015a2c..ea42cac 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp.h
@@ -147,14 +147,14 @@ namespace XMPP
void changePollInterval(int secs);
- void setOptHostPort(const QString &host, quint16 port);
- void connectToServer(const QString &server);
- ByteStream *stream() const;
- void done();
+ void setOptHostPort(const QString &host, quint16 port) Q_DECL_OVERRIDE;
+ void connectToServer(const QString &server) Q_DECL_OVERRIDE;
+ ByteStream *stream() const Q_DECL_OVERRIDE;
+ void done() Q_DECL_OVERRIDE;
int errorCode() const;
- virtual QString host() const;
+ QString host() const Q_DECL_OVERRIDE;
signals:
void srvLookup(const QString &server);
@@ -210,10 +210,10 @@ namespace XMPP
bool XMPPCertCheck();
bool certMatchesHostname();
- void reset();
- void startClient(const QString &host);
- void write(const QByteArray &a);
- void writeIncoming(const QByteArray &a);
+ void reset() Q_DECL_OVERRIDE;
+ void startClient(const QString &host) Q_DECL_OVERRIDE;
+ void write(const QByteArray &a) Q_DECL_OVERRIDE;
+ void writeIncoming(const QByteArray &a) Q_DECL_OVERRIDE;
signals:
void tlsHandshaken();
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 eeb74ca..702588c 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-core/xmpp_clientstream.h
@@ -138,18 +138,18 @@ namespace XMPP
void setCompress(bool);
// reimplemented
- QDomDocument & doc() const;
- QString baseNS() const;
- bool old() const;
-
- void close();
- bool stanzaAvailable() const;
- Stanza read();
- void write(const Stanza &s);
-
- int errorCondition() const;
- QString errorText() const;
- QDomElement errorAppSpec() const;
+ QDomDocument & doc() const Q_DECL_OVERRIDE;
+ QString baseNS() const Q_DECL_OVERRIDE;
+ bool old() const Q_DECL_OVERRIDE;
+
+ void close() Q_DECL_OVERRIDE;
+ bool stanzaAvailable() const Q_DECL_OVERRIDE;
+ Stanza read() Q_DECL_OVERRIDE;
+ void write(const Stanza &s) Q_DECL_OVERRIDE;
+
+ int errorCondition() const Q_DECL_OVERRIDE;
+ QString errorText() const Q_DECL_OVERRIDE;
+ QDomElement errorAppSpec() const Q_DECL_OVERRIDE;
// extra
void writeDirect(const QString &s);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
index 63c53b4..b94663d 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/filetransfer.h
@@ -170,8 +170,8 @@ namespace XMPP
qlonglong rangeLength() const;
QString streamType() const;
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
@@ -200,7 +200,7 @@ namespace XMPP
void respondError(const Jid &to, const QString &id,
Stanza::Error::ErrorCond cond, const QString &str);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
signals:
void incoming(const FTRequest &req);
diff --git a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
index ea037e7..646a7c0 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/s5b.h
@@ -72,30 +72,30 @@ namespace XMPP
void setProxy(const Jid &proxy);
void connectToJid(const Jid &peer, const QString &sid, Mode m = Stream);
- void connectToJid(const Jid &peer, const QString &sid) {
+ void connectToJid(const Jid &peer, const QString &sid) Q_DECL_OVERRIDE {
connectToJid(peer, sid, Stream);
}
- void accept();
- void close();
+ void accept() Q_DECL_OVERRIDE;
+ void close() Q_DECL_OVERRIDE;
- Jid peer() const;
- QString sid() const;
- BytestreamManager* manager() const;
+ Jid peer() const Q_DECL_OVERRIDE;
+ QString sid() const Q_DECL_OVERRIDE;
+ BytestreamManager* manager() const Q_DECL_OVERRIDE;
bool isRemote() const;
Mode mode() const;
int state() const;
- qint64 bytesAvailable() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const Q_DECL_OVERRIDE;
+ qint64 bytesToWrite() const Q_DECL_OVERRIDE;
void writeDatagram(const S5BDatagram &);
S5BDatagram readDatagram();
int datagramsAvailable() const;
protected:
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char * data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
+ qint64 readData(char * data, qint64 maxSize) Q_DECL_OVERRIDE;
signals:
void proxyQuery(); // querying proxy for streamhost information
@@ -147,16 +147,16 @@ namespace XMPP
S5BServer *server() const;
void setServer(S5BServer *s);
- bool isAcceptableSID(const Jid &peer, const QString &sid) const;
+ bool isAcceptableSID(const Jid &peer, const QString &sid) const Q_DECL_OVERRIDE;
- BSConnection *createConnection();
+ BSConnection *createConnection() Q_DECL_OVERRIDE;
S5BConnection *takeIncoming();
class Item;
class Entry;
protected:
- const char* sidPrefix() const;
+ const char* sidPrefix() const Q_DECL_OVERRIDE;
private slots:
void ps_incoming(const S5BRequest &req);
@@ -280,9 +280,9 @@ namespace XMPP
void requestProxyInfo(const Jid &to);
void requestActivation(const Jid &to, const QString &sid, const Jid &target);
- void onGo();
- void onDisconnect();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ void onDisconnect() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
Jid streamHostUsed() const;
StreamHost proxyInfo() const;
@@ -318,7 +318,7 @@ namespace XMPP
void sendUDPSuccess(const Jid &to, const QString &dstaddr);
void sendActivate(const Jid &to, const QString &sid, const Jid &streamHost);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
signals:
void incoming(const S5BRequest &req);
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 2cea312..c79e518 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_discoinfotask.h
@@ -48,8 +48,8 @@ namespace XMPP
const Jid& jid() const;
const QString& node() const;
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private slots:
void cachedReady();
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 2776b1f..c243d77 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_ibb.h
@@ -63,19 +63,19 @@ namespace XMPP
IBBConnection(IBBManager *);
~IBBConnection();
- void connectToJid(const Jid &peer, const QString &sid);
- void accept();
- void close();
+ void connectToJid(const Jid &peer, const QString &sid) Q_DECL_OVERRIDE;
+ void accept() Q_DECL_OVERRIDE;
+ void close() Q_DECL_OVERRIDE;
int state() const;
- Jid peer() const;
- QString sid() const;
- BytestreamManager* manager() const;
+ Jid peer() const Q_DECL_OVERRIDE;
+ QString sid() const Q_DECL_OVERRIDE;
+ BytestreamManager* manager() const Q_DECL_OVERRIDE;
bool isOpen() const;
protected:
- qint64 writeData(const char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE;
signals:
void connected();
@@ -109,8 +109,8 @@ namespace XMPP
static const char* ns();
Client *client() const;
- bool isAcceptableSID(const Jid &peer, const QString &sid) const;
- BSConnection *createConnection();
+ bool isAcceptableSID(const Jid &peer, const QString &sid) const Q_DECL_OVERRIDE;
+ BSConnection *createConnection() Q_DECL_OVERRIDE;
IBBConnection *takeIncoming();
public slots:
@@ -118,7 +118,7 @@ namespace XMPP
const IBBData &data, Stanza::Kind);
protected:
- const char* sidPrefix() const;
+ const char* sidPrefix() const Q_DECL_OVERRIDE;
private slots:
void ibb_incomingRequest(const Jid &from, const QString &id,
@@ -155,8 +155,8 @@ namespace XMPP
Stanza::Error::ErrorCond cond, const QString &text = "");
void respondAck(const Jid &to, const QString &id);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
Jid jid() const;
int mode() const;
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 7f32991..97b8f60 100644
--- a/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h
+++ b/protocols/jabber/libiris/src/xmpp/xmpp-im/xmpp_tasks.h
@@ -56,8 +56,8 @@ namespace XMPP
void setForm(const Form &);
void setForm(const Jid&, const XData &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
QDomElement iq;
@@ -76,7 +76,7 @@ namespace XMPP
void unreg(const Jid &);
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private slots:
void getFormFinished();
@@ -103,8 +103,8 @@ namespace XMPP
QString toString() const;
bool fromString(const QString &);
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
private:
int type;
@@ -122,7 +122,7 @@ namespace XMPP
JT_PushRoster(Task *parent);
~JT_PushRoster();
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
signals:
void roster(const Roster &);
@@ -144,7 +144,7 @@ namespace XMPP
void sub(const Jid &, const QString &subType, const QString& nick = QString());
void probe(const Jid &to);
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
QDomElement tag;
@@ -161,7 +161,7 @@ namespace XMPP
JT_PushPresence(Task *parent);
~JT_PushPresence();
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
signals:
void presence(const Jid &, const Status &);
@@ -176,8 +176,8 @@ namespace XMPP
{
public:
JT_Session(Task *parent);
- void onGo();
- bool take(const QDomElement&);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement&) Q_DECL_OVERRIDE;
};
class JT_Message : public Task
@@ -187,7 +187,7 @@ namespace XMPP
JT_Message(Task *parent, const Message &);
~JT_Message();
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
Message m;
@@ -203,7 +203,7 @@ namespace XMPP
JT_PushMessage(Task *parent);
~JT_PushMessage();
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
signals:
void message(const Message &);
@@ -223,8 +223,8 @@ namespace XMPP
const AgentList & agents() const;
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
private:
class Private;
@@ -249,8 +249,8 @@ namespace XMPP
const Jid & jid() const;
const VCard & vcard() const;
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
private:
int type;
@@ -276,8 +276,8 @@ namespace XMPP
void set(const Form &);
void set(const Jid &, const XData &);
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
private:
QDomElement iq;
@@ -294,8 +294,8 @@ namespace XMPP
JT_ClientVersion(Task *);
void get(const Jid &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
const Jid & jid() const;
const QString & name() const;
@@ -314,8 +314,8 @@ namespace XMPP
public:
JT_EntityTime(Task*);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
void get(const XMPP::Jid &j);
const XMPP::Jid & jid() const;
@@ -336,7 +336,7 @@ namespace XMPP
JT_ServInfo(Task *);
~JT_ServInfo();
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
};
class JT_Gateway : public Task
@@ -347,8 +347,8 @@ namespace XMPP
void get(const Jid &);
void set(const Jid &, const QString &prompt);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
Jid jid() const;
@@ -377,8 +377,8 @@ namespace XMPP
const AgentList & agents() const;
const AgentItem & root() const;
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
@@ -399,8 +399,8 @@ namespace XMPP
const DiscoList &items() const;
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
@@ -416,8 +416,8 @@ namespace XMPP
void set(const Jid &, const DiscoList &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
@@ -430,7 +430,7 @@ namespace XMPP
public:
JT_BoBServer(Task *parent);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
};
class JT_BitsOfBinary : public Task
@@ -442,8 +442,8 @@ namespace XMPP
void get(const Jid &, const QString &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
BoBData &data();
private:
@@ -456,7 +456,7 @@ namespace XMPP
Q_OBJECT
public:
JT_PongServer(Task *);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
};
class JT_MessageCarbons : public Task
@@ -468,8 +468,8 @@ namespace XMPP
void enable();
void disable();
- void onGo();
- bool take(const QDomElement &e);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &e) Q_DECL_OVERRIDE;
private:
QDomElement _iq;
@@ -486,8 +486,8 @@ namespace XMPP
void set(const Jid &, const CaptchaChallenge &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
@@ -502,8 +502,8 @@ namespace XMPP
void set(const Jid &, const XData &);
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
Jid to;
diff --git a/protocols/jabber/tasks/jt_ahcommand.h b/protocols/jabber/tasks/jt_ahcommand.h
index b419f68..e7979d8 100644
--- a/protocols/jabber/tasks/jt_ahcommand.h
+++ b/protocols/jabber/tasks/jt_ahcommand.h
@@ -68,8 +68,8 @@ public:
JT_AHCommand(const XMPP::Jid &jid, const AHCommand &command, XMPP::Task *parent);
~JT_AHCommand();
- void onGo();
- bool take(const QDomElement &e);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &e) Q_DECL_OVERRIDE;
private:
XMPP::Jid mJid;
AHCommand mCommand;
@@ -87,8 +87,8 @@ public:
JT_AHCGetList(XMPP::Task *t, const XMPP::Jid &j);
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
const QList<Item> &commands() const {return mCommands; }
diff --git a/protocols/jabber/tasks/jt_getlastactivity.h b/protocols/jabber/tasks/jt_getlastactivity.h
index a744067..00e40d9 100644
--- a/protocols/jabber/tasks/jt_getlastactivity.h
+++ b/protocols/jabber/tasks/jt_getlastactivity.h
@@ -36,8 +36,8 @@ class JT_GetLastActivity : public XMPP::Task
int seconds() const;
const QString &message() const;
- void onGo();
- bool take(const QDomElement &x);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &x) Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/protocols/jabber/tasks/jt_privatestorage.h b/protocols/jabber/tasks/jt_privatestorage.h
index b2f0f6f..b4f2409 100644
--- a/protocols/jabber/tasks/jt_privatestorage.h
+++ b/protocols/jabber/tasks/jt_privatestorage.h
@@ -35,8 +35,8 @@ class JT_PrivateStorage : public XMPP::Task
QDomElement element();
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/protocols/jabber/tasks/jt_pubsub.h b/protocols/jabber/tasks/jt_pubsub.h
index 6cac9e4..2b4a114 100644
--- a/protocols/jabber/tasks/jt_pubsub.h
+++ b/protocols/jabber/tasks/jt_pubsub.h
@@ -33,8 +33,8 @@ public:
JT_PubSubPublish(XMPP::Task *parent, const QString &node, XMPP::PubSubItem &psitem);
~JT_PubSubPublish();
- void onGo();
- bool take(const QDomElement &);
+ void onGo() Q_DECL_OVERRIDE;
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
private:
QDomElement mIQ;
diff --git a/protocols/jabber/tasks/jt_xregister.h b/protocols/jabber/tasks/jt_xregister.h
index de2455c..bc952ab 100644
--- a/protocols/jabber/tasks/jt_xregister.h
+++ b/protocols/jabber/tasks/jt_xregister.h
@@ -29,11 +29,11 @@ public:
void setXForm(const Form &frm, const XData &_form);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
QDomElement iq() const;
QDomElement xdataElement() const;
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
QDomElement _iq;
diff --git a/protocols/jabber/tasks/jt_xsearch.h b/protocols/jabber/tasks/jt_xsearch.h
index 573f89b..f55844f 100644
--- a/protocols/jabber/tasks/jt_xsearch.h
+++ b/protocols/jabber/tasks/jt_xsearch.h
@@ -29,10 +29,10 @@ public:
void setForm(const Form &frm, const XData &_form);
- bool take(const QDomElement &);
+ bool take(const QDomElement &) Q_DECL_OVERRIDE;
QDomElement iq() const;
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
QDomElement _iq;
diff --git a/protocols/jabber/tasks/privacymanager.h b/protocols/jabber/tasks/privacymanager.h
index 31efab4..a7731b3 100644
--- a/protocols/jabber/tasks/privacymanager.h
+++ b/protocols/jabber/tasks/privacymanager.h
@@ -39,7 +39,7 @@ class PrivacyListListener : public Task
public:
PrivacyListListener ( Task* parent );
- bool take ( const QDomElement &e );
+ bool take ( const QDomElement &e ) Q_DECL_OVERRIDE;
};
class GetPrivacyListsTask : public Task
@@ -54,8 +54,8 @@ class GetPrivacyListsTask : public Task
public:
GetPrivacyListsTask ( Task* parent );
- void onGo();
- bool take ( const QDomElement &x );
+ void onGo() Q_DECL_OVERRIDE;
+ bool take ( const QDomElement &x ) Q_DECL_OVERRIDE;
const QStringList& lists();
const QString& defaultList();
const QString& activeList();
@@ -73,11 +73,11 @@ class SetPrivacyListsTask : public Task
public:
SetPrivacyListsTask ( Task* parent );
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setActive ( const QString& active );
void setDefault ( const QString& d );
void setList ( const PrivacyList& list );
- bool take ( const QDomElement &x );
+ bool take ( const QDomElement &x ) Q_DECL_OVERRIDE;
};
class GetPrivacyListTask : public Task
@@ -92,8 +92,8 @@ class GetPrivacyListTask : public Task
public:
GetPrivacyListTask ( Task* parent, const QString& name );
- void onGo();
- bool take ( const QDomElement &x );
+ void onGo() Q_DECL_OVERRIDE;
+ bool take ( const QDomElement &x ) Q_DECL_OVERRIDE;
const PrivacyList& list();
};
diff --git a/protocols/jabber/ui/dlgjabberbookmarkeditor.cpp b/protocols/jabber/ui/dlgjabberbookmarkeditor.cpp
index e2afbec..ede7e7e 100644
--- a/protocols/jabber/ui/dlgjabberbookmarkeditor.cpp
+++ b/protocols/jabber/ui/dlgjabberbookmarkeditor.cpp
@@ -44,7 +44,7 @@ class JabberBookmarkModel : public QAbstractListModel
return m_bookmarks;
}
- int rowCount( const QModelIndex &parent ) const
+ int rowCount( const QModelIndex &parent ) const Q_DECL_OVERRIDE
{
if ( parent.isValid() )
return 0;
@@ -52,7 +52,7 @@ class JabberBookmarkModel : public QAbstractListModel
return m_bookmarks.count();
}
- QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const
+ QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE
{
if ( index.row() >= m_bookmarks.count() )
return QVariant();
@@ -72,7 +72,7 @@ class JabberBookmarkModel : public QAbstractListModel
return QVariant();
}
- bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole )
+ bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole ) Q_DECL_OVERRIDE
{
if ( index.row() >= m_bookmarks.count() )
return false;
@@ -91,7 +91,7 @@ class JabberBookmarkModel : public QAbstractListModel
return false;
}
- bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() )
+ bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) Q_DECL_OVERRIDE
{
beginRemoveRows( parent, row, row + count - 1 );
for ( int i = 0; i < count; ++i )
diff --git a/protocols/jabber/ui/dlgjabberservices.h b/protocols/jabber/ui/dlgjabberservices.h
index 6eb6d2c..0692287 100644
--- a/protocols/jabber/ui/dlgjabberservices.h
+++ b/protocols/jabber/ui/dlgjabberservices.h
@@ -42,7 +42,7 @@ public:
protected:
void initTree();
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
private slots:
//void slotSetSelection (Q3ListViewItem *);
diff --git a/protocols/jabber/ui/jabberaddcontactpage.h b/protocols/jabber/ui/jabberaddcontactpage.h
index 124d122..76b882b 100644
--- a/protocols/jabber/ui/jabberaddcontactpage.h
+++ b/protocols/jabber/ui/jabberaddcontactpage.h
@@ -36,8 +36,8 @@ class JabberAddContactPage:public AddContactPage
public:
explicit JabberAddContactPage (Kopete::Account * owner, QWidget * parent = nullptr);
~JabberAddContactPage ();
- virtual bool validateData ();
- virtual bool apply (Kopete::Account *, Kopete::MetaContact *);
+ bool validateData () Q_DECL_OVERRIDE;
+ bool apply (Kopete::Account *, Kopete::MetaContact *) Q_DECL_OVERRIDE;
Ui::dlgAddContact *jabData;
QLabel *noaddMsg1;
QLabel *noaddMsg2;
diff --git a/protocols/jabber/ui/jabbereditaccountwidget.h b/protocols/jabber/ui/jabbereditaccountwidget.h
index 7633f61..36c6d0b 100644
--- a/protocols/jabber/ui/jabbereditaccountwidget.h
+++ b/protocols/jabber/ui/jabbereditaccountwidget.h
@@ -42,8 +42,8 @@ Q_OBJECT
public:
JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, QWidget * parent = nullptr);
~JabberEditAccountWidget ();
- virtual bool validateData ();
- virtual Kopete::Account *apply ();
+ bool validateData () Q_DECL_OVERRIDE;
+ Kopete::Account *apply () Q_DECL_OVERRIDE;
JabberAccount *account ();
private slots:
diff --git a/protocols/jabber/ui/jabberregisteraccount.h b/protocols/jabber/ui/jabberregisteraccount.h
index f17c6d1..d27cf64 100644
--- a/protocols/jabber/ui/jabberregisteraccount.h
+++ b/protocols/jabber/ui/jabberregisteraccount.h
@@ -47,7 +47,7 @@ public:
void setServer ( const QString &server );
public slots:
- virtual void accept ();
+ void accept () Q_DECL_OVERRIDE;
private slots:
void slotChooseServer ();
diff --git a/protocols/jabber/ui/privacylistblockedmodel.h b/protocols/jabber/ui/privacylistblockedmodel.h
index fd6fdc3..e9f3b94 100644
--- a/protocols/jabber/ui/privacylistblockedmodel.h
+++ b/protocols/jabber/ui/privacylistblockedmodel.h
@@ -28,9 +28,9 @@ class PrivacyListBlockedModel : public QSortFilterProxyModel
public:
PrivacyListBlockedModel(QObject* parent = NULL);
- bool lessThan(const QModelIndex & left, const QModelIndex & right ) const;
- bool filterAcceptsColumn(int source_column, const QModelIndex & source_parent ) const;
- bool filterAcceptsRow(int source_row, const QModelIndex & source_parent ) const;
+ bool lessThan(const QModelIndex & left, const QModelIndex & right ) const Q_DECL_OVERRIDE;
+ bool filterAcceptsColumn(int source_column, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE;
+ bool filterAcceptsRow(int source_row, const QModelIndex & source_parent ) const Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/jabber/ui/privacylistmodel.h b/protocols/jabber/ui/privacylistmodel.h
index 0817fa8..da3b12e 100644
--- a/protocols/jabber/ui/privacylistmodel.h
+++ b/protocols/jabber/ui/privacylistmodel.h
@@ -38,10 +38,10 @@ public:
PrivacyListModel(const PrivacyList& list = PrivacyList(""), QObject* parent = NULL);
// Overridden from QAbstractListModel
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent = QModelIndex()) const;
- QVariant data(const QModelIndex &index, int role) const;
- bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex());
+ int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
+ bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE;
void reset() { QAbstractListModel::reset(); } // Not really clean
// Own functions
diff --git a/protocols/jabber/xoauth2provider.cpp b/protocols/jabber/xoauth2provider.cpp
index 819951c..5bc1f27 100644
--- a/protocols/jabber/xoauth2provider.cpp
+++ b/protocols/jabber/xoauth2provider.cpp
@@ -56,7 +56,7 @@ public:
reset();
}
- virtual QCA::Provider::Context *clone() const {
+ QCA::Provider::Context *clone() const Q_DECL_OVERRIDE {
XOAuth2SASLContext *s = new XOAuth2SASLContext(provider());
s->user = user;
s->clientId = clientId;
@@ -67,7 +67,7 @@ public:
return s;
}
- virtual void reset() {
+ void reset() Q_DECL_OVERRIDE {
user.clear();
clientId.clear();
clientSecretKey.clear();
@@ -78,13 +78,13 @@ public:
authCondition_ = QCA::SASL::AuthFail;
}
- virtual void setup(const QString &, const QString &, const QCA::SASLContext::HostPort *, const QCA::SASLContext::HostPort *, const QString &, int) {
+ void setup(const QString &, const QString &, const QCA::SASLContext::HostPort *, const QCA::SASLContext::HostPort *, const QString &, int) Q_DECL_OVERRIDE {
}
- virtual void setConstraints(QCA::SASL::AuthFlags, int, int) {
+ void setConstraints(QCA::SASL::AuthFlags, int, int) Q_DECL_OVERRIDE {
}
- virtual void startClient(const QStringList &mechlist, bool) {
+ void startClient(const QStringList &mechlist, bool) Q_DECL_OVERRIDE {
if (!mechlist.contains(QLatin1String("X-OAUTH2"))) {
qWarning("No X-OAUTH2 auth method");
authCondition_ = QCA::SASL::NoMechanism;
@@ -97,21 +97,21 @@ public:
tryAgain();
}
- virtual void startServer(const QString &, bool) {
+ void startServer(const QString &, bool) Q_DECL_OVERRIDE {
result_ = QCA::SASLContext::Error;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual void serverFirstStep(const QString &, const QByteArray *) {
+ void serverFirstStep(const QString &, const QByteArray *) Q_DECL_OVERRIDE {
result_ = QCA::SASLContext::Error;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual void nextStep(const QByteArray &) {
+ void nextStep(const QByteArray &) Q_DECL_OVERRIDE {
tryAgain();
}
- virtual void tryAgain() {
+ void tryAgain() Q_DECL_OVERRIDE {
if (user.isEmpty() || (accessToken.isEmpty() && (clientId.isEmpty() || clientSecretKey.isEmpty() || requestUrl.isEmpty() || refreshToken.isEmpty()))) {
result_ = QCA::SASLContext::Params;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
@@ -124,64 +124,64 @@ public:
sendAuth();
}
- virtual void update(const QByteArray &from_net, const QByteArray &from_app) {
+ void update(const QByteArray &from_net, const QByteArray &from_app) Q_DECL_OVERRIDE {
result_to_app = from_net;
result_to_net = from_app;
result_ = QCA::SASLContext::Success;
QMetaObject::invokeMethod(this, "resultsReady", Qt::QueuedConnection);
}
- virtual bool waitForResultsReady(int) {
+ bool waitForResultsReady(int) Q_DECL_OVERRIDE {
return true;
}
- virtual QCA::SASLContext::Result result() const {
+ QCA::SASLContext::Result result() const Q_DECL_OVERRIDE {
return result_;
}
- virtual QStringList mechlist() const {
+ QStringList mechlist() const Q_DECL_OVERRIDE {
return QStringList();
}
- virtual QString mech() const {
+ QString mech() const Q_DECL_OVERRIDE {
return QLatin1String("X-OAUTH2");
}
- virtual bool haveClientInit() const {
+ bool haveClientInit() const Q_DECL_OVERRIDE {
return false;
}
- virtual QByteArray stepData() const {
+ QByteArray stepData() const Q_DECL_OVERRIDE {
return data;
}
- virtual QByteArray to_net() {
+ QByteArray to_net() Q_DECL_OVERRIDE {
return result_to_net;
}
- virtual int encoded() const {
+ int encoded() const Q_DECL_OVERRIDE {
return result_to_net.size();
}
- virtual QByteArray to_app() {
+ QByteArray to_app() Q_DECL_OVERRIDE {
return result_to_app;
}
- virtual int ssf() const {
+ int ssf() const Q_DECL_OVERRIDE {
return 0;
}
- virtual QCA::SASL::AuthCondition authCondition() const {
+ QCA::SASL::AuthCondition authCondition() const Q_DECL_OVERRIDE {
return authCondition_;
}
- virtual QCA::SASL::Params clientParams() const {
+ QCA::SASL::Params clientParams() const Q_DECL_OVERRIDE {
bool needUser = user.isEmpty();
bool needPass = (accessToken.isEmpty() && (clientId.isEmpty() || clientSecretKey.isEmpty() || requestUrl.isEmpty() || refreshToken.isEmpty()));
return QCA::SASL::Params(needUser, false, needPass, false);
}
- virtual void setClientParams(const QString *userParam, const QString *, const QCA::SecureArray *passParam, const QString *) {
+ void setClientParams(const QString *userParam, const QString *, const QCA::SecureArray *passParam, const QString *) Q_DECL_OVERRIDE {
if (userParam)
user = *userParam;
if (passParam) {
@@ -205,15 +205,15 @@ public:
}
}
- virtual QStringList realmlist() const {
+ QStringList realmlist() const Q_DECL_OVERRIDE {
return QStringList();
}
- virtual QString username() const {
+ QString username() const Q_DECL_OVERRIDE {
return QString();
}
- virtual QString authzid() const {
+ QString authzid() const Q_DECL_OVERRIDE {
return QString();
}
@@ -302,22 +302,22 @@ public:
virtual ~QCAXOAuth2SASL() {
}
- virtual void init() {
+ void init() Q_DECL_OVERRIDE {
}
- virtual int qcaVersion() const {
+ int qcaVersion() const Q_DECL_OVERRIDE {
return QCA_VERSION;
}
- virtual QString name() const {
+ QString name() const Q_DECL_OVERRIDE {
return QLatin1String("xoauth2sasl");
}
- virtual QStringList features() const {
+ QStringList features() const Q_DECL_OVERRIDE {
return QStringList(QLatin1String("sasl"));
}
- QCA::Provider::Context *createContext(const QString& type) {
+ QCA::Provider::Context *createContext(const QString& type) Q_DECL_OVERRIDE {
if (type == QLatin1String("sasl"))
return new XOAuth2SASLContext(this);
return NULL;
diff --git a/protocols/oscar/aim/aimaccount.h b/protocols/oscar/aim/aimaccount.h
index 1d8e290..e489389 100644
--- a/protocols/oscar/aim/aimaccount.h
+++ b/protocols/oscar/aim/aimaccount.h
@@ -53,11 +53,11 @@ class AIMMyselfContact : public OscarMyselfContact
Q_OBJECT
public:
AIMMyselfContact( AIMAccount *acct );
- void userInfoUpdated();
+ void userInfoUpdated() Q_DECL_OVERRIDE;
void setOwnProfile( const QString& newProfile );
QString userProfile();
- virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate );
+ Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags canCreate,
Oscar::WORD exchange, const QString& room );
@@ -87,9 +87,9 @@ public:
AIMProtocol *protocol() const;
// fill the menu for this account
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
- virtual void connectWithPassword( const QString &password );
+ void connectWithPassword( const QString &password ) Q_DECL_OVERRIDE;
void setUserProfile(const QString &profile);
@@ -98,8 +98,8 @@ public:
public slots:
/** Reimplementation from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
- void setStatusMessage( const Kopete::StatusMessage& statusMessage );
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
+ void setStatusMessage( const Kopete::StatusMessage& statusMessage ) Q_DECL_OVERRIDE;
void slotEditInfo();
void slotToggleInvisible();
@@ -109,9 +109,9 @@ public slots:
protected slots:
void joinChatDialogClosed( int );
- virtual void loginActions();
- virtual void disconnected( Kopete::Account::DisconnectReason reason );
- virtual void messageReceived( const Oscar::Message& message );
+ void loginActions() Q_DECL_OVERRIDE;
+ void disconnected( Kopete::Account::DisconnectReason reason ) Q_DECL_OVERRIDE;
+ void messageReceived( const Oscar::Message& message ) Q_DECL_OVERRIDE;
void connectedToChatRoom( Oscar::WORD exchange, const QString& roomName );
void userJoinedChat( Oscar::WORD exchange, const QString& room, const QString& contact );
@@ -123,7 +123,7 @@ protected:
* Implement virtual method from OscarAccount
* This allows OscarAccount to take care of adding new contacts
*/
- OscarContact *createNewContact( const QString &contactId, Kopete::MetaContact *parentContact, const OContact& ssiItem );
+ OscarContact *createNewContact( const QString &contactId, Kopete::MetaContact *parentContact, const OContact& ssiItem ) Q_DECL_OVERRIDE;
private:
Oscar::Presence presence();
diff --git a/protocols/oscar/aim/aimchatsession.h b/protocols/oscar/aim/aimchatsession.h
index 22df0b9..a99f531 100644
--- a/protocols/oscar/aim/aimchatsession.h
+++ b/protocols/oscar/aim/aimchatsession.h
@@ -74,7 +74,7 @@ public:
* @p contactId is the id of the contact. the contact is supposed to be of the same account as
* the @ref account() but we can't be sure the Kopete::Contact is really on the contact list
*/
- virtual void inviteContact(const QString &contactId);
+ void inviteContact(const QString &contactId) Q_DECL_OVERRIDE;
private:
QString m_roomName;
diff --git a/protocols/oscar/aim/aimcontact.h b/protocols/oscar/aim/aimcontact.h
index f90fab0..0dc81f1 100644
--- a/protocols/oscar/aim/aimcontact.h
+++ b/protocols/oscar/aim/aimcontact.h
@@ -34,19 +34,19 @@ public:
const QString& icon = QString() );
virtual ~AIMContact();
- bool isReachable();
- QList<QAction*> *customContextMenuActions();
+ bool isReachable() Q_DECL_OVERRIDE;
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using AIMContactBase::customContextMenuActions;
int warningLevel() const;
- virtual void setSSIItem( const OContact& ssiItem );
+ void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
public slots:
- void slotUserInfo();
- void userInfoUpdated( const QString& contact, const UserDetails& details );
- void userOnline( const QString& userId );
- void userOffline( const QString& userId );
+ void slotUserInfo() Q_DECL_OVERRIDE;
+ 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;
void updateProfile( const QString& contact, const QString& profile );
void gotWarning( const QString& contact, quint16, quint16 );
diff --git a/protocols/oscar/aim/aimprotocol.h b/protocols/oscar/aim/aimprotocol.h
index 76bb1fe..a27221f 100644
--- a/protocols/oscar/aim/aimprotocol.h
+++ b/protocols/oscar/aim/aimprotocol.h
@@ -29,7 +29,7 @@ class AIMProtocolHandler : public Kopete::MimeTypeHandler
{
public:
AIMProtocolHandler();
- void handleURL( const QString&, const QUrl & url ) const;
+ void handleURL( const QString&, const QUrl & url ) const Q_DECL_OVERRIDE;
using Kopete::MimeTypeHandler::handleURL;
};
@@ -48,11 +48,11 @@ public:
bool canSendOffline() const { return false; }
- AddContactPage*createAddContactWidget( QWidget *parent, Kopete::Account *account );
- KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, QWidget *parent );
- Kopete::Account* createNewAccount( const QString &accountId );
+ AddContactPage*createAddContactWidget( QWidget *parent, Kopete::Account *account ) Q_DECL_OVERRIDE;
+ KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, QWidget *parent ) Q_DECL_OVERRIDE;
+ Kopete::Account* createNewAccount( const QString &accountId ) Q_DECL_OVERRIDE;
- OscarStatusManager *statusManager() const;
+ OscarStatusManager *statusManager() const Q_DECL_OVERRIDE;
const Kopete::PropertyTmpl clientProfile;
diff --git a/protocols/oscar/aim/aimstatusmanager.h b/protocols/oscar/aim/aimstatusmanager.h
index 5760844..e68ec1f 100644
--- a/protocols/oscar/aim/aimstatusmanager.h
+++ b/protocols/oscar/aim/aimstatusmanager.h
@@ -29,9 +29,9 @@ public:
AIMStatusManager();
~AIMStatusManager();
- virtual Kopete::OnlineStatus connectingStatus() const;
- virtual Kopete::OnlineStatus unknownStatus() const;
- virtual Kopete::OnlineStatus waitingForAuth() const;
+ Kopete::OnlineStatus connectingStatus() const Q_DECL_OVERRIDE;
+ Kopete::OnlineStatus unknownStatus() const Q_DECL_OVERRIDE;
+ Kopete::OnlineStatus waitingForAuth() const Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/protocols/oscar/aim/icqcontact.h b/protocols/oscar/aim/icqcontact.h
index 6243d06..5f37f97 100644
--- a/protocols/oscar/aim/icqcontact.h
+++ b/protocols/oscar/aim/icqcontact.h
@@ -50,19 +50,19 @@ public:
* Returns a set of custom menu items for
* the context menu
*/
- virtual QList<QAction*> *customContextMenuActions();
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using ICQContactBase::customContextMenuActions;
/** Return whether or not this contact is reachable. */
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
- virtual void setSSIItem( const OContact& ssiItem );
+ void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
public slots:
- void userInfoUpdated( const QString& contact, const UserDetails& details );
+ void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
- void userOnline( const QString& userId );
- void userOffline( const QString& userID );
+ void userOnline( const QString& userId ) Q_DECL_OVERRIDE;
+ void userOffline( const QString& userID ) Q_DECL_OVERRIDE;
void loggedIn();
private:
diff --git a/protocols/oscar/aim/ui/aimaddcontactpage.h b/protocols/oscar/aim/ui/aimaddcontactpage.h
index 1120938..f0787e6 100644
--- a/protocols/oscar/aim/ui/aimaddcontactpage.h
+++ b/protocols/oscar/aim/ui/aimaddcontactpage.h
@@ -22,9 +22,9 @@ public:
~AIMAddContactPage();
/** Validates the data entered */
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
/** Applies the addition to the account */
- virtual bool apply( Kopete::Account *account, Kopete::MetaContact *);
+ bool apply( Kopete::Account *account, Kopete::MetaContact *) Q_DECL_OVERRIDE;
protected:
/** The actual GUI */
diff --git a/protocols/oscar/aim/ui/aimeditaccountwidget.h b/protocols/oscar/aim/ui/aimeditaccountwidget.h
index 74f278f..de0187b 100644
--- a/protocols/oscar/aim/ui/aimeditaccountwidget.h
+++ b/protocols/oscar/aim/ui/aimeditaccountwidget.h
@@ -44,8 +44,8 @@ public:
QWidget *parent=0);
virtual ~AIMEditAccountWidget();
- virtual bool validateData();
- virtual Kopete::Account *apply();
+ bool validateData() Q_DECL_OVERRIDE;
+ Kopete::Account *apply() Q_DECL_OVERRIDE;
private slots:
void slotOpenRegister();
diff --git a/protocols/oscar/icq/aimcontact.h b/protocols/oscar/icq/aimcontact.h
index c74ac5a..1533060 100644
--- a/protocols/oscar/icq/aimcontact.h
+++ b/protocols/oscar/icq/aimcontact.h
@@ -34,21 +34,21 @@ public:
const QString& icon = QString() );
virtual ~AIMContact();
- bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
/**
* Returns a set of custom menu items for
* the context menu
*/
- virtual QList<QAction*> *customContextMenuActions();
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using AIMContactBase::customContextMenuActions;
- virtual void setSSIItem( const OContact& ssiItem );
+ void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
public slots:
- void userInfoUpdated( const QString& contact, const UserDetails& details );
- void userOnline( const QString& userId );
- void userOffline( const QString& userId );
+ 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:
diff --git a/protocols/oscar/icq/icqaccount.h b/protocols/oscar/icq/icqaccount.h
index bddafee..0cae156 100644
--- a/protocols/oscar/icq/icqaccount.h
+++ b/protocols/oscar/icq/icqaccount.h
@@ -39,7 +39,7 @@ class ICQMyselfContact : public OscarMyselfContact
Q_OBJECT
public:
ICQMyselfContact( ICQAccount *acct );
- void userInfoUpdated();
+ void userInfoUpdated() Q_DECL_OVERRIDE;
public slots:
void receivedShortInfo( const QString& );
@@ -58,23 +58,23 @@ public:
ICQProtocol *protocol();
// fill the menu for this account
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/** Reimplementation from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus&, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
- void setStatusMessage( const Kopete::StatusMessage& );
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
+ void setStatusMessage( const Kopete::StatusMessage& ) Q_DECL_OVERRIDE;
- void connectWithPassword( const QString &password );
+ void connectWithPassword( const QString &password ) Q_DECL_OVERRIDE;
void setUserProfile( const QString &profile );
protected:
- virtual OscarContact *createNewContact( const QString &contactId, Kopete::MetaContact *parentContact, const OContact& ssiItem );
+ OscarContact *createNewContact( const QString &contactId, Kopete::MetaContact *parentContact, const OContact& ssiItem ) Q_DECL_OVERRIDE;
protected slots:
- virtual void loginActions();
- virtual void disconnected( DisconnectReason reason );
+ void loginActions() Q_DECL_OVERRIDE;
+ void disconnected( DisconnectReason reason ) Q_DECL_OVERRIDE;
private:
diff --git a/protocols/oscar/icq/icqcontact.h b/protocols/oscar/icq/icqcontact.h
index 9617304..645c407 100644
--- a/protocols/oscar/icq/icqcontact.h
+++ b/protocols/oscar/icq/icqcontact.h
@@ -47,23 +47,23 @@ public:
* Returns a set of custom menu items for
* the context menu
*/
- virtual QList<QAction*> *customContextMenuActions();
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using ICQContactBase::customContextMenuActions;
/** Return whether or not this contact is reachable. */
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
- virtual void setSSIItem( const OContact& ssiItem );
+ void setSSIItem( const OContact& ssiItem ) Q_DECL_OVERRIDE;
/** Set encoding for this contact */
- virtual void setEncoding( int mib );
+ void setEncoding( int mib ) Q_DECL_OVERRIDE;
public slots:
- virtual void slotUserInfo();
- void userInfoUpdated( const QString& contact, const UserDetails& details );
+ void slotUserInfo() Q_DECL_OVERRIDE;
+ void userInfoUpdated( const QString& contact, const UserDetails& details ) Q_DECL_OVERRIDE;
- void userOnline( const QString& userId );
- void userOffline( const QString& userID );
+ void userOnline( const QString& userId ) Q_DECL_OVERRIDE;
+ void userOffline( const QString& userID ) Q_DECL_OVERRIDE;
void loggedIn();
signals:
diff --git a/protocols/oscar/icq/icqprotocol.h b/protocols/oscar/icq/icqprotocol.h
index 69ef534..82c3f00 100644
--- a/protocols/oscar/icq/icqprotocol.h
+++ b/protocols/oscar/icq/icqprotocol.h
@@ -28,7 +28,7 @@ class ICQProtocolHandler : public Kopete::MimeTypeHandler
{
public:
ICQProtocolHandler();
- void handleURL(const QString &mimeType, const QUrl & url) const;
+ void handleURL(const QString &mimeType, const QUrl & url) const Q_DECL_OVERRIDE;
using Kopete::MimeTypeHandler::handleURL;
};
@@ -48,11 +48,11 @@ public:
virtual bool canSendOffline() const;
- AddContactPage *createAddContactWidget(QWidget *parent, Kopete::Account *account);
- KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent);
- Kopete::Account *createNewAccount(const QString &accountId);
+ AddContactPage *createAddContactWidget(QWidget *parent, Kopete::Account *account) Q_DECL_OVERRIDE;
+ KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent) Q_DECL_OVERRIDE;
+ Kopete::Account *createNewAccount(const QString &accountId) Q_DECL_OVERRIDE;
- OscarStatusManager *statusManager() const;
+ OscarStatusManager *statusManager() const Q_DECL_OVERRIDE;
const Kopete::PropertyTmpl firstName;
diff --git a/protocols/oscar/icq/icqstatusmanager.h b/protocols/oscar/icq/icqstatusmanager.h
index 3b11740..e84e31b 100644
--- a/protocols/oscar/icq/icqstatusmanager.h
+++ b/protocols/oscar/icq/icqstatusmanager.h
@@ -36,9 +36,9 @@ public:
ICQStatusManager();
~ICQStatusManager();
- virtual Kopete::OnlineStatus connectingStatus() const;
- virtual Kopete::OnlineStatus unknownStatus() const;
- virtual Kopete::OnlineStatus waitingForAuth() const;
+ Kopete::OnlineStatus connectingStatus() const Q_DECL_OVERRIDE;
+ Kopete::OnlineStatus unknownStatus() const Q_DECL_OVERRIDE;
+ Kopete::OnlineStatus waitingForAuth() const Q_DECL_OVERRIDE;
void loadXtrazStatuses();
void saveXtrazStatuses();
diff --git a/protocols/oscar/icq/ui/iconcells.h b/protocols/oscar/icq/ui/iconcells.h
index a1ff4e9..a3f1cbd 100644
--- a/protocols/oscar/icq/ui/iconcells.h
+++ b/protocols/oscar/icq/ui/iconcells.h
@@ -53,7 +53,7 @@ public:
/** Returns the index of the cell which is currently selected */
int selectedIndex() const;
- virtual QSize sizeHint () const;
+ QSize sizeHint () const Q_DECL_OVERRIDE;
signals:
/** Emitted when a icon is selected in the table */
@@ -65,9 +65,9 @@ protected slots:
protected:
// the three methods below are used to ensure equal column widths and row heights
// for all cells and to update the widths/heights when the widget is resized
- virtual void resizeEvent( QResizeEvent* event );
- virtual int sizeHintForColumn( int column ) const;
- virtual int sizeHintForRow( int row ) const;
+ void resizeEvent( QResizeEvent* event ) Q_DECL_OVERRIDE;
+ int sizeHintForColumn( int column ) const Q_DECL_OVERRIDE;
+ int sizeHintForRow( int row ) const Q_DECL_OVERRIDE;
int rowFromIndex( int index ) const;
int columnFromIndex( int index ) const;
diff --git a/protocols/oscar/icq/ui/icqaddcontactpage.h b/protocols/oscar/icq/ui/icqaddcontactpage.h
index 7a8279d..07809eb 100644
--- a/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -39,13 +39,13 @@ public:
explicit ICQAddContactPage(ICQAccount *owner, QWidget *parent = nullptr);
~ICQAddContactPage();
- virtual bool validateData();
- virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact);
+ bool validateData() Q_DECL_OVERRIDE;
+ bool apply(Kopete::Account* , Kopete::MetaContact *parentContact) Q_DECL_OVERRIDE;
void setUINFromSearch( const QString& );
protected:
- void showEvent(QShowEvent *e);
+ void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
private slots:
void showSearchDialog();
diff --git a/protocols/oscar/icq/ui/icqchangepassworddialog.h b/protocols/oscar/icq/ui/icqchangepassworddialog.h
index fe3d478..bb0e2e0 100644
--- a/protocols/oscar/icq/ui/icqchangepassworddialog.h
+++ b/protocols/oscar/icq/ui/icqchangepassworddialog.h
@@ -35,7 +35,7 @@ public:
~ICQChangePasswordDialog();
protected slots:
- virtual void slotButtonClicked( int button );
+ void slotButtonClicked( int button ) Q_DECL_OVERRIDE;
private slots:
void slotPasswordChanged( bool error );
diff --git a/protocols/oscar/icq/ui/icqeditaccountwidget.h b/protocols/oscar/icq/ui/icqeditaccountwidget.h
index ec5ce4a..c7ff1fc 100644
--- a/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -40,8 +40,8 @@ public:
QWidget *parent=0);
~ICQEditAccountWidget();
- virtual bool validateData();
- virtual Kopete::Account *apply();
+ bool validateData() Q_DECL_OVERRIDE;
+ Kopete::Account *apply() Q_DECL_OVERRIDE;
private slots:
void slotOpenRegister();
diff --git a/protocols/oscar/icq/ui/icqsearchdialog.h b/protocols/oscar/icq/ui/icqsearchdialog.h
index a174fc8..4a41de3 100644
--- a/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -60,7 +60,7 @@ private slots:
void searchFinished( int numLeft );
protected slots:
- virtual void slotButtonClicked( int button );
+ void slotButtonClicked( int button ) Q_DECL_OVERRIDE;
private:
ICQAccount* m_account;
diff --git a/protocols/oscar/icq/ui/infocombobox.h b/protocols/oscar/icq/ui/infocombobox.h
index 761c129..38d1905 100644
--- a/protocols/oscar/icq/ui/infocombobox.h
+++ b/protocols/oscar/icq/ui/infocombobox.h
@@ -37,7 +37,7 @@ public:
void setReadOnly( bool readOnly );
bool isReadOnly() const;
- virtual void showPopup();
+ void showPopup() Q_DECL_OVERRIDE;
private:
bool mReadOnly;
diff --git a/protocols/oscar/icq/ui/xtrazstatusdelegate.h b/protocols/oscar/icq/ui/xtrazstatusdelegate.h
index 95d5082..9282efc 100644
--- a/protocols/oscar/icq/ui/xtrazstatusdelegate.h
+++ b/protocols/oscar/icq/ui/xtrazstatusdelegate.h
@@ -32,13 +32,13 @@ class StatusDelegate : public QItemDelegate
public:
explicit StatusDelegate( const QList<QIcon> &icons, QObject *parent = nullptr );
- QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
+ QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const Q_DECL_OVERRIDE;
- void setEditorData( QWidget *editor, const QModelIndex &index ) const;
+ void setEditorData( QWidget *editor, const QModelIndex &index ) const Q_DECL_OVERRIDE;
- void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const;
+ void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const Q_DECL_OVERRIDE;
- void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
+ void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const Q_DECL_OVERRIDE;
private:
QList<QIcon> mIcons;
diff --git a/protocols/oscar/icq/xtrazstatusmodel.h b/protocols/oscar/icq/xtrazstatusmodel.h
index 4ab26b7..0ba4215 100644
--- a/protocols/oscar/icq/xtrazstatusmodel.h
+++ b/protocols/oscar/icq/xtrazstatusmodel.h
@@ -32,20 +32,20 @@ public:
QList<Xtraz::Status> getStatuses() const;
void setStatuses( const QList<Xtraz::Status> &statusList );
- virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
- virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
+ int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
- virtual bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole );
- virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
+ bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole ) Q_DECL_OVERRIDE;
+ QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
- virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
+ QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
- virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
+ Qt::ItemFlags flags( const QModelIndex &index ) const Q_DECL_OVERRIDE;
bool swapRows( int i, int j );
- virtual bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() );
- virtual bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );
+ bool insertRows( int row, int count, const QModelIndex &parent = QModelIndex() ) Q_DECL_OVERRIDE;
+ bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() ) Q_DECL_OVERRIDE;
private:
QList<Xtraz::Status> mStatuses;
diff --git a/protocols/oscar/liboscar/client.cpp b/protocols/oscar/liboscar/client.cpp
index 51f51a7..948c27b 100644
--- a/protocols/oscar/liboscar/client.cpp
+++ b/protocols/oscar/liboscar/client.cpp
@@ -82,11 +82,11 @@ namespace
class DefaultCodecProvider : public Client::CodecProvider
{
public:
- virtual QTextCodec* codecForContact( const QString& ) const
+ QTextCodec* codecForContact( const QString& ) const Q_DECL_OVERRIDE
{
return QTextCodec::codecForMib( 4 );
}
- virtual QTextCodec* codecForAccount() const
+ QTextCodec* codecForAccount() const Q_DECL_OVERRIDE
{
return QTextCodec::codecForMib( 4 );
}
diff --git a/protocols/oscar/liboscar/flapprotocol.h b/protocols/oscar/liboscar/flapprotocol.h
index 70da835..0ca163f 100644
--- a/protocols/oscar/liboscar/flapprotocol.h
+++ b/protocols/oscar/liboscar/flapprotocol.h
@@ -39,7 +39,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an FlapTransfer object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/icquserinfo.h b/protocols/oscar/liboscar/icquserinfo.h
index 5c5b1b5..d94cc96 100644
--- a/protocols/oscar/liboscar/icquserinfo.h
+++ b/protocols/oscar/liboscar/icquserinfo.h
@@ -56,8 +56,8 @@ class LIBOSCAR_EXPORT ICQShortInfo : public ICQInfoBase
public:
ICQShortInfo();
~ICQShortInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
unsigned long uin;
@@ -75,8 +75,8 @@ class LIBOSCAR_EXPORT ICQGeneralUserInfo : public ICQInfoBase
public:
ICQGeneralUserInfo();
~ICQGeneralUserInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<unsigned long> uin;
@@ -104,8 +104,8 @@ class LIBOSCAR_EXPORT ICQWorkUserInfo : public ICQInfoBase
public:
ICQWorkUserInfo();
~ICQWorkUserInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<QByteArray> city;
@@ -127,8 +127,8 @@ class LIBOSCAR_EXPORT ICQMoreUserInfo : public ICQInfoBase
public:
ICQMoreUserInfo();
~ICQMoreUserInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<int> age;
@@ -152,8 +152,8 @@ class LIBOSCAR_EXPORT ICQEmailInfo : public ICQInfoBase
public:
ICQEmailInfo();
~ICQEmailInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
class EmailItem
@@ -175,8 +175,8 @@ class LIBOSCAR_EXPORT ICQNotesInfo : public ICQInfoBase
public:
ICQNotesInfo();
~ICQNotesInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<QByteArray> notes;
@@ -187,8 +187,8 @@ class LIBOSCAR_EXPORT ICQInterestInfo : public ICQInfoBase
public:
ICQInterestInfo();
~ICQInterestInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<int> topics[4];
@@ -200,8 +200,8 @@ class LIBOSCAR_EXPORT ICQOrgAffInfo : public ICQInfoBase
public:
ICQOrgAffInfo();
~ICQOrgAffInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
ICQInfoValue<int> org1Category;
@@ -266,8 +266,8 @@ public:
ICQFullInfo( bool assumeDirty = true );
~ICQFullInfo() {}
- void fill( Buffer* buffer );
- void store( Buffer* buffer );
+ void fill( Buffer* buffer ) Q_DECL_OVERRIDE;
+ void store( Buffer* buffer ) Q_DECL_OVERRIDE;
public:
class AddressItem
diff --git a/protocols/oscar/liboscar/oftprotocol.h b/protocols/oscar/liboscar/oftprotocol.h
index 12aa71d..50140e1 100644
--- a/protocols/oscar/liboscar/oftprotocol.h
+++ b/protocols/oscar/liboscar/oftprotocol.h
@@ -39,7 +39,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an OftTransfer object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/ofttransfer.h b/protocols/oscar/liboscar/ofttransfer.h
index e14cd11..281df6e 100644
--- a/protocols/oscar/liboscar/ofttransfer.h
+++ b/protocols/oscar/liboscar/ofttransfer.h
@@ -29,8 +29,8 @@ public:
OftTransfer();
virtual ~OftTransfer();
- virtual TransferType type() const;
- virtual QByteArray toWire();
+ TransferType type() const Q_DECL_OVERRIDE;
+ QByteArray toWire() Q_DECL_OVERRIDE;
//! Set the OFT data
void setData( OFT data );
diff --git a/protocols/oscar/liboscar/oscarclientstream.h b/protocols/oscar/liboscar/oscarclientstream.h
index 4973ad8..b92e2af 100644
--- a/protocols/oscar/liboscar/oscarclientstream.h
+++ b/protocols/oscar/liboscar/oscarclientstream.h
@@ -41,7 +41,7 @@ public:
bool isOpen() const;
- void close();
+ void close() Q_DECL_OVERRIDE;
/** Connection related stuff */
void setConnection( Connection* c );
@@ -50,20 +50,20 @@ public:
/**
* Are there any messages waiting to be read
*/
- bool transfersAvailable() const;
+ bool transfersAvailable() const Q_DECL_OVERRIDE;
/**
* Read a message received from the server
*/
- Transfer * read();
+ Transfer * read() Q_DECL_OVERRIDE;
/**
* Send a message to the server
*/
- void write( Transfer* request );
+ void write( Transfer* request ) Q_DECL_OVERRIDE;
- int error() const;
- QString errorString() const;
+ int error() const Q_DECL_OVERRIDE;
+ QString errorString() const Q_DECL_OVERRIDE;
void setNoopTime( int mills );
diff --git a/protocols/oscar/liboscar/snacprotocol.h b/protocols/oscar/liboscar/snacprotocol.h
index ed0a00e..ef927e1 100644
--- a/protocols/oscar/liboscar/snacprotocol.h
+++ b/protocols/oscar/liboscar/snacprotocol.h
@@ -39,7 +39,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an EventTransfer object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/blmlimitstask.h b/protocols/oscar/liboscar/tasks/blmlimitstask.h
index 7ded03a..efd0a1b 100644
--- a/protocols/oscar/liboscar/tasks/blmlimitstask.h
+++ b/protocols/oscar/liboscar/tasks/blmlimitstask.h
@@ -32,9 +32,9 @@ public:
~BLMLimitsTask();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/buddyicontask.h b/protocols/oscar/liboscar/tasks/buddyicontask.h
index 2a13b5f..ce6736b 100644
--- a/protocols/oscar/liboscar/tasks/buddyicontask.h
+++ b/protocols/oscar/liboscar/tasks/buddyicontask.h
@@ -39,9 +39,9 @@ public:
void setHashType( Oscar::BYTE type );
//! Task implementation
- void onGo();
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
+ void onGo() Q_DECL_OVERRIDE;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
signals:
void haveIcon( const QString&, QByteArray );
diff --git a/protocols/oscar/liboscar/tasks/chatnavservicetask.h b/protocols/oscar/liboscar/tasks/chatnavservicetask.h
index 0e8af88..27fc8ac 100644
--- a/protocols/oscar/liboscar/tasks/chatnavservicetask.h
+++ b/protocols/oscar/liboscar/tasks/chatnavservicetask.h
@@ -40,9 +40,9 @@ public:
void setRequestType( RequestType );
RequestType requestType();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
void createRoom( Oscar::WORD exchange, const QString& name ); //create a room. sends the packet as well
QList<int> exchangeList() const;
diff --git a/protocols/oscar/liboscar/tasks/chatroomtask.h b/protocols/oscar/liboscar/tasks/chatroomtask.h
index 86a9142..8a9cff3 100644
--- a/protocols/oscar/liboscar/tasks/chatroomtask.h
+++ b/protocols/oscar/liboscar/tasks/chatroomtask.h
@@ -55,10 +55,10 @@ public:
QString room() const;
//! Task implementation
- virtual bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
protected:
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
public slots:
void doInvite();
diff --git a/protocols/oscar/liboscar/tasks/chatservicetask.h b/protocols/oscar/liboscar/tasks/chatservicetask.h
index a021c66..c22e3b4 100644
--- a/protocols/oscar/liboscar/tasks/chatservicetask.h
+++ b/protocols/oscar/liboscar/tasks/chatservicetask.h
@@ -33,8 +33,8 @@ public:
ChatServiceTask( Task* parent, Oscar::WORD exchange, const QString& room );
~ChatServiceTask();
- void onGo();
- bool take( Transfer* t );
+ void onGo() Q_DECL_OVERRIDE;
+ bool take( Transfer* t ) Q_DECL_OVERRIDE;
void parseRoomInfo();
@@ -53,7 +53,7 @@ signals:
void newChatMessage( const Oscar::Message& msg );
protected:
- bool forMe( const Transfer* t ) const;
+ bool forMe( const Transfer* t ) const Q_DECL_OVERRIDE;
private:
Oscar::WORD m_exchange;
diff --git a/protocols/oscar/liboscar/tasks/clientreadytask.h b/protocols/oscar/liboscar/tasks/clientreadytask.h
index 335a8c7..28ddab2 100644
--- a/protocols/oscar/liboscar/tasks/clientreadytask.h
+++ b/protocols/oscar/liboscar/tasks/clientreadytask.h
@@ -32,7 +32,7 @@ class ClientReadyTask : public Task
public:
ClientReadyTask( Task* parent );
~ClientReadyTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setFamilies( const QList<int>& families );
diff --git a/protocols/oscar/liboscar/tasks/closeconnectiontask.h b/protocols/oscar/liboscar/tasks/closeconnectiontask.h
index e5b1317..4d2c39b 100644
--- a/protocols/oscar/liboscar/tasks/closeconnectiontask.h
+++ b/protocols/oscar/liboscar/tasks/closeconnectiontask.h
@@ -34,11 +34,11 @@ public:
~CloseConnectionTask();
- virtual bool take(Transfer* transfer);
+ bool take(Transfer* transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe(const Transfer* transfer) const;
- virtual void onGo();
+ bool forMe(const Transfer* transfer) const Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/errortask.h b/protocols/oscar/liboscar/tasks/errortask.h
index c612bc2..048567f 100644
--- a/protocols/oscar/liboscar/tasks/errortask.h
+++ b/protocols/oscar/liboscar/tasks/errortask.h
@@ -30,13 +30,13 @@ class ErrorTask : public Task
public:
ErrorTask( Task* parent );
~ErrorTask();
- bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
signals:
void messageError( const QString& contact, uint messageId );
protected:
- bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/filetransfertask.h b/protocols/oscar/liboscar/tasks/filetransfertask.h
index a0a73fb..1320a7c 100644
--- a/protocols/oscar/liboscar/tasks/filetransfertask.h
+++ b/protocols/oscar/liboscar/tasks/filetransfertask.h
@@ -57,8 +57,8 @@ public:
QString description() const;
//! Task implementation
- void onGo();
- bool take( Transfer* transfer );
+ void onGo() Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
bool take( int type, QByteArray cookie, Buffer b );
bool takeAutoResponse( int type, QByteArray cookie, Buffer* b );
diff --git a/protocols/oscar/liboscar/tasks/icbmparamstask.h b/protocols/oscar/liboscar/tasks/icbmparamstask.h
index c7bdfb1..a120f04 100644
--- a/protocols/oscar/liboscar/tasks/icbmparamstask.h
+++ b/protocols/oscar/liboscar/tasks/icbmparamstask.h
@@ -31,8 +31,8 @@ public:
ICBMParamsTask( Task* parent );
~ICBMParamsTask();
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
/**
* Handle the ICBM Parameters we get back from SNAC 0x04, 0x05
@@ -47,7 +47,7 @@ public:
void sendMessageParams( int channel );
protected:
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/icqchangepasswordtask.h b/protocols/oscar/liboscar/tasks/icqchangepasswordtask.h
index 57e456b..2e056ab 100644
--- a/protocols/oscar/liboscar/tasks/icqchangepasswordtask.h
+++ b/protocols/oscar/liboscar/tasks/icqchangepasswordtask.h
@@ -35,9 +35,9 @@ public:
void setPassword( const QString& password );
QString password() const;
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
private:
QString m_password;
diff --git a/protocols/oscar/liboscar/tasks/icqtask.h b/protocols/oscar/liboscar/tasks/icqtask.h
index 2139db4..5366896 100644
--- a/protocols/oscar/liboscar/tasks/icqtask.h
+++ b/protocols/oscar/liboscar/tasks/icqtask.h
@@ -32,9 +32,9 @@ public:
ICQTask( Task* parent );
~ICQTask();
- virtual void onGo();
- virtual bool forMe( const Transfer* t ) const;
- virtual bool take( Transfer* t );
+ void onGo() Q_DECL_OVERRIDE;
+ bool forMe( const Transfer* t ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* t ) Q_DECL_OVERRIDE;
void parseInitialData( Buffer buf );
Buffer* addInitialData( Buffer* buf = 0 ) const;
diff --git a/protocols/oscar/liboscar/tasks/icqtlvinforequesttask.h b/protocols/oscar/liboscar/tasks/icqtlvinforequesttask.h
index 324f61e..09101d3 100644
--- a/protocols/oscar/liboscar/tasks/icqtlvinforequesttask.h
+++ b/protocols/oscar/liboscar/tasks/icqtlvinforequesttask.h
@@ -47,9 +47,9 @@ public:
ICQFullInfo fullInfoFor( const QString& contact );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
Q_SIGNALS:
void receivedInfoFor( const QString& contact );
diff --git a/protocols/oscar/liboscar/tasks/icqtlvinfoupdatetask.h b/protocols/oscar/liboscar/tasks/icqtlvinfoupdatetask.h
index 2264b92..0021cf8 100644
--- a/protocols/oscar/liboscar/tasks/icqtlvinfoupdatetask.h
+++ b/protocols/oscar/liboscar/tasks/icqtlvinfoupdatetask.h
@@ -36,9 +36,9 @@ public:
void setInfo( const ICQFullInfo& info );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
private:
ICQFullInfo m_info;
diff --git a/protocols/oscar/liboscar/tasks/icquserinfotask.h b/protocols/oscar/liboscar/tasks/icquserinfotask.h
index 6397e0e..c849924 100644
--- a/protocols/oscar/liboscar/tasks/icquserinfotask.h
+++ b/protocols/oscar/liboscar/tasks/icquserinfotask.h
@@ -52,9 +52,9 @@ public:
ICQInterestInfo interestInfoFor( const QString& contact );
ICQOrgAffInfo orgAffInfoFor( const QString& contact );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
signals:
void receivedInfoFor( const QString& contact, unsigned int type );
diff --git a/protocols/oscar/liboscar/tasks/icquserinfoupdatetask.h b/protocols/oscar/liboscar/tasks/icquserinfoupdatetask.h
index 4c2c28f..22bbee3 100644
--- a/protocols/oscar/liboscar/tasks/icquserinfoupdatetask.h
+++ b/protocols/oscar/liboscar/tasks/icquserinfoupdatetask.h
@@ -37,9 +37,9 @@ public:
void setInfo( const QList<ICQInfoBase*>& infoList );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
private:
QList<ICQInfoBase*> m_infoList;
diff --git a/protocols/oscar/liboscar/tasks/locationrightstask.h b/protocols/oscar/liboscar/tasks/locationrightstask.h
index a3e8276..fdcd9e5 100644
--- a/protocols/oscar/liboscar/tasks/locationrightstask.h
+++ b/protocols/oscar/liboscar/tasks/locationrightstask.h
@@ -38,11 +38,11 @@ class LocationRightsTask : public Task
public:
LocationRightsTask( Task* parent );
~LocationRightsTask();
- bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
protected:
- bool forMe( const Transfer* transfer ) const;
- void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
private:
//! Send the location rights request ( SNAC 0x02, 0x02 )
diff --git a/protocols/oscar/liboscar/tasks/logintask.h b/protocols/oscar/liboscar/tasks/logintask.h
index e20ef51..76fc99f 100644
--- a/protocols/oscar/liboscar/tasks/logintask.h
+++ b/protocols/oscar/liboscar/tasks/logintask.h
@@ -46,7 +46,7 @@ Q_OBJECT
public:
StageOneLoginTask( Task* parent );
~StageOneLoginTask();
- bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
//Protocol specific stuff
@@ -75,7 +75,7 @@ public slots:
void loginTaskFinished();
protected:
- bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
private:
@@ -110,8 +110,8 @@ Q_OBJECT
public:
StageTwoLoginTask( Task* parent );
~StageTwoLoginTask();
- bool take( Transfer* transfer );
- void onGo();
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
//protocol specifics
//! Set the cookie to send to the server
@@ -132,7 +132,7 @@ public slots:
void rateTaskFinished();
protected:
- bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
private:
QByteArray m_cookie;
diff --git a/protocols/oscar/liboscar/tasks/messageacktask.h b/protocols/oscar/liboscar/tasks/messageacktask.h
index a933324..ff5116e 100644
--- a/protocols/oscar/liboscar/tasks/messageacktask.h
+++ b/protocols/oscar/liboscar/tasks/messageacktask.h
@@ -28,8 +28,8 @@ class MessageAckTask : public Task
public:
MessageAckTask( Task* parent );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
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 7f0d47b..8564600 100644
--- a/protocols/oscar/liboscar/tasks/messagereceivertask.h
+++ b/protocols/oscar/liboscar/tasks/messagereceivertask.h
@@ -36,8 +36,8 @@ public:
MessageReceiverTask( Task* parent );
~MessageReceiverTask();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
signals:
diff --git a/protocols/oscar/liboscar/tasks/offlinemessagestask.h b/protocols/oscar/liboscar/tasks/offlinemessagestask.h
index d0a11e3..22bc4ef 100644
--- a/protocols/oscar/liboscar/tasks/offlinemessagestask.h
+++ b/protocols/oscar/liboscar/tasks/offlinemessagestask.h
@@ -31,9 +31,9 @@ class OfflineMessagesTask : public Task
public:
OfflineMessagesTask( Task* parent );
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/onlinenotifiertask.h b/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
index 51aa0ab..69a34f3 100644
--- a/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
+++ b/protocols/oscar/liboscar/tasks/onlinenotifiertask.h
@@ -40,10 +40,10 @@ public:
~OnlineNotifierTask();
- virtual bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
signals:
void userIsOnline( const QString& user, const UserDetails& ud );
diff --git a/protocols/oscar/liboscar/tasks/oscarlogintask.h b/protocols/oscar/liboscar/tasks/oscarlogintask.h
index 73b4299..a50c815 100644
--- a/protocols/oscar/liboscar/tasks/oscarlogintask.h
+++ b/protocols/oscar/liboscar/tasks/oscarlogintask.h
@@ -30,8 +30,8 @@ Q_OBJECT
public:
OscarLoginTask( Task* parent );
~OscarLoginTask();
- bool take( Transfer* transfer );
- virtual void onGo();
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
//Protocol specific stuff
const QByteArray& cookie() const;
@@ -41,7 +41,7 @@ public:
const QString& bosSSLName() const;
protected:
- bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
signals:
void haveAuthKey();
diff --git a/protocols/oscar/liboscar/tasks/ownuserinfotask.h b/protocols/oscar/liboscar/tasks/ownuserinfotask.h
index 1682ffb..91fecb4 100644
--- a/protocols/oscar/liboscar/tasks/ownuserinfotask.h
+++ b/protocols/oscar/liboscar/tasks/ownuserinfotask.h
@@ -34,9 +34,9 @@ public:
~OwnUserInfoTask();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
UserDetails getInfo() const;
diff --git a/protocols/oscar/liboscar/tasks/prmparamstask.h b/protocols/oscar/liboscar/tasks/prmparamstask.h
index eebfdc6..ff5a4fd 100644
--- a/protocols/oscar/liboscar/tasks/prmparamstask.h
+++ b/protocols/oscar/liboscar/tasks/prmparamstask.h
@@ -31,9 +31,9 @@ public:
PRMParamsTask( Task* parent );
~PRMParamsTask();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
};
diff --git a/protocols/oscar/liboscar/tasks/profiletask.h b/protocols/oscar/liboscar/tasks/profiletask.h
index ecc35a9..5e5a8d0 100644
--- a/protocols/oscar/liboscar/tasks/profiletask.h
+++ b/protocols/oscar/liboscar/tasks/profiletask.h
@@ -35,9 +35,9 @@ public:
ProfileTask( Task* parent );
~ProfileTask();
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
- void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
void setProfileText( const QString& text );
void setAwayMessage( const QString& text );
diff --git a/protocols/oscar/liboscar/tasks/rateinfotask.h b/protocols/oscar/liboscar/tasks/rateinfotask.h
index 37ecae5..54d0c22 100644
--- a/protocols/oscar/liboscar/tasks/rateinfotask.h
+++ b/protocols/oscar/liboscar/tasks/rateinfotask.h
@@ -35,13 +35,13 @@ Q_OBJECT
public:
RateInfoTask( Task* parent );
~RateInfoTask();
- bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
static QList<RateClass*> parseRateClasses(Buffer *);
protected:
- bool forMe( const Transfer* transfer ) const;
- void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
signals:
void gotRateLimits();
diff --git a/protocols/oscar/liboscar/tasks/senddcinfotask.h b/protocols/oscar/liboscar/tasks/senddcinfotask.h
index 49a6d9f..9feb846 100644
--- a/protocols/oscar/liboscar/tasks/senddcinfotask.h
+++ b/protocols/oscar/liboscar/tasks/senddcinfotask.h
@@ -34,7 +34,7 @@ public:
void setIcqMood( int mood );
void setStatusMessage( const QString &message );
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
Oscar::DWORD mStatus;
diff --git a/protocols/oscar/liboscar/tasks/sendidletimetask.h b/protocols/oscar/liboscar/tasks/sendidletimetask.h
index a3f77c5..a740dad 100644
--- a/protocols/oscar/liboscar/tasks/sendidletimetask.h
+++ b/protocols/oscar/liboscar/tasks/sendidletimetask.h
@@ -31,7 +31,7 @@ class SendIdleTimeTask : public Task
public:
SendIdleTimeTask( Task* parent );
~SendIdleTimeTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
//! Set the idle time to send
void setIdleTime( Oscar::DWORD );
diff --git a/protocols/oscar/liboscar/tasks/sendmessagetask.h b/protocols/oscar/liboscar/tasks/sendmessagetask.h
index 10649f7..4cb30c6 100644
--- a/protocols/oscar/liboscar/tasks/sendmessagetask.h
+++ b/protocols/oscar/liboscar/tasks/sendmessagetask.h
@@ -38,7 +38,7 @@ public:
//! our ip address
void setIp( Oscar::DWORD ip );
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
private:
void addBasicTLVs( Buffer* b );
diff --git a/protocols/oscar/liboscar/tasks/serverredirecttask.h b/protocols/oscar/liboscar/tasks/serverredirecttask.h
index 9684b28..b9a77d7 100644
--- a/protocols/oscar/liboscar/tasks/serverredirecttask.h
+++ b/protocols/oscar/liboscar/tasks/serverredirecttask.h
@@ -40,9 +40,9 @@ public:
QString chatRoomName() const;
//Task implementation
- void onGo();
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
+ void onGo() Q_DECL_OVERRIDE;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
void requestNewService();
bool handleRedirect();
diff --git a/protocols/oscar/liboscar/tasks/serverversionstask.h b/protocols/oscar/liboscar/tasks/serverversionstask.h
index 2c86605..b746107 100644
--- a/protocols/oscar/liboscar/tasks/serverversionstask.h
+++ b/protocols/oscar/liboscar/tasks/serverversionstask.h
@@ -37,8 +37,8 @@ public:
~ServerVersionsTask();
- bool forMe(const Transfer* transfer) const;
- bool take(Transfer* transfer);
+ bool forMe(const Transfer* transfer) const Q_DECL_OVERRIDE;
+ bool take(Transfer* transfer) Q_DECL_OVERRIDE;
static QList<int> buildFamiliesList( Buffer* );
diff --git a/protocols/oscar/liboscar/tasks/servicesetuptask.h b/protocols/oscar/liboscar/tasks/servicesetuptask.h
index c5bf5a7..79f9c1f 100644
--- a/protocols/oscar/liboscar/tasks/servicesetuptask.h
+++ b/protocols/oscar/liboscar/tasks/servicesetuptask.h
@@ -42,9 +42,9 @@ public:
ServiceSetupTask( Task* parent );
~ServiceSetupTask();
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
- void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
public slots:
void childTaskFinished();
diff --git a/protocols/oscar/liboscar/tasks/ssiactivatetask.h b/protocols/oscar/liboscar/tasks/ssiactivatetask.h
index c71caa9..99cdbf0 100644
--- a/protocols/oscar/liboscar/tasks/ssiactivatetask.h
+++ b/protocols/oscar/liboscar/tasks/ssiactivatetask.h
@@ -30,7 +30,7 @@ class SSIActivateTask : public Task
public:
SSIActivateTask( Task* parent );
~SSIActivateTask();
- void onGo();
+ void onGo() Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/oscar/liboscar/tasks/ssiauthtask.h b/protocols/oscar/liboscar/tasks/ssiauthtask.h
index 4e32d81..c311969 100644
--- a/protocols/oscar/liboscar/tasks/ssiauthtask.h
+++ b/protocols/oscar/liboscar/tasks/ssiauthtask.h
@@ -34,8 +34,8 @@ public:
~SSIAuthTask();
- virtual bool forMe( const Transfer* t ) const;
- virtual bool take( Transfer* t );
+ bool forMe( const Transfer* t ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* t ) Q_DECL_OVERRIDE;
void grantFutureAuth( const QString& uin, const QString& reason );
void sendAuthRequest( const QString& uin, const QString& reason );
diff --git a/protocols/oscar/liboscar/tasks/ssilisttask.h b/protocols/oscar/liboscar/tasks/ssilisttask.h
index 9af5535..670bc82 100644
--- a/protocols/oscar/liboscar/tasks/ssilisttask.h
+++ b/protocols/oscar/liboscar/tasks/ssilisttask.h
@@ -39,11 +39,11 @@ public:
SSIListTask( Task* parent );
~SSIListTask();
- virtual bool take( Transfer* transfer );
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer* transfer ) const;
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
signals:
/** We have a new group */
diff --git a/protocols/oscar/liboscar/tasks/ssimodifytask.h b/protocols/oscar/liboscar/tasks/ssimodifytask.h
index 1aa403e..7047728 100644
--- a/protocols/oscar/liboscar/tasks/ssimodifytask.h
+++ b/protocols/oscar/liboscar/tasks/ssimodifytask.h
@@ -55,8 +55,8 @@ public:
explicit SSIModifyTask( Task* parent, bool staticTask = false );
~SSIModifyTask();
- virtual void onGo();
- virtual bool take( Transfer* transfer );
+ void onGo() Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
/* Contact properties */
enum OperationType { NoType = 0x00, Add = 0x10, Remove = 0x20, Rename = 0x40, Change = 0x80 };
@@ -107,7 +107,7 @@ public:
bool modifyContact( const OContact& oldItem, const OContact& newItem );
protected:
- virtual bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
private:
//! Handle the acknowledgement from the server
diff --git a/protocols/oscar/liboscar/tasks/ssiparamstask.h b/protocols/oscar/liboscar/tasks/ssiparamstask.h
index abf12aa..0d678d6 100644
--- a/protocols/oscar/liboscar/tasks/ssiparamstask.h
+++ b/protocols/oscar/liboscar/tasks/ssiparamstask.h
@@ -30,9 +30,9 @@ public:
~SSIParamsTask();
- virtual bool forMe(const Transfer* transfer) const;
- virtual bool take(Transfer* transfer);
- virtual void onGo();
+ bool forMe(const Transfer* transfer) const Q_DECL_OVERRIDE;
+ bool take(Transfer* transfer) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
private:
void handleParamReply();
diff --git a/protocols/oscar/liboscar/tasks/typingnotifytask.h b/protocols/oscar/liboscar/tasks/typingnotifytask.h
index 160bd98..b6bd2a3 100644
--- a/protocols/oscar/liboscar/tasks/typingnotifytask.h
+++ b/protocols/oscar/liboscar/tasks/typingnotifytask.h
@@ -34,9 +34,9 @@ public:
TypingNotifyTask( Task* parent );
~TypingNotifyTask();
- virtual bool forMe( const Transfer* transfer) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
void setParams( const QString & contact, int notifyType );
diff --git a/protocols/oscar/liboscar/tasks/userinfotask.h b/protocols/oscar/liboscar/tasks/userinfotask.h
index c119db1..4a9ae37 100644
--- a/protocols/oscar/liboscar/tasks/userinfotask.h
+++ b/protocols/oscar/liboscar/tasks/userinfotask.h
@@ -40,9 +40,9 @@ public:
enum { Profile = 0x0001, General = 0x0002, AwayMessage = 0x0003, Capabilities = 0x0004 };
//! Task implementation
- bool forMe( const Transfer* transfer ) const;
- bool take( Transfer* transfer );
- void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
void requestInfoFor( const QString& userId, unsigned int types );
UserDetails getInfoFor( Oscar::DWORD sequence ) const;
diff --git a/protocols/oscar/liboscar/tasks/usersearchtask.h b/protocols/oscar/liboscar/tasks/usersearchtask.h
index 248aadd..2d78832 100644
--- a/protocols/oscar/liboscar/tasks/usersearchtask.h
+++ b/protocols/oscar/liboscar/tasks/usersearchtask.h
@@ -39,9 +39,9 @@ public:
enum SearchType { UINSearch, WhitepageSearch };
- virtual void onGo();
- virtual bool forMe( const Transfer* t ) const;
- virtual bool take( Transfer* t );
+ void onGo() Q_DECL_OVERRIDE;
+ bool forMe( const Transfer* t ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* t ) Q_DECL_OVERRIDE;
/** Search by UIN */
void searchUserByUIN( const QString& uin );
diff --git a/protocols/oscar/liboscar/tasks/warningtask.h b/protocols/oscar/liboscar/tasks/warningtask.h
index 4edb88d..2c7e742 100644
--- a/protocols/oscar/liboscar/tasks/warningtask.h
+++ b/protocols/oscar/liboscar/tasks/warningtask.h
@@ -39,9 +39,9 @@ public:
Oscar::WORD levelIncrease();
Oscar::WORD newLevel();
- virtual bool forMe( const Transfer* transfer ) const;
- virtual bool take( Transfer* transfer );
- virtual void onGo();
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
+ bool take( Transfer* transfer ) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
signals:
void userWarned( const QString&, quint16, quint16 );
diff --git a/protocols/oscar/liboscar/transfer.h b/protocols/oscar/liboscar/transfer.h
index cee237d..8829b30 100644
--- a/protocols/oscar/liboscar/transfer.h
+++ b/protocols/oscar/liboscar/transfer.h
@@ -74,8 +74,8 @@ public:
FlapTransfer();
virtual ~FlapTransfer();
- virtual TransferType type() const;
- virtual QByteArray toWire();
+ TransferType type() const Q_DECL_OVERRIDE;
+ QByteArray toWire() Q_DECL_OVERRIDE;
//! Set the FLAP channel
@@ -122,8 +122,8 @@ public:
SnacTransfer();
virtual ~SnacTransfer();
- TransferType type() const;
- virtual QByteArray toWire();
+ TransferType type() const Q_DECL_OVERRIDE;
+ QByteArray toWire() Q_DECL_OVERRIDE;
//! Set the SNAC service
diff --git a/protocols/oscar/liboscar/xtrazxawayservice.h b/protocols/oscar/liboscar/xtrazxawayservice.h
index f90150b..1b72e50 100644
--- a/protocols/oscar/liboscar/xtrazxawayservice.h
+++ b/protocols/oscar/liboscar/xtrazxawayservice.h
@@ -41,13 +41,13 @@ public:
void setMessage( const QString& message );
QString message() const;
- virtual QString serviceId() const;
+ QString serviceId() const Q_DECL_OVERRIDE;
protected:
- virtual void createRequest( QDomDocument& doc, QDomElement &e ) const;
- virtual void createResponse( QDomDocument& doc, QDomElement &e ) const;
- virtual void handleRequest( QDomElement& eRoot );
- virtual void handleResponse( QDomElement& eRoot );
+ void createRequest( QDomDocument& doc, QDomElement &e ) const Q_DECL_OVERRIDE;
+ void createResponse( QDomDocument& doc, QDomElement &e ) const Q_DECL_OVERRIDE;
+ void handleRequest( QDomElement& eRoot ) Q_DECL_OVERRIDE;
+ void handleResponse( QDomElement& eRoot ) Q_DECL_OVERRIDE;
private:
int m_iconIndex;
diff --git a/protocols/oscar/liboscar/xtrazxrandomizerservice.h b/protocols/oscar/liboscar/xtrazxrandomizerservice.h
index 1620160..b312cca 100644
--- a/protocols/oscar/liboscar/xtrazxrandomizerservice.h
+++ b/protocols/oscar/liboscar/xtrazxrandomizerservice.h
@@ -29,7 +29,7 @@ class XRandomizerService : public XService
public:
XRandomizerService();
- virtual QString serviceId() const;
+ QString serviceId() const Q_DECL_OVERRIDE;
};
}
diff --git a/protocols/oscar/oscaraccount.cpp b/protocols/oscar/oscaraccount.cpp
index d609d21..67afdca 100644
--- a/protocols/oscar/oscaraccount.cpp
+++ b/protocols/oscar/oscaraccount.cpp
@@ -104,12 +104,12 @@ public:
bool buddyIconDirty;
- virtual QTextCodec* codecForContact( const QString& contactName ) const
+ QTextCodec* codecForContact( const QString& contactName ) const Q_DECL_OVERRIDE
{
return account.contactCodec( Oscar::normalize( contactName ) );
}
- virtual QTextCodec* codecForAccount() const
+ QTextCodec* codecForAccount() const Q_DECL_OVERRIDE
{
return account.defaultCodec();
}
diff --git a/protocols/oscar/oscaraccount.h b/protocols/oscar/oscaraccount.h
index 471ddd3..a1f297a 100644
--- a/protocols/oscar/oscaraccount.h
+++ b/protocols/oscar/oscaraccount.h
@@ -57,7 +57,7 @@ public:
Oscar::Client* engine();
/** Disconnects this account */
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
/**
* Handle the various ways we can be logged off the oscar service
@@ -73,12 +73,12 @@ public:
/**
* Fill the menu for this account
*/
- virtual void fillActionMenu( KActionMenu *actionMenu ) = 0;
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE = 0;
/**
* Sets the identity this account belongs to
*/
- virtual bool setIdentity( Kopete::Identity *ident );
+ bool setIdentity( Kopete::Identity *ident ) Q_DECL_OVERRIDE;
/** Set the server address */
void setServerAddress( const QString& server );
@@ -148,8 +148,8 @@ protected:
* Adds a contact to a meta contact
*/
friend class OscarProtocol;
- virtual bool createContact(const QString &contactId,
- Kopete::MetaContact *parentContact );
+ bool createContact(const QString &contactId,
+ Kopete::MetaContact *parentContact ) Q_DECL_OVERRIDE;
/**
* Protocols using Oscar must implement this to perform the instantiation
diff --git a/protocols/oscar/oscarcontact.h b/protocols/oscar/oscarcontact.h
index 7ada939..80fb1d3 100644
--- a/protocols/oscar/oscarcontact.h
+++ b/protocols/oscar/oscarcontact.h
@@ -74,9 +74,9 @@ public:
virtual ~OscarContact();
- virtual void serialize(QMap<QString, QString>&, QMap<QString, QString>&);
+ void serialize(QMap<QString, QString>&, QMap<QString, QString>&) Q_DECL_OVERRIDE;
- virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CanCreate );
+ Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate = Kopete::Contact::CanCreate ) Q_DECL_OVERRIDE;
const QString &contactName() const { return mName; }
OscarAccount *account() const { return mAccount; }
@@ -116,10 +116,10 @@ public:
public slots:
/** Remove this contact from the server. Reimplemented from Kopete::Contact */
- virtual void deleteContact();
+ void deleteContact() Q_DECL_OVERRIDE;
/** the metacontact owning this contact changed */
- virtual void sync(unsigned int flags);
+ void sync(unsigned int flags) Q_DECL_OVERRIDE;
/** our user info has been updated */
virtual void userInfoUpdated( const QString& contact, const UserDetails& details );
diff --git a/protocols/oscar/oscarlistnonservercontacts.h b/protocols/oscar/oscarlistnonservercontacts.h
index 7626953..ffce6bd 100644
--- a/protocols/oscar/oscarlistnonservercontacts.h
+++ b/protocols/oscar/oscarlistnonservercontacts.h
@@ -38,7 +38,7 @@ public:
bool onlyShowOnce();
protected:
- virtual void slotButtonClicked( int buttonCode );
+ void slotButtonClicked( int buttonCode ) Q_DECL_OVERRIDE;
signals:
void closing();
diff --git a/protocols/oscar/oscarmyselfcontact.h b/protocols/oscar/oscarmyselfcontact.h
index fbeae08..40bbbc4 100644
--- a/protocols/oscar/oscarmyselfcontact.h
+++ b/protocols/oscar/oscarmyselfcontact.h
@@ -40,8 +40,8 @@ public:
OscarMyselfContact( OscarAccount* account );
virtual ~OscarMyselfContact();
- virtual bool isReachable();
- virtual Kopete::ChatSession *manager( CanCreateFlags canCreate );
+ bool isReachable() Q_DECL_OVERRIDE;
+ Kopete::ChatSession *manager( CanCreateFlags canCreate ) Q_DECL_OVERRIDE;
UserDetails details();
@@ -50,7 +50,7 @@ public slots:
virtual void userInfoUpdated() = 0;
/** I'm sorry Dave, I can't let you do that... */
- virtual void deleteContact();
+ void deleteContact() Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/oscar/oscarprotocol.h b/protocols/oscar/oscarprotocol.h
index 853e4d5..bdc062a 100644
--- a/protocols/oscar/oscarprotocol.h
+++ b/protocols/oscar/oscarprotocol.h
@@ -34,9 +34,9 @@ public:
OscarProtocol( QObject *parent, bool canAddMyself = false );
virtual ~OscarProtocol();
- virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
+ Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
const QMap<QString, QString> &serializedData,
- const QMap<QString, QString> &addressBookData );
+ const QMap<QString, QString> &addressBookData ) Q_DECL_OVERRIDE;
const Kopete::PropertyTmpl statusTitle;
const Kopete::PropertyTmpl statusMessage;
diff --git a/protocols/qq/qqaccount.h b/protocols/qq/qqaccount.h
index 94f17b1..1a5b7db 100644
--- a/protocols/qq/qqaccount.h
+++ b/protocols/qq/qqaccount.h
@@ -57,31 +57,31 @@ public:
/**
* Construct the context menu used for the status bar icon
*/
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/** FIXME: connect is used only for testing, once the kwalletd fixed.
* all the code is going to move to connectWithPassword
*/
- virtual void connect( const Kopete::OnlineStatus& /* initialStatus */ );
+ void connect( const Kopete::OnlineStatus& /* initialStatus */ ) Q_DECL_OVERRIDE;
/**
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
* Kopete::MetaContact
*/
- virtual bool createContact(const QString& contactId, Kopete::MetaContact* parentContact);
+ bool createContact(const QString& contactId, Kopete::MetaContact* parentContact) Q_DECL_OVERRIDE;
/**
* Called when Kopete status is changed globally
*/
- virtual void setOnlineStatus(const Kopete::OnlineStatus& status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None);
- virtual void setStatusMessage(const Kopete::StatusMessage& statusMessage);
+ void setOnlineStatus(const Kopete::OnlineStatus& status, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
+ const OnlineStatusOptions& options = None) Q_DECL_OVERRIDE;
+ void setStatusMessage(const Kopete::StatusMessage& statusMessage) Q_DECL_OVERRIDE;
/**
* Connect/Disconnect
*/
- virtual void connectWithPassword( const QString &password );
- virtual void disconnect();
+ void connectWithPassword( const QString &password ) Q_DECL_OVERRIDE;
+ void disconnect() Q_DECL_OVERRIDE;
/**
* Returns the address of the QQ server
diff --git a/protocols/qq/qqaddcontactpage.h b/protocols/qq/qqaddcontactpage.h
index cfa2d45..64c1e4b 100644
--- a/protocols/qq/qqaddcontactpage.h
+++ b/protocols/qq/qqaddcontactpage.h
@@ -37,11 +37,11 @@ public:
/**
* Make a contact out of the entered data
*/
- virtual bool apply(Kopete::Account* a, Kopete::MetaContact* m);
+ bool apply(Kopete::Account* a, Kopete::MetaContact* m) Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected:
Ui::QQAddUI *m_qqAddUI;
diff --git a/protocols/qq/qqchatsession.h b/protocols/qq/qqchatsession.h
index 56b6068..d1af9de 100644
--- a/protocols/qq/qqchatsession.h
+++ b/protocols/qq/qqchatsession.h
@@ -90,7 +90,7 @@ public:
/**
* Reimplemented from Kopete::ChatSession - invites contacts via DND
*/
- virtual void inviteContact(const QString& );
+ void inviteContact(const QString& ) Q_DECL_OVERRIDE;
signals:
/**
* Tell the contact we got a GUID so it can route incoming messages here.
diff --git a/protocols/qq/qqcontact.h b/protocols/qq/qqcontact.h
index 9c09b53..b8ab091 100644
--- a/protocols/qq/qqcontact.h
+++ b/protocols/qq/qqcontact.h
@@ -91,9 +91,9 @@ public:
uint clientFlags() const;
void setClientFlags( uint );
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
- virtual QList<QAction*> *customContextMenuActions();
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using Kopete::Contact::customContextMenuActions;
/**
@@ -102,7 +102,7 @@ public:
void contactRemovedFromGroup( const QString& groupId );
void contactAddedToGroup(const QString& groupId, Kopete::Group *group );
- virtual void serialize( QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData );
+ void serialize( QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData ) Q_DECL_OVERRIDE;
/**
* Rename contact on server
@@ -112,7 +112,7 @@ public:
/**
* Returns the QQ Message Manager associated with this contact
*/
- virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate );
+ Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate ) Q_DECL_OVERRIDE;
/**
@@ -132,15 +132,15 @@ public:
{ m_contactDetail = map; }
public slots:
- virtual void slotUserInfo();
- virtual void deleteContact();
+ void slotUserInfo() Q_DECL_OVERRIDE;
+ void deleteContact() Q_DECL_OVERRIDE;
virtual void sendFile( const KUrl &sourceURL = KUrl(),
const QString &fileName = QString(), uint fileSize = 0L );
/**
* Every time the kopete's contact list is modified, we sync the serverlist with it
*/
- virtual void sync( unsigned int cvhanged= 0xff);
+ void sync( unsigned int cvhanged= 0xff) Q_DECL_OVERRIDE;
void setDisplayPicture(KTemporaryFile *f) ;
diff --git a/protocols/qq/qqnotifysocket.h b/protocols/qq/qqnotifysocket.h
index 6f956c7..570c4bd 100644
--- a/protocols/qq/qqnotifysocket.h
+++ b/protocols/qq/qqnotifysocket.h
@@ -48,7 +48,7 @@ public:
QQNotifySocket( QQAccount* account, const QString &password );
~QQNotifySocket();
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
/**
* this should return a Kopete::Account::DisconnectReason value
@@ -79,20 +79,20 @@ protected:
/**
* Handle an QQ incoming packet.
*/
- virtual void handleIncomingPacket( const QByteArray& rawData );
+ void handleIncomingPacket( const QByteArray& rawData ) Q_DECL_OVERRIDE;
/**
* Handle an QQ error condition.
* This reimplementation handles most of the other QQ error codes.
*/
- virtual void handleError( uint code, uint id );
+ void handleError( uint code, uint id ) Q_DECL_OVERRIDE;
/**
* This reimplementation sets up the negotiating with the server and
* suppresses the change of the status to online until the handshake
* is complete.
*/
- virtual void doneConnect();
+ void doneConnect() Q_DECL_OVERRIDE;
// QQ operations
void sendGoodbye() { return; }
diff --git a/protocols/qq/qqprotocol.h b/protocols/qq/qqprotocol.h
index 404b516..1e3122e 100644
--- a/protocols/qq/qqprotocol.h
+++ b/protocols/qq/qqprotocol.h
@@ -51,23 +51,23 @@ public:
* Convert the serialised data back into a QQContact and add this
* to its Kopete::MetaContact
*/
- virtual Kopete::Contact *deserializeContact(
+ Kopete::Contact *deserializeContact(
Kopete::MetaContact *metaContact,
const QMap< QString, QString > & serializedData,
const QMap< QString, QString > & addressBookData
- );
+ ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add QQContacts
*/
- virtual AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account );
+ AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add/edit accounts for this protocol
*/
- virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent );
+ KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent ) Q_DECL_OVERRIDE;
/**
* Generate a QQAccount
*/
- virtual Kopete::Account * createNewAccount( const QString &accountId );
+ Kopete::Account * createNewAccount( const QString &accountId ) Q_DECL_OVERRIDE;
/**
* Access the instance of this protocol
*/
diff --git a/protocols/qq/ui/qqeditaccountwidget.h b/protocols/qq/ui/qqeditaccountwidget.h
index 121fdc4..b191d3e 100644
--- a/protocols/qq/ui/qqeditaccountwidget.h
+++ b/protocols/qq/ui/qqeditaccountwidget.h
@@ -38,11 +38,11 @@ public:
/**
* Make an account out of the entered data
*/
- virtual Kopete::Account* apply();
+ Kopete::Account* apply() Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
private slots:
void slotOpenRegister();
diff --git a/protocols/testbed/testbedaccount.h b/protocols/testbed/testbedaccount.h
index a4fe8d4..cd7072f 100644
--- a/protocols/testbed/testbedaccount.h
+++ b/protocols/testbed/testbedaccount.h
@@ -44,13 +44,13 @@ public:
/**
* Construct the context menu used for the status bar icon
*/
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/**
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
* Kopete::MetaContact
*/
- virtual bool createContact(const QString& contactId, Kopete::MetaContact* parentContact);
+ bool createContact(const QString& contactId, Kopete::MetaContact* parentContact) Q_DECL_OVERRIDE;
/**
* Called when Kopete is set globally away
*/
@@ -58,17 +58,17 @@ public:
/**
* Called when Kopete status is changed globally
*/
- virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None);
- virtual void setStatusMessage(const Kopete::StatusMessage& statusMessage);
+ void setOnlineStatus(const Kopete::OnlineStatus& status , const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
+ const OnlineStatusOptions& options = None) Q_DECL_OVERRIDE;
+ void setStatusMessage(const Kopete::StatusMessage& statusMessage) Q_DECL_OVERRIDE;
/**
* 'Connect' to the testbed server. Only sets myself() online.
*/
- virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
+ void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ) Q_DECL_OVERRIDE;
/**
* Disconnect from the server. Only sets myself() offline.
*/
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
/**
* Return a reference to the server stub
*/
diff --git a/protocols/testbed/testbedaddcontactpage.h b/protocols/testbed/testbedaddcontactpage.h
index 0c16a5a..47e8adc 100644
--- a/protocols/testbed/testbedaddcontactpage.h
+++ b/protocols/testbed/testbedaddcontactpage.h
@@ -38,11 +38,11 @@ public:
/**
* Make a contact out of the entered data
*/
- virtual bool apply(Kopete::Account* a, Kopete::MetaContact* m);
+ bool apply(Kopete::Account* a, Kopete::MetaContact* m) Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected:
Ui::TestbedAddUI m_testbedAddUI;
diff --git a/protocols/testbed/testbedcontact.h b/protocols/testbed/testbedcontact.h
index 5c7aa1c..2796c4c 100644
--- a/protocols/testbed/testbedcontact.h
+++ b/protocols/testbed/testbedcontact.h
@@ -48,13 +48,13 @@ public:
~TestbedContact();
- virtual bool isReachable();
+ bool isReachable() Q_DECL_OVERRIDE;
/**
* Serialize the contact's data into a key-value map
* suitable for writing to a file
*/
- virtual void serialize(QMap< QString, QString >& serializedData,
- QMap< QString, QString >& addressBookData);
+ void serialize(QMap< QString, QString >& serializedData,
+ QMap< QString, QString >& addressBookData) Q_DECL_OVERRIDE;
/**
* Return the actions for this contact
*/
@@ -63,7 +63,7 @@ public:
/**
* Returns a Kopete::ChatSession associated with this contact
*/
- virtual Kopete::ChatSession *manager( CanCreateFlags canCreate = CannotCreate );
+ Kopete::ChatSession *manager( CanCreateFlags canCreate = CannotCreate ) Q_DECL_OVERRIDE;
/**
* Set the Type of this contact
diff --git a/protocols/testbed/testbededitaccountwidget.h b/protocols/testbed/testbededitaccountwidget.h
index fad4e06..f0c9180 100644
--- a/protocols/testbed/testbededitaccountwidget.h
+++ b/protocols/testbed/testbededitaccountwidget.h
@@ -40,11 +40,11 @@ public:
/**
* Make an account out of the entered data
*/
- virtual Kopete::Account* apply();
+ Kopete::Account* apply() Q_DECL_OVERRIDE;
/**
* Is the data correct?
*/
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
protected:
Kopete::Account *m_account;
Ui::TestbedAccountPreferences *m_preferencesWidget;
diff --git a/protocols/testbed/testbedprotocol.h b/protocols/testbed/testbedprotocol.h
index f5a0db6..91314e6 100644
--- a/protocols/testbed/testbedprotocol.h
+++ b/protocols/testbed/testbedprotocol.h
@@ -36,23 +36,23 @@ public:
* Convert the serialised data back into a TestbedContact and add this
* to its Kopete::MetaContact
*/
- virtual Kopete::Contact *deserializeContact(
+ Kopete::Contact *deserializeContact(
Kopete::MetaContact *metaContact,
const QMap< QString, QString > & serializedData,
const QMap< QString, QString > & addressBookData
- );
+ ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add TestbedContacts
*/
- virtual AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account );
+ AddContactPage * createAddContactWidget( QWidget *parent, Kopete::Account *account ) Q_DECL_OVERRIDE;
/**
* Generate the widget needed to add/edit accounts for this protocol
*/
- virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent );
+ KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, QWidget *parent ) Q_DECL_OVERRIDE;
/**
* Generate a TestbedAccount
*/
- virtual Kopete::Account * createNewAccount( const QString &accountId );
+ Kopete::Account * createNewAccount( const QString &accountId ) Q_DECL_OVERRIDE;
/**
* Access the instance of this protocol
*/
diff --git a/protocols/winpopup/wpaddcontact.h b/protocols/winpopup/wpaddcontact.h
index e72915e..bb8fe31 100644
--- a/protocols/winpopup/wpaddcontact.h
+++ b/protocols/winpopup/wpaddcontact.h
@@ -43,10 +43,10 @@ public:
WPAddContact(QWidget *parent, WPAccount *newAccount);
~WPAddContact();
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
public slots:
- virtual bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact);
+ bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact) Q_DECL_OVERRIDE;
void slotSelected(const QString &Group);
void slotUpdateGroups();
diff --git a/protocols/winpopup/wpcontact.h b/protocols/winpopup/wpcontact.h
index d9e6bc7..6bff630 100644
--- a/protocols/winpopup/wpcontact.h
+++ b/protocols/winpopup/wpcontact.h
@@ -51,14 +51,14 @@ public:
WPContact(Kopete::Account *account, const QString &userId, const QString &fullName, Kopete::MetaContact *metaContact);
// virtual bool isOnline() const;
- virtual bool isReachable();
- virtual QList<QAction *> *customContextMenuActions();
+ bool isReachable() Q_DECL_OVERRIDE;
+ QList<QAction *> *customContextMenuActions() Q_DECL_OVERRIDE;
using Kopete::Contact::customContextMenuActions;
- virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate);
- virtual void serialize(QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData);
+ 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:
- virtual void slotUserInfo();
+ void slotUserInfo() Q_DECL_OVERRIDE;
void slotCheckStatus(); // the call back for the checkStatus timer
void slotNewMessage(const QString &Body, const QDateTime &Arrival);
diff --git a/protocols/winpopup/wpeditaccount.h b/protocols/winpopup/wpeditaccount.h
index c12267c..306ca72 100644
--- a/protocols/winpopup/wpeditaccount.h
+++ b/protocols/winpopup/wpeditaccount.h
@@ -43,11 +43,11 @@ private:
public:
WPEditAccount(QWidget *parent, Kopete::Account *theAccount);
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
void writeConfig();
public slots:
- virtual Kopete::Account *apply();
+ Kopete::Account *apply() Q_DECL_OVERRIDE;
virtual void installSamba();
};
diff --git a/protocols/winpopup/wpprotocol.h b/protocols/winpopup/wpprotocol.h
index 5094549..a46414d 100644
--- a/protocols/winpopup/wpprotocol.h
+++ b/protocols/winpopup/wpprotocol.h
@@ -48,9 +48,9 @@ public:
WPProtocol( QObject *parent, const QVariantList & );
~WPProtocol();
- virtual AddContactPage *createAddContactWidget(QWidget *parent, Kopete::Account *theAccount);
- virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent);
- virtual Kopete::Account *createNewAccount(const QString &accountId);
+ AddContactPage *createAddContactWidget(QWidget *parent, Kopete::Account *theAccount) Q_DECL_OVERRIDE;
+ KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent) Q_DECL_OVERRIDE;
+ Kopete::Account *createNewAccount(const QString &accountId) Q_DECL_OVERRIDE;
const QStringList getGroups() {return popupClient->getGroups(); }
const QStringList getHosts(const QString &Group) { return popupClient->getHosts(Group); }
@@ -58,7 +58,7 @@ public:
// Kopete::Plugin overloading
public:
- virtual Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact, const QMap<QString, QString> &serializedData, const QMap<QString, QString> &addressBookData);
+ Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact, const QMap<QString, QString> &serializedData, const QMap<QString, QString> &addressBookData) Q_DECL_OVERRIDE;
// Stuff used internally & by colleague classes
public:
diff --git a/protocols/yahoo/libkyahoo/alivetask.h b/protocols/yahoo/libkyahoo/alivetask.h
index 475ee3e..d0db52c 100644
--- a/protocols/yahoo/libkyahoo/alivetask.h
+++ b/protocols/yahoo/libkyahoo/alivetask.h
@@ -30,7 +30,7 @@ public:
AliveTask(Task *parent);
~AliveTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/yahoo/libkyahoo/changestatustask.h b/protocols/yahoo/libkyahoo/changestatustask.h
index 8ba0363..caae351 100644
--- a/protocols/yahoo/libkyahoo/changestatustask.h
+++ b/protocols/yahoo/libkyahoo/changestatustask.h
@@ -33,7 +33,7 @@ public:
ChangeStatusTask(Task *parent);
~ChangeStatusTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setMessage( const QString &msg );
void setStatus( Yahoo::Status status );
diff --git a/protocols/yahoo/libkyahoo/chatsessiontask.h b/protocols/yahoo/libkyahoo/chatsessiontask.h
index 964ff41..d173851 100644
--- a/protocols/yahoo/libkyahoo/chatsessiontask.h
+++ b/protocols/yahoo/libkyahoo/chatsessiontask.h
@@ -33,7 +33,7 @@ public:
ChatSessionTask(Task *parent);
~ChatSessionTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setTarget( const QString &to );
void setType( Type type );
diff --git a/protocols/yahoo/libkyahoo/conferencetask.h b/protocols/yahoo/libkyahoo/conferencetask.h
index 9cec6c3..e620292 100644
--- a/protocols/yahoo/libkyahoo/conferencetask.h
+++ b/protocols/yahoo/libkyahoo/conferencetask.h
@@ -31,8 +31,8 @@ public:
ConferenceTask(Task *parent);
~ConferenceTask();
- bool take(Transfer *transfer);
- bool forMe( const Transfer* transfer ) const;
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
void joinConference( const QString &room, const QStringList &members );
void declineConference( const QString &room, const QStringList &members, const QString &msg );
diff --git a/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
index 24b684f..c6b07f5 100644
--- a/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
+++ b/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
@@ -34,10 +34,10 @@ public:
FileTransferNotifierTask(Task *parent);
~FileTransferNotifierTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
signals:
void incomingFileTransfer( const QString &who, const QString &url, long expires, const QString &msg ,
const QString &fname, unsigned long size, const QPixmap &preview );
diff --git a/protocols/yahoo/libkyahoo/listtask.h b/protocols/yahoo/libkyahoo/listtask.h
index 8cb14a6..ca6abfe 100644
--- a/protocols/yahoo/libkyahoo/listtask.h
+++ b/protocols/yahoo/libkyahoo/listtask.h
@@ -32,10 +32,10 @@ public:
ListTask(Task *parent);
~ListTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void parseBuddyList( YMSGTransfer *transfer );
signals:
diff --git a/protocols/yahoo/libkyahoo/logintask.h b/protocols/yahoo/libkyahoo/logintask.h
index 339e804..bd91e50 100644
--- a/protocols/yahoo/libkyahoo/logintask.h
+++ b/protocols/yahoo/libkyahoo/logintask.h
@@ -43,8 +43,8 @@ public:
LoginTask(Task *parent);
~LoginTask();
- bool take(Transfer* transfer);
- virtual void onGo();
+ bool take(Transfer* transfer) Q_DECL_OVERRIDE;
+ void onGo() Q_DECL_OVERRIDE;
void reset();
void setStateOnConnect( Yahoo::Status status );
@@ -55,7 +55,7 @@ public:
const QString &tCookie();
const QString &loginCookie();
protected:
- virtual bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
enum State { InitialState, SentVerify, GotVerifyACK, SentAuth, GotAuthACK, SentAuthResp };
void sendVerify();
void sendAuth(YMSGTransfer* transfer);
diff --git a/protocols/yahoo/libkyahoo/logofftask.h b/protocols/yahoo/libkyahoo/logofftask.h
index b04f8f5..da05f3c 100644
--- a/protocols/yahoo/libkyahoo/logofftask.h
+++ b/protocols/yahoo/libkyahoo/logofftask.h
@@ -29,7 +29,7 @@ public:
LogoffTask(Task *parent);
~LogoffTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/yahoo/libkyahoo/mailnotifiertask.h b/protocols/yahoo/libkyahoo/mailnotifiertask.h
index 1564eb1..6ca945b 100644
--- a/protocols/yahoo/libkyahoo/mailnotifiertask.h
+++ b/protocols/yahoo/libkyahoo/mailnotifiertask.h
@@ -32,10 +32,10 @@ public:
MailNotifierTask(Task *parent);
~MailNotifierTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void parseMail( YMSGTransfer *transfer );
signals:
void mailNotify(const QString&, const QString&, int);
diff --git a/protocols/yahoo/libkyahoo/messagereceivertask.h b/protocols/yahoo/libkyahoo/messagereceivertask.h
index ba057da..32076d3 100644
--- a/protocols/yahoo/libkyahoo/messagereceivertask.h
+++ b/protocols/yahoo/libkyahoo/messagereceivertask.h
@@ -32,10 +32,10 @@ public:
MessageReceiverTask(Task *parent);
~MessageReceiverTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void parseMessage( YMSGTransfer *transfer );
void parseAnimatedAudibleIcon( YMSGTransfer *transfer );
void parseNotify( YMSGTransfer *transfer );
diff --git a/protocols/yahoo/libkyahoo/modifybuddytask.h b/protocols/yahoo/libkyahoo/modifybuddytask.h
index 4b135f9..071cf28 100644
--- a/protocols/yahoo/libkyahoo/modifybuddytask.h
+++ b/protocols/yahoo/libkyahoo/modifybuddytask.h
@@ -32,9 +32,9 @@ public:
ModifyBuddyTask(Task *parent);
~ModifyBuddyTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
void setType( Type type );
void setMessage( const QString &text );
@@ -48,7 +48,7 @@ signals:
void buddyChangeGroupResult( const QString &, const QString &, bool );
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
private:
void addBuddy();
diff --git a/protocols/yahoo/libkyahoo/modifyyabtask.h b/protocols/yahoo/libkyahoo/modifyyabtask.h
index cb9acde..f5e152f 100644
--- a/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -40,7 +40,7 @@ public:
ModifyYABTask(Task *parent);
~ModifyYABTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setAction( Action action );
void setEntry( const YABEntry & );
signals:
diff --git a/protocols/yahoo/libkyahoo/picturenotifiertask.h b/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 245547b..0de08e3 100644
--- a/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -33,10 +33,10 @@ public:
PictureNotifierTask(Task *parent);
~PictureNotifierTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void parsePictureChecksum( YMSGTransfer *transfer );
void parsePictureStatus( YMSGTransfer *transfer );
void parsePicture( YMSGTransfer *transfer );
diff --git a/protocols/yahoo/libkyahoo/pingtask.h b/protocols/yahoo/libkyahoo/pingtask.h
index f1c2f6a..5b4e91a 100644
--- a/protocols/yahoo/libkyahoo/pingtask.h
+++ b/protocols/yahoo/libkyahoo/pingtask.h
@@ -30,7 +30,7 @@ public:
PingTask(Task *parent);
~PingTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/yahoo/libkyahoo/receivefiletask.h b/protocols/yahoo/libkyahoo/receivefiletask.h
index adcf2fa..ac78886 100644
--- a/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -41,7 +41,7 @@ public:
ReceiveFileTask(Task *parent);
~ReceiveFileTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setRemoteUrl( KUrl url );
void setLocalUrl( KUrl url );
@@ -50,10 +50,10 @@ public:
void setType( Type type );
void setUserId( const QString & userId );
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
signals:
void bytesProcessed( unsigned int, unsigned int );
diff --git a/protocols/yahoo/libkyahoo/requestpicturetask.h b/protocols/yahoo/libkyahoo/requestpicturetask.h
index efd2a94..349607a 100644
--- a/protocols/yahoo/libkyahoo/requestpicturetask.h
+++ b/protocols/yahoo/libkyahoo/requestpicturetask.h
@@ -31,7 +31,7 @@ public:
RequestPictureTask(Task *parent);
virtual ~RequestPictureTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setTarget( const QString &target );
private:
diff --git a/protocols/yahoo/libkyahoo/sendauthresptask.h b/protocols/yahoo/libkyahoo/sendauthresptask.h
index fed1516..99ef921 100644
--- a/protocols/yahoo/libkyahoo/sendauthresptask.h
+++ b/protocols/yahoo/libkyahoo/sendauthresptask.h
@@ -32,7 +32,7 @@ public:
SendAuthRespTask(Task *parent);
~SendAuthRespTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setGranted( bool );
void setTarget( const QString &to );
diff --git a/protocols/yahoo/libkyahoo/sendfiletask.h b/protocols/yahoo/libkyahoo/sendfiletask.h
index 394d30e..965e643 100644
--- a/protocols/yahoo/libkyahoo/sendfiletask.h
+++ b/protocols/yahoo/libkyahoo/sendfiletask.h
@@ -36,9 +36,9 @@ public:
SendFileTask(Task *parent);
~SendFileTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
void setTarget( const QString &to );
void setMessage( const QString &msg );
@@ -53,7 +53,7 @@ signals:
void declined();
protected:
- bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void sendFileTransferInfo();
void parseFileTransfer( const Transfer *transfer );
void parseTransferAccept(const Transfer *transfer);
diff --git a/protocols/yahoo/libkyahoo/sendmessagetask.h b/protocols/yahoo/libkyahoo/sendmessagetask.h
index b4c31ef..c268aaf 100644
--- a/protocols/yahoo/libkyahoo/sendmessagetask.h
+++ b/protocols/yahoo/libkyahoo/sendmessagetask.h
@@ -30,7 +30,7 @@ public:
SendMessageTask(Task *parent);
~SendMessageTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setText( const QString &text );
void setTarget( const QString &to );
diff --git a/protocols/yahoo/libkyahoo/sendnotifytask.h b/protocols/yahoo/libkyahoo/sendnotifytask.h
index 67c0547..456e8b7 100644
--- a/protocols/yahoo/libkyahoo/sendnotifytask.h
+++ b/protocols/yahoo/libkyahoo/sendnotifytask.h
@@ -34,7 +34,7 @@ public:
SendNotifyTask(Task *parent);
~SendNotifyTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setType( Type type );
void setTarget( const QString &to );
diff --git a/protocols/yahoo/libkyahoo/sendpicturetask.h b/protocols/yahoo/libkyahoo/sendpicturetask.h
index c207e8b..a58c585 100644
--- a/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -41,7 +41,7 @@ public:
SendPictureTask(Task *parent);
virtual ~SendPictureTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setType( Type type );
void setTarget( const QString &to );
diff --git a/protocols/yahoo/libkyahoo/statusnotifiertask.h b/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 5cc63d8..4ea47a3 100644
--- a/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -33,10 +33,10 @@ public:
StatusNotifierTask(Task *parent);
~StatusNotifierTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
protected:
- virtual bool forMe( const Transfer *transfer ) const;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
void parseStatus( YMSGTransfer *transfer );
void parseStealthStatus( YMSGTransfer *transfer );
void parseAuthorization( YMSGTransfer *transfer );
diff --git a/protocols/yahoo/libkyahoo/stealthtask.h b/protocols/yahoo/libkyahoo/stealthtask.h
index 6c33da1..2984bba 100644
--- a/protocols/yahoo/libkyahoo/stealthtask.h
+++ b/protocols/yahoo/libkyahoo/stealthtask.h
@@ -32,7 +32,7 @@ public:
StealthTask(Task *parent);
~StealthTask();
- virtual void onGo();
+ void onGo() Q_DECL_OVERRIDE;
void setTarget( const QString &to );
void setState( Yahoo::StealthStatus state );
diff --git a/protocols/yahoo/libkyahoo/webcamtask.h b/protocols/yahoo/libkyahoo/webcamtask.h
index 95f71b6..2c34d15 100644
--- a/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/protocols/yahoo/libkyahoo/webcamtask.h
@@ -61,7 +61,7 @@ public:
WebcamTask(Task *parent);
~WebcamTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
bool transmitting() { return transmittingData; }
@@ -92,7 +92,7 @@ private slots:
void doPendingInvitations();
void transmitWebcamImage();
protected:
- virtual bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
private:
void parseWebcamInformation( YMSGTransfer *transfer );
void parseData( QByteArray &data, KStreamSocket *socket );
diff --git a/protocols/yahoo/libkyahoo/yabtask.h b/protocols/yahoo/libkyahoo/yabtask.h
index 15de9a8..5cda175 100644
--- a/protocols/yahoo/libkyahoo/yabtask.h
+++ b/protocols/yahoo/libkyahoo/yabtask.h
@@ -39,7 +39,7 @@ public:
YABTask(Task *parent);
~YABTask();
- bool take(Transfer *transfer);
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
void getAllEntries( long lastMerge, long lastRemoteRevision );
void saveEntry( const YABEntry & );
@@ -47,7 +47,7 @@ signals:
void gotEntry( YABEntry * );
void gotRevision( long rev, bool merged );
protected:
- virtual bool forMe( const Transfer* transfer ) const;
+ bool forMe( const Transfer* transfer ) const Q_DECL_OVERRIDE;
void parseContactDetails( YMSGTransfer* t );
private slots:
void slotData( KIO::Job*, const QByteArray & );
diff --git a/protocols/yahoo/libkyahoo/yahoobytestream.h b/protocols/yahoo/libkyahoo/yahoobytestream.h
index e34bd64..0817a2f 100644
--- a/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -39,8 +39,8 @@ public:
~KNetworkByteStream ();
bool connect ( QString host, QString service );
- virtual bool isOpen () const;
- virtual void close ();
+ bool isOpen () const Q_DECL_OVERRIDE;
+ void close () Q_DECL_OVERRIDE;
KNetwork::KBufferedSocket *socket () const;
@@ -48,7 +48,7 @@ signals:
void connected ();
protected:
- virtual int tryWrite ();
+ int tryWrite () Q_DECL_OVERRIDE;
private slots:
void slotConnected ();
diff --git a/protocols/yahoo/libkyahoo/yahoochattask.h b/protocols/yahoo/libkyahoo/yahoochattask.h
index 32837cc..5bc10ac 100644
--- a/protocols/yahoo/libkyahoo/yahoochattask.h
+++ b/protocols/yahoo/libkyahoo/yahoochattask.h
@@ -47,9 +47,9 @@ public:
YahooChatTask(Task *parent);
virtual ~YahooChatTask();
- virtual void onGo();
- virtual bool forMe( const Transfer *transfer ) const;
- bool take(Transfer *transfer);
+ void onGo() Q_DECL_OVERRIDE;
+ bool forMe( const Transfer *transfer ) const Q_DECL_OVERRIDE;
+ bool take(Transfer *transfer) Q_DECL_OVERRIDE;
void getYahooChatCategories();
void getYahooChatRooms( const Yahoo::ChatCategory &category );
diff --git a/protocols/yahoo/libkyahoo/yahooclientstream.h b/protocols/yahoo/libkyahoo/yahooclientstream.h
index bf65445..befe4b3 100644
--- a/protocols/yahoo/libkyahoo/yahooclientstream.h
+++ b/protocols/yahoo/libkyahoo/yahooclientstream.h
@@ -87,25 +87,25 @@ public:
void setLocalAddr(const QHostAddress &addr, quint16 port);
- void close();
+ void close() Q_DECL_OVERRIDE;
/**
* Are there any messages waiting to be read
*/
- bool transfersAvailable() const;
+ bool transfersAvailable() const Q_DECL_OVERRIDE;
/**
* Read a message received from the server
*/
- Transfer * read();
+ Transfer * read() Q_DECL_OVERRIDE;
/**
* Send a message to the server
*/
- void write( Transfer* request );
+ void write( Transfer* request ) Q_DECL_OVERRIDE;
- int errorCondition() const;
- QString errorText() const;
+ int errorCondition() const Q_DECL_OVERRIDE;
+ QString errorText() const Q_DECL_OVERRIDE;
// extrahttp://bugs.kde.org/show_bug.cgi?id=85158
/*# void writeDirect(const QString &s); // must be for debug testing*/
diff --git a/protocols/yahoo/libkyahoo/yahooconnector.h b/protocols/yahoo/libkyahoo/yahooconnector.h
index 6877901..0ac5799 100644
--- a/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -41,9 +41,9 @@ public:
virtual ~KNetworkConnector();
- virtual void connectToServer( const QString &server );
- virtual ByteStream *stream() const;
- virtual void done();
+ void connectToServer( const QString &server ) Q_DECL_OVERRIDE;
+ ByteStream *stream() const Q_DECL_OVERRIDE;
+ void done() Q_DECL_OVERRIDE;
void setOptHostPort( const QString &host, quint16 port );
diff --git a/protocols/yahoo/libkyahoo/ymsgprotocol.h b/protocols/yahoo/libkyahoo/ymsgprotocol.h
index 43e0236..2530e59 100644
--- a/protocols/yahoo/libkyahoo/ymsgprotocol.h
+++ b/protocols/yahoo/libkyahoo/ymsgprotocol.h
@@ -38,7 +38,7 @@ public:
* @param bytes An integer used to return the number of bytes read.
* @return A pointer to an EventTransfer object if successful, otherwise 0. The caller is responsible for deleting this object.
*/
- Transfer * parse( const QByteArray &, uint & bytes );
+ Transfer * parse( const QByteArray &, uint & bytes ) Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/yahoo/libkyahoo/ymsgtransfer.h b/protocols/yahoo/libkyahoo/ymsgtransfer.h
index 3d2b8f9..5ab69e9 100644
--- a/protocols/yahoo/libkyahoo/ymsgtransfer.h
+++ b/protocols/yahoo/libkyahoo/ymsgtransfer.h
@@ -48,7 +48,7 @@ public:
~YMSGTransfer();
- TransferType type();
+ TransferType type() Q_DECL_OVERRIDE;
//! Get the validity of the transfer object
bool isValid() const;
diff --git a/protocols/yahoo/yahooaccount.h b/protocols/yahoo/yahooaccount.h
index c5c2b94..bff37e8 100644
--- a/protocols/yahoo/yahooaccount.h
+++ b/protocols/yahoo/yahooaccount.h
@@ -79,7 +79,7 @@ public:
*/
YahooContact *contact(const QString &id);
- virtual void fillActionMenu( KActionMenu *actionMenu );
+ void fillActionMenu( KActionMenu *actionMenu ) Q_DECL_OVERRIDE;
/**
* Sets the yahoo away status
@@ -130,16 +130,16 @@ public slots:
/**
* Connect to the Yahoo service
*/
- virtual void connectWithPassword( const QString & );
+ void connectWithPassword( const QString & ) Q_DECL_OVERRIDE;
/**
* Disconnect from the Yahoo service
*/
- virtual void disconnect();
+ void disconnect() Q_DECL_OVERRIDE;
/** Reimplemented from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus&, const Kopete::StatusMessage &reason = Kopete::StatusMessage(),
- const OnlineStatusOptions& options = None );
- void setStatusMessage(const Kopete::StatusMessage&);
+ const OnlineStatusOptions& options = None ) Q_DECL_OVERRIDE;
+ void setStatusMessage(const Kopete::StatusMessage&) Q_DECL_OVERRIDE;
signals:
/**
* Emitted when we receive notification that the person we're talking to is typing
@@ -155,7 +155,7 @@ protected:
/**
* Adds our Yahoo contact to a metacontact
*/
- virtual bool createContact(const QString &contactId, Kopete::MetaContact *parentContact);
+ bool createContact(const QString &contactId, Kopete::MetaContact *parentContact) Q_DECL_OVERRIDE;
virtual bool createChatContact( const QString &nick );
diff --git a/protocols/yahoo/yahooaddcontact.h b/protocols/yahoo/yahooaddcontact.h
index 1bc857c..88d9832 100644
--- a/protocols/yahoo/yahooaddcontact.h
+++ b/protocols/yahoo/yahooaddcontact.h
@@ -43,10 +43,10 @@ public:
explicit YahooAddContact(YahooProtocol *owner, QWidget *parent = 0);
~YahooAddContact();
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
public slots:
- virtual bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact);
+ bool apply(Kopete::Account *theAccount, Kopete::MetaContact *theMetaContact) Q_DECL_OVERRIDE;
};
#endif
diff --git a/protocols/yahoo/yahoocontact.h b/protocols/yahoo/yahoocontact.h
index ce9dd74..8b139a0 100644
--- a/protocols/yahoo/yahoocontact.h
+++ b/protocols/yahoo/yahoocontact.h
@@ -48,11 +48,11 @@ public:
/** Base Class Reimplementations **/
virtual bool isOnline() const;
- virtual bool isReachable();
- virtual QList<QAction*> *customContextMenuActions();
+ bool isReachable() Q_DECL_OVERRIDE;
+ QList<QAction*> *customContextMenuActions() Q_DECL_OVERRIDE;
using Kopete::Contact::customContextMenuActions;
- virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate );
- virtual void serialize( QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData );
+ Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate ) Q_DECL_OVERRIDE;
+ void serialize( QMap<QString, QString> &serializedData, QMap<QString, QString> &addressBookData ) Q_DECL_OVERRIDE;
void setOnlineStatus(const Kopete::OnlineStatus &status);
void setYahooStatus( const Kopete::OnlineStatus& );
@@ -76,9 +76,9 @@ public:
static QString prepareMessage( const QString &messageText );
public slots:
- virtual void slotUserInfo();
+ void slotUserInfo() Q_DECL_OVERRIDE;
virtual void slotSendFile( const KUrl &file );
- virtual void deleteContact();
+ void deleteContact() Q_DECL_OVERRIDE;
virtual void sendFile( const KUrl &sourceURL = KUrl(), const QString &fileName = QString(), uint fileSize = 0L );
void slotUserProfile();
void stealthContact();
@@ -94,7 +94,7 @@ public slots:
*/
void syncToServer();
- void sync(unsigned int flags);
+ void sync(unsigned int flags) Q_DECL_OVERRIDE;
signals:
void signalReceivedWebcamImage( const QPixmap &pic );
diff --git a/protocols/yahoo/yahooeditaccount.h b/protocols/yahoo/yahooeditaccount.h
index db6d507..09365d4 100644
--- a/protocols/yahoo/yahooeditaccount.h
+++ b/protocols/yahoo/yahooeditaccount.h
@@ -44,10 +44,10 @@ private:
public:
YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, QWidget *parent = 0);
- virtual bool validateData();
+ bool validateData() Q_DECL_OVERRIDE;
public slots:
- virtual Kopete::Account *apply();
+ Kopete::Account *apply() Q_DECL_OVERRIDE;
private slots:
void slotOpenRegister();
diff --git a/protocols/yahoo/yahooprotocol.h b/protocols/yahoo/yahooprotocol.h
index 7b6d733..ad952ce 100644
--- a/protocols/yahoo/yahooprotocol.h
+++ b/protocols/yahoo/yahooprotocol.h
@@ -120,16 +120,16 @@ public:
/** Protocol Accessor **/
static YahooProtocol *protocol();
- virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
+ Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact,
const QMap<QString,QString> &serializedData,
- const QMap<QString, QString> &addressBookData );
+ const QMap<QString, QString> &addressBookData ) Q_DECL_OVERRIDE;
Kopete::OnlineStatus statusFromYahoo( int status );
public slots:
- virtual AddContactPage *createAddContactWidget(QWidget * parent, Kopete::Account* a);
- virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, QWidget *parent);
- virtual Kopete::Account *createNewAccount(const QString &accountId);
+ 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;
private: