summaryrefslogtreecommitdiffstats
path: root/kopete
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-17 16:08:14 -0600
committerTimothy Pearson <[email protected]>2012-02-17 16:08:14 -0600
commit6f114e7935d43127c6c0269532fb2674cee9a4f5 (patch)
tree222adc3ae4db93c92937de3d09195aca96ae99ce /kopete
parenta484f7e6af77fe25155e9be30a4166c6f479e46d (diff)
downloadtdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.tar.gz
tdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.zip
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'kopete')
-rw-r--r--kopete/kopete/addaccountwizard/addaccountwizard.h2
-rw-r--r--kopete/kopete/addcontactwizard/addcontactwizard.h2
-rw-r--r--kopete/kopete/addcontactwizard/fastaddcontactwizard.h2
-rw-r--r--kopete/kopete/chatwindow/chatmemberslistwidget.h4
-rw-r--r--kopete/kopete/chatwindow/chatmessagepart.h2
-rw-r--r--kopete/kopete/chatwindow/chattexteditpart.h2
-rw-r--r--kopete/kopete/chatwindow/chatview.h2
-rw-r--r--kopete/kopete/chatwindow/emoticonselector.h4
-rw-r--r--kopete/kopete/chatwindow/kopetechatwindow.h2
-rw-r--r--kopete/kopete/chatwindow/kopetechatwindowstylemanager.h2
-rw-r--r--kopete/kopete/chatwindow/kopeteemailwindow.h2
-rw-r--r--kopete/kopete/chatwindow/kopeteemoticonaction.h2
-rw-r--r--kopete/kopete/chatwindow/krichtexteditpart.h2
-rw-r--r--kopete/kopete/config/accounts/kopeteaccountconfig.h2
-rw-r--r--kopete/kopete/config/appearance/appearanceconfig.h2
-rw-r--r--kopete/kopete/config/appearance/emoticonseditdialog.h4
-rw-r--r--kopete/kopete/config/appearance/tooltipeditdialog.h2
-rw-r--r--kopete/kopete/config/avdevice/avdeviceconfig.h2
-rw-r--r--kopete/kopete/config/behavior/behaviorconfig.h2
-rw-r--r--kopete/kopete/config/identity/globalidentitiesmanager.h2
-rw-r--r--kopete/kopete/config/identity/kopeteidentityconfig.h2
-rw-r--r--kopete/kopete/config/plugins/kopetepluginconfig.h2
-rw-r--r--kopete/kopete/contactlist/customnotificationprops.h2
-rw-r--r--kopete/kopete/contactlist/kabcexport.h2
-rw-r--r--kopete/kopete/contactlist/kopetecontactlistview.h2
-rw-r--r--kopete/kopete/contactlist/kopetegrouplistaction.h2
-rw-r--r--kopete/kopete/contactlist/kopetegroupviewitem.h2
-rw-r--r--kopete/kopete/contactlist/kopetelviprops.h4
-rw-r--r--kopete/kopete/contactlist/kopetemetacontactlvi.h2
-rw-r--r--kopete/kopete/kimifaceimpl.h2
-rw-r--r--kopete/kopete/kopeteaccountstatusbaricon.h2
-rw-r--r--kopete/kopete/kopeteapplication.h2
-rw-r--r--kopete/kopete/kopeteballoon.h4
-rw-r--r--kopete/kopete/kopeteeditglobalidentitywidget.h4
-rw-r--r--kopete/kopete/kopetewindow.h4
-rw-r--r--kopete/kopete/systemtray.h2
-rw-r--r--kopete/libkopete/avdevice/qvideostream.h2
-rw-r--r--kopete/libkopete/compat/kpixmapregionselectorwidget.h2
-rw-r--r--kopete/libkopete/connectionmanager.h2
-rw-r--r--kopete/libkopete/kabcpersistence.h2
-rw-r--r--kopete/libkopete/kautoconfig.h2
-rw-r--r--kopete/libkopete/kcautoconfigmodule.h2
-rw-r--r--kopete/libkopete/knotification.h2
-rw-r--r--kopete/libkopete/kopeteaccount.h2
-rw-r--r--kopete/libkopete/kopeteaccountmanager.h2
-rw-r--r--kopete/libkopete/kopeteaway.h2
-rw-r--r--kopete/libkopete/kopeteawayaction.h2
-rw-r--r--kopete/libkopete/kopeteawaydialog.h2
-rw-r--r--kopete/libkopete/kopeteblacklister.h2
-rw-r--r--kopete/libkopete/kopetechatsession.h2
-rw-r--r--kopete/libkopete/kopetechatsessionmanager.h2
-rw-r--r--kopete/libkopete/kopetecommandhandler.h2
-rw-r--r--kopete/libkopete/kopetecontact.h2
-rw-r--r--kopete/libkopete/kopetecontactlist.h2
-rw-r--r--kopete/libkopete/kopetecontactlistelement.h2
-rw-r--r--kopete/libkopete/kopetegroup.h2
-rw-r--r--kopete/libkopete/kopetemessageevent.h2
-rw-r--r--kopete/libkopete/kopetemessagehandler.h2
-rw-r--r--kopete/libkopete/kopetemessagehandlerchain.h4
-rw-r--r--kopete/libkopete/kopetemetacontact.h2
-rw-r--r--kopete/libkopete/kopeteonlinestatusmanager.h4
-rw-r--r--kopete/libkopete/kopetepassword.h4
-rw-r--r--kopete/libkopete/kopetepasswordedaccount.h2
-rw-r--r--kopete/libkopete/kopeteplugin.h2
-rw-r--r--kopete/libkopete/kopetepluginmanager.h2
-rw-r--r--kopete/libkopete/kopeteprefs.h2
-rw-r--r--kopete/libkopete/kopeteprotocol.h2
-rw-r--r--kopete/libkopete/kopetesimplemessagehandler.h2
-rw-r--r--kopete/libkopete/kopetetask.h2
-rw-r--r--kopete/libkopete/kopetetransfermanager.h4
-rw-r--r--kopete/libkopete/kopetewalletmanager.h4
-rw-r--r--kopete/libkopete/managedconnectionaccount.h2
-rw-r--r--kopete/libkopete/private/kopetecommand.h2
-rw-r--r--kopete/libkopete/private/kopeteemoticons.h2
-rw-r--r--kopete/libkopete/private/kopeteutils_private.h2
-rw-r--r--kopete/libkopete/private/kopeteviewmanager.h2
-rw-r--r--kopete/libkopete/tests/kopetepasswordtest_program.h2
-rw-r--r--kopete/libkopete/tests/kopetewallettest_program.h2
-rw-r--r--kopete/libkopete/ui/accountselector.h2
-rw-r--r--kopete/libkopete/ui/addcontactpage.h2
-rw-r--r--kopete/libkopete/ui/addressbooklinkwidget.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectordialog.h2
-rw-r--r--kopete/libkopete/ui/addressbookselectorwidget.h2
-rw-r--r--kopete/libkopete/ui/contactaddednotifydialog.h2
-rw-r--r--kopete/libkopete/ui/kopetecontactaction.h2
-rw-r--r--kopete/libkopete/ui/kopetefileconfirmdialog.h2
-rw-r--r--kopete/libkopete/ui/kopetelistview.h2
-rw-r--r--kopete/libkopete/ui/kopetelistviewitem.h2
-rw-r--r--kopete/libkopete/ui/kopetelistviewsearchline.h2
-rw-r--r--kopete/libkopete/ui/kopetepasswordwidget.h2
-rw-r--r--kopete/libkopete/ui/kopetestdaction.h2
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.h4
-rw-r--r--kopete/libkopete/ui/userinfodialog.h2
-rw-r--r--kopete/libkopete/webcamwidget.h2
-rw-r--r--kopete/plugins/addbookmarks/addbookmarksplugin.h2
-rw-r--r--kopete/plugins/addbookmarks/addbookmarkspreferences.h2
-rw-r--r--kopete/plugins/addbookmarks/addbookmarksprefssettings.h2
-rw-r--r--kopete/plugins/alias/aliasplugin.h2
-rw-r--r--kopete/plugins/alias/aliaspreferences.h2
-rw-r--r--kopete/plugins/alias/editaliasdialog.h2
-rw-r--r--kopete/plugins/autoreplace/autoreplaceplugin.h2
-rw-r--r--kopete/plugins/autoreplace/autoreplacepreferences.h2
-rw-r--r--kopete/plugins/connectionstatus/connectionstatusplugin.h2
-rw-r--r--kopete/plugins/contactnotes/contactnotesedit.h2
-rw-r--r--kopete/plugins/contactnotes/contactnotesplugin.h2
-rw-r--r--kopete/plugins/cryptography/cryptographyguiclient.h2
-rw-r--r--kopete/plugins/cryptography/cryptographyplugin.h2
-rw-r--r--kopete/plugins/cryptography/cryptographypreferences.h2
-rw-r--r--kopete/plugins/cryptography/cryptographyselectuserkey.h2
-rw-r--r--kopete/plugins/cryptography/kgpginterface.h2
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.h2
-rw-r--r--kopete/plugins/cryptography/popuppublic.h2
-rw-r--r--kopete/plugins/highlight/highlightplugin.h2
-rw-r--r--kopete/plugins/highlight/highlightpreferences.h2
-rw-r--r--kopete/plugins/history/historydialog.h2
-rw-r--r--kopete/plugins/history/historyguiclient.h2
-rw-r--r--kopete/plugins/history/historylogger.h2
-rw-r--r--kopete/plugins/history/historyplugin.h2
-rw-r--r--kopete/plugins/history/historypreferences.h2
-rw-r--r--kopete/plugins/latex/latexguiclient.h2
-rw-r--r--kopete/plugins/latex/latexplugin.h2
-rw-r--r--kopete/plugins/latex/latexpreferences.h2
-rw-r--r--kopete/plugins/motionautoaway/motionawayplugin.h2
-rw-r--r--kopete/plugins/motionautoaway/motionawaypreferences.h2
-rw-r--r--kopete/plugins/netmeeting/netmeetingguiclient.h2
-rw-r--r--kopete/plugins/netmeeting/netmeetinginvitation.h2
-rw-r--r--kopete/plugins/netmeeting/netmeetingplugin.h2
-rw-r--r--kopete/plugins/netmeeting/netmeetingpreferences.h2
-rw-r--r--kopete/plugins/nowlistening/nowlisteningguiclient.h2
-rw-r--r--kopete/plugins/nowlistening/nowlisteningplugin.h2
-rw-r--r--kopete/plugins/nowlistening/nowlisteningpreferences.h2
-rw-r--r--kopete/plugins/smpppdcs/detectornetstat.h2
-rw-r--r--kopete/plugins/smpppdcs/detectornetworkstatus.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsplugin.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdcspreferences.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsprefsimpl.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdlocationwidget.h2
-rw-r--r--kopete/plugins/smpppdcs/smpppdsearcher.h2
-rw-r--r--kopete/plugins/smpppdcs/unittest/clienttest.h2
-rw-r--r--kopete/plugins/statistics/statisticsdialog.h2
-rw-r--r--kopete/plugins/statistics/statisticsplugin.h2
-rw-r--r--kopete/plugins/texteffect/texteffectplugin.h2
-rw-r--r--kopete/plugins/texteffect/texteffectpreferences.h2
-rw-r--r--kopete/plugins/translator/translatordialog.h2
-rw-r--r--kopete/plugins/translator/translatorguiclient.h2
-rw-r--r--kopete/plugins/translator/translatorplugin.h2
-rw-r--r--kopete/plugins/webpresence/webpresenceplugin.h2
-rw-r--r--kopete/plugins/webpresence/webpresencepreferences.h2
-rw-r--r--kopete/protocols/gadu/gaduaccount.h2
-rw-r--r--kopete/protocols/gadu/gaduaddcontactpage.h2
-rw-r--r--kopete/protocols/gadu/gaduaway.h2
-rw-r--r--kopete/protocols/gadu/gaducommands.h8
-rw-r--r--kopete/protocols/gadu/gaducontact.h2
-rw-r--r--kopete/protocols/gadu/gadudcc.h2
-rw-r--r--kopete/protocols/gadu/gadudccserver.h2
-rw-r--r--kopete/protocols/gadu/gadudcctransaction.h2
-rw-r--r--kopete/protocols/gadu/gadueditaccount.h2
-rw-r--r--kopete/protocols/gadu/gadueditcontact.h2
-rw-r--r--kopete/protocols/gadu/gaduprotocol.h2
-rw-r--r--kopete/protocols/gadu/gadupubdir.h2
-rw-r--r--kopete/protocols/gadu/gaduregisteraccount.h2
-rw-r--r--kopete/protocols/gadu/gadusession.h2
-rw-r--r--kopete/protocols/groupwise/gwaccount.h4
-rw-r--r--kopete/protocols/groupwise/gwbytestream.h2
-rw-r--r--kopete/protocols/groupwise/gwconnector.h2
-rw-r--r--kopete/protocols/groupwise/gwcontact.h2
-rw-r--r--kopete/protocols/groupwise/gwcontactlist.h8
-rw-r--r--kopete/protocols/groupwise/gwmessagemanager.h2
-rw-r--r--kopete/protocols/groupwise/gwprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/bytestream.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/chatroommanager.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/client.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/connector.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/coreprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/privacymanager.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/qca.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qcatlshandler.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/responseprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/safedelete.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/securestream.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/stream.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/task.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/logintask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/statustask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tlshandler.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwaddcontactpage.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwchatpropsdialog.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwchatsearchdialog.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactproperties.h2
-rw-r--r--kopete/protocols/groupwise/ui/gweditaccountwidget.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwprivacydialog.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h2
-rw-r--r--kopete/protocols/groupwise/ui/gwsearch.h2
-rw-r--r--kopete/protocols/irc/ircaccount.h2
-rw-r--r--kopete/protocols/irc/ircaddcontactpage.h2
-rw-r--r--kopete/protocols/irc/ircchannelcontact.h2
-rw-r--r--kopete/protocols/irc/irccontact.h2
-rw-r--r--kopete/protocols/irc/irccontactmanager.h2
-rw-r--r--kopete/protocols/irc/ircguiclient.h2
-rw-r--r--kopete/protocols/irc/ircprotocol.h2
-rw-r--r--kopete/protocols/irc/ircservercontact.h2
-rw-r--r--kopete/protocols/irc/ircsignalhandler.h10
-rw-r--r--kopete/protocols/irc/irctransferhandler.h2
-rw-r--r--kopete/protocols/irc/ircusercontact.h2
-rw-r--r--kopete/protocols/irc/kcodecaction.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircentity.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircmessageredirector.h2
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.h2
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferhandler.h2
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferserver.h2
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.h2
-rw-r--r--kopete/protocols/irc/ui/channellist.h2
-rw-r--r--kopete/protocols/irc/ui/channellistdialog.h2
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.h2
-rw-r--r--kopete/protocols/jabber/jabberaccount.h2
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.h2
-rw-r--r--kopete/protocols/jabber/jabberbookmarks.h2
-rw-r--r--kopete/protocols/jabber/jabberbytestream.h2
-rw-r--r--kopete/protocols/jabber/jabbercapabilitiesmanager.h2
-rw-r--r--kopete/protocols/jabber/jabberchatsession.h2
-rw-r--r--kopete/protocols/jabber/jabberclient.h2
-rw-r--r--kopete/protocols/jabber/jabberconnector.h2
-rw-r--r--kopete/protocols/jabber/jabbercontact.h2
-rw-r--r--kopete/protocols/jabber/jabbercontactpool.h4
-rw-r--r--kopete/protocols/jabber/jabberfiletransfer.h2
-rw-r--r--kopete/protocols/jabber/jabberformlineedit.h4
-rw-r--r--kopete/protocols/jabber/jabberformtranslator.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupchatmanager.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupmembercontact.h2
-rw-r--r--kopete/protocols/jabber/jabberprotocol.h2
-rw-r--r--kopete/protocols/jabber/jabberresource.h2
-rw-r--r--kopete/protocols/jabber/jabberresourcepool.h2
-rw-r--r--kopete/protocols/jabber/jabbertransport.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglesession.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglesessionmanager.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicecaller.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesession.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h2
-rw-r--r--kopete/protocols/jabber/jingle/jinglewatchsessiontask.h2
-rw-r--r--kopete/protocols/jabber/jingle/voicecaller.h2
-rw-r--r--kopete/protocols/jabber/kioslave/jabberdisco.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h4
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/ndns.h4
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/servsock.h4
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/socks.h6
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h2
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/im.h4
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/xmpp.h12
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h8
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/s5b.h12
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h6
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h4
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h46
-rw-r--r--kopete/protocols/jabber/libiris/qca/src/qca.h4
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberbrowse.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberchangepassword.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberchatjoin.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberchatroomslist.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregister.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbersendraw.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberservices.h4
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbervcard.h2
-rw-r--r--kopete/protocols/jabber/ui/jabberaddcontactpage.h4
-rw-r--r--kopete/protocols/jabber/ui/jabberchooseserver.h2
-rw-r--r--kopete/protocols/jabber/ui/jabbereditaccountwidget.h2
-rw-r--r--kopete/protocols/jabber/ui/jabberregisteraccount.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhileaccount.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhileaddcontactpage.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhilecontact.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhileeditaccountwidget.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.h2
-rw-r--r--kopete/protocols/meanwhile/meanwhilesession.h2
-rw-r--r--kopete/protocols/msn/dispatcher.h2
-rw-r--r--kopete/protocols/msn/incomingtransfer.h2
-rw-r--r--kopete/protocols/msn/messageformatter.h2
-rw-r--r--kopete/protocols/msn/msnaccount.h2
-rw-r--r--kopete/protocols/msn/msnaddcontactpage.h2
-rw-r--r--kopete/protocols/msn/msnchallengehandler.h2
-rw-r--r--kopete/protocols/msn/msnchatsession.h2
-rw-r--r--kopete/protocols/msn/msncontact.h2
-rw-r--r--kopete/protocols/msn/msndebugrawcmddlg.h2
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.h2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.h2
-rw-r--r--kopete/protocols/msn/msnprotocol.h2
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.h2
-rw-r--r--kopete/protocols/msn/msnsocket.h2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.h2
-rw-r--r--kopete/protocols/msn/outgoingtransfer.h2
-rw-r--r--kopete/protocols/msn/p2p.h2
-rw-r--r--kopete/protocols/msn/transport.h6
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.h2
-rw-r--r--kopete/protocols/msn/webcam.h2
-rw-r--r--kopete/protocols/msn/webcam/msnwebcamdialog.h2
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.h4
-rw-r--r--kopete/protocols/oscar/aim/aimchatsession.h2
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.h2
-rw-r--r--kopete/protocols/oscar/aim/aimjoinchat.h2
-rw-r--r--kopete/protocols/oscar/aim/aimprotocol.h2
-rw-r--r--kopete/protocols/oscar/aim/aimuserinfo.h2
-rw-r--r--kopete/protocols/oscar/aim/ui/aimaddcontactpage.h2
-rw-r--r--kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h2
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.h4
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.h2
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.h2
-rw-r--r--kopete/protocols/oscar/icq/icqreadaway.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplydialog.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.h2
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.h2
-rw-r--r--kopete/protocols/oscar/liboscar/aimlogintask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/buddyicontask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/bytestream.h2
-rw-r--r--kopete/protocols/oscar/liboscar/chatnavservicetask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/chatservicetask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/client.h2
-rw-r--r--kopete/protocols/oscar/liboscar/connection.h2
-rw-r--r--kopete/protocols/oscar/liboscar/connector.h2
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.h2
-rw-r--r--kopete/protocols/oscar/liboscar/flapprotocol.h2
-rw-r--r--kopete/protocols/oscar/liboscar/icqlogintask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/icqtask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/icquserinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/inputprotocolbase.h2
-rw-r--r--kopete/protocols/oscar/liboscar/logintask.h4
-rw-r--r--kopete/protocols/oscar/liboscar/messagereceivertask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/offlinemessagestask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/onlinenotifiertask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarbytestream.h2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarclientstream.h2
-rw-r--r--kopete/protocols/oscar/liboscar/oscarconnector.h2
-rw-r--r--kopete/protocols/oscar/liboscar/ownuserinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/rateclass.h2
-rw-r--r--kopete/protocols/oscar/liboscar/rateclassmanager.h2
-rw-r--r--kopete/protocols/oscar/liboscar/rateinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/safedelete.h2
-rw-r--r--kopete/protocols/oscar/liboscar/serverredirecttask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/serverversionstask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/servicesetuptask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/snacprotocol.h2
-rw-r--r--kopete/protocols/oscar/liboscar/ssiauthtask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/ssilisttask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/ssimanager.h2
-rw-r--r--kopete/protocols/oscar/liboscar/stream.h2
-rw-r--r--kopete/protocols/oscar/liboscar/task.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/kunittest.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.h2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.h2
-rw-r--r--kopete/protocols/oscar/liboscar/typingnotifytask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/userinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/usersearchtask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/warningtask.h2
-rw-r--r--kopete/protocols/oscar/oscaraccount.h2
-rw-r--r--kopete/protocols/oscar/oscarcontact.h2
-rw-r--r--kopete/protocols/oscar/oscarencodingselectiondialog.h2
-rw-r--r--kopete/protocols/oscar/oscarlistnonservercontacts.h2
-rw-r--r--kopete/protocols/oscar/oscarmyselfcontact.h2
-rw-r--r--kopete/protocols/oscar/oscarversionupdater.h2
-rw-r--r--kopete/protocols/oscar/oscarvisibilitydialog.h2
-rw-r--r--kopete/protocols/sms/services/gsmlib.h2
-rw-r--r--kopete/protocols/sms/services/kopete_unix_serial.h2
-rw-r--r--kopete/protocols/sms/services/smsclient.h2
-rw-r--r--kopete/protocols/sms/services/smssend.h2
-rw-r--r--kopete/protocols/sms/services/smssendprovider.h2
-rw-r--r--kopete/protocols/sms/smsaccount.h2
-rw-r--r--kopete/protocols/sms/smsaddcontactpage.h2
-rw-r--r--kopete/protocols/sms/smscontact.h2
-rw-r--r--kopete/protocols/sms/smseditaccountwidget.h2
-rw-r--r--kopete/protocols/sms/smsprotocol.h2
-rw-r--r--kopete/protocols/sms/smsservice.h2
-rw-r--r--kopete/protocols/sms/smsuserpreferences.h2
-rw-r--r--kopete/protocols/testbed/testbedaccount.h2
-rw-r--r--kopete/protocols/testbed/testbedaddcontactpage.h2
-rw-r--r--kopete/protocols/testbed/testbedcontact.h2
-rw-r--r--kopete/protocols/testbed/testbededitaccountwidget.h2
-rw-r--r--kopete/protocols/testbed/testbedfakeserver.h2
-rw-r--r--kopete/protocols/testbed/testbedincomingmessage.h2
-rw-r--r--kopete/protocols/testbed/testbedprotocol.h2
-rw-r--r--kopete/protocols/testbed/ui/testbedwebcamdialog.h2
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.h2
-rw-r--r--kopete/protocols/winpopup/wpaccount.h2
-rw-r--r--kopete/protocols/winpopup/wpaddcontact.h2
-rw-r--r--kopete/protocols/winpopup/wpcontact.h2
-rw-r--r--kopete/protocols/winpopup/wpeditaccount.h2
-rw-r--r--kopete/protocols/winpopup/wpprotocol.h2
-rw-r--r--kopete/protocols/winpopup/wpuserinfo.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/bytestream.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/client.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/conferencetask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/connector.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/coreprotocol.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/listtask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/messagereceivertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifybuddytask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/receivefiletask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/requestpicturetask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/safedelete.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendauthresptask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendfiletask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendnotifytask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/stream.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/task.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/tests/logintest.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/webcamtask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabtask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobytestream.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoochattask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahooclientstream.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahooconnector.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h2
-rw-r--r--kopete/protocols/yahoo/ui/yahooinvitelistimpl.h2
-rw-r--r--kopete/protocols/yahoo/ui/yahoouserinfodialog.h2
-rw-r--r--kopete/protocols/yahoo/ui/yahoowebcamdialog.h2
-rw-r--r--kopete/protocols/yahoo/yahooaccount.h2
-rw-r--r--kopete/protocols/yahoo/yahooaddcontact.h2
-rw-r--r--kopete/protocols/yahoo/yahoochatsession.h2
-rw-r--r--kopete/protocols/yahoo/yahooconferencemessagemanager.h2
-rw-r--r--kopete/protocols/yahoo/yahoocontact.h2
-rw-r--r--kopete/protocols/yahoo/yahooeditaccount.h2
-rw-r--r--kopete/protocols/yahoo/yahooprotocol.h2
-rw-r--r--kopete/protocols/yahoo/yahooverifyaccount.h2
-rw-r--r--kopete/protocols/yahoo/yahoowebcam.h2
482 files changed, 564 insertions, 564 deletions
diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.h b/kopete/kopete/addaccountwizard/addaccountwizard.h
index 3e3508b1..474246de 100644
--- a/kopete/kopete/addaccountwizard/addaccountwizard.h
+++ b/kopete/kopete/addaccountwizard/addaccountwizard.h
@@ -42,7 +42,7 @@ class KopeteEditAccountWidget;
class AddAccountWizard : public KWizard
{
Q_OBJECT
- TQ_OBJECT
+
public:
AddAccountWizard( TQWidget *parent = 0, const char *name = 0 , bool modal = false, bool firstRun = false );
diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.h b/kopete/kopete/addcontactwizard/addcontactwizard.h
index e6ac4949..8c9fc1bc 100644
--- a/kopete/kopete/addcontactwizard/addcontactwizard.h
+++ b/kopete/kopete/addcontactwizard/addcontactwizard.h
@@ -50,7 +50,7 @@ class AddressBookSelectorWidget;
class AddContactWizard : public AddContactWizard_Base
{
Q_OBJECT
- TQ_OBJECT
+
public:
AddContactWizard( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
index 2164f356..1313e04f 100644
--- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
+++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h
@@ -48,7 +48,7 @@ class Account;
class FastAddContactWizard : public FastAddContactWizard_Base
{
Q_OBJECT
- TQ_OBJECT
+
public:
FastAddContactWizard( TQWidget *parent = 0, const char *name = 0 );
~FastAddContactWizard();
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h
index 83744110..0c1668fa 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.h
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h
@@ -35,7 +35,7 @@ class OnlineStatus;
class ChatMembersListWidget : public KListView
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 );
virtual ~ChatMembersListWidget();
@@ -99,7 +99,7 @@ private:
class ChatMembersListWidget::ContactItem : public TQObject, public KListViewItem
{
Q_OBJECT
- TQ_OBJECT
+
public:
ContactItem( ChatMembersListWidget *list, Kopete::Contact *contact );
Kopete::Contact *contact() const { return m_contact; }
diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h
index 02551b71..224e7c0c 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.h
+++ b/kopete/kopete/chatwindow/chatmessagepart.h
@@ -39,7 +39,7 @@ class ChatWindowStyle;
class ChatMessagePart : public KHTMLPart
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Create a new ChatMessage Part.
diff --git a/kopete/kopete/chatwindow/chattexteditpart.h b/kopete/kopete/chatwindow/chattexteditpart.h
index 9084d9db..f5741042 100644
--- a/kopete/kopete/chatwindow/chattexteditpart.h
+++ b/kopete/kopete/chatwindow/chattexteditpart.h
@@ -47,7 +47,7 @@ class ChatSession;
class ChatTextEditPart : public KopeteRichTextEditPart
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatTextEditPart( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 );
~ChatTextEditPart();
diff --git a/kopete/kopete/chatwindow/chatview.h b/kopete/kopete/chatwindow/chatview.h
index f7ec6f76..0e625ea1 100644
--- a/kopete/kopete/chatwindow/chatview.h
+++ b/kopete/kopete/chatwindow/chatview.h
@@ -54,7 +54,7 @@ namespace Kopete
class ChatView : public KDockMainWindow, public KopeteView
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatView( Kopete::ChatSession *manager, ChatWindowPlugin *parent, const char *name = 0 );
~ChatView();
diff --git a/kopete/kopete/chatwindow/emoticonselector.h b/kopete/kopete/chatwindow/emoticonselector.h
index a91a178e..b0e87677 100644
--- a/kopete/kopete/chatwindow/emoticonselector.h
+++ b/kopete/kopete/chatwindow/emoticonselector.h
@@ -29,7 +29,7 @@ class TQShowEvent;
class EmoticonLabel : public TQLabel
{
Q_OBJECT
- TQ_OBJECT
+
public:
EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *parent=0, const char *name=0);
@@ -46,7 +46,7 @@ protected:
class EmoticonSelector : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h
index 8929d4c4..4dbb3d1b 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/kopete/chatwindow/kopetechatwindow.h
@@ -54,7 +54,7 @@ typedef TQPtrList<Contact> ContactPtrList;
class KopeteChatWindow : public KParts::MainWindow
{
Q_OBJECT
- TQ_OBJECT
+
enum {NEW_WINDOW, GROUP_BY_ACCOUNT, GROUP_ALL, GROUP_BY_GROUP, GROUP_BY_METACONTACT};
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
index 74f145ca..3cf5d6e9 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h
@@ -44,7 +44,7 @@ class ChatWindowStyle;
class KOPETE_EXPORT ChatWindowStyleManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* StyleList typedef (a TQMap)
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h
index fd398189..a0f596f5 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.h
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.h
@@ -31,7 +31,7 @@ class EmailWindowPlugin;
class KopeteEmailWindow : KParts::MainWindow, public KopeteView
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum WindowMode { Send, Read, Reply };
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h
index a76dcb0c..eb77a84b 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.h
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h
@@ -26,7 +26,7 @@
class KopeteEmoticonAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h
index 7492aca2..c560145e 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.h
+++ b/kopete/kopete/chatwindow/krichtexteditpart.h
@@ -24,7 +24,7 @@ class KopeteTextEdit;
class KopeteRichTextEditPart : public KParts::ReadOnlyPart
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& );
diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.h b/kopete/kopete/config/accounts/kopeteaccountconfig.h
index ad434137..dc3ff2d6 100644
--- a/kopete/kopete/config/accounts/kopeteaccountconfig.h
+++ b/kopete/kopete/config/accounts/kopeteaccountconfig.h
@@ -33,7 +33,7 @@ class KopeteAccountConfigBase;
class KopeteAccountConfig : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteAccountConfig(TQWidget *parent, const char *name, const TQStringList &args );
diff --git a/kopete/kopete/config/appearance/appearanceconfig.h b/kopete/kopete/config/appearance/appearanceconfig.h
index 9de2b11c..60f769a4 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.h
+++ b/kopete/kopete/config/appearance/appearanceconfig.h
@@ -30,7 +30,7 @@
class AppearanceConfig : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
friend class KopeteStyleNewStuff;
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.h b/kopete/kopete/config/appearance/emoticonseditdialog.h
index e4435ebf..0d1590d7 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.h
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.h
@@ -29,7 +29,7 @@ class EmoticonsEditWidget;
class EditDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
EditDialog(TQWidget *parent, const char* name);
@@ -49,7 +49,7 @@ class EditDialog : public KDialogBase
class EmoticonsEditDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
EmoticonsEditDialog(TQWidget *parent=0, TQString theme = TQString(), const char* name="EmoticonsEditDialog");
diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.h b/kopete/kopete/config/appearance/tooltipeditdialog.h
index 35635359..2e6af96f 100644
--- a/kopete/kopete/config/appearance/tooltipeditdialog.h
+++ b/kopete/kopete/config/appearance/tooltipeditdialog.h
@@ -25,7 +25,7 @@ class TooltipEditWidget;
class TooltipEditDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
TooltipEditDialog(TQWidget *parent=0, const char* name="ToolTipEditDialog");
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.h b/kopete/kopete/config/avdevice/avdeviceconfig.h
index eb267c44..ee03faf5 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.h
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.h
@@ -40,7 +40,7 @@ class AVDeviceConfig_AudioDevice;
class AVDeviceConfig : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args);
diff --git a/kopete/kopete/config/behavior/behaviorconfig.h b/kopete/kopete/config/behavior/behaviorconfig.h
index 4f01c943..c181cda4 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.h
+++ b/kopete/kopete/config/behavior/behaviorconfig.h
@@ -35,7 +35,7 @@ class KPluginInfo;
class BehaviorConfig : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
BehaviorConfig(TQWidget *parent, const char * name , const TQStringList &args) ;
diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.h b/kopete/kopete/config/identity/globalidentitiesmanager.h
index a253bdc8..e7ee06c0 100644
--- a/kopete/kopete/config/identity/globalidentitiesmanager.h
+++ b/kopete/kopete/config/identity/globalidentitiesmanager.h
@@ -37,7 +37,7 @@ class TQDomDocument;
class GlobalIdentitiesManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* @brief Return the single instance of GlobalIdentitiesManager class
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h
index c74ae463..107d1ee5 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.h
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.h
@@ -36,7 +36,7 @@ class KopeteIdentityConfigBase;
class KopeteIdentityConfig : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteIdentityConfig(TQWidget *parent, const char *name, const TQStringList &args );
~KopeteIdentityConfig();
diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.h b/kopete/kopete/config/plugins/kopetepluginconfig.h
index c235a699..7abeb7ed 100644
--- a/kopete/kopete/config/plugins/kopetepluginconfig.h
+++ b/kopete/kopete/config/plugins/kopetepluginconfig.h
@@ -30,7 +30,7 @@ class KopetePluginConfigPrivate;
class KopetePluginConfig : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopetePluginConfig( TQWidget *parent, const char *name = 0L );
diff --git a/kopete/kopete/contactlist/customnotificationprops.h b/kopete/kopete/contactlist/customnotificationprops.h
index 6da6f1f2..ecc0caec 100644
--- a/kopete/kopete/contactlist/customnotificationprops.h
+++ b/kopete/kopete/contactlist/customnotificationprops.h
@@ -30,7 +30,7 @@ class NotifyDataObject;
class CustomNotificationProps : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name = 0 );
~CustomNotificationProps() {}
diff --git a/kopete/kopete/contactlist/kabcexport.h b/kopete/kopete/contactlist/kabcexport.h
index 3e5ff965..d8ca8da1 100644
--- a/kopete/kopete/contactlist/kabcexport.h
+++ b/kopete/kopete/contactlist/kabcexport.h
@@ -36,7 +36,7 @@ namespace KRES {
class KabcExportWizard : public KabcExportWizard_Base
{
Q_OBJECT
- TQ_OBJECT
+
public:
KabcExportWizard( TQWidget *parent = 0, const char *name = 0 );
~KabcExportWizard();
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.h b/kopete/kopete/contactlist/kopetecontactlistview.h
index 6a4e2937..eb9cb690 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.h
+++ b/kopete/kopete/contactlist/kopetecontactlistview.h
@@ -59,7 +59,7 @@ class MessageEvent;
class KopeteContactListView : public Kopete::UI::ListView::ListView
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteContactListView( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h
index 1b1846e1..2d4bb985 100644
--- a/kopete/kopete/contactlist/kopetegrouplistaction.h
+++ b/kopete/kopete/contactlist/kopetegrouplistaction.h
@@ -29,7 +29,7 @@
class KopeteGroupListAction : public KListAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteGroupListAction( const TQString &, const TQString &, const KShortcut &,
diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.h b/kopete/kopete/contactlist/kopetegroupviewitem.h
index 19b24cfd..0447d809 100644
--- a/kopete/kopete/contactlist/kopetegroupviewitem.h
+++ b/kopete/kopete/contactlist/kopetegroupviewitem.h
@@ -35,7 +35,7 @@ class Group;
class KopeteGroupViewItem : public Kopete::UI::ListView::Item
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteGroupViewItem( Kopete::Group *group , TQListView *parent, const char *name = 0 );
KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *parent, const char *name = 0 );
diff --git a/kopete/kopete/contactlist/kopetelviprops.h b/kopete/kopete/contactlist/kopetelviprops.h
index 320c729e..01e91936 100644
--- a/kopete/kopete/contactlist/kopetelviprops.h
+++ b/kopete/kopete/contactlist/kopetelviprops.h
@@ -43,7 +43,7 @@ namespace Kopete { class Contact; }
class KopeteGVIProps: public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name=0L);
@@ -65,7 +65,7 @@ class KopeteGVIProps: public KDialogBase
class KopeteMetaLVIProps: public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *parent, const char *name=0L);
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h
index fc755158..ba0e28f0 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.h
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h
@@ -53,7 +53,7 @@ class KopeteGroupViewItem;
class KopeteMetaContactLVI : public Kopete::UI::ListView::Item
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent );
diff --git a/kopete/kopete/kimifaceimpl.h b/kopete/kopete/kimifaceimpl.h
index ec3a45e8..0b7339b9 100644
--- a/kopete/kopete/kimifaceimpl.h
+++ b/kopete/kopete/kimifaceimpl.h
@@ -28,7 +28,7 @@ class MetaContact;
class KIMIfaceImpl : public TQObject, public KIMIface
{
Q_OBJECT
- TQ_OBJECT
+
public:
KIMIfaceImpl();
~KIMIfaceImpl();
diff --git a/kopete/kopete/kopeteaccountstatusbaricon.h b/kopete/kopete/kopeteaccountstatusbaricon.h
index bd867351..81c7c798 100644
--- a/kopete/kopete/kopeteaccountstatusbaricon.h
+++ b/kopete/kopete/kopeteaccountstatusbaricon.h
@@ -33,7 +33,7 @@ class Account;
class KopeteAccountStatusBarIcon : public TQLabel
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/kopete/kopeteapplication.h b/kopete/kopete/kopeteapplication.h
index 5fa10549..06888371 100644
--- a/kopete/kopete/kopeteapplication.h
+++ b/kopete/kopete/kopeteapplication.h
@@ -43,7 +43,7 @@ namespace Kopete
class KopeteApplication : public KUniqueApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteApplication();
diff --git a/kopete/kopete/kopeteballoon.h b/kopete/kopete/kopeteballoon.h
index 103c86c4..0da65a82 100644
--- a/kopete/kopete/kopeteballoon.h
+++ b/kopete/kopete/kopeteballoon.h
@@ -31,7 +31,7 @@
class KopeteActiveLabel : public KActiveLabel
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteActiveLabel( TQWidget *parent = 0, const char* name = 0 );
@@ -52,7 +52,7 @@ public slots:
class KopeteBalloon : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteBalloon(const TQString &text, const TQString &pic);
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.h b/kopete/kopete/kopeteeditglobalidentitywidget.h
index 82ad3ca7..d2e077a0 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.h
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.h
@@ -33,7 +33,7 @@
class KopeteEditGlobalIdentityWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteEditGlobalIdentityWidget(TQWidget *parent = 0, const char *name = 0);
virtual ~KopeteEditGlobalIdentityWidget();
@@ -87,7 +87,7 @@ class TQMouseEvent;
class ClickableLabel : public TQLabel
{
Q_OBJECT
- TQ_OBJECT
+
public:
ClickableLabel(TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h
index 4148104a..0a687831 100644
--- a/kopete/kopete/kopetewindow.h
+++ b/kopete/kopete/kopetewindow.h
@@ -61,7 +61,7 @@ class Protocol;
class KopeteWindow : public KMainWindow
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteWindow ( TQWidget *parent = 0, const char *name = 0 );
@@ -266,7 +266,7 @@ private:
class GlobalStatusMessageIconLabel : public TQLabel
{
Q_OBJECT
- TQ_OBJECT
+
public:
GlobalStatusMessageIconLabel(TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/kopete/systemtray.h b/kopete/kopete/systemtray.h
index 3f5d3fb9..496e438d 100644
--- a/kopete/kopete/systemtray.h
+++ b/kopete/kopete/systemtray.h
@@ -42,7 +42,7 @@ class KopeteBalloon;
class KopeteSystemTray : public KSystemTray
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/avdevice/qvideostream.h b/kopete/libkopete/avdevice/qvideostream.h
index 90df7131..afd7f02c 100644
--- a/kopete/libkopete/avdevice/qvideostream.h
+++ b/kopete/libkopete/avdevice/qvideostream.h
@@ -44,7 +44,7 @@ class QVideoStreamPrivate;
class QVideoStream : public TQObject, public QVideo
{
Q_OBJECT
- TQ_OBJECT
+
public:
QVideoStream(TQWidget *widget, const char* name = 0);
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
index 5a9ec050..db95ee37 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h
@@ -44,7 +44,7 @@ class KPopupMenu;
class KOPETE_EXPORT KPixmapRegionSelectorWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructor for a KPixmapRegionSelectorWidget.
diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h
index 9890e474..44ff1b2e 100644
--- a/kopete/libkopete/connectionmanager.h
+++ b/kopete/libkopete/connectionmanager.h
@@ -26,7 +26,7 @@ class ConnectionManagerPrivate;
class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObject
{
Q_OBJECT
-// TQ_OBJECT
+//
K_DCOP
public:
static ConnectionManager* self();
diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/kabcpersistence.h
index 1e027cc5..ae84d615 100644
--- a/kopete/libkopete/kabcpersistence.h
+++ b/kopete/libkopete/kabcpersistence.h
@@ -42,7 +42,7 @@ namespace Kopete
class KOPETE_EXPORT KABCPersistence : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* \brief Retrieve the instance of AccountManager.
diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h
index 7d1d3d28..c9b4fa2a 100644
--- a/kopete/libkopete/kautoconfig.h
+++ b/kopete/libkopete/kautoconfig.h
@@ -88,7 +88,7 @@ class TQWidget;
class KOPETE_EXPORT KAutoConfig : public TQObject {
Q_OBJECT
- TQ_OBJECT
+
signals:
/**
diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h
index 9102f2b4..1fe15acf 100644
--- a/kopete/libkopete/kcautoconfigmodule.h
+++ b/kopete/libkopete/kcautoconfigmodule.h
@@ -53,7 +53,7 @@ class KConfig;
class KOPETE_EXPORT KCAutoConfigModule : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Standard KCModule constructor. Use KGlobal::config()
diff --git a/kopete/libkopete/knotification.h b/kopete/libkopete/knotification.h
index 96789942..f9c2ec5d 100644
--- a/kopete/libkopete/knotification.h
+++ b/kopete/libkopete/knotification.h
@@ -54,7 +54,7 @@ namespace Kopete { class MetaContact; }
class KOPETE_EXPORT KNotification : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum NotificationFlags
diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h
index 90ae678b..f6728446 100644
--- a/kopete/libkopete/kopeteaccount.h
+++ b/kopete/libkopete/kopeteaccount.h
@@ -66,7 +66,7 @@ class BlackLister;
class KOPETE_EXPORT Account : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
Q_ENUMS( AddMode )
TQ_PROPERTY( TQString accountId READ accountId )
diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h
index f1ba6443..03b56334 100644
--- a/kopete/libkopete/kopeteaccountmanager.h
+++ b/kopete/libkopete/kopeteaccountmanager.h
@@ -46,7 +46,7 @@ class OnlineStatus;
class KOPETE_EXPORT AccountManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopeteaway.h b/kopete/libkopete/kopeteaway.h
index 90d07469..81adb30f 100644
--- a/kopete/libkopete/kopeteaway.h
+++ b/kopete/libkopete/kopeteaway.h
@@ -57,7 +57,7 @@ namespace Kopete
class KOPETE_EXPORT Away : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
friend class ::KopeteAwayDialog;
diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h
index 25121850..23680ed4 100644
--- a/kopete/libkopete/kopeteawayaction.h
+++ b/kopete/libkopete/kopeteawayaction.h
@@ -40,7 +40,7 @@ class OnlineStatus;
class KOPETE_EXPORT AwayAction : public KSelectAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructor
diff --git a/kopete/libkopete/kopeteawaydialog.h b/kopete/libkopete/kopeteawaydialog.h
index 1ca75615..b9470af9 100644
--- a/kopete/libkopete/kopeteawaydialog.h
+++ b/kopete/libkopete/kopeteawaydialog.h
@@ -53,7 +53,7 @@ class KopeteAwayDialogPrivate;
class KOPETE_EXPORT KopeteAwayDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopeteblacklister.h b/kopete/libkopete/kopeteblacklister.h
index a9f82157..29bf9d79 100644
--- a/kopete/libkopete/kopeteblacklister.h
+++ b/kopete/libkopete/kopeteblacklister.h
@@ -45,7 +45,7 @@ class Contact;
class BlackLister : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopetechatsession.h b/kopete/libkopete/kopetechatsession.h
index cab992c9..e0d9eac6 100644
--- a/kopete/libkopete/kopetechatsession.h
+++ b/kopete/libkopete/kopetechatsession.h
@@ -77,7 +77,7 @@ class KOPETE_EXPORT ChatSession : public TQObject , public KXMLGUIClient
friend class ChatSessionManager;
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopetechatsessionmanager.h b/kopete/libkopete/kopetechatsessionmanager.h
index b78509fc..e21aaabe 100644
--- a/kopete/libkopete/kopetechatsessionmanager.h
+++ b/kopete/libkopete/kopetechatsessionmanager.h
@@ -49,7 +49,7 @@ typedef TQValueList<Message> MessageList;
class KOPETE_EXPORT ChatSessionManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static ChatSessionManager* self();
diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h
index 5ffa76bb..143a0fc6 100644
--- a/kopete/libkopete/kopetecommandhandler.h
+++ b/kopete/libkopete/kopetecommandhandler.h
@@ -50,7 +50,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject
friend class ::KopeteCommandGUIClient;
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h
index 05160664..fa7e3f3c 100644
--- a/kopete/libkopete/kopetecontact.h
+++ b/kopete/libkopete/kopetecontact.h
@@ -54,7 +54,7 @@ typedef TQPtrList<Group> GroupList;
class KOPETE_EXPORT Contact : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
Q_ENUMS( CanCreateFlags )
TQ_PROPERTY( TQString formattedName READ formattedName )
diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h
index 5833fb34..c929ac13 100644
--- a/kopete/libkopete/kopetecontactlist.h
+++ b/kopete/libkopete/kopetecontactlist.h
@@ -50,7 +50,7 @@ class Contact;
class KOPETE_EXPORT ContactList : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopetecontactlistelement.h b/kopete/libkopete/kopetecontactlistelement.h
index 7afda322..97d91a4a 100644
--- a/kopete/libkopete/kopetecontactlistelement.h
+++ b/kopete/libkopete/kopetecontactlistelement.h
@@ -44,7 +44,7 @@ class Plugin;
class KOPETE_EXPORT ContactListElement : public TQObject /* public KopeteNotifyDataObject */
{
Q_OBJECT
- TQ_OBJECT
+
protected:
ContactListElement( TQObject *parent = 0L, const char *name = 0L );
diff --git a/kopete/libkopete/kopetegroup.h b/kopete/libkopete/kopetegroup.h
index 3f430eda..b175bce1 100644
--- a/kopete/libkopete/kopetegroup.h
+++ b/kopete/libkopete/kopetegroup.h
@@ -51,7 +51,7 @@ class KOPETE_EXPORT Group : public ContactListElement, public NotifyDataObject
TQ_PROPERTY( bool expanded READ isExpanded WRITE setExpanded )
Q_OBJECT
- TQ_OBJECT
+
public:
/** Kinds of groups. */
diff --git a/kopete/libkopete/kopetemessageevent.h b/kopete/libkopete/kopetemessageevent.h
index 2432c0a5..b227c283 100644
--- a/kopete/libkopete/kopetemessageevent.h
+++ b/kopete/libkopete/kopetemessageevent.h
@@ -42,7 +42,7 @@ namespace Kopete
class KOPETE_EXPORT MessageEvent : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
MessageEvent(const Kopete::Message& , TQObject* parent=0L, const char *name=0L);
diff --git a/kopete/libkopete/kopetemessagehandler.h b/kopete/libkopete/kopetemessagehandler.h
index 67858e4d..21306b17 100644
--- a/kopete/libkopete/kopetemessagehandler.h
+++ b/kopete/libkopete/kopetemessagehandler.h
@@ -45,7 +45,7 @@ class ChatSession;
class KOPETE_EXPORT MessageHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
MessageHandler();
virtual ~MessageHandler() = 0;
diff --git a/kopete/libkopete/kopetemessagehandlerchain.h b/kopete/libkopete/kopetemessagehandlerchain.h
index cfdf3271..2fd253b9 100644
--- a/kopete/libkopete/kopetemessagehandlerchain.h
+++ b/kopete/libkopete/kopetemessagehandlerchain.h
@@ -44,7 +44,7 @@ class ProcessMessageTask;
class MessageHandlerChain : public TQObject, private KShared
{
Q_OBJECT
- TQ_OBJECT
+
public:
friend class KSharedPtr<MessageHandlerChain>;
typedef KSharedPtr<MessageHandlerChain> Ptr;
@@ -74,7 +74,7 @@ private:
class ProcessMessageTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
MessageEvent *event();
diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h
index 60c8f6a2..2f918c73 100644
--- a/kopete/libkopete/kopetemetacontact.h
+++ b/kopete/libkopete/kopetemetacontact.h
@@ -57,7 +57,7 @@ class Picture;
class KOPETE_EXPORT MetaContact : public ContactListElement, public NotifyDataObject
{
Q_OBJECT
- TQ_OBJECT
+
TQ_PROPERTY( TQString displayName READ displayName WRITE setDisplayName )
TQ_PROPERTY( TQString statusString READ statusString )
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h
index 8edd8861..92650fce 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.h
+++ b/kopete/libkopete/kopeteonlinestatusmanager.h
@@ -42,7 +42,7 @@ namespace Kopete
class KOPETE_EXPORT OnlineStatusManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static OnlineStatusManager* self();
~OnlineStatusManager();
@@ -152,7 +152,7 @@ private:
class OnlineStatusAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent=0, const char *name=0);
signals:
diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h
index 3846d6d1..19c1643c 100644
--- a/kopete/libkopete/kopetepassword.h
+++ b/kopete/libkopete/kopetepassword.h
@@ -46,7 +46,7 @@ namespace Kopete
class KOPETE_EXPORT Password : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
@@ -208,7 +208,7 @@ private:
class KopetePasswordRequestBase : public virtual TQObject
{
Q_OBJECT
- TQ_OBJECT
+
signals:
void requestFinished( const TQString &password );
public slots:
diff --git a/kopete/libkopete/kopetepasswordedaccount.h b/kopete/libkopete/kopetepasswordedaccount.h
index 210adbd4..0cc46dbb 100644
--- a/kopete/libkopete/kopetepasswordedaccount.h
+++ b/kopete/libkopete/kopetepasswordedaccount.h
@@ -35,7 +35,7 @@ class Password;
class KOPETE_EXPORT PasswordedAccount : public Account
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h
index cae084ee..932c8174 100644
--- a/kopete/libkopete/kopeteplugin.h
+++ b/kopete/libkopete/kopeteplugin.h
@@ -90,7 +90,7 @@ Comment=Plugin that do some nice stuff
class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
Plugin( KInstance *instance, TQObject *parent, const char *name );
diff --git a/kopete/libkopete/kopetepluginmanager.h b/kopete/libkopete/kopetepluginmanager.h
index 7cf69a48..d0eceb29 100644
--- a/kopete/libkopete/kopetepluginmanager.h
+++ b/kopete/libkopete/kopetepluginmanager.h
@@ -43,7 +43,7 @@ typedef TQValueList<Plugin*> PluginList;
class KOPETE_EXPORT PluginManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
Q_ENUMS( PluginLoadMode )
public:
diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h
index 5d1c1700..19138b66 100644
--- a/kopete/libkopete/kopeteprefs.h
+++ b/kopete/libkopete/kopeteprefs.h
@@ -29,7 +29,7 @@ class KConfig;
class KOPETE_EXPORT KopetePrefs : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
// here so we can use TQt to translate enums<-->strings
TQ_PROPERTY( ContactDisplayMode contactListDisplayMode READ contactListDisplayMode WRITE setContactListDisplayMode )
TQ_PROPERTY( IconDisplayMode contactListIconMode READ contactListIconMode WRITE setContactListIconMode )
diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h
index f97bf809..1b1d7c08 100644
--- a/kopete/libkopete/kopeteprotocol.h
+++ b/kopete/libkopete/kopeteprotocol.h
@@ -58,7 +58,7 @@ class Account;
class KOPETE_EXPORT Protocol : public Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/libkopete/kopetesimplemessagehandler.h b/kopete/libkopete/kopetesimplemessagehandler.h
index b165dbb0..b0123c40 100644
--- a/kopete/libkopete/kopetesimplemessagehandler.h
+++ b/kopete/libkopete/kopetesimplemessagehandler.h
@@ -69,7 +69,7 @@ private:
class SimpleMessageHandler : public MessageHandler
{
Q_OBJECT
- TQ_OBJECT
+
public:
SimpleMessageHandler();
~SimpleMessageHandler();
diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h
index d669d68b..648ed4fc 100644
--- a/kopete/libkopete/kopetetask.h
+++ b/kopete/libkopete/kopetetask.h
@@ -48,7 +48,7 @@ namespace Kopete
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
protected:
Task();
diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h
index 4a952e10..60ce2eac 100644
--- a/kopete/libkopete/kopetetransfermanager.h
+++ b/kopete/libkopete/kopetetransfermanager.h
@@ -66,7 +66,7 @@ private:
class KOPETE_EXPORT TransferManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
@@ -135,7 +135,7 @@ private:
class KOPETE_EXPORT Transfer : public KIO::Job
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h
index 83fcefc8..f12f826c 100644
--- a/kopete/libkopete/kopetewalletmanager.h
+++ b/kopete/libkopete/kopetewalletmanager.h
@@ -37,7 +37,7 @@ namespace Kopete
class KOPETE_EXPORT WalletManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
@@ -106,7 +106,7 @@ private:
class KopeteWalletSignal : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
friend class Kopete::WalletManager;
signals:
void walletOpened( KWallet::Wallet *wallet );
diff --git a/kopete/libkopete/managedconnectionaccount.h b/kopete/libkopete/managedconnectionaccount.h
index 755fbf71..2141a2bf 100644
--- a/kopete/libkopete/managedconnectionaccount.h
+++ b/kopete/libkopete/managedconnectionaccount.h
@@ -36,7 +36,7 @@ class Protocol;
class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* @brief ManagedConnectionAccount constructor.
diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h
index 47286967..80e68fea 100644
--- a/kopete/libkopete/private/kopetecommand.h
+++ b/kopete/libkopete/private/kopetecommand.h
@@ -30,7 +30,7 @@ class ChatSession;
class Command : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/private/kopeteemoticons.h b/kopete/libkopete/private/kopeteemoticons.h
index c780ac0c..fd2d93a1 100644
--- a/kopete/libkopete/private/kopeteemoticons.h
+++ b/kopete/libkopete/private/kopeteemoticons.h
@@ -29,7 +29,7 @@ namespace Kopete {
class KOPETE_EXPORT Emoticons : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructor: DON'T use it if you want to use the emoticon theme
diff --git a/kopete/libkopete/private/kopeteutils_private.h b/kopete/libkopete/private/kopeteutils_private.h
index 4114e65f..5a380e8d 100644
--- a/kopete/libkopete/private/kopeteutils_private.h
+++ b/kopete/libkopete/private/kopeteutils_private.h
@@ -40,7 +40,7 @@ typedef struct
class NotifyHelper : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static NotifyHelper* self();
void registerNotification(const KNotification* event, ErrorNotificationInfo error);
diff --git a/kopete/libkopete/private/kopeteviewmanager.h b/kopete/libkopete/private/kopeteviewmanager.h
index c1de7730..2413bfc3 100644
--- a/kopete/libkopete/private/kopeteviewmanager.h
+++ b/kopete/libkopete/private/kopeteviewmanager.h
@@ -39,7 +39,7 @@ struct KopeteViewManagerPrivate;
class KOPETE_EXPORT KopeteViewManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** This is a singleton class. Call this method to get a pointer to
* a KopeteViewManager.
diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.h b/kopete/libkopete/tests/kopetepasswordtest_program.h
index 776374c1..45b08989 100644
--- a/kopete/libkopete/tests/kopetepasswordtest_program.h
+++ b/kopete/libkopete/tests/kopetepasswordtest_program.h
@@ -6,7 +6,7 @@
class PasswordRetriever : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TQString password;
public slots:
diff --git a/kopete/libkopete/tests/kopetewallettest_program.h b/kopete/libkopete/tests/kopetewallettest_program.h
index 225fa6ad..abea5a23 100644
--- a/kopete/libkopete/tests/kopetewallettest_program.h
+++ b/kopete/libkopete/tests/kopetewallettest_program.h
@@ -8,7 +8,7 @@ namespace KWallet { class Wallet; }
class WalletReciever : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public slots:
void timer();
private slots:
diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h
index 2ad22a53..f675603f 100644
--- a/kopete/libkopete/ui/accountselector.h
+++ b/kopete/libkopete/ui/accountselector.h
@@ -31,7 +31,7 @@ class TQListViewItem;
class KOPETE_EXPORT AccountSelector : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h
index 8ef81e0e..71209d21 100644
--- a/kopete/libkopete/ui/addcontactpage.h
+++ b/kopete/libkopete/ui/addcontactpage.h
@@ -32,7 +32,7 @@
class KOPETE_EXPORT AddContactPage : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
AddContactPage(TQWidget *parent=0, const char *name=0);
diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h
index cec68f8d..09574193 100644
--- a/kopete/libkopete/ui/addressbooklinkwidget.h
+++ b/kopete/libkopete/ui/addressbooklinkwidget.h
@@ -43,7 +43,7 @@ namespace UI {
class AddressBookLinkWidget : public AddressBookLinkWidgetBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
AddressBookLinkWidget( TQWidget * parent, const char * name );
~AddressBookLinkWidget() {}
diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h
index 235dabd5..5f5f6500 100644
--- a/kopete/libkopete/ui/addressbookselectordialog.h
+++ b/kopete/libkopete/ui/addressbookselectordialog.h
@@ -47,7 +47,7 @@ class AddressBookSelectorWidget;
class KOPETE_EXPORT AddressBookSelectorDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* The constructor of an empty AddressBookSelectorWidget
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h
index 6aff7fb5..af4b1834 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.h
+++ b/kopete/libkopete/ui/addressbookselectorwidget.h
@@ -48,7 +48,7 @@ namespace UI
class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget_Base
{
Q_OBJECT
- TQ_OBJECT
+
public:
AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 );
~AddressBookSelectorWidget();
diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h
index ae873344..e439ed47 100644
--- a/kopete/libkopete/ui/contactaddednotifydialog.h
+++ b/kopete/libkopete/ui/contactaddednotifydialog.h
@@ -70,7 +70,7 @@ namespace UI {
class KOPETE_EXPORT ContactAddedNotifyDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* All widget in the dialog that may be hidden.
diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h
index e87b0437..15143697 100644
--- a/kopete/libkopete/ui/kopetecontactaction.h
+++ b/kopete/libkopete/ui/kopetecontactaction.h
@@ -32,7 +32,7 @@ class Contact;
class KOPETE_EXPORT KopeteContactAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h
index 3a15693d..4cc2bc9b 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.h
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h
@@ -31,7 +31,7 @@ class FileConfirmBase;
class KopeteFileConfirmDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *parent=0, const char* name=0);
diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h
index 6dcf4ccc..79a96dbb 100644
--- a/kopete/libkopete/ui/kopetelistview.h
+++ b/kopete/libkopete/ui/kopetelistview.h
@@ -32,7 +32,7 @@ namespace ListView {
class ListView : public KListView
{
Q_OBJECT
- TQ_OBJECT
+
public:
ListView( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index bd2a2968..8285047a 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -454,7 +454,7 @@ public:
class Item : public TQObject, public KListViewItem, public ComponentBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 );
Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 );
diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h
index c30cc90f..55d3ce91 100644
--- a/kopete/libkopete/ui/kopetelistviewsearchline.h
+++ b/kopete/libkopete/ui/kopetelistviewsearchline.h
@@ -29,7 +29,7 @@ class ListView;
class SearchLine : public KListViewSearchLine
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructs a SearchLine with \a listView being the
diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h
index d4ad2c11..66fe5d9b 100644
--- a/kopete/libkopete/ui/kopetepasswordwidget.h
+++ b/kopete/libkopete/ui/kopetepasswordwidget.h
@@ -37,7 +37,7 @@ namespace UI
class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h
index c4941e20..895ad180 100644
--- a/kopete/libkopete/ui/kopetestdaction.h
+++ b/kopete/libkopete/ui/kopetestdaction.h
@@ -104,7 +104,7 @@ namespace KSettings
class KOPETE_EXPORT KopetePreferencesAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
KopetePreferencesAction( KActionCollection *parent, const char *name = 0 );
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h
index 0335ac62..fb0f1e17 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.h
+++ b/kopete/libkopete/ui/metacontactselectorwidget.h
@@ -38,7 +38,7 @@ namespace UI
class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MetaContactSelectorWidget( TQWidget *parent = 0, const char *name = 0 );
~MetaContactSelectorWidget();
@@ -81,7 +81,7 @@ private:
class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item
{
Q_OBJECT
- TQ_OBJECT
+
public:
MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 );
Kopete::MetaContact* metaContact();
diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h
index ce2dcc90..511aeb3f 100644
--- a/kopete/libkopete/ui/userinfodialog.h
+++ b/kopete/libkopete/ui/userinfodialog.h
@@ -30,7 +30,7 @@ namespace Kopete {
class KOPETE_EXPORT UserInfoDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
UserInfoDialog( const TQString& descr );
virtual ~UserInfoDialog();
diff --git a/kopete/libkopete/webcamwidget.h b/kopete/libkopete/webcamwidget.h
index 8b217897..44a2a254 100644
--- a/kopete/libkopete/webcamwidget.h
+++ b/kopete/libkopete/webcamwidget.h
@@ -31,7 +31,7 @@ namespace Kopete
class KOPETE_EXPORT WebcamWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* @brief WebcamWidget constructor.
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h
index 187aae0f..4de58478 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.h
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h
@@ -27,7 +27,7 @@
class BookmarksPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &args);
diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
index ad9a6fb8..19ba80b5 100644
--- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h
+++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h
@@ -22,7 +22,7 @@
class BookmarksPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
BookmarksPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
index 03925f1a..64e878d8 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h
@@ -21,7 +21,7 @@
class BookmarksPrefsSettings : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum UseSubfolders { Always=0, Never=1, SelectedContacts=2, UnselectedContacts=3 };
diff --git a/kopete/plugins/alias/aliasplugin.h b/kopete/plugins/alias/aliasplugin.h
index 213e7ba7..ae27b7de 100644
--- a/kopete/plugins/alias/aliasplugin.h
+++ b/kopete/plugins/alias/aliasplugin.h
@@ -15,7 +15,7 @@
class AliasPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static AliasPlugin *plugin();
diff --git a/kopete/plugins/alias/aliaspreferences.h b/kopete/plugins/alias/aliaspreferences.h
index 24f96573..dcbc2671 100644
--- a/kopete/plugins/alias/aliaspreferences.h
+++ b/kopete/plugins/alias/aliaspreferences.h
@@ -24,7 +24,7 @@ namespace Kopete { class Plugin; }
class AliasPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
AliasPreferences( TQWidget *parent = 0, const char *name = 0,
diff --git a/kopete/plugins/alias/editaliasdialog.h b/kopete/plugins/alias/editaliasdialog.h
index cd444878..e9af86b1 100644
--- a/kopete/plugins/alias/editaliasdialog.h
+++ b/kopete/plugins/alias/editaliasdialog.h
@@ -25,7 +25,7 @@ class TQWidget;
class EditAliasDialog : public AliasDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
EditAliasDialog( TQWidget* parent = 0, const char* name = 0 );
virtual ~EditAliasDialog();
diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.h b/kopete/plugins/autoreplace/autoreplaceplugin.h
index ac8012d0..c770642a 100644
--- a/kopete/plugins/autoreplace/autoreplaceplugin.h
+++ b/kopete/plugins/autoreplace/autoreplaceplugin.h
@@ -38,7 +38,7 @@ class AutoReplaceConfig;
class AutoReplacePlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static AutoReplacePlugin *plugin();
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.h b/kopete/plugins/autoreplace/autoreplacepreferences.h
index b2f504d7..fc34d695 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.h
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.h
@@ -32,7 +32,7 @@ class AutoReplaceConfig;
class AutoReplacePreferences : public KCAutoConfigModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
AutoReplacePreferences( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h
index c030c71c..6240e11e 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.h
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h
@@ -29,7 +29,7 @@ class KProcess;
class ConnectionStatusPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/plugins/contactnotes/contactnotesedit.h b/kopete/plugins/contactnotes/contactnotesedit.h
index 81b9b71e..f9a3d892 100644
--- a/kopete/plugins/contactnotes/contactnotesedit.h
+++ b/kopete/plugins/contactnotes/contactnotesedit.h
@@ -33,7 +33,7 @@ class ContactNotesPlugin;
class ContactNotesEdit : public KDialogBase {
Q_OBJECT
- TQ_OBJECT
+
public:
ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p=0 ,const char *name=0);
~ContactNotesEdit();
diff --git a/kopete/plugins/contactnotes/contactnotesplugin.h b/kopete/plugins/contactnotes/contactnotesplugin.h
index 1b3177e6..ebd2cade 100644
--- a/kopete/plugins/contactnotes/contactnotesplugin.h
+++ b/kopete/plugins/contactnotes/contactnotesplugin.h
@@ -40,7 +40,7 @@ namespace Kopete { class MetaContact; }
class ContactNotesPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static ContactNotesPlugin *plugin();
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.h b/kopete/plugins/cryptography/cryptographyguiclient.h
index 000ca880..530a1172 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.h
+++ b/kopete/plugins/cryptography/cryptographyguiclient.h
@@ -27,7 +27,7 @@ class KToggleAction;
class CryptographyGUIClient : public TQObject, public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
CryptographyGUIClient(Kopete::ChatSession *parent = 0);
~CryptographyGUIClient();
diff --git a/kopete/plugins/cryptography/cryptographyplugin.h b/kopete/plugins/cryptography/cryptographyplugin.h
index a75d9833..ad96767e 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.h
+++ b/kopete/plugins/cryptography/cryptographyplugin.h
@@ -40,7 +40,7 @@ namespace Kopete
class CryptographyPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum CacheMode
diff --git a/kopete/plugins/cryptography/cryptographypreferences.h b/kopete/plugins/cryptography/cryptographypreferences.h
index a206f826..398daaba 100644
--- a/kopete/plugins/cryptography/cryptographypreferences.h
+++ b/kopete/plugins/cryptography/cryptographypreferences.h
@@ -29,7 +29,7 @@ class KAutoConfig;
*/
class CryptographyPreferences : public KCAutoConfigModule {
Q_OBJECT
- TQ_OBJECT
+
public:
CryptographyPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
private:
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.h b/kopete/plugins/cryptography/cryptographyselectuserkey.h
index a7f47853..3d8847a6 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.h
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.h
@@ -29,7 +29,7 @@ class CryptographyUserKey_ui;
class CryptographySelectUserKey : public KDialogBase {
Q_OBJECT
- TQ_OBJECT
+
public:
CryptographySelectUserKey(const TQString &key, Kopete::MetaContact *mc);
~CryptographySelectUserKey();
diff --git a/kopete/plugins/cryptography/kgpginterface.h b/kopete/plugins/cryptography/kgpginterface.h
index 9da953fe..9ed98871 100644
--- a/kopete/plugins/cryptography/kgpginterface.h
+++ b/kopete/plugins/cryptography/kgpginterface.h
@@ -30,7 +30,7 @@
class KgpgInterface : public TQObject {
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/plugins/cryptography/kgpgselkey.h b/kopete/plugins/cryptography/kgpgselkey.h
index 659c7043..0742082a 100644
--- a/kopete/plugins/cryptography/kgpgselkey.h
+++ b/kopete/plugins/cryptography/kgpgselkey.h
@@ -41,7 +41,7 @@ struct gpgKey {
class KgpgSelKey : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true);
diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index 0a3acfac..ca62a6d7 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -34,7 +34,7 @@ class KProcIO;
class popupPublic : public KDialogBase //TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
diff --git a/kopete/plugins/highlight/highlightplugin.h b/kopete/plugins/highlight/highlightplugin.h
index e9ba7a6d..a85b21a7 100644
--- a/kopete/plugins/highlight/highlightplugin.h
+++ b/kopete/plugins/highlight/highlightplugin.h
@@ -43,7 +43,7 @@ class Filter;
class HighlightPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static HighlightPlugin *plugin();
diff --git a/kopete/plugins/highlight/highlightpreferences.h b/kopete/plugins/highlight/highlightpreferences.h
index eada93fe..597564f4 100644
--- a/kopete/plugins/highlight/highlightpreferences.h
+++ b/kopete/plugins/highlight/highlightpreferences.h
@@ -31,7 +31,7 @@ class TQListViewItem;
class HighlightPreferences : public KCModule {
Q_OBJECT
- TQ_OBJECT
+
public:
HighlightPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h
index a950d384..05295ad6 100644
--- a/kopete/plugins/history/historydialog.h
+++ b/kopete/plugins/history/historydialog.h
@@ -62,7 +62,7 @@ class DMPair
class HistoryDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent=0,
diff --git a/kopete/plugins/history/historyguiclient.h b/kopete/plugins/history/historyguiclient.h
index 3c09eaf4..356afe29 100644
--- a/kopete/plugins/history/historyguiclient.h
+++ b/kopete/plugins/history/historyguiclient.h
@@ -29,7 +29,7 @@ class KAction;
class HistoryGUIClient : public TQObject , public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
HistoryGUIClient(Kopete::ChatSession *parent = 0, const char *name = 0);
~HistoryGUIClient();
diff --git a/kopete/plugins/history/historylogger.h b/kopete/plugins/history/historylogger.h
index 1d7fae61..274eabd1 100644
--- a/kopete/plugins/history/historylogger.h
+++ b/kopete/plugins/history/historylogger.h
@@ -35,7 +35,7 @@ class TQTimer;
class HistoryLogger : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/plugins/history/historyplugin.h b/kopete/plugins/history/historyplugin.h
index e80ce26b..85aa2a3e 100644
--- a/kopete/plugins/history/historyplugin.h
+++ b/kopete/plugins/history/historyplugin.h
@@ -74,7 +74,7 @@ public:
class HistoryPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
HistoryPlugin( TQObject *parent, const char *name, const TQStringList &args );
~HistoryPlugin();
diff --git a/kopete/plugins/history/historypreferences.h b/kopete/plugins/history/historypreferences.h
index 61339290..d0dfa920 100644
--- a/kopete/plugins/history/historypreferences.h
+++ b/kopete/plugins/history/historypreferences.h
@@ -29,7 +29,7 @@ class HistoryPrefsUI;
class HistoryPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
HistoryPreferences(TQWidget *parent=0, const char* name=0,
const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/latex/latexguiclient.h b/kopete/plugins/latex/latexguiclient.h
index 0b1afac4..2534e9a5 100644
--- a/kopete/plugins/latex/latexguiclient.h
+++ b/kopete/plugins/latex/latexguiclient.h
@@ -37,7 +37,7 @@ namespace Kopete { class ChatSession; }
class LatexGUIClient : public TQObject , public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
LatexGUIClient( Kopete::ChatSession *parent, const char *name=0L);
diff --git a/kopete/plugins/latex/latexplugin.h b/kopete/plugins/latex/latexplugin.h
index 1a8fb73d..52be1c69 100644
--- a/kopete/plugins/latex/latexplugin.h
+++ b/kopete/plugins/latex/latexplugin.h
@@ -42,7 +42,7 @@ namespace Kopete { class Message; class ChatSession; }
class LatexPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static LatexPlugin *plugin();
diff --git a/kopete/plugins/latex/latexpreferences.h b/kopete/plugins/latex/latexpreferences.h
index 536bccf5..33013acb 100644
--- a/kopete/plugins/latex/latexpreferences.h
+++ b/kopete/plugins/latex/latexpreferences.h
@@ -31,7 +31,7 @@ class TQListViewItem;
class LatexPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
LatexPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.h b/kopete/plugins/motionautoaway/motionawayplugin.h
index ebbdcfdf..2be15cc5 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.h
+++ b/kopete/plugins/motionautoaway/motionawayplugin.h
@@ -36,7 +36,7 @@ class TQTimer;
class MotionAwayPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h
index 31ba25e9..3574005b 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.h
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.h
@@ -29,7 +29,7 @@ class motionawayPrefsUI;
class MotionAwayPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
MotionAwayPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
virtual void save();
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.h b/kopete/plugins/netmeeting/netmeetingguiclient.h
index a5cc8cbf..882a7759 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.h
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.h
@@ -34,7 +34,7 @@ class NetMeetingPlugin;
class NetMeetingGUIClient : public TQObject , public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
NetMeetingGUIClient( MSNChatSession *parent, const char *name=0L);
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.h b/kopete/plugins/netmeeting/netmeetinginvitation.h
index 8e1be112..8bf88e96 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.h
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.h
@@ -28,7 +28,7 @@ class MSNContact;
class NetMeetingInvitation : public TQObject , public MSNInvitation
{
Q_OBJECT
- TQ_OBJECT
+
public:
NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *parent = 0);
~NetMeetingInvitation();
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.h b/kopete/plugins/netmeeting/netmeetingplugin.h
index 0d3ca9de..0456dadd 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.h
+++ b/kopete/plugins/netmeeting/netmeetingplugin.h
@@ -29,7 +29,7 @@ class MSNInvitation;
class NetMeetingPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h
index 47b402f9..2ed4d86b 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.h
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.h
@@ -28,7 +28,7 @@ class NetmeetingPrefsUI;
class NetmeetingPreferences : public KCModule {
Q_OBJECT
- TQ_OBJECT
+
public:
NetmeetingPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.h b/kopete/plugins/nowlistening/nowlisteningguiclient.h
index 156c33e5..f4c4b47f 100644
--- a/kopete/plugins/nowlistening/nowlisteningguiclient.h
+++ b/kopete/plugins/nowlistening/nowlisteningguiclient.h
@@ -34,7 +34,7 @@ namespace Kopete {
class NowListeningGUIClient : public TQObject, public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
NowListeningGUIClient( Kopete::ChatSession* parent, NowListeningPlugin* plugin );
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.h b/kopete/plugins/nowlistening/nowlisteningplugin.h
index b3b57fb5..8489044e 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.h
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.h
@@ -37,7 +37,7 @@ class TQStringList;
class NowListeningPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
friend class NowListeningGUIClient;
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.h b/kopete/plugins/nowlistening/nowlisteningpreferences.h
index 332abb05..7e29df51 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.h
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.h
@@ -32,7 +32,7 @@ class NowListeningConfig;
class NowListeningPreferences : public KCModule
{
Q_OBJECT
- TQ_OBJECT
+
public:
NowListeningPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
virtual ~NowListeningPreferences();
diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h
index 548b903f..959cf7fc 100644
--- a/kopete/plugins/smpppdcs/detectornetstat.h
+++ b/kopete/plugins/smpppdcs/detectornetstat.h
@@ -29,7 +29,7 @@ class IConnector;
*/
class DetectorNetstat : protected TQObject, public Detector {
Q_OBJECT
- TQ_OBJECT
+
DetectorNetstat(const DetectorNetstat&);
DetectorNetstat& operator=(const DetectorNetstat&);
diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.h b/kopete/plugins/smpppdcs/detectornetworkstatus.h
index 850be008..8e45f53b 100644
--- a/kopete/plugins/smpppdcs/detectornetworkstatus.h
+++ b/kopete/plugins/smpppdcs/detectornetworkstatus.h
@@ -30,7 +30,7 @@ class ConnectionManager;
class DetectorNetworkStatus : protected TQObject, public Detector
{
Q_OBJECT
- TQ_OBJECT
+
DetectorNetworkStatus(const DetectorNetworkStatus&);
DetectorNetworkStatus& operator=(const DetectorNetworkStatus&);
diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h
index 5214ecc5..ed9fd7d2 100644
--- a/kopete/plugins/smpppdcs/smpppdcsplugin.h
+++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h
@@ -48,7 +48,7 @@ class OnlineInquiry;
*/
class SMPPPDCSPlugin : public Kopete::Plugin, public IConnector, virtual public SMPPPDCSIFace {
Q_OBJECT
- TQ_OBJECT
+
SMPPPDCSPlugin(const SMPPPDCSPlugin&);
SMPPPDCSPlugin& operator=(const SMPPPDCSPlugin&);
diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.h b/kopete/plugins/smpppdcs/smpppdcspreferences.h
index f406d2aa..f9ccf914 100644
--- a/kopete/plugins/smpppdcs/smpppdcspreferences.h
+++ b/kopete/plugins/smpppdcs/smpppdcspreferences.h
@@ -38,7 +38,7 @@ public:
*/
class SMPPPDCSPreferences : public KCModule {
Q_OBJECT
- TQ_OBJECT
+
SMPPPDCSPreferences(const SMPPPDCSPreferences&);
SMPPPDCSPreferences& operator=(const SMPPPDCSPreferences&);
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
index 5d013585..d8545434 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h
@@ -32,7 +32,7 @@ class SMPPPDSearcher;
class SMPPPDCSPrefs : public SMPPPDCSPrefsBase
{
Q_OBJECT
- TQ_OBJECT
+
SMPPPDCSPrefs(const SMPPPDCSPrefs&);
SMPPPDCSPrefs& operator=(const SMPPPDCSPrefs&);
diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.h b/kopete/plugins/smpppdcs/smpppdlocationwidget.h
index 71393a08..dbb7be12 100644
--- a/kopete/plugins/smpppdcs/smpppdlocationwidget.h
+++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.h
@@ -25,7 +25,7 @@
class SMPPPDLocationWidget : public SMPPPDLocationWidgetBase
{
Q_OBJECT
- TQ_OBJECT
+
SMPPPDLocationWidget(const SMPPPDLocationWidget&);
SMPPPDLocationWidget& operator=(const SMPPPDLocationWidget&);
diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h
index e5bb05a1..36c4ac9c 100644
--- a/kopete/plugins/smpppdcs/smpppdsearcher.h
+++ b/kopete/plugins/smpppdcs/smpppdsearcher.h
@@ -30,7 +30,7 @@ class KProcess;
*/
class SMPPPDSearcher : public TQObject {
Q_OBJECT
- TQ_OBJECT
+
SMPPPDSearcher(const SMPPPDSearcher&);
SMPPPDSearcher& operator=(const SMPPPDSearcher&);
diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.h b/kopete/plugins/smpppdcs/unittest/clienttest.h
index 0da9d71e..2892d572 100644
--- a/kopete/plugins/smpppdcs/unittest/clienttest.h
+++ b/kopete/plugins/smpppdcs/unittest/clienttest.h
@@ -24,7 +24,7 @@
*/
class ClientTest : public KUnitTest::SlotTester {
Q_OBJECT
- TQ_OBJECT
+
ClientTest(const ClientTest&);
ClientTest& operator=(const ClientTest&);
diff --git a/kopete/plugins/statistics/statisticsdialog.h b/kopete/plugins/statistics/statisticsdialog.h
index 30d16a33..def9d03e 100644
--- a/kopete/plugins/statistics/statisticsdialog.h
+++ b/kopete/plugins/statistics/statisticsdialog.h
@@ -39,7 +39,7 @@ namespace KParts
class StatisticsDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, TQWidget* parent=0,
const char* name="StatisticsDialog");
diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h
index d6f75c81..0fe1e7b6 100644
--- a/kopete/plugins/statistics/statisticsplugin.h
+++ b/kopete/plugins/statistics/statisticsplugin.h
@@ -99,7 +99,7 @@ class KActionCollection;
class StatisticsPlugin : public Kopete::Plugin, virtual public StatisticsDCOPIface
{
Q_OBJECT
- TQ_OBJECT
+
public:
/// Standard plugin constructors
StatisticsPlugin(TQObject *parent, const char *name, const TQStringList &args);
diff --git a/kopete/plugins/texteffect/texteffectplugin.h b/kopete/plugins/texteffect/texteffectplugin.h
index 9f4989c1..686dcd83 100644
--- a/kopete/plugins/texteffect/texteffectplugin.h
+++ b/kopete/plugins/texteffect/texteffectplugin.h
@@ -41,7 +41,7 @@ class TextEffectConfig;
class TextEffectPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
public:
static TextEffectPlugin *plugin();
diff --git a/kopete/plugins/texteffect/texteffectpreferences.h b/kopete/plugins/texteffect/texteffectpreferences.h
index 7e5c92ed..2afda35f 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.h
+++ b/kopete/plugins/texteffect/texteffectpreferences.h
@@ -30,7 +30,7 @@ class TQStringList;
class TextEffectPreferences : public KCModule {
Q_OBJECT
- TQ_OBJECT
+
public:
TextEffectPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/plugins/translator/translatordialog.h b/kopete/plugins/translator/translatordialog.h
index 48734cdc..067bf75b 100644
--- a/kopete/plugins/translator/translatordialog.h
+++ b/kopete/plugins/translator/translatordialog.h
@@ -31,7 +31,7 @@ class KTextEdit;
class TranslatorDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
TranslatorDialog(const TQString &translated, TQWidget *parent=0, const char *name=0);
diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h
index 2b5f3393..21675216 100644
--- a/kopete/plugins/translator/translatorguiclient.h
+++ b/kopete/plugins/translator/translatorguiclient.h
@@ -37,7 +37,7 @@ namespace Kopete { class ChatSession; }
class TranslatorGUIClient : public TQObject , public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
TranslatorGUIClient( Kopete::ChatSession *parent, const char *name=0L);
diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h
index d526fd76..f3b50bce 100644
--- a/kopete/plugins/translator/translatorplugin.h
+++ b/kopete/plugins/translator/translatorplugin.h
@@ -52,7 +52,7 @@ class TranslatorLanguages;
class TranslatorPlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
friend class TranslatorGUIClient;
diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h
index 04babfa2..c4db2429 100644
--- a/kopete/plugins/webpresence/webpresenceplugin.h
+++ b/kopete/plugins/webpresence/webpresenceplugin.h
@@ -38,7 +38,7 @@ typedef TQValueList<Kopete::Protocol*> ProtocolList;
class WebPresencePlugin : public Kopete::Plugin
{
Q_OBJECT
- TQ_OBJECT
+
private:
int frequency;
diff --git a/kopete/plugins/webpresence/webpresencepreferences.h b/kopete/plugins/webpresence/webpresencepreferences.h
index aac7536a..5fd42de5 100644
--- a/kopete/plugins/webpresence/webpresencepreferences.h
+++ b/kopete/plugins/webpresence/webpresencepreferences.h
@@ -29,7 +29,7 @@ class KAutoConfig;
*/
class WebPresencePreferences : public KCModule {
Q_OBJECT
- TQ_OBJECT
+
public:
WebPresencePreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index 1786e3a9..1ba9a5c2 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -54,7 +54,7 @@ class GaduDCCTransaction;
class GaduAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduAccount( Kopete::Protocol*, const TQString& accountID, const char* name = 0L );
diff --git a/kopete/protocols/gadu/gaduaddcontactpage.h b/kopete/protocols/gadu/gaduaddcontactpage.h
index 1ec333b9..9104f36f 100644
--- a/kopete/protocols/gadu/gaduaddcontactpage.h
+++ b/kopete/protocols/gadu/gaduaddcontactpage.h
@@ -37,7 +37,7 @@ class GaduAddUI;
class GaduAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduAddContactPage( GaduAccount*, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/gadu/gaduaway.h b/kopete/protocols/gadu/gaduaway.h
index 6b1e0483..60e32d7a 100644
--- a/kopete/protocols/gadu/gaduaway.h
+++ b/kopete/protocols/gadu/gaduaway.h
@@ -32,7 +32,7 @@ class GaduAwayUI;
class GaduAway : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduAway( GaduAccount*, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h
index a191242c..f8f07993 100644
--- a/kopete/protocols/gadu/gaducommands.h
+++ b/kopete/protocols/gadu/gaducommands.h
@@ -38,7 +38,7 @@ class TQPixmap;
class GaduCommand : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduCommand( TQObject* parent = 0, const char* name = 0 );
@@ -74,7 +74,7 @@ private:
class RegisterCommand : public GaduCommand
{
Q_OBJECT
- TQ_OBJECT
+
public:
RegisterCommand( TQObject* parent = 0, const char* name = 0 );
@@ -108,7 +108,7 @@ private:
class RemindPasswordCommand : public GaduCommand
{
Q_OBJECT
- TQ_OBJECT
+
public:
RemindPasswordCommand( uin_t uin, TQObject* parent = 0, const char* name = 0 );
@@ -129,7 +129,7 @@ private:
class ChangePasswordCommand : public GaduCommand
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChangePasswordCommand( TQObject* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h
index 66851c0c..05d0f3b8 100644
--- a/kopete/protocols/gadu/gaducontact.h
+++ b/kopete/protocols/gadu/gaducontact.h
@@ -45,7 +45,7 @@ class TQStringList;
class GaduContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduContact( unsigned int, const TQString&, Kopete::Account*, Kopete::MetaContact* );
diff --git a/kopete/protocols/gadu/gadudcc.h b/kopete/protocols/gadu/gadudcc.h
index 465de8d4..98c81fc4 100644
--- a/kopete/protocols/gadu/gadudcc.h
+++ b/kopete/protocols/gadu/gadudcc.h
@@ -35,7 +35,7 @@ class GaduDCCServer;
class GaduDCC: public TQObject {
Q_OBJECT
- TQ_OBJECT
+
public:
GaduDCC( TQObject* parent, const char* name = NULL );
~GaduDCC();
diff --git a/kopete/protocols/gadu/gadudccserver.h b/kopete/protocols/gadu/gadudccserver.h
index 50982eab..3e4400c9 100644
--- a/kopete/protocols/gadu/gadudccserver.h
+++ b/kopete/protocols/gadu/gadudccserver.h
@@ -34,7 +34,7 @@ class GaduAccount;
class GaduDCCServer: public TQObject {
Q_OBJECT
- TQ_OBJECT
+
public:
GaduDCCServer( TQHostAddress* dccIp = NULL, unsigned int port = 1550 );
~GaduDCCServer();
diff --git a/kopete/protocols/gadu/gadudcctransaction.h b/kopete/protocols/gadu/gadudcctransaction.h
index 43c6395a..15af8f7d 100644
--- a/kopete/protocols/gadu/gadudcctransaction.h
+++ b/kopete/protocols/gadu/gadudcctransaction.h
@@ -36,7 +36,7 @@ class GaduDCC;
class GaduDCCTransaction: TQObject {
Q_OBJECT
- TQ_OBJECT
+
public:
GaduDCCTransaction( GaduDCC*, const char* name = NULL );
~GaduDCCTransaction();
diff --git a/kopete/protocols/gadu/gadueditaccount.h b/kopete/protocols/gadu/gadueditaccount.h
index 23e230fd..13e61d31 100644
--- a/kopete/protocols/gadu/gadueditaccount.h
+++ b/kopete/protocols/gadu/gadueditaccount.h
@@ -35,7 +35,7 @@ namespace Kopete { class Account; }
class GaduEditAccount : public GaduAccountEditUI, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/gadu/gadueditcontact.h b/kopete/protocols/gadu/gadueditcontact.h
index 48f95980..0c553f58 100644
--- a/kopete/protocols/gadu/gadueditcontact.h
+++ b/kopete/protocols/gadu/gadueditcontact.h
@@ -36,7 +36,7 @@ class TQListViewItem;
class GaduEditContact : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduEditContact( GaduAccount*, GaduContact*,
diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h
index ff34d970..0152d680 100644
--- a/kopete/protocols/gadu/gaduprotocol.h
+++ b/kopete/protocols/gadu/gaduprotocol.h
@@ -50,7 +50,7 @@ class GaduPreferences;
class GaduProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduProtocol( TQObject* parent, const char* name, const TQStringList& str);
diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h
index 4a2dce64..86d385c1 100644
--- a/kopete/protocols/gadu/gadupubdir.h
+++ b/kopete/protocols/gadu/gadupubdir.h
@@ -39,7 +39,7 @@ class GaduContact;
class GaduPublicDir : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" );
diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h
index ddc295ec..0e0cddb9 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.h
+++ b/kopete/protocols/gadu/gaduregisteraccount.h
@@ -33,7 +33,7 @@ class GaduRegisterAccountUI;
class GaduRegisterAccount : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduRegisterAccount( TQWidget* , const char* );
diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h
index 747163e1..8d1b6b9e 100644
--- a/kopete/protocols/gadu/gadusession.h
+++ b/kopete/protocols/gadu/gadusession.h
@@ -92,7 +92,7 @@ class GaduRichTextFormat;
class GaduSession : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
GaduSession( TQObject* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index ff6cca19..d7102e0b 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -57,7 +57,7 @@ using namespace GroupWise;
class GroupWiseAccount : public Kopete::ManagedConnectionAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 );
~GroupWiseAccount();
@@ -347,7 +347,7 @@ private:
/*class OnlineStatusMessageAction : public KAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0);
signals:
diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h
index 1dcbacdc..16e81389 100644
--- a/kopete/protocols/groupwise/gwbytestream.h
+++ b/kopete/protocols/groupwise/gwbytestream.h
@@ -35,7 +35,7 @@ class KNetworkByteStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h
index 7f3ef3ac..f1bc0054 100644
--- a/kopete/protocols/groupwise/gwconnector.h
+++ b/kopete/protocols/groupwise/gwconnector.h
@@ -35,7 +35,7 @@ class KNetworkConnector : public Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkConnector ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h
index 2e81823f..7de4a61d 100644
--- a/kopete/protocols/groupwise/gwcontact.h
+++ b/kopete/protocols/groupwise/gwcontact.h
@@ -53,7 +53,7 @@ using namespace GroupWise;
class GroupWiseContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructor
diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h
index b70de5af..c0f42045 100644
--- a/kopete/protocols/groupwise/gwcontactlist.h
+++ b/kopete/protocols/groupwise/gwcontactlist.h
@@ -42,7 +42,7 @@ typedef TQValueList<GWContactInstance *> GWContactInstanceList;
class GWContactList : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
GWContactList( TQObject * parent );
GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName );
@@ -61,7 +61,7 @@ public:
class GWContactListItem : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName );
@@ -73,7 +73,7 @@ public:
class GWFolder : public GWContactListItem
{
Q_OBJECT
- TQ_OBJECT
+
public:
GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName );
virtual void dump( unsigned int depth );
@@ -82,7 +82,7 @@ public:
class GWContactInstance : public GWContactListItem
{
Q_OBJECT
- TQ_OBJECT
+
public:
GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn );
TQString dn; // DN
diff --git a/kopete/protocols/groupwise/gwmessagemanager.h b/kopete/protocols/groupwise/gwmessagemanager.h
index 7c0d3d2c..25f61b9a 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.h
+++ b/kopete/protocols/groupwise/gwmessagemanager.h
@@ -35,7 +35,7 @@ using namespace GroupWise;
class GroupWiseChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
friend class GroupWiseAccount;
diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h
index 95105f17..cc1b34fb 100644
--- a/kopete/protocols/groupwise/gwprotocol.h
+++ b/kopete/protocols/groupwise/gwprotocol.h
@@ -34,7 +34,7 @@
class GroupWiseProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args);
~GroupWiseProtocol();
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h
index b72fad78..0ffab15b 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h
@@ -30,7 +30,7 @@
class ByteStream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
ByteStream(TQObject *parent=0);
diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
index 2cb73cbf..97521bf1 100644
--- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h
@@ -32,7 +32,7 @@ class Client;
class ChatroomManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatroomManager( Client * client, const char *name = 0);
~ChatroomManager();
diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 542d32eb..d302bf0e 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -39,7 +39,7 @@ using namespace GroupWise;
class Client : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h
index 7654f7f0..15c58676 100644
--- a/kopete/protocols/groupwise/libgroupwise/connector.h
+++ b/kopete/protocols/groupwise/libgroupwise/connector.h
@@ -29,7 +29,7 @@ class ByteStream;
class Connector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connector(TQObject *parent=0);
virtual ~Connector();
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index d1b2486c..14d94997 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -115,7 +115,7 @@ class Transfer;
class CoreProtocol : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum State { NeedMore, Available, NoData };
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 49d1d9dd..62903611 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -109,7 +109,7 @@ class EventTransfer;
class EventProtocol : public InputProtocolBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
EventProtocol(TQObject *parent = 0, const char *name = 0);
~EventProtocol();
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index 8e2394c3..5585104a 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -40,7 +40,7 @@ typedef struct NovellDN
class ClientStream : public Stream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error {
ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
index 152ac0f1..69e104de 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h
@@ -30,7 +30,7 @@ Defines a basic interface for protocols dealing with input from the GroupWise se
class InputProtocolBase : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
InputProtocolBase(TQObject *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.h b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
index 3d1e29f3..4e798fb1 100644
--- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h
@@ -32,7 +32,7 @@ Keeps a record of the server side privacy allow and deny lists, default policy a
class PrivacyManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
PrivacyManager( Client * client, const char *name = 0);
~PrivacyManager();
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index 79b028bf..4c27f047 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -314,7 +314,7 @@ namespace QCA
class QCA_EXPORT TLS : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Validity {
NoCert,
@@ -376,7 +376,7 @@ namespace QCA
class QCA_EXPORT SASL : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrAuth, ErrCrypt };
enum ErrorCond {
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
index 65c89f55..129591d1 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -28,7 +28,7 @@ class QCA::TLS;
class QCATLSHandler : public TLSHandler
{
Q_OBJECT
- TQ_OBJECT
+
public:
QCATLSHandler(QCA::TLS *parent);
~QCATLSHandler();
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
index 1a9c1b94..61e928a2 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h
@@ -32,7 +32,7 @@ Handles the parsing of incoming Response messages
class ResponseProtocol : public InputProtocolBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Describes the current state of the protocol
diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h
index 88cfb3d4..33748953 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.h
+++ b/kopete/protocols/groupwise/libgroupwise/safedelete.h
@@ -60,7 +60,7 @@ private:
class SafeDeleteLater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static SafeDeleteLater *ensureExists();
void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index f0c6223e..fa0f5f14 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -34,7 +34,7 @@
class SecureStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrTLS = ErrCustom, ErrSASL };
SecureStream(ByteStream *s);
@@ -104,7 +104,7 @@ USE_TLSHANDLER
class SecureLayer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SecureLayer(QCA::TLS *t);
SecureLayer(QCA::SASL *s);
diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h
index e07b5e49..95f27060 100644
--- a/kopete/protocols/groupwise/libgroupwise/stream.h
+++ b/kopete/protocols/groupwise/libgroupwise/stream.h
@@ -31,7 +31,7 @@
class Stream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
enum StreamCond {
diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h
index 223e7243..2b6bd155 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.h
+++ b/kopete/protocols/groupwise/libgroupwise/task.h
@@ -32,7 +32,7 @@ class Request;
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrDisc };
Task(Task *parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
index 65edb07e..74efc267 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h
@@ -34,7 +34,7 @@ Get the current number of users in each chat on the server
class ChatCountsTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatCountsTask(Task* parent);
~ChatCountsTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
index e8b05c99..76bc1c24 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h
@@ -35,7 +35,7 @@ Get the current number of users in each chat on the server
class ChatPropertiesTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatPropertiesTask(Task* parent);
~ChatPropertiesTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
index 64b9f111..a64bd452 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h
@@ -36,7 +36,7 @@ using namespace GroupWise;
class ConferenceTask : public EventTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ConferenceTask( Task* parent );
~ConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
index 0bbc2625..6d8a1a40 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h
@@ -31,7 +31,7 @@ This task monitors connection related events, currently 'connected elsewhere' di
class ConnectionTask : public EventTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ConnectionTask(Task* parent);
~ConnectionTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
index 69911dac..630050b4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h
@@ -31,7 +31,7 @@ This task is responsible for creating a conference at the server, and confirming
class CreateConferenceTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
CreateConferenceTask(Task* parent);
~CreateConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
index fc7bb184..879e4ecf 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h
@@ -31,7 +31,7 @@ Creates a contact on the server. The response to this action is handled by its
class CreateContactInstanceTask : public NeedFolderTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
CreateContactInstanceTask(Task* parent);
~CreateContactInstanceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
index f63a19af..7323aea3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h
@@ -42,7 +42,7 @@ using namespace GroupWise;
class CreateContactTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
CreateContactTask(Task* parent);
~CreateContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
index 37dbc19f..c9e1c939 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h
@@ -31,7 +31,7 @@ Creates a folder on the server
class CreateFolderTask : public ModifyContactListTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
CreateFolderTask(Task* parent);
~CreateFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
index ce2e3bd0..7141ba37 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h
@@ -29,7 +29,7 @@
class DeleteItemTask : public ModifyContactListTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
DeleteItemTask(Task* parent);
~DeleteItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
index 15ed1761..4dec0f9c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h
@@ -31,7 +31,7 @@ class Transfer;
class EventTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
EventTask( Task *parent );
protected:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index 5671a122..60a68e1d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -35,7 +35,7 @@ Search results are polled on the server, using the search handle returned by the
class GetChatSearchResultsTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 };
GetChatSearchResultsTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
index 577ccc45..0f58d72a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h
@@ -34,7 +34,7 @@ using namespace GroupWise;
class GetDetailsTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
GetDetailsTask( Task * parent );
~GetDetailsTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index aec5050f..ea3d5dbb 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -30,7 +30,7 @@
class GetStatusTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
GetStatusTask(Task* parent);
~GetStatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
index 36b14d28..95279bed 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h
@@ -34,7 +34,7 @@ Sends Join Conference messages when the user accepts an invitation
class JoinChatTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
JoinChatTask(Task* parent);
~JoinChatTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
index 0f92379f..e8b06c82 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h
@@ -34,7 +34,7 @@ Sends Join Conference messages when the user accepts an invitation
class JoinConferenceTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
JoinConferenceTask(Task* parent);
~JoinConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
index b9d9272c..176b4e07 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h
@@ -29,7 +29,7 @@
class KeepAliveTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
KeepAliveTask(Task* parent);
~KeepAliveTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
index 30d9e293..73c2061d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h
@@ -31,7 +31,7 @@ Tells the server that you are leaving a conference (closed the chatwindow)
class LeaveConferenceTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
LeaveConferenceTask(Task* parent);
~LeaveConferenceTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index fdeaeb9d..ecb5c0e1 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -31,7 +31,7 @@ using namespace GroupWise;
class LoginTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTask( Task * parent );
~LoginTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
index b0787ce0..aebfd7e6 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h
@@ -34,7 +34,7 @@ using namespace GroupWise;
class ModifyContactListTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ModifyContactListTask(Task* parent);
~ModifyContactListTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
index b67a23ac..4f49148c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h
@@ -31,7 +31,7 @@ Moves a contact between folders on the server
class MoveContactTask : public NeedFolderTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
MoveContactTask(Task* parent);
~MoveContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
index 383be314..c204c602 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h
@@ -22,7 +22,7 @@ This Task is the ancestor of Tasks that may need to create a folder on the serve
class NeedFolderTask : public ModifyContactListTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
NeedFolderTask(Task* parent);
~NeedFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index c69b7e0c..20380df0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -35,7 +35,7 @@ Search results are polled on the server, using the search handle supplied by the
class PollSearchResultsTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 };
PollSearchResultsTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
index ea0d5e42..8d9c97c9 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h
@@ -31,7 +31,7 @@ Adds a contact to the server side allow or deny lists
class PrivacyItemTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
PrivacyItemTask( Task* parent);
~PrivacyItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
index b4903596..bf7f8f84 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h
@@ -31,7 +31,7 @@ Used to reject an invitation to join a conference
class RejectInviteTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
RejectInviteTask(Task* parent);
~RejectInviteTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
index 10f6568c..a2cd8fc2 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h
@@ -28,7 +28,7 @@ class Transfer;
class RequestTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
RequestTask( Task *parent );
bool take( Transfer * transfer );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
index aa87e474..15fe12b7 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h
@@ -35,7 +35,7 @@ This Task searches for chatrooms on the server
class SearchChatTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum SearchType { FetchAll=0, SinceLastSearch };
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
index 1fa398d6..390edad8 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h
@@ -33,7 +33,7 @@ This Task performs user searching on the server
class SearchUserTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
SearchUserTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 4a7a753d..fa3afbc5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -30,7 +30,7 @@
class SetStatusTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
SetStatusTask(Task* parent);
~SetStatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index cc14bace..c4ddc744 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -29,7 +29,7 @@
class StatusTask : public EventTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
StatusTask(Task* parent);
~StatusTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
index 7fc63f90..fb01a6b3 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h
@@ -31,7 +31,7 @@
class TypingTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
TypingTask(Task* parent);
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
index 17dad6e7..d84cecdd 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h
@@ -32,7 +32,7 @@
class UpdateContactTask : public UpdateItemTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
UpdateContactTask(Task* parent);
~UpdateContactTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
index 1f3dcd07..435ce2f5 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h
@@ -31,7 +31,7 @@ Renames a folder on the server
class UpdateFolderTask : public UpdateItemTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
UpdateFolderTask(Task* parent);
~UpdateFolderTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
index 4e0bea2d..3d950745 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h
@@ -31,7 +31,7 @@ Rename a folder or contact on the server. In future may be used for changing th
class UpdateItemTask : public RequestTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
UpdateItemTask( Task* parent );
~UpdateItemTask();
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index a40f337c..33370a5d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -32,7 +32,7 @@
class ClientStreamTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
ClientStreamTest(int argc, char ** argv);
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
index 8a964101..44772293 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
@@ -31,7 +31,7 @@
class TLSHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TLSHandler(TQObject *parent=0);
virtual ~TLSHandler();
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
index 4f4c8df9..b81b7ce8 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h
@@ -34,7 +34,7 @@ Several client event handling processes require that a contact's details are ava
class UserDetailsManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
UserDetailsManager( Client * parent, const char *name = 0);
~UserDetailsManager();
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
index 8597a7ec..11aa1094 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h
@@ -41,7 +41,7 @@ class GroupWiseContactSearch;
class GroupWiseAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 );
~GroupWiseAddContactPage();
diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
index b3ecc6f3..18419180 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h
@@ -41,7 +41,7 @@ class GroupWiseChatPropsWidget;
class GroupWiseChatPropsDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Construct an empty dialog
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
index a063284a..c0264b62 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
+++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h
@@ -29,7 +29,7 @@ class GroupWiseChatSearchWidget;
class GroupWiseChatSearchDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
~GroupWiseChatSearchDialog();
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h
index afb0cd62..213834bc 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.h
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h
@@ -35,7 +35,7 @@ Logic, wrapping UI, for displaying contact properties
class GroupWiseContactProperties : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Display properties given a GroupWiseContact
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
index 9c21f7fd..ccdf890b 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h
@@ -36,7 +36,7 @@ class GroupWiseAccountPreferences;
class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account);
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h
index 57bb6e83..3ac2ae39 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.h
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h
@@ -34,7 +34,7 @@ Logic for the UI part managing the allow and deny lists, and the default privacy
class GroupWisePrivacyDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name );
~GroupWisePrivacyDialog();
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
index 688071fd..42be43ab 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h
@@ -31,7 +31,7 @@ This is the dialog that is shown when you receive an invitation to chat.
class ReceiveInvitationDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name );
~ReceiveInvitationDialog();
diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h
index c4e11364..7f215aaa 100644
--- a/kopete/protocols/groupwise/ui/gwsearch.h
+++ b/kopete/protocols/groupwise/ui/gwsearch.h
@@ -33,7 +33,7 @@ Logic for searching for and displaying users and chat rooms using a GroupWiseCon
class GroupWiseContactSearch : public GroupWiseContactSearchWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly,
TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h
index 0d8fc313..640fb678 100644
--- a/kopete/protocols/irc/ircaccount.h
+++ b/kopete/protocols/irc/ircaccount.h
@@ -73,7 +73,7 @@ class IRCAccount
friend class IRCProtocolHandler;
Q_OBJECT
- TQ_OBJECT
+
public:
static const TQString CONFIG_CODECMIB;
diff --git a/kopete/protocols/irc/ircaddcontactpage.h b/kopete/protocols/irc/ircaddcontactpage.h
index a843f551..17f0cb9e 100644
--- a/kopete/protocols/irc/ircaddcontactpage.h
+++ b/kopete/protocols/irc/ircaddcontactpage.h
@@ -32,7 +32,7 @@ class ChannelList;
class IRCAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCAddContactPage(TQWidget *parent=0, IRCAccount* account = 0);
~IRCAddContactPage();
diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h
index 7906e0d1..853bd256 100644
--- a/kopete/protocols/irc/ircchannelcontact.h
+++ b/kopete/protocols/irc/ircchannelcontact.h
@@ -47,7 +47,7 @@ class IRCChannelContact
friend class IRCSignalMapper;
Q_OBJECT
- TQ_OBJECT
+
public:
IRCChannelContact(IRCContactManager *, const TQString &channel, Kopete::MetaContact *metac);
diff --git a/kopete/protocols/irc/irccontact.h b/kopete/protocols/irc/irccontact.h
index a415929d..d8310c27 100644
--- a/kopete/protocols/irc/irccontact.h
+++ b/kopete/protocols/irc/irccontact.h
@@ -61,7 +61,7 @@ class IRCContact
: public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCContact(IRCAccount *account, KIRC::EntityPtr entity, Kopete::MetaContact *metac, const TQString& icon = TQString());
diff --git a/kopete/protocols/irc/irccontactmanager.h b/kopete/protocols/irc/irccontactmanager.h
index 0a0f558b..0a979407 100644
--- a/kopete/protocols/irc/irccontactmanager.h
+++ b/kopete/protocols/irc/irccontactmanager.h
@@ -55,7 +55,7 @@ class IRCContactManager
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCContactManager(const TQString &nickName, IRCAccount *account, const char *name=0);
diff --git a/kopete/protocols/irc/ircguiclient.h b/kopete/protocols/irc/ircguiclient.h
index 4ab832ac..94c115e4 100644
--- a/kopete/protocols/irc/ircguiclient.h
+++ b/kopete/protocols/irc/ircguiclient.h
@@ -28,7 +28,7 @@ class IRCContact;
class IRCGUIClient : public TQObject , public KXMLGUIClient
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCGUIClient( Kopete::ChatSession *parent = 0 );
~IRCGUIClient();
diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h
index 662b7f8a..7820da1f 100644
--- a/kopete/protocols/irc/ircprotocol.h
+++ b/kopete/protocols/irc/ircprotocol.h
@@ -64,7 +64,7 @@ static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") );
class IRCProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum IRCStatus
diff --git a/kopete/protocols/irc/ircservercontact.h b/kopete/protocols/irc/ircservercontact.h
index f5167a9f..97f99d88 100644
--- a/kopete/protocols/irc/ircservercontact.h
+++ b/kopete/protocols/irc/ircservercontact.h
@@ -45,7 +45,7 @@ class IRCServerContact
: public IRCContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
// This class provides a Kopete::Contact for each server of a given IRC connection.
diff --git a/kopete/protocols/irc/ircsignalhandler.h b/kopete/protocols/irc/ircsignalhandler.h
index ad986238..58a79e65 100644
--- a/kopete/protocols/irc/ircsignalhandler.h
+++ b/kopete/protocols/irc/ircsignalhandler.h
@@ -84,7 +84,7 @@ the Mapping functions when they emit.
class QMember : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
QMember( IRCSignalMappingT *m, TQObject *p ) : TQObject( p ), mapping( m ){};
@@ -103,7 +103,7 @@ class QMember : public TQObject
class QMemberSingle : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
QMemberSingle( IRCSignalMappingSingleT *m, TQObject *p ) : TQObject( p ), mapping( m ){}
@@ -122,7 +122,7 @@ class QMemberSingle : public TQObject
class QMemberDouble : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
QMemberDouble( IRCSignalMappingDoubleT *m, TQObject *p ) : TQObject( p ), mapping( m ){}
@@ -141,7 +141,7 @@ class QMemberDouble : public TQObject
class QMemberTriple : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
QMemberTriple( IRCSignalMappingTripleT *m, TQObject *p ) : TQObject( p ), mapping( m ){}
@@ -257,7 +257,7 @@ class IRCSignalMappingTriple : public IRCSignalMappingTripleT
class IRCSignalHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCSignalHandler( IRCContactManager *manager );
diff --git a/kopete/protocols/irc/irctransferhandler.h b/kopete/protocols/irc/irctransferhandler.h
index d5a76bd4..60235e57 100644
--- a/kopete/protocols/irc/irctransferhandler.h
+++ b/kopete/protocols/irc/irctransferhandler.h
@@ -37,7 +37,7 @@ class IRCTransferHandler
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static IRCTransferHandler *self();
diff --git a/kopete/protocols/irc/ircusercontact.h b/kopete/protocols/irc/ircusercontact.h
index dbf4b51c..25461b15 100644
--- a/kopete/protocols/irc/ircusercontact.h
+++ b/kopete/protocols/irc/ircusercontact.h
@@ -61,7 +61,7 @@ struct IRCUserInfo
class IRCUserContact : public IRCContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
// This class provides a Kopete::Contact for each user on the channel.
diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h
index d0c07594..5689d751 100644
--- a/kopete/protocols/irc/kcodecaction.h
+++ b/kopete/protocols/irc/kcodecaction.h
@@ -29,7 +29,7 @@
class KCodecAction : public KSelectAction
{
Q_OBJECT
- TQ_OBJECT
+
public:
KCodecAction( const TQString &text, const KShortcut &cut = KShortcut(),
TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index bb7dfbb7..5b12e744 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -54,7 +54,7 @@ class Engine
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
// TQ_PROPERTY(TQUrl serverURL READ serverURL WRITE setServerURL)
diff --git a/kopete/protocols/irc/libkirc/kircentity.h b/kopete/protocols/irc/libkirc/kircentity.h
index 37a5b986..3536b4a1 100644
--- a/kopete/protocols/irc/libkirc/kircentity.h
+++ b/kopete/protocols/irc/libkirc/kircentity.h
@@ -37,7 +37,7 @@ class Entity
public KShared
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.h b/kopete/protocols/irc/libkirc/kircmessageredirector.h
index e6fbda80..eee27d36 100644
--- a/kopete/protocols/irc/libkirc/kircmessageredirector.h
+++ b/kopete/protocols/irc/libkirc/kircmessageredirector.h
@@ -32,7 +32,7 @@ class MessageRedirector
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum {
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h
index 53e71735..96ea18e9 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.h
+++ b/kopete/protocols/irc/libkirc/kirctransfer.h
@@ -37,7 +37,7 @@ class Transfer
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type {
diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.h b/kopete/protocols/irc/libkirc/kirctransferhandler.h
index 34516f15..d42c6bd7 100644
--- a/kopete/protocols/irc/libkirc/kirctransferhandler.h
+++ b/kopete/protocols/irc/libkirc/kirctransferhandler.h
@@ -35,7 +35,7 @@ class TransferHandler
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static TransferHandler *self();
diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.h b/kopete/protocols/irc/libkirc/kirctransferserver.h
index e013d9db..5c5fbf77 100644
--- a/kopete/protocols/irc/libkirc/kirctransferserver.h
+++ b/kopete/protocols/irc/libkirc/kirctransferserver.h
@@ -34,7 +34,7 @@ class TransferServer
: public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
// TransferServer(TQObject *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h
index 795941cc..68196538 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.h
+++ b/kopete/protocols/irc/libkirc/ksslsocket.h
@@ -29,7 +29,7 @@ class KSSLSocketPrivate;
class KSSLSocket : public KExtendedSocket
{
Q_OBJECT
- TQ_OBJECT
+
public:
KSSLSocket();
diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h
index 1a528bb9..077372b0 100644
--- a/kopete/protocols/irc/ui/channellist.h
+++ b/kopete/protocols/irc/ui/channellist.h
@@ -38,7 +38,7 @@ class ChannelList
: public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChannelList( TQWidget *parent, KIRC::Engine *engine );
diff --git a/kopete/protocols/irc/ui/channellistdialog.h b/kopete/protocols/irc/ui/channellistdialog.h
index e97316b9..edfef5d4 100644
--- a/kopete/protocols/irc/ui/channellistdialog.h
+++ b/kopete/protocols/irc/ui/channellistdialog.h
@@ -26,7 +26,7 @@ class ChannelListDialog
: public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan);
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.h b/kopete/protocols/irc/ui/irceditaccountwidget.h
index ba2d334f..b11f2424 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.h
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.h
@@ -29,7 +29,7 @@ class TQListViewItem;
class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *parent=0, const char *name=0);
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h
index 9ce7c9c4..f30c2aa3 100644
--- a/kopete/protocols/jabber/jabberaccount.h
+++ b/kopete/protocols/jabber/jabberaccount.h
@@ -57,7 +57,7 @@ class VoiceCaller;
class JabberAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L);
diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h
index 2dcc26b7..bb430f11 100644
--- a/kopete/protocols/jabber/jabberbasecontact.h
+++ b/kopete/protocols/jabber/jabberbasecontact.h
@@ -35,7 +35,7 @@ class JabberBaseContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
friend class JabberAccount; /* Friends can touch each other's private parts. */
public:
diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h
index 65ea8e36..f60f1ccf 100644
--- a/kopete/protocols/jabber/jabberbookmarks.h
+++ b/kopete/protocols/jabber/jabberbookmarks.h
@@ -36,7 +36,7 @@ class KAction;
class JabberBookmarks : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Constructor
diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h
index 91351160..d72ce9ab 100644
--- a/kopete/protocols/jabber/jabberbytestream.h
+++ b/kopete/protocols/jabber/jabberbytestream.h
@@ -31,7 +31,7 @@ class JabberByteStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberByteStream ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
index 8e2a95a6..6c8389f4 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
@@ -36,7 +36,7 @@ class JabberAccount;
class JabberCapabilitiesManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Construct
diff --git a/kopete/protocols/jabber/jabberchatsession.h b/kopete/protocols/jabber/jabberchatsession.h
index 564523de..956b17fd 100644
--- a/kopete/protocols/jabber/jabberchatsession.h
+++ b/kopete/protocols/jabber/jabberchatsession.h
@@ -35,7 +35,7 @@ class TQString;
class JabberChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user,
diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h
index 7ba389f9..81c11a02 100644
--- a/kopete/protocols/jabber/jabberclient.h
+++ b/kopete/protocols/jabber/jabberclient.h
@@ -58,7 +58,7 @@ class JabberClient : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h
index f4a561e9..5116c823 100644
--- a/kopete/protocols/jabber/jabberconnector.h
+++ b/kopete/protocols/jabber/jabberconnector.h
@@ -33,7 +33,7 @@ class JabberConnector : public XMPP::Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberConnector ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h
index 15b5096e..4dcb6f8b 100644
--- a/kopete/protocols/jabber/jabbercontact.h
+++ b/kopete/protocols/jabber/jabbercontact.h
@@ -34,7 +34,7 @@ class JabberContact : public JabberBaseContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/jabber/jabbercontactpool.h b/kopete/protocols/jabber/jabbercontactpool.h
index e6bb1a88..563fc9c3 100644
--- a/kopete/protocols/jabber/jabbercontactpool.h
+++ b/kopete/protocols/jabber/jabbercontactpool.h
@@ -37,7 +37,7 @@ class JabberContactPool : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
@@ -109,7 +109,7 @@ private:
class JabberContactPoolItem : TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberContactPoolItem ( JabberBaseContact *contact );
~JabberContactPoolItem ();
diff --git a/kopete/protocols/jabber/jabberfiletransfer.h b/kopete/protocols/jabber/jabberfiletransfer.h
index 2a5e4810..e5285e0e 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.h
+++ b/kopete/protocols/jabber/jabberfiletransfer.h
@@ -31,7 +31,7 @@ class JabberFileTransfer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h
index d4f0de39..1b2567b2 100644
--- a/kopete/protocols/jabber/jabberformlineedit.h
+++ b/kopete/protocols/jabber/jabberformlineedit.h
@@ -32,7 +32,7 @@ class JabberFormLineEdit:public TQLineEdit
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0);
@@ -50,7 +50,7 @@ class JabberFormPasswordEdit:public KPasswordEdit
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h
index 2ee316d6..1e594329 100644
--- a/kopete/protocols/jabber/jabberformtranslator.h
+++ b/kopete/protocols/jabber/jabberformtranslator.h
@@ -31,7 +31,7 @@ class JabberFormTranslator:public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.h b/kopete/protocols/jabber/jabbergroupchatmanager.h
index fb92ba40..655063ca 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.h
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.h
@@ -33,7 +33,7 @@ class TQString;
class JabberGroupChatManager : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberGroupChatManager ( JabberProtocol *protocol, const JabberBaseContact *user,
diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h
index 46bdad2a..07ae6f40 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.h
+++ b/kopete/protocols/jabber/jabbergroupcontact.h
@@ -27,7 +27,7 @@ class JabberGroupContact : public JabberBaseContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h
index cddc0a58..49dd9417 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.h
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.h
@@ -28,7 +28,7 @@ class JabberGroupMemberContact : public JabberBaseContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h
index 6e647f74..117b683c 100644
--- a/kopete/protocols/jabber/jabberprotocol.h
+++ b/kopete/protocols/jabber/jabberprotocol.h
@@ -50,7 +50,7 @@ class JabberCapabilitiesManager;
class JabberProtocol:public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/jabberresource.h b/kopete/protocols/jabber/jabberresource.h
index 5f274668..16ba49d6 100644
--- a/kopete/protocols/jabber/jabberresource.h
+++ b/kopete/protocols/jabber/jabberresource.h
@@ -38,7 +38,7 @@ class Features;
class JabberResource : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/jabberresourcepool.h b/kopete/protocols/jabber/jabberresourcepool.h
index 1f892d24..d7720d1e 100644
--- a/kopete/protocols/jabber/jabberresourcepool.h
+++ b/kopete/protocols/jabber/jabberresourcepool.h
@@ -32,7 +32,7 @@ class JabberAccount;
class JabberResourcePool : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static XMPP::Resource EmptyResource;
diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h
index 2cfcd4c1..8ed1360f 100644
--- a/kopete/protocols/jabber/jabbertransport.h
+++ b/kopete/protocols/jabber/jabbertransport.h
@@ -40,7 +40,7 @@ class JabberProtocol;
class JabberTransport : public Kopete::Account
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/jingle/jinglesession.h b/kopete/protocols/jabber/jingle/jinglesession.h
index ad5d68a7..91ac2123 100644
--- a/kopete/protocols/jabber/jingle/jinglesession.h
+++ b/kopete/protocols/jabber/jingle/jinglesession.h
@@ -32,7 +32,7 @@ class JabberAccount;
class JingleSession : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
typedef TQValueList<XMPP::Jid> JidList;
diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.h b/kopete/protocols/jabber/jingle/jinglesessionmanager.h
index 2ec3ef46..03ad0a4d 100644
--- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h
+++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h
@@ -39,7 +39,7 @@ class JabberAccount;
class JingleSessionManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
typedef TQValueList<XMPP::Jid> JidList;
diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.h b/kopete/protocols/jabber/jingle/jinglevoicecaller.h
index e29eaf16..ab403233 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h
@@ -31,7 +31,7 @@ class JingleCallSlots;
class JingleVoiceCaller : public VoiceCaller
{
Q_OBJECT
- TQ_OBJECT
+
friend class JingleClientSlots;
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.h b/kopete/protocols/jabber/jingle/jinglevoicesession.h
index 0089a1bf..58365f2d 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.h
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h
@@ -38,7 +38,7 @@ class JingleSession;
class JingleVoiceSession : public JingleSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
typedef TQValueList<XMPP::Jid> JidList;
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h
index 738b2cb4..5221829e 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h
@@ -30,7 +30,7 @@ class VoiceCaller;
class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated };
diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
index 8c37b0c8..52b03665 100644
--- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
+++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h
@@ -26,7 +26,7 @@
class JingleWatchSessionTask : public XMPP::Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JingleWatchSessionTask(XMPP::Task *parent);
~JingleWatchSessionTask();
diff --git a/kopete/protocols/jabber/jingle/voicecaller.h b/kopete/protocols/jabber/jingle/voicecaller.h
index 6907f09d..fab047f5 100644
--- a/kopete/protocols/jabber/jingle/voicecaller.h
+++ b/kopete/protocols/jabber/jingle/voicecaller.h
@@ -17,7 +17,7 @@ using namespace XMPP;
class VoiceCaller : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h
index 19a12d8a..9b8f5be0 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.h
+++ b/kopete/protocols/jabber/kioslave/jabberdisco.h
@@ -37,7 +37,7 @@ class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket );
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
index 25e33c04..38aa4912 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
@@ -30,7 +30,7 @@
class BSocket : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound };
enum State { Idle, HostLookup, Connecting, Connected, Closing };
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
index 6c73acd5..148356e8 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
@@ -28,7 +28,7 @@
class HttpConnect : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
HttpConnect(TQObject *parent=0);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
index a4c542f6..088d5c33 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
@@ -28,7 +28,7 @@
class HttpPoll : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
HttpPoll(TQObject *parent=0);
@@ -71,7 +71,7 @@ private:
class HttpProxyPost : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
HttpProxyPost(TQObject *parent=0);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
index 3b000d9b..01907ccd 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
@@ -35,7 +35,7 @@ class NDnsManager;
class NDns : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
NDns(TQObject *parent=0);
~NDns();
@@ -60,7 +60,7 @@ private:
class NDnsManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
~NDnsManager();
class Item;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
index fe63abef..c77b57c8 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
@@ -28,7 +28,7 @@
class ServSock : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
ServSock(TQObject *parent=0);
~ServSock();
@@ -53,7 +53,7 @@ private:
class ServSockSignal : public TQServerSocket
{
Q_OBJECT
- TQ_OBJECT
+
public:
ServSockSignal(int port);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
index 14c2a176..3205ceb2 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
@@ -32,7 +32,7 @@ class SocksServer;
class SocksUDP : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
~SocksUDP();
@@ -56,7 +56,7 @@ private:
class SocksClient : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth };
enum Method { AuthNone=0x0001, AuthUsername=0x0002 };
@@ -130,7 +130,7 @@ private:
class SocksServer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SocksServer(TQObject *parent=0);
~SocksServer();
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
index 8ef15684..669bcf80 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
@@ -29,7 +29,7 @@
class SrvResolver : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SrvResolver(TQObject *parent=0);
~SrvResolver();
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
index b72fad78..0ffab15b 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
@@ -30,7 +30,7 @@
class ByteStream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
ByteStream(TQObject *parent=0);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
index 01c47a32..ce7a789a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
@@ -41,7 +41,7 @@ private:
class SafeDeleteLater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static SafeDeleteLater *ensureExists();
void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
index 8c84be12..f8eb7095 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
@@ -26,7 +26,7 @@
class ShowTextDlg : public TQDialog
{
Q_OBJECT
- TQ_OBJECT
+
public:
ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0);
};
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 835eed62..46a599b7 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -495,7 +495,7 @@ namespace XMPP
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrDisc };
Task(Task *parent);
@@ -543,7 +543,7 @@ namespace XMPP
class Client : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Client(TQObject *parent=0);
diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
index ef5604a1..38006b6f 100644
--- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h
+++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
@@ -63,7 +63,7 @@ namespace XMPP
class Connector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connector(TQObject *parent=0);
virtual ~Connector();
@@ -96,7 +96,7 @@ namespace XMPP
class AdvancedConnector : public Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
AdvancedConnector(TQObject *parent=0);
@@ -171,7 +171,7 @@ namespace XMPP
class TLSHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TLSHandler(TQObject *parent=0);
virtual ~TLSHandler();
@@ -192,7 +192,7 @@ namespace XMPP
class QCATLSHandler : public TLSHandler
{
Q_OBJECT
- TQ_OBJECT
+
public:
QCATLSHandler(QCA::TLS *parent);
~QCATLSHandler();
@@ -360,7 +360,7 @@ namespace XMPP
class Stream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
enum StreamCond {
@@ -409,7 +409,7 @@ namespace XMPP
class ClientStream : public Stream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error {
ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
index f3688768..36171a76 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
@@ -31,7 +31,7 @@ namespace XMPP
class FileTransfer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream };
enum { Idle, Requesting, Connecting, WaitingForAccept, Active };
@@ -89,7 +89,7 @@ namespace XMPP
class FileTransferManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
FileTransferManager(Client *);
~FileTransferManager();
@@ -121,7 +121,7 @@ namespace XMPP
class JT_FT : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_FT(Task *parent);
~JT_FT();
@@ -152,7 +152,7 @@ namespace XMPP
class JT_PushFT : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushFT(Task *parent);
~JT_PushFT();
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 9e1f4ccd..3a9adf68 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -64,7 +64,7 @@ static bool haveHost(const StreamHostList &list, const Jid &j)
class S5BManager::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { Idle, Initiator, Target, Active };
enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy };
@@ -1749,7 +1749,7 @@ void S5BManager::Item::finished()
class S5BConnector::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SocksClient *client;
SocksUDP *client_udp;
@@ -1981,7 +1981,7 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost)
class S5BServer::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SocksClient *client;
TQString host;
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
index d925e25f..46bea1c8 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
@@ -60,7 +60,7 @@ namespace XMPP
class S5BConnection : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Mode { Stream, Datagram };
enum Error { ErrRefused, ErrConnect, ErrProxy, ErrSocket };
@@ -131,7 +131,7 @@ namespace XMPP
class S5BManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BManager(Client *);
~S5BManager();
@@ -201,7 +201,7 @@ namespace XMPP
class S5BConnector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BConnector(TQObject *parent=0);
~S5BConnector();
@@ -233,7 +233,7 @@ namespace XMPP
class S5BServer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BServer(TQObject *par=0);
~S5BServer();
@@ -267,7 +267,7 @@ namespace XMPP
class JT_S5B : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_S5B(Task *);
~JT_S5B();
@@ -302,7 +302,7 @@ namespace XMPP
class JT_PushS5B : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushS5B(Task *);
~JT_PushS5B();
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
index 27df2465..f177e3a8 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
@@ -37,7 +37,7 @@ namespace XMPP
class IBBConnection : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrRequest, ErrData };
enum { Idle, Requesting, WaitingForAccept, Active };
@@ -82,7 +82,7 @@ namespace XMPP
class IBBManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
IBBManager(Client *);
~IBBManager();
@@ -116,7 +116,7 @@ namespace XMPP
class JT_IBB : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ModeRequest, ModeSendData };
JT_IBB(Task *, bool serve=false);
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
index a10547ff..055299f3 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
@@ -38,7 +38,7 @@ namespace XMPP
class JidLink : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { None, DTCP, IBB };
enum { Idle, Connecting, WaitingForAccept, Active };
@@ -98,7 +98,7 @@ namespace XMPP
class JidLinkManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
JidLinkManager(Client *);
~JidLinkManager();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
index 40872ce0..55555f04 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
@@ -112,7 +112,7 @@ int LayerTracker::finished(int encoded)
class SecureLayer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { TLS, SASL, TLSH };
int type;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
index f76bd617..69826343 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
@@ -36,7 +36,7 @@ namespace XMPP
class SecureStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrTLS = ErrCustom, ErrSASL };
SecureStream(ByteStream *s);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index f33e428f..f322802a 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -1600,7 +1600,7 @@ bool Features::haveVCard() const
class Features::FeatureName : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
FeatureName()
: TQObject(tqApp)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 0a1fdac5..438d298c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -35,7 +35,7 @@ namespace XMPP
class JT_Register : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Register(Task *parent);
~JT_Register();
@@ -62,7 +62,7 @@ namespace XMPP
class JT_UnRegister : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_UnRegister(Task *parent);
~JT_UnRegister();
@@ -83,7 +83,7 @@ namespace XMPP
class JT_Roster : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Roster(Task *parent);
~JT_Roster();
@@ -112,7 +112,7 @@ namespace XMPP
class JT_PushRoster : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushRoster(Task *parent);
~JT_PushRoster();
@@ -130,7 +130,7 @@ namespace XMPP
class JT_Presence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Presence(Task *parent);
~JT_Presence();
@@ -152,7 +152,7 @@ namespace XMPP
class JT_PushPresence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushPresence(Task *parent);
~JT_PushPresence();
@@ -171,7 +171,7 @@ namespace XMPP
class JT_Message : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Message(Task *parent, const Message &);
~JT_Message();
@@ -188,7 +188,7 @@ namespace XMPP
class JT_PushMessage : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushMessage(Task *parent);
~JT_PushMessage();
@@ -206,7 +206,7 @@ namespace XMPP
class JT_GetLastActivity : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_GetLastActivity(Task *);
~JT_GetLastActivity();
@@ -230,7 +230,7 @@ namespace XMPP
class JT_GetServices : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_GetServices(Task *);
@@ -253,7 +253,7 @@ namespace XMPP
class JT_VCard : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_VCard(Task *parent);
~JT_VCard();
@@ -277,7 +277,7 @@ namespace XMPP
class JT_Search : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Search(Task *parent);
~JT_Search();
@@ -302,7 +302,7 @@ namespace XMPP
class JT_ClientVersion : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ClientVersion(Task *);
@@ -325,7 +325,7 @@ namespace XMPP
class JT_ClientTime : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ClientTime(Task *, const Jid &);
@@ -343,7 +343,7 @@ namespace XMPP
class JT_ServInfo : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ServInfo(Task *);
~JT_ServInfo();
@@ -354,7 +354,7 @@ namespace XMPP
class JT_Gateway : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Gateway(Task *);
@@ -378,7 +378,7 @@ namespace XMPP
class JT_Browse : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Browse(Task *);
~JT_Browse();
@@ -401,7 +401,7 @@ namespace XMPP
class JT_DiscoItems : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoItems(Task *);
~JT_DiscoItems();
@@ -422,7 +422,7 @@ namespace XMPP
class JT_DiscoInfo : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoInfo(Task *);
~JT_DiscoInfo();
@@ -445,7 +445,7 @@ namespace XMPP
class JT_DiscoPublish : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoPublish(Task *);
~JT_DiscoPublish();
@@ -463,7 +463,7 @@ namespace XMPP
class JT_MucPresence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_MucPresence(Task *parent);
~JT_MucPresence();
@@ -484,7 +484,7 @@ namespace XMPP
class JT_PrivateStorage : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PrivateStorage(Task *parent);
~JT_PrivateStorage();
@@ -506,7 +506,7 @@ namespace XMPP
class PongServer : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
PongServer(Task *);
~PongServer();
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h
index 79b028bf..4c27f047 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.h
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.h
@@ -314,7 +314,7 @@ namespace QCA
class QCA_EXPORT TLS : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Validity {
NoCert,
@@ -376,7 +376,7 @@ namespace QCA
class QCA_EXPORT SASL : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrAuth, ErrCrypt };
enum ErrorCond {
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h
index 57549852..3926e987 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h
@@ -35,7 +35,7 @@ class dlgJabberBrowse:public dlgBrowse
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h
index ffeed22b..39756858 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h
+++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h
@@ -32,7 +32,7 @@ class DlgJabberChangePassword : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h
index 1327ba47..45bd649a 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h
+++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h
@@ -25,7 +25,7 @@
class dlgJabberChatJoin : public dlgChatJoin
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h
index f16802cc..c2c6cf33 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h
+++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h
@@ -21,7 +21,7 @@
class dlgJabberChatRoomsList : public dlgChatRoomsList
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* parent = 0, const char* name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h
index bc0bfe44..cd24c929 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.h
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.h
@@ -39,7 +39,7 @@ class dlgJabberRegister:public dlgRegister
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h
index 898ba739..b85e37af 100644
--- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h
+++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h
@@ -36,7 +36,7 @@ class JabberClient;
class dlgJabberSendRaw:public DlgSendRaw
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h
index 4ef09d9e..ea85658f 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.h
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.h
@@ -34,7 +34,7 @@
class dlgJabberServices:public dlgServices
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0);
@@ -60,7 +60,7 @@ private:
class dlgJabberServies_item : protected TQObject, public TQListViewItem
{
Q_OBJECT
- TQ_OBJECT
+
public:
dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 )
: TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {}
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h
index a20f2812..44711c44 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.h
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h
@@ -45,7 +45,7 @@ class dlgVCard;
class dlgJabberVCard : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h
index f7c328c2..ed4fa41c 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h
@@ -32,7 +32,7 @@ class TQLabel;
class JabberAddContactPage:public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0);
@@ -55,7 +55,7 @@ class JabberTransport;
*/
class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public TQObject
{ Q_OBJECT
- TQ_OBJECT
+
public:
JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent);
Kopete::MetaContact *metacontact;
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h
index aee2668e..8523a0dc 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.h
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.h
@@ -39,7 +39,7 @@ class JabberChooseServer : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h
index 82f56215..f53c566c 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h
@@ -35,7 +35,7 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0);
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h
index 74de6387..9979f59f 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.h
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h
@@ -36,7 +36,7 @@ class JabberRegisterAccount : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h
index 2b59e1ca..cb9ac083 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.h
+++ b/kopete/protocols/meanwhile/meanwhileaccount.h
@@ -30,7 +30,7 @@ class MeanwhileSession;
class MeanwhileAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Create a new Meanwhile account
diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h
index dadf6848..e0eb6f82 100644
--- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h
+++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h
@@ -26,7 +26,7 @@ namespace Kopete { class MetaContact; }
class MeanwhileAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
MeanwhileAddContactPage( TQWidget* parent = 0,
Kopete::Account *account=0);
diff --git a/kopete/protocols/meanwhile/meanwhilecontact.h b/kopete/protocols/meanwhile/meanwhilecontact.h
index 180ff0d3..5c92ebb8 100644
--- a/kopete/protocols/meanwhile/meanwhilecontact.h
+++ b/kopete/protocols/meanwhile/meanwhilecontact.h
@@ -31,7 +31,7 @@ namespace Kopete { class MetaContact; }
class MeanwhileContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
MeanwhileContact(TQString userId, TQString nickname,
diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h
index 0f38bc4f..577b8305 100644
--- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h
+++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h
@@ -29,7 +29,7 @@ class MeanwhileEditAccountWidget :
public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MeanwhileEditAccountWidget( TQWidget* parent,
Kopete::Account* account,
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h
index 9b550c9e..907b0482 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.h
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.h
@@ -38,7 +38,7 @@ class MeanwhileAddContactPage;
class MeanwhileProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
MeanwhileProtocol(TQObject *parent, const char *name,
const TQStringList &args);
diff --git a/kopete/protocols/meanwhile/meanwhilesession.h b/kopete/protocols/meanwhile/meanwhilesession.h
index 040d0c2a..314efe0b 100644
--- a/kopete/protocols/meanwhile/meanwhilesession.h
+++ b/kopete/protocols/meanwhile/meanwhilesession.h
@@ -36,7 +36,7 @@ struct MeanwhileClientID {
class MeanwhileSession : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/msn/dispatcher.h b/kopete/protocols/msn/dispatcher.h
index f7933ffc..65b8dd3d 100644
--- a/kopete/protocols/msn/dispatcher.h
+++ b/kopete/protocols/msn/dispatcher.h
@@ -40,7 +40,7 @@ namespace P2P{
class KOPETE_EXPORT Dispatcher : public TQObject
{ Q_OBJECT
- TQ_OBJECT
+
public:
Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip);
~Dispatcher();
diff --git a/kopete/protocols/msn/incomingtransfer.h b/kopete/protocols/msn/incomingtransfer.h
index aeac991e..5ef5a209 100644
--- a/kopete/protocols/msn/incomingtransfer.h
+++ b/kopete/protocols/msn/incomingtransfer.h
@@ -30,7 +30,7 @@ namespace KNetwork{
namespace P2P{
class IncomingTransfer : public P2P::TransferContext
{ Q_OBJECT
- TQ_OBJECT
+
public:
IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId);
virtual ~IncomingTransfer();
diff --git a/kopete/protocols/msn/messageformatter.h b/kopete/protocols/msn/messageformatter.h
index 7fd050d7..fb29c300 100644
--- a/kopete/protocols/msn/messageformatter.h
+++ b/kopete/protocols/msn/messageformatter.h
@@ -28,7 +28,7 @@ namespace P2P{
namespace P2P{
class MessageFormatter : public TQObject
{ Q_OBJECT
- TQ_OBJECT
+
public:
MessageFormatter(TQObject *parent = 0, const char *name = 0);
~MessageFormatter();
diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h
index 31ae451d..0be900e0 100644
--- a/kopete/protocols/msn/msnaccount.h
+++ b/kopete/protocols/msn/msnaccount.h
@@ -40,7 +40,7 @@ class MSNContact;
class MSNAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNAccount( MSNProtocol *parent, const TQString &accountID, const char *name = 0L );
diff --git a/kopete/protocols/msn/msnaddcontactpage.h b/kopete/protocols/msn/msnaddcontactpage.h
index 8e1f7694..dc81dc44 100644
--- a/kopete/protocols/msn/msnaddcontactpage.h
+++ b/kopete/protocols/msn/msnaddcontactpage.h
@@ -15,7 +15,7 @@ class MSNProtocol;
class MSNAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNAddContactPage(bool connected, TQWidget *parent=0, const char *name=0);
~MSNAddContactPage();
diff --git a/kopete/protocols/msn/msnchallengehandler.h b/kopete/protocols/msn/msnchallengehandler.h
index e2413fb5..22024aee 100644
--- a/kopete/protocols/msn/msnchallengehandler.h
+++ b/kopete/protocols/msn/msnchallengehandler.h
@@ -31,7 +31,7 @@
class MSNChallengeHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNChallengeHandler(const TQString& productKey, const TQString& productId);
~MSNChallengeHandler();
diff --git a/kopete/protocols/msn/msnchatsession.h b/kopete/protocols/msn/msnchatsession.h
index dde77246..fb70c573 100644
--- a/kopete/protocols/msn/msnchatsession.h
+++ b/kopete/protocols/msn/msnchatsession.h
@@ -34,7 +34,7 @@ class TQLabel;
class KOPETE_EXPORT MSNChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 );
diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 42667682..2eec2494 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -44,7 +44,7 @@ namespace Kopete { class OnlineStatus; }
class MSNContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent );
diff --git a/kopete/protocols/msn/msndebugrawcmddlg.h b/kopete/protocols/msn/msndebugrawcmddlg.h
index 7ff50df7..443b8c05 100644
--- a/kopete/protocols/msn/msndebugrawcmddlg.h
+++ b/kopete/protocols/msn/msndebugrawcmddlg.h
@@ -32,7 +32,7 @@ class MSNDebugRawCommand_base;
class MSNDebugRawCmdDlg : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNDebugRawCmdDlg( TQWidget *parent );
diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h
index 6dda5aa0..974dbf5e 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.h
+++ b/kopete/protocols/msn/msnfiletransfersocket.h
@@ -40,7 +40,7 @@ namespace Kopete { class Contact; }
class MSNFileTransferSocket : public MSNSocket , public MSNInvitation
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* parent = 0L );
diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h
index ccec2e89..838aee94 100644
--- a/kopete/protocols/msn/msnnotifysocket.h
+++ b/kopete/protocols/msn/msnnotifysocket.h
@@ -42,7 +42,7 @@ class MSNChallengeHandler;
class MSNNotifySocket : public MSNSocket
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNNotifySocket( MSNAccount* account, const TQString &msnId, const TQString &password );
diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h
index 4da1e6ad..5decc1ec 100644
--- a/kopete/protocols/msn/msnprotocol.h
+++ b/kopete/protocols/msn/msnprotocol.h
@@ -56,7 +56,7 @@ namespace Kopete { class Group; }
class KOPETE_EXPORT MSNProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNProtocol( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h
index c25daf0d..0416a35f 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.h
+++ b/kopete/protocols/msn/msnsecureloginhandler.h
@@ -34,7 +34,7 @@ namespace KIO
class MSNSecureLoginHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNSecureLoginHandler(const TQString &accountId, const TQString &password, const TQString &authParameters);
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index aa5a5922..42595c25 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -47,7 +47,7 @@ class MimeMessage;
class KOPETE_EXPORT MSNSocket : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNSocket(TQObject* parent=0l);
diff --git a/kopete/protocols/msn/msnswitchboardsocket.h b/kopete/protocols/msn/msnswitchboardsocket.h
index f607a0a6..e47ebdfe 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.h
+++ b/kopete/protocols/msn/msnswitchboardsocket.h
@@ -43,7 +43,7 @@ namespace P2P { class Dispatcher; }
class KOPETE_EXPORT MSNSwitchBoardSocket : public MSNSocket
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
diff --git a/kopete/protocols/msn/outgoingtransfer.h b/kopete/protocols/msn/outgoingtransfer.h
index 90542151..0ec5846c 100644
--- a/kopete/protocols/msn/outgoingtransfer.h
+++ b/kopete/protocols/msn/outgoingtransfer.h
@@ -27,7 +27,7 @@
namespace P2P{
class OutgoingTransfer : public TransferContext
{ Q_OBJECT
- TQ_OBJECT
+
public:
OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId);
virtual ~OutgoingTransfer();
diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h
index 363fb3ff..e98e7364 100644
--- a/kopete/protocols/msn/p2p.h
+++ b/kopete/protocols/msn/p2p.h
@@ -95,7 +95,7 @@ namespace P2P{
class KOPETE_EXPORT TransferContext : public TQObject
{ Q_OBJECT
- TQ_OBJECT
+
public:
virtual ~TransferContext();
diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h
index 5d7fef31..c5554b54 100644
--- a/kopete/protocols/msn/transport.h
+++ b/kopete/protocols/msn/transport.h
@@ -50,7 +50,7 @@ enum TransportBridgeType
class Transport : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/** @brief Creates a new instance of the class Transport. */
Transport(TQObject* parent, const char* name = 0l);
@@ -81,7 +81,7 @@ private:
class TransportBridge : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
virtual ~TransportBridge();
@@ -124,7 +124,7 @@ protected:
class TcpTransportBridge : public TransportBridge
{
Q_OBJECT
- TQ_OBJECT
+
friend class Transport;
public:
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h
index d52c52c9..730eea3f 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.h
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.h
@@ -35,7 +35,7 @@ class MSNEditAccountWidgetPrivate;
class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 459f7fca..d11f8b02 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -30,7 +30,7 @@ namespace P2P {
class Webcam : public TransferContext
{ Q_OBJECT
- TQ_OBJECT
+
public:
enum Who { wProducer , wViewer };
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.h b/kopete/protocols/msn/webcam/msnwebcamdialog.h
index 0bd415fe..a740e8ab 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.h
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.h
@@ -35,7 +35,7 @@ class MSNContact;
class KOPETE_EXPORT MSNWebcamDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
MSNWebcamDialog( const TQString& contact, TQWidget* parent = 0, const char* name = 0 );
~MSNWebcamDialog();
diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h
index fb18c69a..c7418e36 100644
--- a/kopete/protocols/oscar/aim/aimaccount.h
+++ b/kopete/protocols/oscar/aim/aimaccount.h
@@ -53,7 +53,7 @@ class OscarVisibilityDialog;
class AIMMyselfContact : public OscarMyselfContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMMyselfContact( AIMAccount *acct );
void userInfoUpdated();
@@ -84,7 +84,7 @@ private:
class AIMAccount : public OscarAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L);
diff --git a/kopete/protocols/oscar/aim/aimchatsession.h b/kopete/protocols/oscar/aim/aimchatsession.h
index 0634d02a..b4e78e3d 100644
--- a/kopete/protocols/oscar/aim/aimchatsession.h
+++ b/kopete/protocols/oscar/aim/aimchatsession.h
@@ -27,7 +27,7 @@ class Client;
class AIMChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMChatSession( const Kopete::Contact* contact, Kopete::ContactPtrList others,
Kopete::Protocol* protocol, Oscar::WORD exchange = 0,
diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h
index 37be084d..d66c62c6 100644
--- a/kopete/protocols/oscar/aim/aimcontact.h
+++ b/kopete/protocols/oscar/aim/aimcontact.h
@@ -35,7 +35,7 @@ class AIMUserInfoDialog;
class AIMContact : public OscarContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMContact( Kopete::Account*, const TQString&, Kopete::MetaContact*,
diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h
index 13838fd1..828aab35 100644
--- a/kopete/protocols/oscar/aim/aimjoinchat.h
+++ b/kopete/protocols/oscar/aim/aimjoinchat.h
@@ -30,7 +30,7 @@ class AIMJoinChatBase;
class AIMJoinChatUI : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* parent = 0,
const char* name = 0 );
diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h
index a1e03983..26d092b6 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.h
+++ b/kopete/protocols/oscar/aim/aimprotocol.h
@@ -40,7 +40,7 @@ public:
class AIMProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMProtocol( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h
index da2c261c..d9e77fc5 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.h
+++ b/kopete/protocols/oscar/aim/aimuserinfo.h
@@ -30,7 +30,7 @@ class AIMAccount;
class AIMUserInfoDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal,
TQWidget *parent, const char* name);
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
index c3cb1092..c3bcaa36 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h
@@ -17,7 +17,7 @@ class MetaContact;
class AIMAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMAddContactPage(bool connected, TQWidget *parent=0,
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
index dbf82adb..6ccaceb5 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h
@@ -37,7 +37,7 @@ class aimEditAccountUI;
class AIMEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account,
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index f3a62c73..19069529 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -34,7 +34,7 @@ class OscarVisibilityDialog;
class ICQMyselfContact : public OscarMyselfContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQMyselfContact( ICQAccount *acct );
void userInfoUpdated();
@@ -48,7 +48,7 @@ public slots:
class ICQAccount : public OscarAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQAccount( Kopete::Protocol *parent, TQString accountID, const char *name = 0L );
diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h
index 4c1d11e2..be8e064f 100644
--- a/kopete/protocols/oscar/icq/icqcontact.h
+++ b/kopete/protocols/oscar/icq/icqcontact.h
@@ -47,7 +47,7 @@ class ICQInterestInfoWidget;
class ICQContact : public OscarContact
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/oscar/icq/icqprotocol.h b/kopete/protocols/oscar/icq/icqprotocol.h
index 7af69b84..2b3e7f4a 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.h
+++ b/kopete/protocols/oscar/icq/icqprotocol.h
@@ -38,7 +38,7 @@ public:
class ICQProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQProtocol(TQObject *parent, const char *name, const TQStringList &args);
diff --git a/kopete/protocols/oscar/icq/icqreadaway.h b/kopete/protocols/oscar/icq/icqreadaway.h
index a9a03c72..64a8c2f1 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.h
+++ b/kopete/protocols/oscar/icq/icqreadaway.h
@@ -28,7 +28,7 @@ class TQVBox;
class ICQReadAway : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQReadAway(ICQContact *, TQWidget *parent = 0, const char* name = "ICQReadAway");
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
index 1a901a0e..cf77a99b 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h
@@ -32,7 +32,7 @@ class ICQSearchDialog;
class ICQAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
index de11a442..eaf7427c 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h
@@ -29,7 +29,7 @@ class ICQAuthReplyUI;
class ICQAuthReplyDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true);
~ICQAuthReplyDialog();
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
index 788cee4b..e3046702 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h
@@ -31,7 +31,7 @@ class ICQEditAccountUI;
class ICQEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQEditAccountWidget(ICQProtocol *, Kopete::Account *,
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
index e437ce63..6752d5e5 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h
@@ -32,7 +32,7 @@ class ICQUserInfoWidget;
class ICQSearchDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 );
~ICQSearchDialog();
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
index e8c5c54f..edafc223 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h
@@ -32,7 +32,7 @@ class ICQContact;
class ICQUserInfoWidget : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 );
void setContact( ICQContact* contact );
diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h
index af907e6a..82850a47 100644
--- a/kopete/protocols/oscar/liboscar/aimlogintask.h
+++ b/kopete/protocols/oscar/liboscar/aimlogintask.h
@@ -26,7 +26,7 @@ using namespace Oscar;
class AimLoginTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
AimLoginTask( Task* parent );
~AimLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h
index d19e0ab6..c3b7c4f9 100644
--- a/kopete/protocols/oscar/liboscar/buddyicontask.h
+++ b/kopete/protocols/oscar/liboscar/buddyicontask.h
@@ -28,7 +28,7 @@ class Transfer;
class BuddyIconTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
BuddyIconTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h
index 9104bbce..e64ce68d 100644
--- a/kopete/protocols/oscar/liboscar/bytestream.h
+++ b/kopete/protocols/oscar/liboscar/bytestream.h
@@ -30,7 +30,7 @@
class ByteStream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
ByteStream(TQObject *parent=0);
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
index a36e2ab4..1b47dbf8 100644
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h
@@ -30,7 +30,7 @@ class Transfer;
class ChatNavServiceTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatNavServiceTask( Task* parent );
~ChatNavServiceTask();
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h
index 8cc09b9f..1b6d2ddf 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.h
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.h
@@ -28,7 +28,7 @@ class Transfer;
class ChatServiceTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room );
~ChatServiceTask();
diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h
index b09be40e..71cf668a 100644
--- a/kopete/protocols/oscar/liboscar/client.h
+++ b/kopete/protocols/oscar/liboscar/client.h
@@ -50,7 +50,7 @@ class Settings;
class KOPETE_EXPORT Client : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/oscar/liboscar/connection.h b/kopete/protocols/oscar/liboscar/connection.h
index b840a597..9a3cd861 100644
--- a/kopete/protocols/oscar/liboscar/connection.h
+++ b/kopete/protocols/oscar/liboscar/connection.h
@@ -48,7 +48,7 @@ class Settings;
class Connection : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connection( Connector* connector, ClientStream* cs, const char* name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h
index ee5d3e32..62b9a5a3 100644
--- a/kopete/protocols/oscar/liboscar/connector.h
+++ b/kopete/protocols/oscar/liboscar/connector.h
@@ -30,7 +30,7 @@ class ByteStream;
class Connector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connector(TQObject *parent=0);
virtual ~Connector();
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.h b/kopete/protocols/oscar/liboscar/coreprotocol.h
index 807679ba..bf3cfeea 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.h
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.h
@@ -32,7 +32,7 @@ class Transfer;
class CoreProtocol : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum State { NeedMore, Available, NoData, OutOfSync };
diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h
index 0771197a..9e5e3f75 100644
--- a/kopete/protocols/oscar/liboscar/flapprotocol.h
+++ b/kopete/protocols/oscar/liboscar/flapprotocol.h
@@ -28,7 +28,7 @@ class FlapTransfer;
class FlapProtocol : public InputProtocolBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
FlapProtocol( TQObject *parent = 0, const char *name = 0 );
~FlapProtocol();
diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h
index 3111608d..0d998c73 100644
--- a/kopete/protocols/oscar/liboscar/icqlogintask.h
+++ b/kopete/protocols/oscar/liboscar/icqlogintask.h
@@ -30,7 +30,7 @@ using namespace Oscar;
class IcqLoginTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
IcqLoginTask( Task* parent );
~IcqLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/icqtask.h b/kopete/protocols/oscar/liboscar/icqtask.h
index 00ef13fb..71baf3af 100644
--- a/kopete/protocols/oscar/liboscar/icqtask.h
+++ b/kopete/protocols/oscar/liboscar/icqtask.h
@@ -28,7 +28,7 @@ class Buffer;
class ICQTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQTask( Task* parent );
~ICQTask();
diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h
index cd157f4d..4039dc91 100644
--- a/kopete/protocols/oscar/liboscar/icquserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h
@@ -33,7 +33,7 @@ class Transfer;
class ICQUserInfoRequestTask : public ICQTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
ICQUserInfoRequestTask( Task* parent );
~ICQUserInfoRequestTask();
diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
index 365927cc..badf788a 100644
--- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h
+++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h
@@ -30,7 +30,7 @@ Defines a basic interface for protocols dealing with input from the GroupWise se
class InputProtocolBase : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
InputProtocolBase(TQObject *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h
index c9bf27dc..3e1a21c5 100644
--- a/kopete/protocols/oscar/liboscar/logintask.h
+++ b/kopete/protocols/oscar/liboscar/logintask.h
@@ -44,7 +44,7 @@ class Transfer;
class StageOneLoginTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
StageOneLoginTask( Task* parent );
~StageOneLoginTask();
@@ -104,7 +104,7 @@ class RateInfoTask;
class StageTwoLoginTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
StageTwoLoginTask( Task* parent );
~StageTwoLoginTask();
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h
index c288a82d..30fe0b5b 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.h
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h
@@ -32,7 +32,7 @@ class TQTextCodec;
class MessageReceiverTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
MessageReceiverTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.h b/kopete/protocols/oscar/liboscar/offlinemessagestask.h
index 87a7a9dc..42793be2 100644
--- a/kopete/protocols/oscar/liboscar/offlinemessagestask.h
+++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.h
@@ -30,7 +30,7 @@ ICQ Offline messages handling
class OfflineMessagesTask : public ICQTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
OfflineMessagesTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
index 08730c70..da691c63 100644
--- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
+++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h
@@ -35,7 +35,7 @@ Implements SNACS (0x03, 0x11) and (0x03, 0x12)
class OnlineNotifierTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
OnlineNotifierTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h
index db5c3a3b..15346ff0 100644
--- a/kopete/protocols/oscar/liboscar/oscarbytestream.h
+++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h
@@ -35,7 +35,7 @@ class KNetworkByteStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h
index 6d4f2026..f59063f4 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.h
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h
@@ -34,7 +34,7 @@ class TQHostAddress;
class ClientStream : public Stream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error {
ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h
index 3e72a8dc..f1045f34 100644
--- a/kopete/protocols/oscar/liboscar/oscarconnector.h
+++ b/kopete/protocols/oscar/liboscar/oscarconnector.h
@@ -37,7 +37,7 @@ class KNetworkConnector : public Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkConnector( TQObject *parent = 0, const char *name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
index c5c77d2f..75781c4d 100644
--- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h
+++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h
@@ -29,7 +29,7 @@ Request our user info from the server and handle our user info when it comes bac
class OwnUserInfoTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
OwnUserInfoTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h
index d981dd83..a7d3f52c 100644
--- a/kopete/protocols/oscar/liboscar/rateclass.h
+++ b/kopete/protocols/oscar/liboscar/rateclass.h
@@ -37,7 +37,7 @@ class Transfer;
class RateClass : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
RateClass( TQObject* parent = 0 );
~RateClass();
diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h
index 14155029..6a5eef03 100644
--- a/kopete/protocols/oscar/liboscar/rateclassmanager.h
+++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h
@@ -34,7 +34,7 @@ class RateClassManagerPrivate;
class RateClassManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
RateClassManager( Connection* parent, const char* name = 0 );
~RateClassManager();
diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h
index 1ca3174f..ccbe1535 100644
--- a/kopete/protocols/oscar/liboscar/rateinfotask.h
+++ b/kopete/protocols/oscar/liboscar/rateinfotask.h
@@ -30,7 +30,7 @@ using namespace Oscar;
class RateInfoTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
RateInfoTask( Task* parent );
~RateInfoTask();
diff --git a/kopete/protocols/oscar/liboscar/safedelete.h b/kopete/protocols/oscar/liboscar/safedelete.h
index 88cfb3d4..33748953 100644
--- a/kopete/protocols/oscar/liboscar/safedelete.h
+++ b/kopete/protocols/oscar/liboscar/safedelete.h
@@ -60,7 +60,7 @@ private:
class SafeDeleteLater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static SafeDeleteLater *ensureExists();
void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h
index b43fe195..3640b1ce 100644
--- a/kopete/protocols/oscar/liboscar/serverredirecttask.h
+++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h
@@ -32,7 +32,7 @@ class Transfer;
class ServerRedirectTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ServerRedirectTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h
index ed7f0104..822911bd 100644
--- a/kopete/protocols/oscar/liboscar/serverversionstask.h
+++ b/kopete/protocols/oscar/liboscar/serverversionstask.h
@@ -31,7 +31,7 @@ class Transfer;
class ServerVersionsTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ServerVersionsTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.h b/kopete/protocols/oscar/liboscar/servicesetuptask.h
index 513344ba..b935569d 100644
--- a/kopete/protocols/oscar/liboscar/servicesetuptask.h
+++ b/kopete/protocols/oscar/liboscar/servicesetuptask.h
@@ -38,7 +38,7 @@ Set up the various services for the BOS connection
class ServiceSetupTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ServiceSetupTask( Task* parent );
~ServiceSetupTask();
diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h
index 04608487..d65b101e 100644
--- a/kopete/protocols/oscar/liboscar/snacprotocol.h
+++ b/kopete/protocols/oscar/liboscar/snacprotocol.h
@@ -28,7 +28,7 @@ class SnacTransfer;
class SnacProtocol : public InputProtocolBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
SnacProtocol( TQObject *parent = 0, const char *name = 0 );
~SnacProtocol();
diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h
index c5d8a351..4935dbe6 100644
--- a/kopete/protocols/oscar/liboscar/ssiauthtask.h
+++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h
@@ -29,7 +29,7 @@ class SSIManager;
class SSIAuthTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
SSIAuthTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.h b/kopete/protocols/oscar/liboscar/ssilisttask.h
index ac0ddfe5..4358cd9e 100644
--- a/kopete/protocols/oscar/liboscar/ssilisttask.h
+++ b/kopete/protocols/oscar/liboscar/ssilisttask.h
@@ -35,7 +35,7 @@ class SSIManager;
class SSIListTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
SSIListTask( Task* parent );
~SSIListTask();
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h
index 2d8d4fd1..89cdaa12 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.h
+++ b/kopete/protocols/oscar/liboscar/ssimanager.h
@@ -41,7 +41,7 @@ SSI management
class KOPETE_EXPORT SSIManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SSIManager( TQObject* parent = 0, const char* name = 0 );
diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h
index 583fa5eb..919c7799 100644
--- a/kopete/protocols/oscar/liboscar/stream.h
+++ b/kopete/protocols/oscar/liboscar/stream.h
@@ -28,7 +28,7 @@ class Transfer;
class Stream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
enum StreamCond {
diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h
index 7aaba596..ccaa5d08 100644
--- a/kopete/protocols/oscar/liboscar/task.h
+++ b/kopete/protocols/oscar/liboscar/task.h
@@ -37,7 +37,7 @@ using namespace Oscar;
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrDisc };
Task(Task *parent);
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
index 80c68446..7148eb11 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h
@@ -24,7 +24,7 @@
class ClientStreamTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
ClientStreamTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h
index c2149992..b5173e1a 100644
--- a/kopete/protocols/oscar/liboscar/tests/kunittest.h
+++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h
@@ -39,7 +39,7 @@
class KUnitTest : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
KUnitTest();
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.h b/kopete/protocols/oscar/liboscar/tests/logintest.h
index 661ae49d..4ba4f3cd 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.h
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.h
@@ -25,7 +25,7 @@
class LoginTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
index e997b9db..b86abe41 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h
@@ -25,7 +25,7 @@
class LoginTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.h b/kopete/protocols/oscar/liboscar/tests/ssitest.h
index db7e8697..ff5b6ccf 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.h
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h
@@ -21,7 +21,7 @@
class SSITest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
SSITest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
index a17818e6..a32b7a46 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h
@@ -25,7 +25,7 @@
class LoginTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h
index 4940735f..d4982c83 100644
--- a/kopete/protocols/oscar/liboscar/typingnotifytask.h
+++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h
@@ -28,7 +28,7 @@
class TypingNotifyTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { Finished = 0x0000, Typed = 0x0001, Begin = 0x0002 };
diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h
index 2b1baf82..b4fbc90a 100644
--- a/kopete/protocols/oscar/liboscar/userinfotask.h
+++ b/kopete/protocols/oscar/liboscar/userinfotask.h
@@ -33,7 +33,7 @@ Handles user information requests that are done via SNAC 02,05 and 02,06
class UserInfoTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
UserInfoTask( Task* parent );
~UserInfoTask();
diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h
index 6b187e84..cbbd2bea 100644
--- a/kopete/protocols/oscar/liboscar/usersearchtask.h
+++ b/kopete/protocols/oscar/liboscar/usersearchtask.h
@@ -31,7 +31,7 @@ Search for contacts
class UserSearchTask : public ICQTask
{
Q_OBJECT
- TQ_OBJECT
+
public:
UserSearchTask( Task* parent );
diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h
index 9287f697..760e9939 100644
--- a/kopete/protocols/oscar/liboscar/warningtask.h
+++ b/kopete/protocols/oscar/liboscar/warningtask.h
@@ -29,7 +29,7 @@
class WarningTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
WarningTask( Task* parent );
~WarningTask();
diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h
index 22062d72..a3290506 100644
--- a/kopete/protocols/oscar/oscaraccount.h
+++ b/kopete/protocols/oscar/oscaraccount.h
@@ -42,7 +42,7 @@ class TQTextCodec;
class KDE_EXPORT OscarAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L, bool isICQ=false);
diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h
index eae7d3e6..b115f7a1 100644
--- a/kopete/protocols/oscar/oscarcontact.h
+++ b/kopete/protocols/oscar/oscarcontact.h
@@ -60,7 +60,7 @@ class KToggleAction;
class KDE_EXPORT OscarContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarContact( Kopete::Account* account, const TQString& name,
diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.h b/kopete/protocols/oscar/oscarencodingselectiondialog.h
index 65f36abc..beff9074 100644
--- a/kopete/protocols/oscar/oscarencodingselectiondialog.h
+++ b/kopete/protocols/oscar/oscarencodingselectiondialog.h
@@ -27,7 +27,7 @@ class OscarEncodingBaseUI;
class KOPETE_EXPORT OscarEncodingSelectionDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarEncodingSelectionDialog( TQWidget* parent = 0, int initialEncoding = 4);
~OscarEncodingSelectionDialog() {}
diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.h b/kopete/protocols/oscar/oscarlistnonservercontacts.h
index df4461d4..159b99f1 100644
--- a/kopete/protocols/oscar/oscarlistnonservercontacts.h
+++ b/kopete/protocols/oscar/oscarlistnonservercontacts.h
@@ -28,7 +28,7 @@ class TQStringList;
class KOPETE_EXPORT OscarListNonServerContacts : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarListNonServerContacts( TQWidget* parent );
~OscarListNonServerContacts();
diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h
index 922637e5..3434d3e3 100644
--- a/kopete/protocols/oscar/oscarmyselfcontact.h
+++ b/kopete/protocols/oscar/oscarmyselfcontact.h
@@ -37,7 +37,7 @@ class KToggleAction;
class KDE_EXPORT OscarMyselfContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarMyselfContact( OscarAccount* account );
diff --git a/kopete/protocols/oscar/oscarversionupdater.h b/kopete/protocols/oscar/oscarversionupdater.h
index 0bfbc4c4..117734c8 100644
--- a/kopete/protocols/oscar/oscarversionupdater.h
+++ b/kopete/protocols/oscar/oscarversionupdater.h
@@ -37,7 +37,7 @@ class TQDomDocument;
class OscarVersionUpdater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
OscarVersionUpdater();
diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.h b/kopete/protocols/oscar/oscarvisibilitydialog.h
index 213e6941..a5583024 100644
--- a/kopete/protocols/oscar/oscarvisibilitydialog.h
+++ b/kopete/protocols/oscar/oscarvisibilitydialog.h
@@ -30,7 +30,7 @@ class Client;
class KOPETE_EXPORT OscarVisibilityDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
typedef TQMap<TQString, TQString> ContactMap;
diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h
index ac5066c7..c49e26b7 100644
--- a/kopete/protocols/sms/services/gsmlib.h
+++ b/kopete/protocols/sms/services/gsmlib.h
@@ -46,7 +46,7 @@ class GSMLibThread;
class GSMLib : public SMSService
{
Q_OBJECT
- TQ_OBJECT
+
public:
GSMLib(Kopete::Account* account);
~GSMLib();
diff --git a/kopete/protocols/sms/services/kopete_unix_serial.h b/kopete/protocols/sms/services/kopete_unix_serial.h
index a85fa94b..cdc30be7 100644
--- a/kopete/protocols/sms/services/kopete_unix_serial.h
+++ b/kopete/protocols/sms/services/kopete_unix_serial.h
@@ -33,7 +33,7 @@ namespace gsmlib
class KopeteUnixSerialPort : public TQObject, public Port
{
Q_OBJECT
- TQ_OBJECT
+
protected:
int _fd; // file descriptor for device
diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h
index 06a89050..988565b1 100644
--- a/kopete/protocols/sms/services/smsclient.h
+++ b/kopete/protocols/sms/services/smsclient.h
@@ -31,7 +31,7 @@ class KProcess;
class SMSClient : public SMSService
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSClient(Kopete::Account* account);
~SMSClient();
diff --git a/kopete/protocols/sms/services/smssend.h b/kopete/protocols/sms/services/smssend.h
index bd36d89c..9b575a72 100644
--- a/kopete/protocols/sms/services/smssend.h
+++ b/kopete/protocols/sms/services/smssend.h
@@ -33,7 +33,7 @@ class TQGridLayout;
class SMSSend : public SMSService
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSSend(Kopete::Account* account);
~SMSSend();
diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h
index 3ea98307..97d60542 100644
--- a/kopete/protocols/sms/services/smssendprovider.h
+++ b/kopete/protocols/sms/services/smssendprovider.h
@@ -36,7 +36,7 @@ class SMSContact;
class SMSSendProvider : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent = 0, const char* name = 0);
~SMSSendProvider();
diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h
index db7d0f9a..f127759f 100644
--- a/kopete/protocols/sms/smsaccount.h
+++ b/kopete/protocols/sms/smsaccount.h
@@ -30,7 +30,7 @@ enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT };
class SMSAccount : public Kopete::Account
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L );
diff --git a/kopete/protocols/sms/smsaddcontactpage.h b/kopete/protocols/sms/smsaddcontactpage.h
index 25239bcb..cf2afc86 100644
--- a/kopete/protocols/sms/smsaddcontactpage.h
+++ b/kopete/protocols/sms/smsaddcontactpage.h
@@ -26,7 +26,7 @@ class SMSProtocol;
class SMSAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSAddContactPage(TQWidget *parent=0, const char *name=0);
~SMSAddContactPage();
diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h
index ae11e564..81d73bcd 100644
--- a/kopete/protocols/sms/smscontact.h
+++ b/kopete/protocols/sms/smscontact.h
@@ -32,7 +32,7 @@ class KAction;
class SMSContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSContact( Kopete::Account* _account, const TQString &phoneNumber,
const TQString &displayName, Kopete::MetaContact *parent );
diff --git a/kopete/protocols/sms/smseditaccountwidget.h b/kopete/protocols/sms/smseditaccountwidget.h
index 00011639..c454abae 100644
--- a/kopete/protocols/sms/smseditaccountwidget.h
+++ b/kopete/protocols/sms/smseditaccountwidget.h
@@ -29,7 +29,7 @@ class TQGridLayout;
class SMSEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0);
~SMSEditAccountWidget();
diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h
index a97d1282..e25c0a24 100644
--- a/kopete/protocols/sms/smsprotocol.h
+++ b/kopete/protocols/sms/smsprotocol.h
@@ -40,7 +40,7 @@ class SMSContact;
class SMSProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSProtocol(TQObject *parent, const char *name, const TQStringList &args);
diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h
index dc0493bb..616529ca 100644
--- a/kopete/protocols/sms/smsservice.h
+++ b/kopete/protocols/sms/smsservice.h
@@ -31,7 +31,7 @@ class TQWidget;
class SMSService : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSService(Kopete::Account* account = 0);
virtual ~SMSService();
diff --git a/kopete/protocols/sms/smsuserpreferences.h b/kopete/protocols/sms/smsuserpreferences.h
index 5dee2d19..6b8b708f 100644
--- a/kopete/protocols/sms/smsuserpreferences.h
+++ b/kopete/protocols/sms/smsuserpreferences.h
@@ -27,7 +27,7 @@ class SMSContact;
class SMSUserPreferences : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
SMSUserPreferences(SMSContact* contact);
~SMSUserPreferences();
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index 8bb310ca..f57d41d1 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -35,7 +35,7 @@ class TestbedFakeServer;
class TestbedAccount : public Kopete::Account
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name = 0 );
~TestbedAccount();
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.h b/kopete/protocols/testbed/testbedaddcontactpage.h
index a39681dd..50ae0c8e 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.h
+++ b/kopete/protocols/testbed/testbedaddcontactpage.h
@@ -30,7 +30,7 @@ class TestbedAddUI;
class TestbedAddContactPage : public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedAddContactPage( TQWidget* parent = 0, const char* name = 0 );
~TestbedAddContactPage();
diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h
index 30dc6d13..3ad16124 100644
--- a/kopete/protocols/testbed/testbedcontact.h
+++ b/kopete/protocols/testbed/testbedcontact.h
@@ -33,7 +33,7 @@ namespace Kopete { class MetaContact; }
class TestbedContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* The range of possible contact types
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.h b/kopete/protocols/testbed/testbededitaccountwidget.h
index 39b1a39a..2e1e1625 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.h
+++ b/kopete/protocols/testbed/testbededitaccountwidget.h
@@ -31,7 +31,7 @@ class TestbedAccountPreferences;
class TestbedEditAccountWidget : public TQWidget, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account);
diff --git a/kopete/protocols/testbed/testbedfakeserver.h b/kopete/protocols/testbed/testbedfakeserver.h
index 1fff7104..5f59ad0d 100644
--- a/kopete/protocols/testbed/testbedfakeserver.h
+++ b/kopete/protocols/testbed/testbedfakeserver.h
@@ -29,7 +29,7 @@ class TestbedIncomingMessage;
class TestbedFakeServer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedFakeServer();
~TestbedFakeServer();
diff --git a/kopete/protocols/testbed/testbedincomingmessage.h b/kopete/protocols/testbed/testbedincomingmessage.h
index cacace11..c6a22160 100644
--- a/kopete/protocols/testbed/testbedincomingmessage.h
+++ b/kopete/protocols/testbed/testbedincomingmessage.h
@@ -28,7 +28,7 @@
class TestbedIncomingMessage : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
/**
* Create a new incoming message
diff --git a/kopete/protocols/testbed/testbedprotocol.h b/kopete/protocols/testbed/testbedprotocol.h
index a38dfe20..8bd14292 100644
--- a/kopete/protocols/testbed/testbedprotocol.h
+++ b/kopete/protocols/testbed/testbedprotocol.h
@@ -27,7 +27,7 @@
class TestbedProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedProtocol(TQObject *parent, const char *name, const TQStringList &args);
~TestbedProtocol();
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.h b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
index ff622a12..38d17cb4 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.h
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.h
@@ -40,7 +40,7 @@ namespace Kopete {
class TestbedWebcamDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
TestbedWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 );
~TestbedWebcamDialog();
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index b4d7dc82..c4789ebc 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -47,7 +47,7 @@ public:
class WinPopupLib : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
WinPopupLib(const TQString &smbClient,int groupFreq);
diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h
index 04f8ea20..2eb258c3 100644
--- a/kopete/protocols/winpopup/wpaccount.h
+++ b/kopete/protocols/winpopup/wpaccount.h
@@ -48,7 +48,7 @@ class KopeteWinPopup;
class WPAccount : public Kopete::Account
{
Q_OBJECT
- TQ_OBJECT
+
// Kopete::Account overloading
public:
diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h
index 59ebaecd..b9898c42 100644
--- a/kopete/protocols/winpopup/wpaddcontact.h
+++ b/kopete/protocols/winpopup/wpaddcontact.h
@@ -34,7 +34,7 @@ namespace Kopete { class MetaContact; }
class WPAddContact: public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
private:
WPAccount *theAccount;
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 8acd7235..73e5808e 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -49,7 +49,7 @@ namespace Kopete { class MetaContact; }
class WPContact: public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
WPContact(Kopete::Account *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact);
diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h
index 4101c37a..6662bba0 100644
--- a/kopete/protocols/winpopup/wpeditaccount.h
+++ b/kopete/protocols/winpopup/wpeditaccount.h
@@ -35,7 +35,7 @@ namespace Kopete { class Account; }
class WPEditAccount: public WPEditAccountBase, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
private:
WPProtocol *mProtocol;
diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h
index acff4cc0..7a5ef92c 100644
--- a/kopete/protocols/winpopup/wpprotocol.h
+++ b/kopete/protocols/winpopup/wpprotocol.h
@@ -48,7 +48,7 @@ class WPAccount;
class WPProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
// Kopete::Protocol overloading
public:
diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h
index 4d9bd098..09d2f332 100644
--- a/kopete/protocols/winpopup/wpuserinfo.h
+++ b/kopete/protocols/winpopup/wpuserinfo.h
@@ -34,7 +34,7 @@ class WPContact;
class WPUserInfo : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
WPUserInfo( WPContact *, WPAccount *, TQWidget *parent = 0, const char* name = "WPUserInfo" );
diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h
index 9104bbce..e64ce68d 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/bytestream.h
@@ -30,7 +30,7 @@
class ByteStream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrRead, ErrWrite, ErrCustom = 10 };
ByteStream(TQObject *parent=0);
diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h
index 4e1602eb..16f85d0a 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.h
+++ b/kopete/protocols/yahoo/libkyahoo/client.h
@@ -43,7 +43,7 @@ struct YABEntry;
class Client : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
index 4490fc6a..1588855f 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h
@@ -27,7 +27,7 @@ class YMSGTransfer;
class ConferenceTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ConferenceTask(Task *parent);
~ConferenceTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h
index a15f137b..bb9ea57e 100644
--- a/kopete/protocols/yahoo/libkyahoo/connector.h
+++ b/kopete/protocols/yahoo/libkyahoo/connector.h
@@ -30,7 +30,7 @@ class ByteStream;
class Connector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connector(TQObject *parent=0);
virtual ~Connector();
diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
index fc4c2be6..c10e9bc0 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h
@@ -30,7 +30,7 @@ class YMSGProtocol;
class CoreProtocol : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum State { NeedMore, Available, NoData, OutOfSync };
diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
index 9851bf60..7a9d10a5 100644
--- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h
@@ -30,7 +30,7 @@ class TQPixmap;
class FileTransferNotifierTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
FileTransferNotifierTask(Task *parent);
~FileTransferNotifierTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
index 683202f4..ca0f07a2 100644
--- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
+++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h
@@ -30,7 +30,7 @@ Defines a basic interface for protocols dealing with input from the GroupWise se
class InputProtocolBase : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError };
InputProtocolBase(TQObject *parent = 0, const char *name = 0);
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h
index 8f8e69ba..24bc6f48 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.h
@@ -28,7 +28,7 @@ class YMSGTransfer;
class ListTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
ListTask(Task *parent);
~ListTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index 4ed1ac95..33ce4db6 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -38,7 +38,7 @@ namespace KIO
class LoginTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTask(Task *parent);
~LoginTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
index cbdbe3d7..82caaef9 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h
@@ -28,7 +28,7 @@ class YMSGTransfer;
class MailNotifierTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
MailNotifierTask(Task *parent);
~MailNotifierTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
index d95fa135..d8428bcd 100644
--- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h
@@ -28,7 +28,7 @@ class YMSGTransfer;
class MessageReceiverTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
MessageReceiverTask(Task *parent);
~MessageReceiverTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
index 266a3f00..672eeea8 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h
@@ -27,7 +27,7 @@ class TQString;
class ModifyBuddyTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type { AddBuddy, RemoveBuddy, MoveBuddy };
ModifyBuddyTask(Task *parent);
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
index 8030e011..4194fcca 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
@@ -35,7 +35,7 @@ namespace KNetwork {
class ModifyYABTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Action { AddEntry, EditEntry, DeleteEntry };
ModifyYABTask(Task *parent);
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 832efc35..7104d8c2 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -29,7 +29,7 @@ class YMSGTransfer;
class PictureNotifierTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
PictureNotifierTask(Task *parent);
~PictureNotifierTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
index bc429b30..63d6db07 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h
@@ -36,7 +36,7 @@ class YMSGTransfer;
class ReceiveFileTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject };
ReceiveFileTask(Task *parent);
diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
index 4152afa9..c246115a 100644
--- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h
@@ -27,7 +27,7 @@ class TQString;
class RequestPictureTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
RequestPictureTask(Task *parent);
virtual ~RequestPictureTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.h b/kopete/protocols/yahoo/libkyahoo/safedelete.h
index 8e6d5abd..b46e9b8f 100644
--- a/kopete/protocols/yahoo/libkyahoo/safedelete.h
+++ b/kopete/protocols/yahoo/libkyahoo/safedelete.h
@@ -60,7 +60,7 @@ private:
class SafeDeleteLater : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
static SafeDeleteLater *ensureExists();
void deleteItLater(TQObject *o);
diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
index 4f69f156..11102a92 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h
@@ -28,7 +28,7 @@ class TQString;
class SendAuthRespTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
SendAuthRespTask(Task *parent);
~SendAuthRespTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
index 70402a2d..57b98954 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h
@@ -32,7 +32,7 @@ namespace KNetwork{
class SendFileTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
SendFileTask(Task *parent);
~SendFileTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
index c55f8004..e35c00ba 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h
@@ -27,7 +27,7 @@ class TQString;
class SendNotifyTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame };
enum State { Active = 1, NotActive = 0 };
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index 4bac4f31..dad47858 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -35,7 +35,7 @@ namespace KNetwork {
class SendPictureTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus };
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
index d819d54a..1b6299be 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -29,7 +29,7 @@ class YMSGTransfer;
class StatusNotifierTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
StatusNotifierTask(Task *parent);
~StatusNotifierTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h
index cabcc9fc..a8d9c705 100644
--- a/kopete/protocols/yahoo/libkyahoo/stream.h
+++ b/kopete/protocols/yahoo/libkyahoo/stream.h
@@ -28,7 +28,7 @@ class Transfer;
class Stream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
enum StreamCond
diff --git a/kopete/protocols/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h
index 22458a8f..47c48df9 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.h
+++ b/kopete/protocols/yahoo/libkyahoo/task.h
@@ -30,7 +30,7 @@ class Transfer;
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrDisc };
Task(Task *parent);
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
index e09c89bb..37905b0d 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
+++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h
@@ -24,7 +24,7 @@
class ClientStreamTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
ClientStreamTest(int argc, char ** argv);
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
index 1fd43976..36817dde 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
+++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h
@@ -37,7 +37,7 @@
class LoginTest : public TQApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
LoginTest(int argc, char ** argv);
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
index 66dd92c8..d41796cf 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
@@ -57,7 +57,7 @@ typedef TQMap< KStreamSocket *, YahooWebcamInformation > SocketInfoMap;
class WebcamTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
WebcamTask(Task *parent);
~WebcamTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h
index 3970e4a6..1194829c 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h
@@ -34,7 +34,7 @@ namespace KIO {
class YABTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
YABTask(Task *parent);
~YABTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
index 4726f1ec..7961b393 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
@@ -48,7 +48,7 @@ struct IconLoadJob {
class YahooBuddyIconLoader : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooBuddyIconLoader( Client *c );
~YahooBuddyIconLoader();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
index d08641a9..f4ff3061 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h
@@ -32,7 +32,7 @@ class KNetworkByteStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkByteStream ( TQObject *parent = 0 );
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
index a971cf0c..2a90016f 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h
@@ -41,7 +41,7 @@ struct YahooChatJob {
class YahooChatTask : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooChatTask(Task *parent);
virtual ~YahooChatTask();
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
index 87b60c82..b031a9a8 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h
@@ -32,7 +32,7 @@ class Transfer;
class ClientStream : public Stream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error {
ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
index 889382bf..bcdf372c 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h
@@ -34,7 +34,7 @@ class KNetworkConnector : public Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
KNetworkConnector( TQObject *parent = 0 );
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
index 8fa91498..f84128dc 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h
@@ -25,7 +25,7 @@
class YMSGProtocol : public InputProtocolBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
index 30109a7d..ce66119f 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h
@@ -25,7 +25,7 @@
class YahooInviteListImpl : public YahooInviteListBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooInviteListImpl(TQWidget *parent=0, const char *name=0);
~YahooInviteListImpl();
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
index 6778a1af..1c5ec3d9 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h
@@ -32,7 +32,7 @@ class YahooContact;
class YahooUserInfoDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 );
void setAccountConnected( bool isOnline );
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
index 3718841a..5219049f 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h
@@ -33,7 +33,7 @@ namespace Kopete
class YahooWebcamDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 );
~YahooWebcamDialog();
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index de647bbe..7a127f26 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -64,7 +64,7 @@ namespace KIO{
class YahooAccount : public Kopete::PasswordedAccount
{
Q_OBJECT
- TQ_OBJECT
+
public:
diff --git a/kopete/protocols/yahoo/yahooaddcontact.h b/kopete/protocols/yahoo/yahooaddcontact.h
index 5f2e5744..38788979 100644
--- a/kopete/protocols/yahoo/yahooaddcontact.h
+++ b/kopete/protocols/yahoo/yahooaddcontact.h
@@ -34,7 +34,7 @@ namespace Kopete { class MetaContact; }
class YahooAddContact: public AddContactPage
{
Q_OBJECT
- TQ_OBJECT
+
private:
YahooProtocol *theProtocol;
diff --git a/kopete/protocols/yahoo/yahoochatsession.h b/kopete/protocols/yahoo/yahoochatsession.h
index e20bb257..7109d816 100644
--- a/kopete/protocols/yahoo/yahoochatsession.h
+++ b/kopete/protocols/yahoo/yahoochatsession.h
@@ -30,7 +30,7 @@ class TQLabel;
class KOPETE_EXPORT YahooChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 );
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.h b/kopete/protocols/yahoo/yahooconferencemessagemanager.h
index 1f54ac5b..363dc003 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.h
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.h
@@ -32,7 +32,7 @@ class KActionMenu;
class YahooConferenceChatSession : public Kopete::ChatSession
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooConferenceChatSession( const TQString &m_yahooRoom, Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 );
diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h
index acd69e0d..dd2f9f8b 100644
--- a/kopete/protocols/yahoo/yahoocontact.h
+++ b/kopete/protocols/yahoo/yahoocontact.h
@@ -41,7 +41,7 @@ struct KURL;
class YahooContact : public Kopete::Contact
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact );
~YahooContact();
diff --git a/kopete/protocols/yahoo/yahooeditaccount.h b/kopete/protocols/yahoo/yahooeditaccount.h
index de7dcfd9..db50f0d8 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.h
+++ b/kopete/protocols/yahoo/yahooeditaccount.h
@@ -35,7 +35,7 @@ namespace Kopete { class Account; }
class YahooEditAccount: public YahooEditAccountBase, public KopeteEditAccountWidget
{
Q_OBJECT
- TQ_OBJECT
+
private:
YahooProtocol *theProtocol;
diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h
index c12cb8c9..7acbea7d 100644
--- a/kopete/protocols/yahoo/yahooprotocol.h
+++ b/kopete/protocols/yahoo/yahooprotocol.h
@@ -42,7 +42,7 @@ namespace Kopete { class OnlineStatus; }
class YahooProtocol : public Kopete::Protocol
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooProtocol( TQObject *parent, const char *name, const TQStringList &args );
~YahooProtocol();
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h
index 666e3561..26dcf320 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.h
+++ b/kopete/protocols/yahoo/yahooverifyaccount.h
@@ -31,7 +31,7 @@ class KTempFile;
class YahooVerifyAccount : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
private:
Kopete::Account *mTheAccount;
KTempFile *mFile;
diff --git a/kopete/protocols/yahoo/yahoowebcam.h b/kopete/protocols/yahoo/yahoowebcam.h
index 09b519ed..046fc025 100644
--- a/kopete/protocols/yahoo/yahoowebcam.h
+++ b/kopete/protocols/yahoo/yahoowebcam.h
@@ -34,7 +34,7 @@ namespace Kopete {
class YahooWebcam : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
YahooWebcam( YahooAccount *account );
~YahooWebcam();