summaryrefslogtreecommitdiffstats
path: root/kopete/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols')
-rw-r--r--kopete/protocols/gadu/gaduaccount.cpp78
-rw-r--r--kopete/protocols/gadu/gaduaccount.h2
-rw-r--r--kopete/protocols/gadu/gaduaddcontactpage.cpp2
-rw-r--r--kopete/protocols/gadu/gaduaway.cpp4
-rw-r--r--kopete/protocols/gadu/gaducommands.cpp8
-rw-r--r--kopete/protocols/gadu/gaducommands.h2
-rw-r--r--kopete/protocols/gadu/gaducontact.cpp10
-rw-r--r--kopete/protocols/gadu/gaducontact.h2
-rw-r--r--kopete/protocols/gadu/gadudcctransaction.cpp4
-rw-r--r--kopete/protocols/gadu/gadueditcontact.cpp2
-rw-r--r--kopete/protocols/gadu/gaduprotocol.cpp2
-rw-r--r--kopete/protocols/gadu/gaduprotocol.h2
-rw-r--r--kopete/protocols/gadu/gadupubdir.cpp6
-rw-r--r--kopete/protocols/gadu/gadupubdir.h2
-rw-r--r--kopete/protocols/gadu/gaduregisteraccount.cpp26
-rw-r--r--kopete/protocols/gadu/gaduregisteraccount.h2
-rw-r--r--kopete/protocols/gadu/gadurichtextformat.cpp32
-rw-r--r--kopete/protocols/gadu/gadusession.cpp14
-rw-r--r--kopete/protocols/gadu/gadusession.h2
-rw-r--r--kopete/protocols/gadu/ui/gaduadd.ui12
-rw-r--r--kopete/protocols/gadu/ui/gaduawayui.ui8
-rw-r--r--kopete/protocols/gadu/ui/gadueditaccountui.ui34
-rw-r--r--kopete/protocols/gadu/ui/gaduregisteraccountui.ui32
-rw-r--r--kopete/protocols/gadu/ui/gadusearch.ui32
-rw-r--r--kopete/protocols/groupwise/gwaccount.cpp52
-rw-r--r--kopete/protocols/groupwise/gwaccount.h6
-rw-r--r--kopete/protocols/groupwise/gwaddui.ui4
-rw-r--r--kopete/protocols/groupwise/gwcontact.cpp14
-rw-r--r--kopete/protocols/groupwise/gwmessagemanager.cpp20
-rw-r--r--kopete/protocols/groupwise/gwprotocol.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/client.cpp34
-rw-r--r--kopete/protocols/groupwise/libgroupwise/client.h10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp18
-rw-r--r--kopete/protocols/groupwise/libgroupwise/coreprotocol.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp16
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventprotocol.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/eventtransfer.h6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwchatrooms.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwerror.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwerror.h8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp24
-rw-r--r--kopete/protocols/groupwise/libgroupwise/rtf.cc2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/rtf.ll2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/rtf2html.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/task.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp24
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/logintask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp12
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp10
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/statustask.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp4
-rw-r--r--kopete/protocols/groupwise/ui/gwaccountpreferences.ui8
-rw-r--r--kopete/protocols/groupwise/ui/gwaddcontactpage.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gwchatpropswidget.ui4
-rw-r--r--kopete/protocols/groupwise/ui/gwchatsearchwidget.ui4
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactproperties.cpp6
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactpropswidget.ui4
-rw-r--r--kopete/protocols/groupwise/ui/gwcontactsearch.ui10
-rw-r--r--kopete/protocols/groupwise/ui/gwcustomstatusedit.ui6
-rw-r--r--kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui4
-rw-r--r--kopete/protocols/groupwise/ui/gweditaccountwidget.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gwprivacy.ui14
-rw-r--r--kopete/protocols/groupwise/ui/gwprivacydialog.cpp4
-rw-r--r--kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp2
-rw-r--r--kopete/protocols/groupwise/ui/gwshowinvitation.ui8
-rw-r--r--kopete/protocols/irc/ircaccount.cpp90
-rw-r--r--kopete/protocols/irc/ircaccount.h2
-rw-r--r--kopete/protocols/irc/ircaddcontactpage.cpp2
-rw-r--r--kopete/protocols/irc/ircchannelcontact.cpp64
-rw-r--r--kopete/protocols/irc/ircchannelcontact.h4
-rw-r--r--kopete/protocols/irc/irccontact.cpp32
-rw-r--r--kopete/protocols/irc/irccontact.h2
-rw-r--r--kopete/protocols/irc/ircprotocol.cpp148
-rw-r--r--kopete/protocols/irc/ircprotocol.h6
-rw-r--r--kopete/protocols/irc/ircservercontact.cpp16
-rw-r--r--kopete/protocols/irc/ircservercontact.h2
-rw-r--r--kopete/protocols/irc/irctransferhandler.cpp2
-rw-r--r--kopete/protocols/irc/ircusercontact.cpp128
-rw-r--r--kopete/protocols/irc/ircusercontact.h2
-rw-r--r--kopete/protocols/irc/kcodecaction.cpp2
-rw-r--r--kopete/protocols/irc/ksparser.cpp24
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.cpp40
-rw-r--r--kopete/protocols/irc/libkirc/kircengine.h12
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_commands.cpp10
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_ctcp.cpp30
-rw-r--r--kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/kircentity.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/kircmessage.cpp24
-rw-r--r--kopete/protocols/irc/libkirc/kircmessage.h2
-rw-r--r--kopete/protocols/irc/libkirc/kircmessageredirector.cpp6
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.cpp4
-rw-r--r--kopete/protocols/irc/libkirc/kirctransfer.h6
-rw-r--r--kopete/protocols/irc/libkirc/kirctransferhandler.cpp2
-rw-r--r--kopete/protocols/irc/libkirc/ksslsocket.cpp4
-rw-r--r--kopete/protocols/irc/ui/channellist.cpp30
-rw-r--r--kopete/protocols/irc/ui/channellist.h4
-rw-r--r--kopete/protocols/irc/ui/channellistdialog.cpp2
-rw-r--r--kopete/protocols/irc/ui/ircadd.ui6
-rw-r--r--kopete/protocols/irc/ui/irceditaccount.ui34
-rw-r--r--kopete/protocols/irc/ui/irceditaccountwidget.cpp10
-rw-r--r--kopete/protocols/irc/ui/networkconfig.ui6
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp76
-rw-r--r--kopete/protocols/jabber/jabberaccount.h8
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.cpp16
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.h2
-rw-r--r--kopete/protocols/jabber/jabbercapabilitiesmanager.cpp16
-rw-r--r--kopete/protocols/jabber/jabbercapabilitiesmanager.h6
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp2
-rw-r--r--kopete/protocols/jabber/jabberclient.cpp14
-rw-r--r--kopete/protocols/jabber/jabberclient.h10
-rw-r--r--kopete/protocols/jabber/jabbercontact.cpp58
-rw-r--r--kopete/protocols/jabber/jabbercontact.h2
-rw-r--r--kopete/protocols/jabber/jabberformtranslator.cpp6
-rw-r--r--kopete/protocols/jabber/jabberformtranslator.h2
-rw-r--r--kopete/protocols/jabber/jabbergroupchatmanager.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.cpp8
-rw-r--r--kopete/protocols/jabber/jabberprotocol.cpp24
-rw-r--r--kopete/protocols/jabber/jabberprotocol.h12
-rw-r--r--kopete/protocols/jabber/jabberresourcepool.cpp2
-rw-r--r--kopete/protocols/jabber/jabbertransport.cpp28
-rw-r--r--kopete/protocols/jabber/jabbertransport.h6
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicecaller.cpp16
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesession.cpp2
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp20
-rw-r--r--kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui36
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/task.h14
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc20
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc24
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc14
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h26
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h10
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h40
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc30
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h36
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc8
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc4
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h6
-rw-r--r--kopete/protocols/jabber/libiris/005_join_muc_with_password.patch20
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp4
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/im.h36
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp8
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp88
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp76
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp24
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h12
-rw-r--r--kopete/protocols/jabber/libiris/jingle_iris.patch16
-rw-r--r--kopete/protocols/jabber/libiris/qca/src/qca.cpp4
-rw-r--r--kopete/protocols/jabber/ui/dlgaddcontact.ui8
-rw-r--r--kopete/protocols/jabber/ui/dlgbrowse.ui4
-rw-r--r--kopete/protocols/jabber/ui/dlgchangepassword.ui4
-rw-r--r--kopete/protocols/jabber/ui/dlgchatjoin.ui4
-rw-r--r--kopete/protocols/jabber/ui/dlgchatroomslist.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberbrowse.cpp2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberchooseserver.ui4
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui42
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregister.cpp4
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregister.h2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui28
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbersendraw.cpp2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberservices.cpp2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbervcard.cpp16
-rw-r--r--kopete/protocols/jabber/ui/dlgregister.ui4
-rw-r--r--kopete/protocols/jabber/ui/dlgsendraw.ui10
-rw-r--r--kopete/protocols/jabber/ui/dlgservices.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgvcard.ui48
-rw-r--r--kopete/protocols/jabber/ui/jabberaddcontactpage.cpp2
-rw-r--r--kopete/protocols/jabber/ui/jabberchooseserver.cpp8
-rw-r--r--kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp2
-rw-r--r--kopete/protocols/jabber/ui/jabberregisteraccount.cpp8
-rw-r--r--kopete/protocols/meanwhile/meanwhileaccount.cpp12
-rw-r--r--kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp2
-rw-r--r--kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp6
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.cpp8
-rw-r--r--kopete/protocols/meanwhile/meanwhileprotocol.h4
-rw-r--r--kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui6
-rw-r--r--kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui16
-rw-r--r--kopete/protocols/msn/config/msnprefs.ui4
-rw-r--r--kopete/protocols/msn/dispatcher.cpp18
-rw-r--r--kopete/protocols/msn/incomingtransfer.cpp12
-rw-r--r--kopete/protocols/msn/messageformatter.cpp2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp12
-rw-r--r--kopete/protocols/msn/msnaddcontactpage.cpp2
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp14
-rw-r--r--kopete/protocols/msn/msncontact.cpp18
-rw-r--r--kopete/protocols/msn/msncontact.h4
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp44
-rw-r--r--kopete/protocols/msn/msnnotifysocket.h8
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp22
-rw-r--r--kopete/protocols/msn/msnsocket.h6
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp38
-rw-r--r--kopete/protocols/msn/outgoingtransfer.cpp8
-rw-r--r--kopete/protocols/msn/transport.cpp2
-rw-r--r--kopete/protocols/msn/ui/msnadd.ui8
-rw-r--r--kopete/protocols/msn/ui/msneditaccountui.ui76
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp2
-rw-r--r--kopete/protocols/msn/ui/msninfo.ui4
-rw-r--r--kopete/protocols/msn/webcam.cpp22
-rw-r--r--kopete/protocols/msn/webcam.h4
-rw-r--r--kopete/protocols/msn/webcam/msnwebcamdialog.cpp8
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.cpp84
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.cpp92
-rw-r--r--kopete/protocols/oscar/aim/aimprotocol.cpp10
-rw-r--r--kopete/protocols/oscar/aim/aimuserinfo.cpp8
-rw-r--r--kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp2
-rw-r--r--kopete/protocols/oscar/aim/ui/aimeditaccountui.ui16
-rw-r--r--kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp2
-rw-r--r--kopete/protocols/oscar/aim/ui/aiminfobase.ui12
-rw-r--r--kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui6
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp30
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.h2
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp42
-rw-r--r--kopete/protocols/oscar/icq/icqpresence.cpp26
-rw-r--r--kopete/protocols/oscar/icq/icqpresence.h14
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.cpp18
-rw-r--r--kopete/protocols/oscar/icq/icqreadaway.cpp6
-rw-r--r--kopete/protocols/oscar/icq/ui/icqadd.ui8
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplyui.ui10
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountui.ui12
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchbase.ui8
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp12
-rw-r--r--kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui2
-rw-r--r--kopete/protocols/oscar/liboscar/buffer.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/chatnavservicetask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/chatservicetask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/client.cpp30
-rw-r--r--kopete/protocols/oscar/liboscar/client.h12
-rw-r--r--kopete/protocols/oscar/liboscar/coreprotocol.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/messagereceivertask.cpp8
-rw-r--r--kopete/protocols/oscar/liboscar/oscarmessage.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/oscartypeclasses.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/rtf.cc2
-rw-r--r--kopete/protocols/oscar/liboscar/rtf.ll2
-rw-r--r--kopete/protocols/oscar/liboscar/rtf2html.h2
-rw-r--r--kopete/protocols/oscar/liboscar/senddcinfotask.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/senddcinfotask.h2
-rw-r--r--kopete/protocols/oscar/liboscar/sendmessagetask.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/ssimanager.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/task.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/logintest.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp6
-rw-r--r--kopete/protocols/oscar/liboscar/tests/ssitest.cpp12
-rw-r--r--kopete/protocols/oscar/liboscar/tests/userinfotest.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/transfer.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.cpp52
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.h4
-rw-r--r--kopete/protocols/oscar/oscaraccount.cpp52
-rw-r--r--kopete/protocols/oscar/oscarcontact.cpp6
-rw-r--r--kopete/protocols/oscar/oscarencodingselectionbase.ui2
-rw-r--r--kopete/protocols/oscar/oscarvisibilitybase.ui8
-rw-r--r--kopete/protocols/sms/serviceloader.cpp2
-rw-r--r--kopete/protocols/sms/services/gsmlib.cpp14
-rw-r--r--kopete/protocols/sms/services/gsmlibprefs.ui4
-rw-r--r--kopete/protocols/sms/services/smsclient.cpp30
-rw-r--r--kopete/protocols/sms/services/smsclientprefs.ui4
-rw-r--r--kopete/protocols/sms/services/smssend.cpp14
-rw-r--r--kopete/protocols/sms/services/smssendprefs.ui6
-rw-r--r--kopete/protocols/sms/services/smssendprovider.cpp12
-rw-r--r--kopete/protocols/sms/smsaccount.cpp12
-rw-r--r--kopete/protocols/sms/smsaddcontactpage.cpp2
-rw-r--r--kopete/protocols/sms/smseditaccountwidget.cpp2
-rw-r--r--kopete/protocols/sms/smsservice.cpp2
-rw-r--r--kopete/protocols/sms/smsservice.h4
-rw-r--r--kopete/protocols/sms/ui/smsactprefs.ui14
-rw-r--r--kopete/protocols/sms/ui/smsadd.ui8
-rw-r--r--kopete/protocols/sms/ui/smsuserprefs.ui4
-rw-r--r--kopete/protocols/testbed/testbedaccount.cpp18
-rw-r--r--kopete/protocols/testbed/testbedaccount.h4
-rw-r--r--kopete/protocols/testbed/testbedaccountpreferences.ui8
-rw-r--r--kopete/protocols/testbed/testbedaddcontactpage.cpp4
-rw-r--r--kopete/protocols/testbed/testbedaddui.ui4
-rw-r--r--kopete/protocols/testbed/testbededitaccountwidget.cpp2
-rw-r--r--kopete/protocols/testbed/testbedfakeserver.cpp4
-rw-r--r--kopete/protocols/testbed/testbedprotocol.cpp4
-rw-r--r--kopete/protocols/testbed/ui/testbedwebcamdialog.cpp6
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp18
-rw-r--r--kopete/protocols/winpopup/libwinpopup/libwinpopup.h2
-rw-r--r--kopete/protocols/winpopup/ui/wpaddcontactbase.ui12
-rw-r--r--kopete/protocols/winpopup/ui/wpeditaccountbase.ui16
-rw-r--r--kopete/protocols/winpopup/ui/wpuserinfowidget.ui6
-rw-r--r--kopete/protocols/winpopup/wpaccount.cpp14
-rw-r--r--kopete/protocols/winpopup/wpaddcontact.cpp4
-rw-r--r--kopete/protocols/winpopup/wpcontact.cpp16
-rw-r--r--kopete/protocols/winpopup/wpcontact.h4
-rw-r--r--kopete/protocols/winpopup/wpprotocol.cpp2
-rw-r--r--kopete/protocols/winpopup/wpuserinfo.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/changestatustask.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/changestatustask.h6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/client.cpp48
-rw-r--r--kopete/protocols/yahoo/libkyahoo/client.h16
-rw-r--r--kopete/protocols/yahoo/libkyahoo/conferencetask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/listtask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.cpp6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/logintask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp14
-rw-r--r--kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp16
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp18
-rw-r--r--kopete/protocols/yahoo/libkyahoo/sendpicturetask.h6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp14
-rw-r--r--kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h6
-rw-r--r--kopete/protocols/yahoo/libkyahoo/stealthtask.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/stealthtask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/task.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/webcamtask.cpp12
-rw-r--r--kopete/protocols/yahoo/libkyahoo/webcamtask.h4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabentry.cpp4
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yabtask.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp2
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/yahootypes.h14
-rw-r--r--kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp18
-rw-r--r--kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp8
-rw-r--r--kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h6
-rw-r--r--kopete/protocols/yahoo/ui/yahooadd.ui6
-rw-r--r--kopete/protocols/yahoo/ui/yahooeditaccountbase.ui20
-rw-r--r--kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui4
-rw-r--r--kopete/protocols/yahoo/ui/yahooinvitelistbase.ui26
-rw-r--r--kopete/protocols/yahoo/ui/yahoootherinfowidget.ui2
-rw-r--r--kopete/protocols/yahoo/ui/yahoostealthsetting.ui2
-rw-r--r--kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp16
-rw-r--r--kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui16
-rw-r--r--kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp22
-rw-r--r--kopete/protocols/yahoo/ui/yahooworkinfowidget.ui4
-rw-r--r--kopete/protocols/yahoo/yahooaccount.cpp146
-rw-r--r--kopete/protocols/yahoo/yahooaccount.h4
-rw-r--r--kopete/protocols/yahoo/yahooaddcontact.cpp2
-rw-r--r--kopete/protocols/yahoo/yahoochatsession.cpp2
-rw-r--r--kopete/protocols/yahoo/yahoocontact.cpp44
-rw-r--r--kopete/protocols/yahoo/yahoocontact.h2
-rw-r--r--kopete/protocols/yahoo/yahooeditaccount.cpp2
-rw-r--r--kopete/protocols/yahoo/yahooverifyaccount.cpp2
388 files changed, 2369 insertions, 2369 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp
index 52f13e08..5ef1fe50 100644
--- a/kopete/protocols/gadu/gaduaccount.cpp
+++ b/kopete/protocols/gadu/gaduaccount.cpp
@@ -49,9 +49,9 @@
#include <tqapplication.h>
#include <tqdialog.h>
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqhostaddress.h>
#include <netinet/in.h>
@@ -132,7 +132,7 @@ static const char* const servers_ip[] = {
setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) );
- p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+ p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
p->lastDescription = TQString();
for ( unsigned int i = 0; i < NUM_SERVERS ; i++ ) {
@@ -234,15 +234,15 @@ GaduAccount::initConnections()
void
GaduAccount::setAway( bool isAway, const TQString& awayMessage )
{
- unsigned int currenttqStatus;
+ unsigned int currentStatus;
if ( isAway ) {
- currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR;
+ currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR;
}
else{
- currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR;
+ currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR;
}
- changetqStatus( GaduProtocol::protocol()->converttqStatus( currenttqStatus ), awayMessage );
+ changeStatus( GaduProtocol::protocol()->convertStatus( currentStatus ), awayMessage );
}
@@ -251,8 +251,8 @@ GaduAccount::actionMenu()
{
kdDebug(14100) << "actionMenu() " << endl;
- p->actionMenu_ = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this );
- p->actionMenu_->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), i18n( "%1 <%2> " ).
+ p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
+ p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ).
arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) );
if ( p->session_->isConnected() ) {
@@ -287,19 +287,19 @@ GaduAccount::actionMenu()
p->listFromFileAction->setEnabled( TRUE );
}
p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ),
- GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ).iconFor( this ),
+ GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ),
0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ),
- GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ).iconFor( this ),
+ GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ),
0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ),
- GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
+ GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ),
- GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
+ GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info",
@@ -332,7 +332,7 @@ GaduAccount::connectWithPassword(const TQString& password)
if (isConnected ())
return;
// FIXME: add status description to this mechainsm, this is a hack now. libkopete design issue.
- changetqStatus( initialtqStatus(), p->lastDescription );
+ changeStatus( initialStatus(), p->lastDescription );
}
void
@@ -353,7 +353,7 @@ void
GaduAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason )
{
kdDebug(14100) << k_funcinfo << "Called" << endl;
- changetqStatus( status, reason);
+ changeStatus( status, reason);
}
void
@@ -390,7 +390,7 @@ GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* pare
}
void
-GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr )
+GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& descr )
{
unsigned int ns;
@@ -418,14 +418,14 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString&
if (!descr.isEmpty() && !GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) {
// and rerun us again. This won't cause any recursive call, as both conversions are static
ns = GaduProtocol::protocol()->statusToWithDescription( status );
- changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr );
+ changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr );
return;
}
// well, if it's empty but we want to set status with desc, change it too
if (descr.isEmpty() && GaduProtocol::protocol()->statusWithDescription( status.internalStatus() ) ) {
ns = GaduProtocol::protocol()->statusToWithoutDescription( status );
- changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr );
+ changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr );
return;
}
@@ -455,7 +455,7 @@ GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString&
else {
p->status = status;
if ( descr.isEmpty() ) {
- if ( p->session_->changetqStatus( status.internalStatus(), p->forFriends ) != 0 )
+ if ( p->session_->changeStatus( status.internalStatus(), p->forFriends ) != 0 )
return;
}
else {
@@ -481,7 +481,7 @@ GaduAccount::slotLogin( int status, const TQString& dscr )
{
p->lastDescription = dscr;
- myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING ));
+ myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING ));
myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, dscr );
if ( !p->session_->isConnected() ) {
@@ -507,16 +507,16 @@ GaduAccount::slotLogin( int status, const TQString& dscr )
}
}
else {
- p->session_->changetqStatus( status );
+ p->session_->changeStatus( status );
}
}
void
GaduAccount::slotLogoff()
{
- if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )) {
- p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
- changetqStatus( p->status );
+ if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )) {
+ p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
+ changeStatus( p->status );
p->session_->logoff();
dccOff();
}
@@ -525,7 +525,7 @@ GaduAccount::slotLogoff()
void
GaduAccount::slotGoOnline()
{
- changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ) );
+ changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ) );
}
void
GaduAccount::slotGoOffline()
@@ -537,13 +537,13 @@ GaduAccount::slotGoOffline()
void
GaduAccount::slotGoInvisible()
{
- changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ) );
+ changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ) );
}
void
GaduAccount::slotGoBusy()
{
- changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ) );
+ changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ) );
}
void
@@ -648,7 +648,7 @@ GaduAccount::contactStatusChanged( KGaduNotify* gaduNotify )
return;
}
- contact->changedtqStatus( gaduNotify );
+ contact->changedStatus( gaduNotify );
}
void
@@ -675,7 +675,7 @@ GaduAccount::connectionFailed( gg_failure_t failure )
case GG_FAILURE_PASSWORD:
password().setWrong();
// user pressed CANCEL
- p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+ p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
myself()->setOnlineStatus( p->status );
disconnected( BadPassword );
return;
@@ -710,9 +710,9 @@ GaduAccount::connectionFailed( gg_failure_t failure )
slotLogin( p->status.internalStatus() , p->lastDescription );
}
else {
- error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ),
+ error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).arg( GaduSession::failureDescription( failure ) ),
i18n( "Connection Error" ) );
- p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL );
+ p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL );
myself()->setOnlineStatus( p->status );
disconnected( InvalidHost );
}
@@ -777,7 +777,7 @@ void
GaduAccount::connectionSucceed( )
{
kdDebug(14100) << "#### Gadu-Gadu connected! " << endl;
- p->status = GaduProtocol::protocol()->converttqStatus( p->session_->status() );
+ p->status = GaduProtocol::protocol()->convertStatus( p->session_->status() );
myself()->setOnlineStatus( p->status );
myself()->setProperty( GaduProtocol::protocol()->propAwayMessage, p->lastDescription );
startNotify();
@@ -822,11 +822,11 @@ GaduAccount::slotSessionDisconnect( Kopete::Account::DisconnectReason reason )
p->pingTimer_->stop();
}
- setAllContactstqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) );
+ setAllContactsStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) );
- status = myself()->onlinetqStatus().internalStatus();
+ status = myself()->onlineStatus().internalStatus();
if ( status != GG_STATUS_NOT_AVAIL || status != GG_STATUS_NOT_AVAIL_DESCR ) {
- myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) );
+ myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) );
}
GaduAccount::disconnect( reason );
}
@@ -903,7 +903,7 @@ GaduAccount::slotFriendsMode()
p->forFriends = !p->forFriends;
kdDebug( 14100 ) << "for friends mode: " << p->forFriends << " desc" << p->lastDescription << endl;
// now change status, it will changing it with p->forFriends flag
- changetqStatus( p->status, p->lastDescription );
+ changeStatus( p->status, p->lastDescription );
saveFriendsMode( p->forFriends );
@@ -925,7 +925,7 @@ GaduAccount::slotExportContactsListToFile()
p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(),
Kopete::UI::Global::mainWidget(), "gadu-list-save", false );
p->saveListDialog->setCaption(
- i18n("Save Contacts List for Account %1 As").tqarg(
+ i18n("Save Contacts List for Account %1 As").arg(
myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) );
if ( p->saveListDialog->exec() == TQDialog::Accepted ) {
@@ -971,7 +971,7 @@ GaduAccount::slotImportContactsFromFile()
p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString(),
Kopete::UI::Global::mainWidget(), "gadu-list-load", true );
p->loadListDialog->setCaption(
- i18n("Load Contacts List for Account %1 As").tqarg(
+ i18n("Load Contacts List for Account %1 As").arg(
myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) );
if ( p->loadListDialog->exec() == TQDialog::Accepted ) {
@@ -1077,7 +1077,7 @@ GaduAccount::slotDescription()
GaduAway* away = new GaduAway( this );
if( away->exec() == TQDialog::Accepted ) {
- changetqStatus( GaduProtocol::protocol()->converttqStatus( away->status() ),
+ changeStatus( GaduProtocol::protocol()->convertStatus( away->status() ),
away->awayText() );
}
delete away;
diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h
index 0363d181..1786e3a9 100644
--- a/kopete/protocols/gadu/gaduaccount.h
+++ b/kopete/protocols/gadu/gaduaccount.h
@@ -77,7 +77,7 @@ public slots:
void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString());
//}
- void changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() );
+ void changeStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() );
void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString() );
void slotLogoff();
void slotGoOnline();
diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp
index 99867508..de4aee9d 100644
--- a/kopete/protocols/gadu/gaduaddcontactpage.cpp
+++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp
@@ -36,7 +36,7 @@
#include <tqwidget.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqptrlist.h>
diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp
index 8785f08f..2be2a2aa 100644
--- a/kopete/protocols/gadu/gaduaway.cpp
+++ b/kopete/protocols/gadu/gaduaway.cpp
@@ -47,7 +47,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name )
ui_ = new GaduAwayUI( this );
setMainWidget( ui_ );
- ks = account->myself()->onlinetqStatus();
+ ks = account->myself()->onlineStatus();
s = GaduProtocol::protocol()->statusToWithDescription( ks );
if ( s == GG_STATUS_NOT_AVAIL_DESCR ) {
@@ -79,7 +79,7 @@ void
GaduAway::slotApply()
{
if ( account_ ) {
- account_->changetqStatus( GaduProtocol::protocol()->converttqStatus( status() ),awayText() );
+ account_->changeStatus( GaduProtocol::protocol()->convertStatus( status() ),awayText() );
}
}
diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp
index fb5944f8..581ce9c1 100644
--- a/kopete/protocols/gadu/gaducommands.cpp
+++ b/kopete/protocols/gadu/gaducommands.cpp
@@ -29,7 +29,7 @@
#include <tqsocketnotifier.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqimage.h>
#include <klocale.h>
@@ -44,7 +44,7 @@ GaduCommand::GaduCommand( TQObject* parent, const char* name )
GaduCommand::~GaduCommand()
{
- //TQSocketNotifiers are tqchildren and will
+ //TQSocketNotifiers are children and will
//be deleted anyhow
}
@@ -204,7 +204,7 @@ void RegisterCommand::watcher()
}
pubDir = (struct gg_pubdir *)session_->data;
- emit operationtqStatus( i18n( "Token retrieving status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
+ emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) );
switch ( session_->state ) {
case GG_STATE_CONNECTING:
kdDebug( 14100 ) << "Recreating notifiers " << endl;
@@ -254,7 +254,7 @@ void RegisterCommand::watcher()
return;
}
pubDir = (gg_pubdir*) session_->data;
- emit operationtqStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) );
+ emit operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) );
switch ( session_->state ) {
case GG_STATE_CONNECTING:
kdDebug( 14100 ) << "Recreating notifiers " << endl;
diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h
index a9c78b35..a191242c 100644
--- a/kopete/protocols/gadu/gaducommands.h
+++ b/kopete/protocols/gadu/gaducommands.h
@@ -53,7 +53,7 @@ signals:
void done( const TQString& title, const TQString& what );
void error( const TQString& title, const TQString& error );
void socketReady();
- void operationtqStatus( const TQString );
+ void operationStatus( const TQString );
protected:
void checkSocket( int, int );
diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp
index d7965d3b..c9a68f25 100644
--- a/kopete/protocols/gadu/gaducontact.cpp
+++ b/kopete/protocols/gadu/gaducontact.cpp
@@ -66,7 +66,7 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco
setFileCapable( true );
//offline
- setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) );
+ setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) );
setProperty( Kopete::Global::Properties::self()->nickName(), name );
}
@@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint
void
-GaduContact::changedtqStatus( KGaduNotify* newstatus )
+GaduContact::changedStatus( KGaduNotify* newstatus )
{
if ( newstatus->description.isNull() ) {
- setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
+ setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
removeProperty( GaduProtocol::protocol()->propAwayMessage );
}
else {
- setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) );
+ setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) );
setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description );
}
@@ -230,7 +230,7 @@ GaduContact::slotUserInfo()
dlg->setName( metaContact()->displayName() );
dlg->setId( TQString::number( uin_ ) );
- dlg->settqStatus( onlinetqStatus().description() );
+ dlg->setStatus( onlineStatus().description() );
dlg->setAwayMessage( description_ );
dlg->show();
}
diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h
index 15eaf288..66851c0c 100644
--- a/kopete/protocols/gadu/gaducontact.h
+++ b/kopete/protocols/gadu/gaducontact.h
@@ -67,7 +67,7 @@ public:
bool ignored();
static TQString findBestContactName( const GaduContactsList::ContactLine* );
- void changedtqStatus( KGaduNotify* );
+ void changedStatus( KGaduNotify* );
uin_t uin() const;
diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp
index 2d0e45d4..7ec8d2ac 100644
--- a/kopete/protocols/gadu/gadudcctransaction.cpp
+++ b/kopete/protocols/gadu/gadudcctransaction.cpp
@@ -237,8 +237,8 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
KGuiItem resumeButton( i18n ( "&Resume" ) );
KGuiItem overwriteButton( i18n ( "Over&write" ) );
switch ( KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget (),
- i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ),
- i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) )
+ i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).arg( fileName ),
+ i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) )
{
// resume
case KMessageBox::Yes:
diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp
index 985a9874..15fd717d 100644
--- a/kopete/protocols/gadu/gadueditcontact.cpp
+++ b/kopete/protocols/gadu/gadueditcontact.cpp
@@ -37,7 +37,7 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
#include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistview.h>
#include <tqptrlist.h>
diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp
index 517902f1..3ec773f0 100644
--- a/kopete/protocols/gadu/gaduprotocol.cpp
+++ b/kopete/protocols/gadu/gaduprotocol.cpp
@@ -199,7 +199,7 @@ GaduProtocol::statusWithDescription( uint status )
}
Kopete::OnlineStatus
-GaduProtocol::converttqStatus( uint status ) const
+GaduProtocol::convertStatus( uint status ) const
{
switch( status ) {
case GG_STATUS_NOT_AVAIL:
diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h
index 5abae065..ff34d970 100644
--- a/kopete/protocols/gadu/gaduprotocol.h
+++ b/kopete/protocols/gadu/gaduprotocol.h
@@ -71,7 +71,7 @@ public:
// }
//!Plugin reimplementation
- Kopete::OnlineStatus converttqStatus( uint ) const;
+ Kopete::OnlineStatus convertStatus( uint ) const;
bool statusWithDescription( uint status );
uint statusToWithDescription( Kopete::OnlineStatus status );
diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp
index 570f2796..fc496aaa 100644
--- a/kopete/protocols/gadu/gadupubdir.cpp
+++ b/kopete/protocols/gadu/gadupubdir.cpp
@@ -225,12 +225,12 @@ GaduPublicDir::validateData()
// Move to GaduProtocol someday
TQPixmap
-GaduPublicDir::iconFortqStatus( uint status )
+GaduPublicDir::iconForStatus( uint status )
{
TQPixmap n;
if ( GaduProtocol::protocol() ) {
- return GaduProtocol::protocol()->converttqStatus( status ).protocolIcon();
+ return GaduProtocol::protocol()->convertStatus( status ).protocolIcon();
}
return n;
}
@@ -256,7 +256,7 @@ GaduPublicDir::slotSearchResult( const SearchResult& result, unsigned int )
(*r).city,
TQString::number( (*r).uin ).ascii()
);
- sl->setPixmap( 0, iconFortqStatus( (*r).status ) );
+ sl->setPixmap( 0, iconForStatus( (*r).status ) );
}
// if not found anything, obviously we don't want to search for more
diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h
index 42fed436..4a2dce64 100644
--- a/kopete/protocols/gadu/gadupubdir.h
+++ b/kopete/protocols/gadu/gadupubdir.h
@@ -44,7 +44,7 @@ Q_OBJECT
public:
GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" );
GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" );
- TQPixmap iconFortqStatus( uint status );
+ TQPixmap iconForStatus( uint status );
private slots:
void slotSearch();
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index 1b24575f..e33b4959 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -62,9 +62,9 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
connect( cRegister, TQT_SIGNAL( done( const TQString&, const TQString& ) ), TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) );
connect( cRegister, TQT_SIGNAL( error( const TQString&, const TQString& ) ), TQT_SLOT( registrationError( const TQString&, const TQString& ) ) );
- connect( cRegister, TQT_SIGNAL( operationtqStatus( const TQString ) ), TQT_SLOT( updatetqStatus( const TQString ) ) );
+ connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) );
- updatetqStatus( i18n( "Retrieving token" ) );
+ updateStatus( i18n( "Retrieving token" ) );
cRegister->requestToken();
show();
@@ -86,7 +86,7 @@ GaduRegisterAccount::validateInput()
if ( !emailRegexp->exactMatch( ui->valueEmailAddress->text() ) )
{
- updatetqStatus( i18n( "Please enter a valid E-Mail Address." ) );
+ updateStatus( i18n( "Please enter a valid E-Mail Address." ) );
ui->pixmapEmailAddress->setPixmap ( hintPixmap );
valid = false;
}
@@ -96,21 +96,21 @@ GaduRegisterAccount::validateInput()
if ( valid && ( ( ui->valuePassword->text().isEmpty() ) || ( ui->valuePasswordVerify->text().isEmpty() ) ) )
{
- updatetqStatus( i18n( "Please enter the same password twice." ) );
+ updateStatus( i18n( "Please enter the same password twice." ) );
valid = false;
passwordHighlight = true;
}
if ( valid && ( ui->valuePassword->text() != ui->valuePasswordVerify->text() ) )
{
- updatetqStatus( i18n( "Password entries do not match." ) );
+ updateStatus( i18n( "Password entries do not match." ) );
valid = false;
passwordHighlight = true;
}
if ( valid && ( ui->valueVerificationSequence->text().isEmpty() ) )
{
- updatetqStatus( i18n( "Please enter the verification sequence." ) );
+ updateStatus( i18n( "Please enter the verification sequence." ) );
ui->pixmapVerificationSequence->setPixmap ( hintPixmap );
valid = false;
}
@@ -131,7 +131,7 @@ GaduRegisterAccount::validateInput()
if ( valid )
{
// clear status message if we have valid data
- updatetqStatus( i18n( "" ) );
+ updateStatus( i18n( "" ) );
}
enableButton( User1, valid );
@@ -156,7 +156,7 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri
ui->labelVerificationSequence->setDisabled( true );
ui->labelInstructions->setDisabled( true );
emit registeredNumber( cRegister->newUin(), ui->valuePassword->text() );
- updatetqStatus( i18n( "Account created; your new UIN is %1." ).tqarg(TQString::number( cRegister->newUin() ) ) );
+ updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) );
enableButton( User1, false );
setButtonText( Ok, i18n( "&Close" ) );
}
@@ -164,18 +164,18 @@ GaduRegisterAccount::registrationDone( const TQString& /*title*/, const TQStri
void
GaduRegisterAccount::registrationError( const TQString& title, const TQString& what )
{
- updatetqStatus( i18n( "Registration failed: %1" ).tqarg( what ) );
+ updateStatus( i18n( "Registration failed: %1" ).arg( what ) );
KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title );
disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) );
disconnect( this, TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) );
disconnect( this, TQT_SLOT( registrationError( const TQString&, const TQString& ) ) );
- disconnect( this, TQT_SLOT( updatetqStatus( const TQString ) ) );
+ disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) );
ui->valueVerificationSequence->setDisabled( true );
ui->valueVerificationSequence->setText( "" );
enableButton( User1, false );
- updatetqStatus( "" );
+ updateStatus( "" );
// emit UIN 0, to enable 'register new account' button again in dialog below
emit registeredNumber( 0, TQString( "" ) );
@@ -192,9 +192,9 @@ GaduRegisterAccount::displayToken( TQPixmap image, TQString /*tokenId */ )
}
void
-GaduRegisterAccount::updatetqStatus( const TQString status )
+GaduRegisterAccount::updateStatus( const TQString status )
{
- ui->labelStatusMessage->tqsetAlignment( AlignCenter );
+ ui->labelStatusMessage->setAlignment( AlignCenter );
ui->labelStatusMessage->setText( status );
}
diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h
index f6abb06d..ddc295ec 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.h
+++ b/kopete/protocols/gadu/gaduregisteraccount.h
@@ -49,7 +49,7 @@ protected slots:
void registrationDone( const TQString&, const TQString& );
void inputChanged( const TQString & );
void doRegister();
- void updatetqStatus( const TQString status );
+ void updateStatus( const TQString status );
private:
void validateInput();
diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp
index 9dcdbc21..377967bc 100644
--- a/kopete/protocols/gadu/gadurichtextformat.cpp
+++ b/kopete/protocols/gadu/gadurichtextformat.cpp
@@ -100,9 +100,9 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo
g = (int)color->green;
b = (int)color->blue;
}
- style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b );
+ style += TQString(" color: rgb( %1, %2, %3 ); ").arg( r ).arg( g ).arg( b );
- tmp += formatOpeningTag( TQString::tqfromLatin1("span"), TQString::tqfromLatin1("style=\"%1\"").tqarg( style ) );
+ tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) );
opened = true;
}
@@ -150,8 +150,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
output->rtf.resize(0);
// test first if there is any HTML formating in it
- if( htmlString.find( TQString::tqfromLatin1("</span") ) > -1 ) {
- TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") );
+ if( htmlString.find( TQString::fromLatin1("</span") ) > -1 ) {
+ TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") );
findTags.setMinimal( true );
int pos = 0;
int lastpos = 0;
@@ -198,7 +198,7 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
return NULL;
}
- TQString rep = TQString("<span style=\"%1\">%2</span>" ).tqarg( styleHTML ).tqarg( replacement );
+ TQString rep = TQString("<span style=\"%1\">%2</span>" ).arg( styleHTML ).arg( replacement );
htmlString.replace( findTags.pos( 0 ), rep.length(), replacement );
replacement = unescapeGaduMessage( replacement );
@@ -226,16 +226,16 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message )
void
GaduRichTextFormat::parseAttributes( const TQString attribute, const TQString value )
{
- if( attribute == TQString::tqfromLatin1("color") ) {
+ if( attribute == TQString::fromLatin1("color") ) {
color.setNamedColor( value );
}
- if( attribute == TQString::tqfromLatin1("font-weight") && value == TQString::tqfromLatin1("600") ) {
+ if( attribute == TQString::fromLatin1("font-weight") && value == TQString::fromLatin1("600") ) {
rtfs.font |= GG_FONT_BOLD;
}
- if( attribute == TQString::tqfromLatin1("text-decoration") && value == TQString::tqfromLatin1("underline") ) {
+ if( attribute == TQString::fromLatin1("text-decoration") && value == TQString::fromLatin1("underline") ) {
rtfs.font |= GG_FONT_UNDERLINE ;
}
- if( attribute == TQString::tqfromLatin1("font-style") && value == TQString::tqfromLatin1("italic") ) {
+ if( attribute == TQString::fromLatin1("font-style") && value == TQString::fromLatin1("italic") ) {
rtfs.font |= GG_FONT_ITALIC;
}
}
@@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position)
// append font description
rtfs.position = position;
uint csize = rtf.size();
- if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) {
+ if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) {
return false;
};
memcpy( rtf.data() + csize, &rtfs, sizeof( rtfs ) );
// append color description, if color has changed
if ( rtfs.font & GG_FONT_COLOR ) {
csize = rtf.size();
- if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) {
+ if ( rtf.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) {
return false;
};
memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) );
@@ -282,10 +282,10 @@ GaduRichTextFormat::insertRtf( uint position)
TQString
GaduRichTextFormat::escapeBody( TQString& input )
{
- input.replace( '<', TQString::tqfromLatin1("&lt;") );
- input.replace( '>', TQString::tqfromLatin1("&gt;") );
- input.replace( '\n', TQString::tqfromLatin1( "<br />" ) );
- input.replace( '\t', TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
- input.replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( " &nbsp;" ) );
+ input.replace( '<', TQString::fromLatin1("&lt;") );
+ input.replace( '>', TQString::fromLatin1("&gt;") );
+ input.replace( '\n', TQString::fromLatin1( "<br />" ) );
+ input.replace( '\t', TQString::fromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) );
+ input.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( " &nbsp;" ) );
return input;
}
diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp
index a9a84691..a0cf70d6 100644
--- a/kopete/protocols/gadu/gadusession.cpp
+++ b/kopete/protocols/gadu/gadusession.cpp
@@ -30,7 +30,7 @@
#include "kopetemessage.h"
#include <tqsocketnotifier.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqdatetime.h>
#include "gadurichtextformat.h"
@@ -279,7 +279,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl
}
int
-GaduSession::changetqStatus( int status, bool forFriends )
+GaduSession::changeStatus( int status, bool forFriends )
{
kdDebug(14101)<<"## Changing to "<<status<<endl;
if ( isConnected() ) {
@@ -424,8 +424,8 @@ GaduSession::pubDirSearch( ResLine& query, int ageFrom, int ageTo, bool onlyAli
(const char*)textcodec->fromUnicode( query.city ) );
}
if ( ageFrom || ageTo ) {
- TQString yearFrom = TQString::number( TQDate::tqcurrentDate().year() - ageFrom );
- TQString yearTo = TQString::number( TQDate::tqcurrentDate().year() - ageTo );
+ TQString yearFrom = TQString::number( TQDate::currentDate().year() - ageFrom );
+ TQString yearTo = TQString::number( TQDate::currentDate().year() - ageTo );
if ( ageFrom && ageTo ) {
gg_pubdir50_add( searchRequest, GG_PUBDIR50_BIRTHYEAR,
@@ -490,7 +490,7 @@ GaduSession::sendResult( gg_pubdir50_t result )
resultLine.status = stat.toInt();
age = resultLine.age.toInt();
if ( age ) {
- resultLine.age = TQString::number( TQDate::tqcurrentDate().year() - age );
+ resultLine.age = TQString::number( TQDate::currentDate().year() - age );
}
else {
resultLine.age.truncate( 0 );
@@ -617,7 +617,7 @@ GaduSession::errorDescription( int err )
case GG_ERROR_WRITING:
return i18n( "Writing error." );
default:
- return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) );
+ return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) );
}
}
@@ -642,7 +642,7 @@ GaduSession::failureDescription( gg_failure_t f )
case GG_FAILURE_TLS:
return i18n( "Unable to connect over encrypted channel.\nTry to turn off encryption support in Gadu account settings and reconnect." );
default:
- return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) );
+ return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)f ) );
}
}
diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h
index 7f732749..747163e1 100644
--- a/kopete/protocols/gadu/gadusession.h
+++ b/kopete/protocols/gadu/gadusession.h
@@ -124,7 +124,7 @@ public slots:
int addNotify( uin_t );
int removeNotify( uin_t );
int sendMessage( uin_t recipient, const Kopete::Message& msg, int msgClass );
- int changetqStatus( int, bool forFriends = false );
+ int changeStatus( int, bool forFriends = false );
int changeStatusDescription( int, const TQString&, bool forFriends = false );
int ping();
diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui
index 7fa193d6..e51209c6 100644
--- a/kopete/protocols/gadu/ui/gaduadd.ui
+++ b/kopete/protocols/gadu/ui/gaduadd.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout39</cstring>
+ <cstring>layout39</cstring>
</property>
<hbox>
<property name="name">
@@ -45,7 +45,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -78,13 +78,13 @@
<property name="text">
<string>&lt;i&gt;(for example: 1234567)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -92,7 +92,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -223,7 +223,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui
index de6b1b81..70600eb1 100644
--- a/kopete/protocols/gadu/ui/gaduawayui.ui
+++ b/kopete/protocols/gadu/ui/gaduawayui.ui
@@ -33,7 +33,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -44,7 +44,7 @@
<cstring>statusGroup_</cstring>
</property>
<property name="title">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
<property name="whatsThis" stdset="0">
<string>Choose status, by default present status is selected.
@@ -57,7 +57,7 @@ Choosing Offline status will disconnect you, with given description.</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -137,7 +137,7 @@ Choosing Offline status will disconnect you, with given description.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout278</cstring>
+ <cstring>layout278</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui
index ff165d35..79722aa0 100644
--- a/kopete/protocols/gadu/ui/gadueditaccountui.ui
+++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui
@@ -58,7 +58,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -158,7 +158,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -168,7 +168,7 @@
<string>To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.&lt;br&gt;&lt;br&gt;
If you do not currently have an account, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -201,7 +201,7 @@ If you do not currently have an account, please click the button to create one.<
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -231,7 +231,7 @@ If you do not currently have an account, please click the button to create one.<
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
@@ -265,7 +265,7 @@ If you do not currently have an account, please click the button to create one.<
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout65</cstring>
+ <cstring>layout65</cstring>
</property>
<hbox>
<property name="name">
@@ -413,7 +413,7 @@ If you do not currently have an account, please click the button to create one.<
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -421,7 +421,7 @@ If you do not currently have an account, please click the button to create one.<
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -479,7 +479,7 @@ If you do not currently have an account, please click the button to create one.<
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@@ -570,7 +570,7 @@ If you do not currently have an account, please click the button to create one.<
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -579,7 +579,7 @@ If you do not currently have an account, please click the button to create one.<
</spacer>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -587,7 +587,7 @@ If you do not currently have an account, please click the button to create one.<
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@@ -613,7 +613,7 @@ If you do not currently have an account, please click the button to create one.<
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -686,7 +686,7 @@ If you do not currently have an account, please click the button to create one.<
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@@ -694,7 +694,7 @@ If you do not currently have an account, please click the button to create one.<
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<hbox>
<property name="name">
@@ -780,7 +780,7 @@ If you do not currently have an account, please click the button to create one.<
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>180</height>
@@ -797,7 +797,7 @@ If you do not currently have an account, please click the button to create one.<
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
index 9397854c..fcb5b1c3 100644
--- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
+++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<grid>
<property name="name">
@@ -39,13 +39,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -112,13 +112,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -157,13 +157,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -216,13 +216,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>23</width>
<height>20</height>
@@ -302,13 +302,13 @@
<verstretch>13</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>256</width>
<height>64</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>256</width>
<height>64</height>
@@ -350,7 +350,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>22</width>
<height>20</height>
@@ -374,7 +374,7 @@
<property name="text">
<string>&lt;i&gt;Type the letters and numbers shown in the image above into the &lt;b&gt;Verification Sequence&lt;/b&gt; field. This is used to prevent automated registration abuse.&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -388,7 +388,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -402,7 +402,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui
index d9c39029..e747e952 100644
--- a/kopete/protocols/gadu/ui/gadusearch.ui
+++ b/kopete/protocols/gadu/ui/gadusearch.ui
@@ -50,7 +50,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout38</cstring>
+ <cstring>layout38</cstring>
</property>
<vbox>
<property name="name">
@@ -58,7 +58,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<vbox>
<property name="name">
@@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout31</cstring>
+ <cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@@ -74,7 +74,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<vbox>
<property name="name">
@@ -116,7 +116,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout30</cstring>
+ <cstring>layout30</cstring>
</property>
<vbox>
<property name="name">
@@ -148,7 +148,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<hbox>
<property name="name">
@@ -220,7 +220,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>297</width>
<height>21</height>
@@ -231,7 +231,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout32</cstring>
+ <cstring>layout32</cstring>
</property>
<hbox>
<property name="name">
@@ -282,7 +282,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<vbox>
<property name="name">
@@ -290,7 +290,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@@ -343,7 +343,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -367,7 +367,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>224</width>
<height>21</height>
@@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -411,7 +411,7 @@
<widget class="KListView" row="0" column="0">
<column>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
@@ -527,13 +527,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>512</width>
<height>256</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>640</width>
<height>512</height>
diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp
index cb9c7928..d6d89a25 100644
--- a/kopete/protocols/groupwise/gwaccount.cpp
+++ b/kopete/protocols/groupwise/gwaccount.cpp
@@ -308,13 +308,13 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
// contact details listed
TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) );
// contact status changed
- TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( const TQString &, TQ_UINT16 , const TQString & ) ) );
+ TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) );
// incoming message
TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) );
// auto reply to one of our messages because the recipient is away
TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) );
- TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ) ) );
+ TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) );
// conference events
TQObject::connect( m_client,
TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ),
@@ -364,7 +364,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password )
void GroupWiseAccount::slotMessageSendingFailed()
{
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
- i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( accountId() ) );
+ i18n("Message Sending Failed", "Kopete was not able to send the last message sent on account '%1'.\nIf possible, please send the console output from Kopete to <wstephenson@novell.com> for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( accountId() ) );
}
void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQString &reason )
@@ -390,9 +390,9 @@ void GroupWiseAccount::setOnlineStatus( const Kopete::OnlineStatus& status, cons
// Appear Offline is achieved by explicitly setting the status to offline,
// rather than disconnecting as when really going offline.
if ( status == protocol()->groupwiseAppearOffline )
- m_client->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) );
+ m_client->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) );
else
- m_client->settqStatus( ( GroupWise::tqStatus )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) );
+ m_client->setStatus( ( GroupWise::Status )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) );
}
// going online
else
@@ -474,11 +474,11 @@ void GroupWiseAccount::slotLoggedIn()
// set local status display
myself()->setOnlineStatus( protocol()->groupwiseAvailable );
// set status on server
- if ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) &&
- ( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) )
+ if ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) &&
+ ( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) )
{
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialtqStatus().internalStatus() << endl;
- m_client->settqStatus( ( GroupWise::tqStatus )initialtqStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) );
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Initial status is not online, setting status to " << initialStatus().internalStatus() << endl;
+ m_client->setStatus( ( GroupWise::Status )initialStatus().internalStatus(), m_initialReason, configGroup()->readEntry( "AutoReply" ) );
}
}
@@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges()
break;
}
else
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple tqchildren and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "metacontact " << c->metaContact()->displayName( ) << "has multiple children and group membership, and contact " << c->dn() << " was removed from one group on the server." << endl;
conflicts = true;
}
} //
@@ -647,7 +647,7 @@ void GroupWiseAccount::slotConnError()
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry,
- i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) );
+ i18n( "Error shown when connecting failed", "Kopete was not able to connect to the GroupWise Messenger server for account '%1'.\nPlease check your server and port settings and try again." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( accountId() ) );
disconnect();
}
@@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected()
TQValueList<GroupWiseChatSession *>::ConstIterator it;
for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it )
(*it)->setClosed();
- setAllContactstqStatus( protocol()->groupwiseOffline );
+ setAllContactsStatus( protocol()->groupwiseOffline );
client()->close();
}
@@ -807,8 +807,8 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message )
// if we receive a message from an Offline contact, they are probably blocking us
// but we have to set their status to Unknown so that we can reply to them.
- kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlinetqStatus().description() << endl;
- if ( sender->onlinetqStatus() == protocol()->groupwiseOffline ) {
+ kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlineStatus().description() << endl;
+ if ( sender->onlineStatus() == protocol()->groupwiseOffline ) {
sender->setMessageReceivedOffline( true );
}
@@ -823,19 +823,19 @@ void GroupWiseAccount::handleIncomingMessage( const ConferenceEvent & message )
{
TQString prefix = i18n("Prefix used for automatically generated auto-reply"
" messages when the contact is Away, contains contact's name",
- "Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() );
+ "Auto reply from %1: " ).arg( sender->metaContact()->displayName() );
messageMunged = prefix + message.message;
}
if ( message.type == GroupWise::ReceivedBroadcast )
{
TQString prefix = i18n("Prefix used for broadcast messages",
- "Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+ "Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
messageMunged = prefix + message.message;
}
if ( message.type == GroupWise::ReceivedSystemBroadcast )
{
TQString prefix = i18n("Prefix used for system broadcast messages",
- "System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() );
+ "System Broadcast message from %1: " ).arg( sender->metaContact()->displayName() );
messageMunged = prefix + message.message;
}
@@ -1040,14 +1040,14 @@ GroupWiseContact * GroupWiseAccount::createTemporaryContact( const TQString & dn
Kopete::ContactList::self()->addMetaContact( metaContact );
// the contact details probably don't contain status - but we can ask for it
if ( details.status == GroupWise::Invalid && isConnected() )
- m_client->requesttqStatus( details.dn );
+ m_client->requestStatus( details.dn );
}
else
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl;
return c;
}
-void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage )
+void GroupWiseAccount::receiveStatus( const TQString & contactId, TQ_UINT16 status, const TQString &awayMessage )
{
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "got status for: " << contactId << ", status: " << status << ", away message: " << awayMessage << endl;
GroupWiseContact * c = contactForDN( contactId );
@@ -1062,7 +1062,7 @@ void GroupWiseAccount::receivetqStatus( const TQString & contactId, TQ_UINT16 st
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl;
}
-void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply )
+void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply )
{
if ( status == GroupWise::Offline )
myself()->setOnlineStatus( protocol()->groupwiseAppearOffline );
@@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated()
else
{
client()->requestDetails( TQStringList( cct->dn() ) );
- client()->requesttqStatus( cct->dn() );
+ client()->requestStatus( cct->dn() );
}
}
else
@@ -1210,7 +1210,7 @@ void GroupWiseAccount::receiveContactCreated()
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Error,
i18n ("The contact %1 could not be added to the contact list, with error message: %2").
- tqarg(cct->userId() ).tqarg( cct->statusString() ),
+ arg(cct->userId() ).arg( cct->statusString() ),
i18n ("Error Adding Contact") );
}
}
@@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance )
void GroupWiseAccount::slotConnectedElsewhere()
{
- KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").tqarg( accountId() ),
- i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).tqarg( accountId() ) , Kopete::UI::Global::mainWidget() );
+ KPassivePopup::message( i18n ("Signed in as %1 Elsewhere").arg( accountId() ),
+ i18n( "The parameter is the user's own account id for this protocol", "You have been disconnected from GroupWise Messenger because you signed in as %1 elsewhere" ).arg( accountId() ) , Kopete::UI::Global::mainWidget() );
disconnect();
}
@@ -1364,7 +1364,7 @@ void GroupWiseAccount::receiveInviteNotify( const ConferenceEvent & event )
c = createTemporaryContact( event.user );
sess->addInvitee( c );
- Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
+ Kopete::Message declined = Kopete::Message( myself(), sess->members(), i18n("%1 has been invited to join this conversation.").arg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText );
sess->appendMessage( declined );
}
else
@@ -1400,7 +1400,7 @@ void GroupWiseAccount::slotSetAutoReply()
void GroupWiseAccount::slotTestRTFize()
{
/* bool ok;
- const TQString query = TQString::tqfromLatin1("Enter a string to rtfize:");
+ const TQString query = TQString::fromLatin1("Enter a string to rtfize:");
TQString testText = KLineEditDlg::getText( query, TQString(), &ok, Kopete::UI::Global::mainWidget() );
if ( ok )
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Converted text is: '" << protocol()->rtfizeText( testText ) << "'" << endl;*/
diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h
index f05f00a1..ff6cca19 100644
--- a/kopete/protocols/groupwise/gwaccount.h
+++ b/kopete/protocols/groupwise/gwaccount.h
@@ -225,11 +225,11 @@ protected slots:
/**
* A contact changed status
*/
- void receivetqStatus( const TQString &, TQ_UINT16, const TQString & );
+ void receiveStatus( const TQString &, TQ_UINT16, const TQString & );
/**
* Our status changed on the server
*/
- void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & );
+ void changeOurStatus( GroupWise::Status, const TQString &, const TQString & );
/**
* Called when we've been disconnected for logging in as this user somewhere else
*/
@@ -307,7 +307,7 @@ protected:
/**
* Sends a status message to the server - called by the status specific slotGoAway etc
*/
- //void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() );
+ //void setStatus( GroupWise::Status status, const TQString & reason = TQString() );
int handleTLSWarning (int warning, TQString server, TQString accountId);
diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui
index 6302f869..25be8093 100644
--- a/kopete/protocols/groupwise/gwaddui.ui
+++ b/kopete/protocols/groupwise/gwaddui.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp
index 11f2d23b..1aef7110 100644
--- a/kopete/protocols/groupwise/gwcontact.cpp
+++ b/kopete/protocols/groupwise/gwcontact.cpp
@@ -134,9 +134,9 @@ bool GroupWiseContact::isReachable()
// in GWChatSession
// (This is a GroupWise rule, not a problem in Kopete)
- if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */)
+ if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlineStatus() != protocol()->groupwiseAppearOffline */)
return true;
- if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ )
+ if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ )
return false;
// fallback, something went wrong
@@ -222,22 +222,22 @@ void GroupWiseContact::receivePrivacyChanged( const TQString & dn, bool allow )
{
Q_UNUSED( allow );
if ( dn == m_dn ) // set the online status back to itself. this will set the blocking state
- setOnlineStatus( this->onlinetqStatus() );
+ setOnlineStatus( this->onlineStatus() );
}
void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status )
{
setMessageReceivedOffline( false );
- if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
+ if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() )
setIdleTime( 1 );
- else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() )
+ else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() )
setIdleTime( 0 );
if ( account()->isContactBlocked( m_dn ) && status.internalStatus() < 15 )
{
Kopete::Contact::setOnlineStatus(Kopete::OnlineStatus(status.status() , (status.weight()==0) ? 0 : (status.weight() -1) ,
- protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"),
- i18n("%1|Blocked").tqarg( status.description() ) ) );
+ protocol() , status.internalStatus()+15 , TQString::fromLatin1("msn_blocked"),
+ i18n("%1|Blocked").arg( status.description() ) ) );
}
else
{
diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp
index 424a1545..100bbfdf 100644
--- a/kopete/protocols/groupwise/gwmessagemanager.cpp
+++ b/kopete/protocols/groupwise/gwmessagemanager.cpp
@@ -196,7 +196,7 @@ void GroupWiseChatSession::slotCreationFailed( const int failedId, const int sta
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't start a chat, no GUID.\n" << endl;
//emit creationFailed();
- Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").tqarg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText);
+ Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("An error occurred when trying to start a chat: %1").arg( statusCode ), Kopete::Message::Internal, Kopete::Message::PlainText);
appendMessage( failureNotify );
setClosed();
}
@@ -206,7 +206,7 @@ void GroupWiseChatSession::slotSendTypingNotification( bool typing )
{
// only send a notification if we've got a conference going and we are not Appear Offline
if ( !m_guid.isEmpty() && m_memberCount &&
- ( account()->myself()->onlinetqStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) )
+ ( account()->myself()->onlineStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) )
account()->client()->sendTyping( guid(), typing );
}
@@ -221,7 +221,7 @@ void GroupWiseChatSession::slotMessageSent( Kopete::Message & message, Kopete::C
appendMessage( failureNotify );
messageSucceeded();
}
- else*/ if ( account()->myself()->onlinetqStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline )
+ else*/ if ( account()->myself()->onlineStatus() == ( static_cast<GroupWiseProtocol *>( protocol() ) )->groupwiseAppearOffline )
{
Kopete::Message failureNotify = Kopete::Message( myself(), members(), i18n("Your message could not be sent. You cannot send messages while your status is Appear Offline. "), Kopete::Message::Internal, Kopete::Message::PlainText);
appendMessage( failureNotify );
@@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact )
}
else
{
- TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+ TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
bool ok;
TQRegExp rx( ".*" );
@@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact()
if ( !m_searchDlg )
{
// show search dialog
- TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+ TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel );
m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" );
@@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers()
TQValueList< ContactDetails > selected = m_search->selectedResults();
if ( selected.count() )
{
- TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+ TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
ContactDetails cd = selected.first();
bool ok;
@@ -399,7 +399,7 @@ void GroupWiseChatSession::addInvitee( const Kopete::Contact * c )
Kopete::MetaContact * inviteeMC = new Kopete::MetaContact();
inviteeMC->setDisplayName( c->metaContact()->displayName() + pending );
GroupWiseContact * invitee = new GroupWiseContact( account(), c->contactId() + " " + pending, inviteeMC, 0, 0, 0 );
- invitee->setOnlineStatus( c->onlinetqStatus() );
+ invitee->setOnlineStatus( c->onlineStatus() );
// TODO: we could set all the placeholder's properties etc here too
addContact( invitee, true );
m_invitees.append( invitee );
@@ -468,7 +468,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c )
TQString from = c->metaContact()->displayName();
Kopete::Message declined = Kopete::Message( myself(), members(),
- i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ),
+ i18n("%1 has rejected an invitation to join this conversation.").arg( from ),
Kopete::Message::Internal, Kopete::Message::PlainText );
appendMessage( declined );
}
@@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving()
void GroupWiseChatSession::slotShowSecurity()
{
- TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+ TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) );
}
void GroupWiseChatSession::slotShowArchiving()
{
- TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) :
+ TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() );
KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) );
}
diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp
index 0b4d351a..68a31fb4 100644
--- a/kopete/protocols/groupwise/gwprotocol.cpp
+++ b/kopete/protocols/groupwise/gwprotocol.cpp
@@ -173,7 +173,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
// of multi-byte UTF-8 characters 2 to 6 bytes long (with first byte > 0x7f), these are recoded as 32 bit values, escaped as \u<val>? strings
// vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message
- TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n"
+ TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n"
"{\\fonttbl{\\f0\\fnil Unknown;}}\n"
"{\\colortbl ;\\red0\\green0\\blue0;}\n"
"\\uc1\\cf1\\f0\\fs18 %1\\par\n}");
@@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
case '{':
case '}':
case '\\':
- outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) );
+ outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) );
break;
case '\n':
outputText.append( "\\par " );
@@ -253,12 +253,12 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain )
bytesEncoded = 1;
}
index += bytesEncoded;
- escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char );
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl;
+ escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char );
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode escaped char: " << escapedUnicodeChar << endl;
outputText.append( escapedUnicodeChar );
}
}
- return rtfTemplate.tqarg( outputText );
+ return rtfTemplate.arg( outputText );
}
TQString GroupWiseProtocol::dnToDotted( const TQString & dn )
diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index e7395157..5df0d1de 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -63,7 +63,7 @@ public:
UserDetailsManager * userDetailsMgr;
PrivacyManager * privacyMgr;
uint protocolVersion;
- TQValueList<GroupWise::CustomtqStatus> customStatuses;
+ TQValueList<GroupWise::CustomStatus> customStatuses;
TQTimer * keepAliveTimer;
};
@@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI
connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
- connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ),
- TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) );
+ connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ),
+ TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) );
@@ -185,7 +185,7 @@ int Client::port()
return d->port;
}
-TQValueList<GroupWise::CustomtqStatus> Client::customStatuses()
+TQValueList<GroupWise::CustomStatus> Client::customStatuses()
{
return d->customStatuses;
}
@@ -194,7 +194,7 @@ void Client::initialiseEventTasks()
{
// The StatusTask handles incoming status changes
StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot?
- connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+ connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
// The ConferenceTask handles incoming conference events, messages, joins, leaves, etc
ConferenceTask * ct = new ConferenceTask( d->root );
connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
@@ -216,9 +216,9 @@ void Client::initialiseEventTasks()
connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) );
}
-void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply )
+void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply )
{
- debug( TQString("Setting status to %1").tqarg( status ) );;
+ debug( TQString("Setting status to %1").arg( status ) );;
SetStatusTask * sst = new SetStatusTask( d->root );
sst->status( status, reason, autoReply );
connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) );
@@ -226,11 +226,11 @@ void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, c
// TODO: set status change in progress flag
}
-void Client::requesttqStatus( const TQString & userDN )
+void Client::requestStatus( const TQString & userDN )
{
GetStatusTask * gst = new GetStatusTask( d->root );
gst->userDN( userDN );
- connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
+ connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
gst->go( true );
}
@@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr
// SLOTS //
void Client::streamError( int error )
{
- debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) );
+ debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) );
}
void Client::streamReadyRead()
@@ -348,7 +348,7 @@ void Client::sst_statusChanged()
const SetStatusTask * sst = (SetStatusTask *)sender();
if ( sst->success() )
{
- emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() );
+ emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() );
}
}
@@ -390,19 +390,19 @@ void Client::jct_joinConfCompleted()
{
const JoinConferenceTask * jct = ( JoinConferenceTask * )sender();
#ifdef LIBGW_DEBUG
- debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) );
+ debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) );
TQStringList parts = jct->participants();
for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it )
- debug( TQString( " - %1" ).tqarg(*it) );
+ debug( TQString( " - %1" ).arg(*it) );
debug( "invitees are: " );
TQStringList invitees = jct->invitees();
for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it )
- debug( TQString( " - %1" ).tqarg(*it) );
+ debug( TQString( " - %1" ).arg(*it) );
#endif
emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() );
}
-void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom )
+void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom )
{
d->customStatuses.append( custom );
}
@@ -431,7 +431,7 @@ TQString Client::password()
TQString Client::userAgent()
{
- return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname );
+ return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname );
}
TQCString Client::ipAddress()
@@ -457,7 +457,7 @@ void Client::send( Request * request )
return;
}
// TQString out = request.toString();
-// debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+// debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
// xmlOutgoing(out);
d->stream->write( request );
diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h
index 8bdd236d..542d32eb 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.h
+++ b/kopete/protocols/groupwise/libgroupwise/client.h
@@ -92,7 +92,7 @@ fd * @param password
* @param reason custom status name for away statuses
* @param autoReply auto reply message for use in this status
*/
- void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply );
+ void setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply );
/**
* Send a message
@@ -118,7 +118,7 @@ fd * @param password
/**
* Request the status of a single user, for example, if they have messaged us and are not on our contact list
*/
- void requesttqStatus( const TQString & userDN );
+ void requestStatus( const TQString & userDN );
/**
* Add a contact to the contact list
@@ -211,7 +211,7 @@ fd * @param password
/**
* Obtain the list of custom statuses stored on the server
*/
- TQValueList<GroupWise::CustomtqStatus> customStatuses();
+ TQValueList<GroupWise::CustomStatus> customStatuses();
/**
* Get a reference to the RequestFactory for this Client.
@@ -281,7 +281,7 @@ fd * @param password
/**
* Our status changed on the server
*/
- void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply );
+ void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply );
/** CONFERENCE (MANAGEMENT) EVENTS */
/**
@@ -371,7 +371,7 @@ fd * @param password
/**
* Receive a custom status during login and record it
*/
- void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & );
+ void lt_gotCustomStatus( const GroupWise::CustomStatus & );
/**
* Notify us of the keepalive period contained in the login response
*/
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
index 79ecf419..6cfa01b9 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp
@@ -26,7 +26,7 @@
#include <tqdatastream.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
@@ -142,7 +142,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes )
while ( m_in.size() && ( parsedBytes = wireToTransfer( m_in ) ) )
{
transferCount++;
- debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( transferCount ) );
+ debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).arg( transferCount ) );
int size = m_in.size();
if ( parsedBytes < size )
{
@@ -185,7 +185,7 @@ Transfer* CoreProtocol::incomingTransfer()
void cp_dump( const TQByteArray &bytes )
{
#ifdef LIBGW_DEBUG
- CoreProtocol::debug( TQString( "contains: %1 bytes" ).tqarg( bytes.count() ) );
+ CoreProtocol::debug( TQString( "contains: %1 bytes" ).arg( bytes.count() ) );
for ( uint i = 0; i < bytes.count(); ++i )
{
printf( "%02x ", bytes[ i ] );
@@ -226,7 +226,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
command = "login";
host = request->command().section( ':', 1, 1 ).ascii();
port = request->command().section( ':', 2, 2 ).ascii();
- debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( port.data() ) );
+ debug( TQString( "Host: %1 Port: %2" ).arg( host.data() ).arg( port.data() ) );
}
else
command = request->command().ascii();
@@ -246,7 +246,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing )
else
dout << "\r\n";
- debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) );
+ debug( TQString( "data out: %1" ).arg( bytesOut.data() ) );
emit outgoingData( bytesOut );
// now convert
@@ -337,7 +337,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth )
+ GW_URLVAR_VAL + (const char *)valString
+ GW_URLVAR_TYPE + typeString;
- debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( outgoing.data() ) );
+ debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).arg( outgoing.data() ) );
dout.writeRawBytes( outgoing.data(), outgoing.length() );
// write what we have so far, we may be calling this function recursively
//kdDebug( 14999 ) << k_funcinfo << "writing \'" << bout << "\'" << endl;
@@ -398,12 +398,12 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire )
}
else // otherwise -> Event code
{
- debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) );
+ debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).arg( val ).arg( wire.size() ) );
Transfer * t = m_eventProtocol->parse( wire, bytesParsed );
if ( t )
{
m_inTransfer = t;
- debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) );
+ debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) );
m_state = Available;
emit incomingData();
}
@@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( TQ_UINT8 method )
void CoreProtocol::slotOutgoingData( const TQCString &out )
{
- debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) );
+ debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out.data() ) );
}
bool CoreProtocol::okToProceed()
diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
index ea3a2626..d1b2486c 100644
--- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h
@@ -108,7 +108,7 @@ class Transfer;
* any of three ways -
* ascii text,
* latin1 as hexadecimal,
- * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? )
+ * escaped unicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the unicode value and the ? )
* Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server
*
*/
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index b6ff646d..93ce7c92 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -53,10 +53,10 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
m_din >> type;
m_bytes += sizeof( TQ_UINT32 );
- debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) );
+ debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) );
if ( type > Stop )
{
- debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) );
+ debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) );
m_state = OutOfSync;
return 0;
}
@@ -71,7 +71,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
// now create an event object
//HACK: lowercased DN
- EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() );
+ EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() );
// add any additional data depending on the type of event
// Note: if there are any errors in the way the data is read below, we will soon be OutOfSync
@@ -96,9 +96,9 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
m_din.unsetDevice();
return 0;
}
- debug( TQString( "got status: %1").tqarg( status ) );
- tentative->settqStatus( status );
- debug( TQString( "tentative status: %1").tqarg( tentative->status() ) );
+ debug( TQString( "got status: %1").arg( status ) );
+ tentative->setStatus( status );
+ debug( TQString( "tentative status: %1").arg( tentative->status() ) );
tentative->setStatusText( statusText );
break;
case ConferenceJoined: // 106 - GUID + FLAGS
@@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
}
tentative->setFlags( flags );
break;
- case UndeliverabletqStatus: //102 - GUID
+ case UndeliverableStatus: //102 - GUID
case ConferenceClosed: //105
case ConferenceInviteNotify://118
case ConferenceReject: //119
@@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
tentative->setMessage( message );
break;
default:
- debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) );
+ debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) );
break;
}
// if we got this far, the parse succeeded, return the Transfer
diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
index 97e48c22..49d1d9dd 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h
@@ -50,7 +50,7 @@ class EventTransfer;
All Events contain an event code, and a source ( a DN )
NOTHANDLED indicates that there is no further data and we don't handle events of that type, because they are not sent by the server
NONE indicates there is no further data
- STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded tqunicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
+ STATUSTEXT, GUID, MESSAGE indicate a string encoded in the usual GroupWise binary string encoding: a UINT32 containing the string length in little-endian, followed by the string itself, as UTF-8 encoded unicode. The string length value includes a terminating NUL, so when converting to a TQString, subtract one from the string length.
FLAGS contains a UINT32 containing the server's flags for this conference. See gwerror.h for the possible values and meanings of these flags. Only Logging has been observed in practice.
All events are timestamped with the local time on receipt.
@@ -58,7 +58,7 @@ class EventTransfer;
From gwerror.h:
enum Event { InvalidRecipient = 101,
NOTHANDLED
- UndeliverabletqStatus = 102,
+ UndeliverableStatus = 102,
NOTHANDLED *
StatusChange = 103,
TQ_UINT16 STATUS
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
index be645abb..fb9ab8b3 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp
@@ -60,9 +60,9 @@ bool EventTransfer::hasMessage()
return ( m_contentFlags & Message );
}
-bool EventTransfer::hastqStatus()
+bool EventTransfer::hasStatus()
{
- return ( m_contentFlags & tqStatus );
+ return ( m_contentFlags & Status );
}
bool EventTransfer::hasStatusText()
@@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message )
m_message = message;
}
-void EventTransfer::settqStatus( const TQ_UINT16 intqStatus )
+void EventTransfer::setStatus( const TQ_UINT16 inStatus )
{
- m_contentFlags |= tqStatus;
- m_status = intqStatus;
+ m_contentFlags |= Status;
+ m_status = inStatus;
}
void EventTransfer::setStatusText( const TQString & statusText )
diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
index 594d0d16..ad325619 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
+++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h
@@ -47,7 +47,7 @@ public:
Guid = 0x00000008,
Flags = 0x00000010,
Message = 0x00000020,
- tqStatus = 0x00000040,
+ Status = 0x00000040,
StatusText = 0x00000080 };
/**
* Constructor
@@ -70,7 +70,7 @@ public:
bool hasGuid();
bool hasFlags();
bool hasMessage();
- bool hastqStatus();
+ bool hasStatus();
bool hasStatusText();
/**
@@ -92,7 +92,7 @@ public:
void setGuid( const GroupWise::ConferenceGuid & guid );
void setFlags( const TQ_UINT32 flags );
void setMessage( const TQString & message );
- void settqStatus( const TQ_UINT16 status );
+ void setStatus( const TQ_UINT16 status );
void setStatusText( const TQString & statusText);
private:
diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
index 5349fd30..4e73955a 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h
@@ -44,7 +44,7 @@ struct ChatroomSearchResult
class Chatroom
{
public:
- enum UsertqStatus { Participating, NotParticipating };
+ enum UserStatus { Participating, NotParticipating };
enum Rights { Read = 1, Write = 2, Modify = 4, Moderator = 8, Owner = 16 };
TQString creatorDN;
TQString description;
@@ -57,7 +57,7 @@ class Chatroom
bool archive;
uint maxUsers;
uint chatRights;
- UsertqStatus usertqStatus;
+ UserStatus userStatus;
TQDateTime createdOn;
uint participantsCount;
// haveParticipants, Acl, Invites indicate if we have obtained these lists from the server, so we can tell 'not fetched list' and 'fetched empty list' apart.
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 7305f7bc..e3827622 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -19,7 +19,7 @@
*************************************************************************
*/
-//#include<tqtextstream.h>
+//#include<textstream.h>
//#include<tqguardedptr.h>
// #include<qca.h>
// #include<stdlib.h>
@@ -378,7 +378,7 @@ void cs_dump( const TQByteArray &bytes )
{
//#define GW_CLIENTSTREAM_DEBUG 1
#ifdef GW_CLIENTSTREAM_DEBUG
- CoreProtocol::debug( TQString( "contains: %1 bytes " ).tqarg( bytes.count() ) );
+ CoreProtocol::debug( TQString( "contains: %1 bytes " ).arg( bytes.count() ) );
uint count = 0;
while ( count < bytes.count() )
{
@@ -440,7 +440,7 @@ void ClientStream::cp_incomingData()
emit doReadyRead();
}
else
- CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( d->client.state() ) );
+ CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).arg( d->client.state() ) );
}
void ClientStream::cr_connected()
@@ -520,7 +520,7 @@ void ClientStream::ss_readyRead()
#ifdef LIBGW_DEBUG
TQCString cs(a.data(), a.size()+1);
- CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( a.size() ) );
+ CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).arg( a.size() ) );
cs_dump( a );
#endif
@@ -532,7 +532,7 @@ void ClientStream::ss_readyRead()
void ClientStream::ss_bytesWritten(int bytes)
{
#ifdef LIBGW_DEBUG
- CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( bytes ) );
+ CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).arg( bytes ) );
#else
Q_UNUSED( bytes );
#endif
@@ -556,7 +556,7 @@ void ClientStream::ss_tlsClosed()
void ClientStream::ss_error(int x)
{
- CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) );
+ CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").arg( x ) );
if(x == SecureStream::ErrTLS) {
reset();
d->errCond = TLSFail;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
index 65574eb3..ba2a2a58 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp
@@ -146,7 +146,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
errorString = i18n( "Chat has been removed from server" );
break;
default:
- errorString = i18n("Unrecognized error code: %s").tqarg( errorCode );
+ errorString = i18n("Unrecognized error code: %s").arg( errorCode );
#else
case NMERR_ACCESS_DENIED:
errorString = "Access denied";
@@ -269,7 +269,7 @@ TQString GroupWise::errorCodeToString( int errorCode )
errorString = "Chat has been removed from server";
break;
default:
- errorString = TQString("Unrecognized error code: %s").tqarg( errorCode );
+ errorString = TQString("Unrecognized error code: %s").arg( errorCode );
#endif
}
return errorString;
diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h
index f5de53ce..f19d3d39 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwerror.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h
@@ -36,7 +36,7 @@ typedef TQ_UINT16 NMERR_T;
namespace GroupWise
{
- enum tqStatus { Unknown = 0,
+ enum Status { Unknown = 0,
Offline = 1,
Available = 2,
Busy = 3,
@@ -58,7 +58,7 @@ namespace GroupWise
};
enum Event { InvalidRecipient = 101,
- UndeliverabletqStatus = 102,
+ UndeliverableStatus = 102,
StatusChange = 103,
ContactAdd = 104,
ConferenceClosed = 105,
@@ -164,9 +164,9 @@ namespace GroupWise
int operation;
};
- struct CustomtqStatus
+ struct CustomStatus
{
- GroupWise::tqStatus status;
+ GroupWise::Status status;
TQString name;
TQString autoReply;
};
diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
index 14a5af70..415905bf 100644
--- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp
@@ -98,7 +98,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len )
// if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF )
if ( temp.length() < ( val - 1 ) )
{
- debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) );
+ debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).arg( temp.length() ).arg( val ) );
m_state = NeedMore;
return false;
}
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index 9aa7d80b..7e7dbeed 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::tqfromLatin1(cs);
+ return TQString::fromLatin1(cs);
}
bool RSAKey::fromPEM(const TQString &str)
@@ -798,7 +798,7 @@ TQString Cert::toPEM() const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::tqfromLatin1(cs);
+ return TQString::fromLatin1(cs);
}
bool Cert::fromPEM(const TQString &str)
diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
index 50788178..a3c82b51 100644
--- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp
@@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
return 0;
}
headerRest.append( line );
- debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( line.data() ) );
+ debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) );
}
debug( "ResponseProtocol::readResponse() header finished" );
// if it's a redirect, set flag
@@ -85,14 +85,14 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
// other header processing ( 500! )
if ( ok && rtnCode == 500 )
{
- debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
+ debug( TQString( "- server error %1" ).arg( rtnCode ) );
packetState = ServerError;
m_din.unsetDevice();
return 0;
}
if ( ok && rtnCode == 404 )
{
- debug( TQString( "- server error %1" ).tqarg( rtnCode ) );
+ debug( TQString( "- server error %1" ).arg( rtnCode ) );
packetState = ServerError;
m_din.unsetDevice();
return 0;
@@ -123,7 +123,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
if ( sf )
{
tId = sf->value().toInt();
- debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) );
+ debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) );
m_collatingFields.remove( it );
delete sf;
}
@@ -135,7 +135,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
if ( sf )
{
resultCode = sf->value().toInt();
- debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( resultCode ) );
+ debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) );
m_collatingFields.remove( it );
delete sf;
}
@@ -143,7 +143,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes )
// append to inQueue
if ( tId )
{
- debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) );
+ debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).arg(m_collatingFields.count() ) );
packetState = Available;
bytes = m_bytes;
m_din.unsetDevice();
@@ -169,7 +169,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
// if we find the beginning of a new nested list, push the current list onto m_collatingFields
debug( "ResponseProtocol::readFields()" );
if ( fieldCount > 0 )
- debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) );
+ debug( TQString( "reading %1 fields" ).arg( fieldCount ) );
Field::FieldList currentList;
while ( fieldCount != 0 ) // prevents bad input data from ruining our day
{
@@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
return false;
}
- debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) );
+ debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) );
// if multivalue or array
if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY )
{
@@ -223,7 +223,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
m_bytes += sizeof( TQ_UINT32 );
// create multifield
- debug( TQString( " multi field containing: %1" ).tqarg( val ) );
+ debug( TQString( " multi field containing: %1" ).arg( val ) );
Field::MultiField* m = new Field::MultiField( tag, method, 0, type );
currentList.append( m );
if ( !readFields( val, &currentList) )
@@ -248,9 +248,9 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
m_packetState = ProtocolError;
break;
}
- // convert to tqunicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
+ // convert to unicode - ignore the terminating NUL, because TQt<3.3.2 doesn't sanity check val.
TQString fieldValue = TQString::fromUtf8( rawData.data(), val - 1 );
- debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) );
+ debug( TQString( "- utf/dn single field: %1" ).arg( fieldValue ) );
// create singlefield
Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue );
currentList.append( s );
@@ -266,7 +266,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list )
}
m_din >> val;
m_bytes += sizeof( TQ_UINT32 );
- debug( TQString( "- numeric field: %1" ).tqarg( val ) );
+ debug( TQString( "- numeric field: %1" ).arg( val ) );
Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val );
currentList.append( s );
}
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc
index afe7b18e..a74b4c67 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -2182,7 +2182,7 @@ void Level::clearParagraphFormatting()
// implicitly start a paragraph
if (!isParagraphOpen())
startParagraph();
- // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+ // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
// we don't clean up anything here. Note that \pard does NOT clean character
// formatting (such as font size, font weight, italics...).
p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 7f2f1841..67e9f5f5 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.ll
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll
@@ -517,7 +517,7 @@ void Level::clearParagraphFormatting()
// implicitly start a paragraph
if (!isParagraphOpen())
startParagraph();
- // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+ // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
// we don't clean up anything here. Note that \pard does NOT clean character
// formatting (such as font size, font weight, italics...).
p->parStyle.clearFormatting();
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf2html.h b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
index 5685e4a1..3a3122d8 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf2html.h
+++ b/kopete/protocols/groupwise/libgroupwise/rtf2html.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <stdio.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqcolor.h>
#include <tqregexp.h>
#include <kdebug.h>
diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp
index 858c8fde..547844d9 100644
--- a/kopete/protocols/groupwise/libgroupwise/task.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/task.cpp
@@ -130,7 +130,7 @@ bool Task::take( Transfer * transfer)
if(p.isEmpty())
return false;
- // pass along the transfer to our tqchildren
+ // pass along the transfer to our children
TQObjectListIt it(p);
Task *t;
for(; it.current(); ++it) {
@@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer)
if(t->take( transfer ))
{
- client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) );
+ client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) );
return true;
}
}
@@ -256,7 +256,7 @@ void Task::clientDisconnected()
void Task::debug(const TQString &str)
{
- client()->debug(TQString("%1: ").tqarg(className()) + str);
+ client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index 3fccc218..c88e22b4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask()
void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt )
{
- client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg
- ( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg
- ( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) );
- client()->debug( TQString( " flags: %1" ).tqarg( evt.flags, 8 ) );
+ client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg
+ ( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg
+ ( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) );
+ client()->debug( TQString( " flags: %1" ).arg( evt.flags, 8 ) );
}
bool ConferenceTask::take( Transfer * transfer )
@@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer )
Q_ASSERT( incomingEvent->hasMessage() );
event.message = incomingEvent->message();
client()->debug( "ReceiveMessage" );
- client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+ client()->debug( TQString( "message: %1" ).arg( event.message ) );
if ( !queueWhileAwaitingData( event ) )
emit message( event );
break;
@@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer )
Q_ASSERT( incomingEvent->hasMessage() );
event.message = incomingEvent->message();
client()->debug( "ConferenceInvite" );
- client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+ client()->debug( TQString( "message: %1" ).arg( event.message ) );
if ( !queueWhileAwaitingData( event ) )
emit invited( event );
break;
@@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer )
Q_ASSERT( incomingEvent->hasMessage() );
event.message = incomingEvent->message();
client()->debug( "ReceiveAutoReply" );
- client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) );
+ client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) );
emit autoReply( event );
break;
case GroupWise::ReceivedBroadcast:
Q_ASSERT( incomingEvent->hasMessage() );
event.message = incomingEvent->message();
client()->debug( "ReceivedBroadCast" );
- client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+ client()->debug( TQString( "message: %1" ).arg( event.message ) );
if ( !queueWhileAwaitingData( event ) )
emit broadcast( event );
break;
@@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer )
Q_ASSERT( incomingEvent->hasMessage() );
event.message = incomingEvent->message();
client()->debug( "ReceivedSystemBroadCast" );
- client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
+ client()->debug( TQString( "message: %1" ).arg( event.message ) );
emit systemBroadcast( event );
break;
default:
- client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) );
+ client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) );
}
dumpConferenceEvent( event );
@@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d
// if the details relate to event, try again to handle it
if ( details.dn == (*current).user )
{
- client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) );
+ client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) );
switch ( (*current).type )
{
case GroupWise::ConferenceJoined:
@@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event )
}
else
{
- client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) );
+ client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) );
client()->userDetailsManager()->requestDetails( event.user );
m_pendingEvents.append( event );
return true;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
index 920eec3b..0d167236 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp
@@ -71,7 +71,7 @@ void CreateContactTask::onGo()
// create contacts on the server
for ( ; it != end; ++it )
{
- client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*it).id ) );
+ client()->debug( TQString( " - contact is in folder %1 with id %2" ).arg( (*it).name ).arg( (*it).id ) );
CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() );
// the add contact action may cause other contacts' sequence numbers to change
// CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount
@@ -112,8 +112,8 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact )
client()->debug( " - addedContact is not the one we were trying to add, ignoring it ( Account will update it )" );
return;
}
- client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg
- ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) );
+ client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).arg
+ ( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) );
if ( m_dn.isEmpty() )
m_dn = addedContact.dn;
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
index 7744552c..a62cf022 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp
@@ -62,7 +62,7 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
// look for the status code
Field::FieldList responseFields = response->fields();
Field::SingleField * sf = responseFields.findSingleField( NM_A_UW_STATUS );
- m_querytqStatus = (SearchResultCode)sf->value().toInt();
+ m_queryStatus = (SearchResultCode)sf->value().toInt();
Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
if ( !resultsArray )
@@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer )
m_results.append( cd );
}
- if ( m_querytqStatus != DataRetrieved )
- setError( m_querytqStatus );
+ if ( m_queryStatus != DataRetrieved )
+ setError( m_queryStatus );
else
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl;
- setSuccess( m_querytqStatus );
+ setSuccess( m_queryStatus );
}
return true;
}
@@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results
return m_results;
}
-int GetChatSearchResultsTask::querytqStatus()
+int GetChatSearchResultsTask::queryStatus()
{
- return m_querytqStatus;
+ return m_queryStatus;
}
GroupWise::ChatroomSearchResult GetChatSearchResultsTask::extractChatDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
index bebe8ff7..5671a122 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h
@@ -42,11 +42,11 @@ class GetChatSearchResultsTask : public RequestTask
~GetChatSearchResultsTask();
void poll( int queryHandle);
bool take( Transfer * transfer );
- int querytqStatus();
+ int queryStatus();
TQValueList< GroupWise::ChatroomSearchResult > results();
private:
GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields );
- SearchResultCode m_querytqStatus;
+ SearchResultCode m_queryStatus;
TQValueList< GroupWise::ChatroomSearchResult > m_results;
};
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
index 86179b62..2b77e33e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp
@@ -61,7 +61,7 @@ bool GetStatusTask::take( Transfer * transfer )
// TODO: Check that the change to sending DNs above has fixed this problem.
status = sf->value().toInt();
// unfortunately getstatus doesn't give us an away message so we pass TQString() here
- emit gottqStatus( m_userDN, status, TQString() );
+ emit gotStatus( m_userDN, status, TQString() );
setSuccess();
}
else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
index bd291c62..aec5050f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h
@@ -37,7 +37,7 @@ public:
void userDN( const TQString & dn );
bool take( Transfer * transfer );
signals:
- void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+ void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
private:
TQString m_userDN;
};
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
index ed4f6bfd..b7b1f1cc 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp
@@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer )
void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details )
{
- client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( details.dn ) );
+ client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) );
TQStringList::Iterator it = m_unknowns.begin();
TQStringList::Iterator end = m_unknowns.end();
while( it != end )
{
TQString current = *it;
++it;
- client()->debug( TQString( " - can we remove %1?" ).tqarg(current ) );
+ client()->debug( TQString( " - can we remove %1?" ).arg(current ) );
if ( current == details.dn )
{
client()->debug( " - it's gone!" );
@@ -143,7 +143,7 @@ void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details
break;
}
}
- client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) );
+ client()->debug( TQString( " - now %1 unknowns").arg( m_unknowns.count() ) );
if ( m_unknowns.empty() )
{
client()->debug( " - finished()" );
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
index f3d55583..6a28124f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp
@@ -36,7 +36,7 @@ LoginTask::~LoginTask()
void LoginTask::initialise()
{
- TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() );
+ TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() );
Field::FieldList lst;
lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) );
@@ -123,7 +123,7 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer )
current = fl.findSingleField( NM_A_SZ_PARENT_ID );
folder.parentId = current->value().toInt();
- client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) );
+ client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg( folder.id ).arg( folder.parentId ).arg( folder.sequence ) );
// tell the world about it
emit gotFolder( folder );
}
@@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields )
Field::MultiField * mf2 = dynamic_cast<Field::MultiField *>( *custStatIt );
if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) )
{
- GroupWise::CustomtqStatus custom;
+ GroupWise::CustomStatus custom;
Field::FieldList fl2 = mf2->fields();
for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt )
{
if ( Field::SingleField * sf3 = dynamic_cast<Field::SingleField *>( *custContentIt ) )
{
if ( sf3->tag() == NM_A_SZ_TYPE )
- custom.status = (GroupWise::tqStatus)sf3->value().toInt();
+ custom.status = (GroupWise::Status)sf3->value().toInt();
else if ( sf3->tag() == NM_A_SZ_DISPLAY_NAME )
custom.name = sf3->value().toString();
else if ( sf3->tag() == NM_A_SZ_MESSAGE_BODY )
custom.autoReply = sf3->value().toString();
}
}
- emit gotCustomtqStatus( custom );
+ emit gotCustomStatus( custom );
}
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
index f37add97..fdeaeb9d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h
@@ -58,7 +58,7 @@ signals:
void gotContact( const ContactItem & );
void gotContactUserDetails( const GroupWise::ContactDetails & );
void gotPrivacySettings( bool locked, bool defaultDeny, const TQStringList & allowList, const TQStringList & denyList );
- void gotCustomtqStatus( const GroupWise::CustomtqStatus & );
+ void gotCustomStatus( const GroupWise::CustomStatus & );
void gotKeepalivePeriod( int );
};
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
index 5a1eb414..12c7382a 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp
@@ -38,7 +38,7 @@ void NeedFolderTask::slotFolderAdded( const FolderItem & addedFolder )
// if this is the folder we were trying to create
if ( m_folderDisplayName == addedFolder.name )
{
- client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) );
+ client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).arg( addedFolder.name ).arg( addedFolder.id ) );
m_folderId = addedFolder.id;
}
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
index 38870112..d65a5a20 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp
@@ -59,7 +59,7 @@ bool PollSearchResultsTask::take( Transfer * transfer )
// look for the status code
Field::FieldList responseFields = response->fields();
Field::SingleField * sf = responseFields.findSingleField( NM_A_SZ_STATUS );
- m_querytqStatus = sf->value().toInt();
+ m_queryStatus = sf->value().toInt();
Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS );
if ( !resultsArray )
@@ -90,10 +90,10 @@ bool PollSearchResultsTask::take( Transfer * transfer )
// followed by NM_A_FA_RESULTS, looks like a getdetails
// add an accessor to get at the results list of ContactItems, probably
- if ( m_querytqStatus != 2 )
- setError( m_querytqStatus );
+ if ( m_queryStatus != 2 )
+ setError( m_queryStatus );
else
- setSuccess( m_querytqStatus );
+ setSuccess( m_queryStatus );
return true;
}
@@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results()
return m_results;
}
-int PollSearchResultsTask::querytqStatus()
+int PollSearchResultsTask::queryStatus()
{
- return m_querytqStatus;
+ return m_queryStatus;
}
GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields )
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
index ccf0560b..c69b7e0c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h
@@ -42,11 +42,11 @@ public:
~PollSearchResultsTask();
void poll( const TQString & queryHandle);
bool take( Transfer * transfer );
- int querytqStatus();
+ int queryStatus();
TQValueList< GroupWise::ContactDetails > results();
GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields );
private:
- int m_querytqStatus;
+ int m_queryStatus;
TQValueList< GroupWise::ContactDetails > m_results;
};
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
index 7d4b41aa..44f54124 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp
@@ -50,7 +50,7 @@ void RequestTask::onGo()
{
if ( transfer() )
{
- client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast<Request *>( transfer() )->command() ) );
+ client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast<Request *>( transfer() )->command() ) );
send( static_cast<Request *>( transfer() ) );
}
else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
index 946450e9..87694eb4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp
@@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults()
void SearchChatTask::slotGotPollResults()
{
GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender();
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl;
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl;
m_polls++;
- switch ( gcsrt->querytqStatus() )
+ switch ( gcsrt->queryStatus() )
{
case GetChatSearchResultsTask::GettingData:
if ( m_polls < GW_POLL_MAXIMUM ) // restart timer
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
index 3dde5297..1b64c47d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp
@@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask()
void SearchUserTask::search( const TQValueList<UserSearchQueryTerm> & query )
{
- m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().toTime_t () );
+ m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () );
Field::FieldList lst;
if ( query.isEmpty() )
{
@@ -102,9 +102,9 @@ void SearchUserTask::slotPollForResults()
void SearchUserTask::slotGotPollResults()
{
PollSearchResultsTask * psrt = (PollSearchResultsTask *)sender();
- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl;
+ kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->queryStatus() << endl;
m_polls++;
- switch ( psrt->querytqStatus() )
+ switch ( psrt->queryStatus() )
{
case PollSearchResultsTask::Pending:
case PollSearchResultsTask::InProgess:
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
index 817df4a6..bf463407 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp
@@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask()
{
}
-void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply )
+void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply )
{
- if ( newtqStatus > GroupWise::Invalid )
+ if ( newStatus > GroupWise::Invalid )
{
setError( 1, "Invalid Status" );
return;
}
- m_status = newtqStatus;
+ m_status = newStatus;
m_awayMessage = awayMessage;
m_autoReply = autoReply;
Field::FieldList lst;
- lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) );
+ lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) );
if ( !awayMessage.isNull() )
lst.append( new Field::SingleField( NM_A_SZ_STATUS_TEXT, 0, NMFIELD_TYPE_UTF8, awayMessage ) );
if ( !autoReply.isNull() )
@@ -51,7 +51,7 @@ void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, c
createTransfer( "setstatus", lst );
}
-tqStatus SetStatusTask::requestedtqStatus() const
+Status SetStatusTask::requestedStatus() const
{
return m_status;
}
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
index 0c316220..4a7a753d 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h
@@ -34,12 +34,12 @@ Q_OBJECT
public:
SetStatusTask(Task* parent);
~SetStatusTask();
- void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply );
- GroupWise::tqStatus requestedtqStatus() const;
+ void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply );
+ GroupWise::Status requestedStatus() const;
TQString awayMessage() const;
TQString autoReply() const;
private:
- GroupWise::tqStatus m_status;
+ GroupWise::Status m_status;
TQString m_awayMessage;
TQString m_autoReply;
};
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
index 7076324a..e7272402 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp
@@ -37,8 +37,8 @@ bool StatusTask::take( Transfer * transfer )
if ( forMe( transfer, event ) )
{
client()->debug( "Got a status change!" );
- client()->debug( TQString( "%1 changed status to %2, message: %3" ).tqarg( event->source() ).tqarg( event->status() ).tqarg( event->statusText() ) );
- emit gottqStatus( event->source().lower(), event->status(), event->statusText() );
+ client()->debug( TQString( "%1 changed status to %2, message: %3" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) );
+ emit gotStatus( event->source().lower(), event->status(), event->statusText() );
return true;
}
else
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
index de5839d7..cc14bace 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h
@@ -35,7 +35,7 @@ public:
~StatusTask();
bool take( Transfer * transfer );
signals:
- void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
+ void gotStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText );
};
#endif
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 0eb61409..2dace60b 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
@@ -62,15 +62,15 @@ void buildList()
// sf - contactlist (empty field array)
// sf - message body
- Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
+ Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
fl.append( sf );
- sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) );
+ sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) );
fl.append( sf );
// nested list
Field::FieldList nl;
sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 );
nl.append( sf );
- sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) );
+ sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) );
nl.append( sf );
Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY );
mf->setFields( nl );
diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
index f87cfa25..ceb29632 100644
--- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp
@@ -88,7 +88,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
TQStringList::Iterator found = m_pendingDNs.find( *it );
if ( found == m_pendingDNs.end() )
{
- m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*it) ) );
+ m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) );
requestList.append( *it );
m_pendingDNs.append( *it );
}
@@ -110,7 +110,7 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU
void UserDetailsManager::requestDetails( const TQString & dn, bool onlyUnknown )
{
- m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) );
+ m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).arg( dn ) );
TQStringList list;
list.append( dn );
requestDetails( list, onlyUnknown );
diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
index 21f774b5..40917ccf 100644
--- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
+++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -121,7 +121,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<hbox>
<property name="name">
@@ -269,7 +269,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>91</height>
@@ -286,7 +286,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
index 5ece3882..a10bcc16 100644
--- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
+++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp
@@ -23,7 +23,7 @@
//#include <tqcombobox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistview.h>
#include <tqpushbutton.h>
diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
index 726376a5..c4f9a9c6 100644
--- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui
@@ -29,7 +29,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@@ -341,7 +341,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
index 63ffca38..1899a525 100644
--- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
+++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui
@@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>340</width>
<height>20</height>
diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
index e7b6ecb2..5a991a42 100644
--- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
+++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp
@@ -16,7 +16,7 @@
*************************************************************************
*/
-#include <tqclipboard.h>
+#include <clipboard.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <tqlineedit.h>
@@ -47,7 +47,7 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta
init();
// set up the contents of the props widget
m_propsWidget->m_userId->setText( contact->contactId() );
- m_propsWidget->m_status->setText( contact->onlinetqStatus().description() );
+ m_propsWidget->m_status->setText( contact->onlineStatus().description() );
m_propsWidget->m_displayName->setText( contact->metaContact()->displayName() );
m_propsWidget->m_firstName->setText( contact->property( Kopete::Global::Properties::self()->firstName() ).value().toString() );
m_propsWidget->m_lastName->setText( contact->property( Kopete::Global::Properties::self()->lastName() ).value().toString() );
@@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy()
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
if ( m_propsWidget->m_propsView->currentItem() )
{
- TQClipboard *cb = kapp->tqclipboard();
+ TQClipboard *cb = kapp->clipboard();
cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) );
}
}
diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
index b403abec..95481add 100644
--- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui
@@ -48,7 +48,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -73,7 +73,7 @@
<cstring>textLabel14</cstring>
</property>
<property name="text">
- <string>tqStatus:</string>
+ <string>Status:</string>
</property>
</widget>
<widget class="TQLineEdit" row="2" column="1">
diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
index e6c6a2f6..3713e31b 100644
--- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui
+++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
@@ -255,7 +255,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -264,7 +264,7 @@
<widget class="TQListView">
<column>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
<property name="clickable">
<bool>true</bool>
@@ -318,7 +318,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>141</height>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
index 9ef4caad..0e81a783 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -43,7 +43,7 @@
</widget>
<widget class="TQComboBox" row="0" column="1">
<property name="name">
- <cstring>m_cmbtqStatus</cstring>
+ <cstring>m_cmbStatus</cstring>
</property>
</widget>
<widget class="TQLabel" row="0" column="0">
@@ -51,7 +51,7 @@
<cstring>textLabel3</cstring>
</property>
<property name="text">
- <string>&amp;tqStatus:</string>
+ <string>&amp;Status:</string>
</property>
<property name="buddy" stdset="0">
<cstring>comboBox1</cstring>
diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
index 821c6030..0c3efcac 100644
--- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
+++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui
@@ -54,7 +54,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
index 7f049d7c..87296ab2 100644
--- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
+++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
@@ -20,7 +20,7 @@
*/
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui
index 1f4b6bcb..60fb63db 100644
--- a/kopete/protocols/groupwise/ui/gwprivacy.ui
+++ b/kopete/protocols/groupwise/ui/gwprivacy.ui
@@ -26,7 +26,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -34,7 +34,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>53</height>
@@ -142,7 +142,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>52</height>
@@ -153,7 +153,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
index e6179882..80daff71 100644
--- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp
@@ -49,7 +49,7 @@ private:
};
GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name )
- : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( account->accountId() ),
+ : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ),
KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ), m_dirty( false ), m_searchDlg(0)
{
m_privacy = new GroupWisePrivacyWidget( this );
@@ -343,7 +343,7 @@ void GroupWisePrivacyDialog::commitChanges()
void GroupWisePrivacyDialog::errorNotConnected()
{
KMessageBox::queuedMessageBox( this, KMessageBox::Information,
- i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").tqarg( m_account->accountId() ) );
+ i18n( "You can only change privacy settings while you are logged in to the GroupWise Messenger server." ) , i18n("'%1' Not Logged In").arg( m_account->accountId() ) );
}
#include "gwprivacydialog.moc"
diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
index 547de1b5..6005f61a 100644
--- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
+++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp
@@ -50,7 +50,7 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co
m_wid->m_contactName->setText( event.user );
m_wid->m_dateTime->setText( KGlobal::locale()->formatDateTime( event.timeStamp ) );
- m_wid->m_message->setText( TQString("<b>%1</b>").tqarg( event.message ) );
+ m_wid->m_message->setText( TQString("<b>%1</b>").arg( event.message ) );
setMainWidget( m_wid );
}
diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
index 48c061a9..2027c579 100644
--- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui
+++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
@@ -82,13 +82,13 @@
<property name="text">
<string>INVITE_MESSAGE</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 9dbdfc4a..e9d88985 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -54,14 +54,14 @@
#include <knotifyclient.h>
#include <kpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
-const TQString IRCAccount::CONFIG_CODECMIB = TQString::tqfromLatin1("Codec");
-const TQString IRCAccount::CONFIG_NETWORKNAME = TQString::tqfromLatin1("NetworkName");
-const TQString IRCAccount::CONFIG_NICKNAME = TQString::tqfromLatin1("NickName");
-const TQString IRCAccount::CONFIG_USERNAME = TQString::tqfromLatin1("UserName");
-const TQString IRCAccount::CONFIG_REALNAME = TQString::tqfromLatin1("RealName");
+const TQString IRCAccount::CONFIG_CODECMIB = TQString::fromLatin1("Codec");
+const TQString IRCAccount::CONFIG_NETWORKNAME = TQString::fromLatin1("NetworkName");
+const TQString IRCAccount::CONFIG_NICKNAME = TQString::fromLatin1("NickName");
+const TQString IRCAccount::CONFIG_USERNAME = TQString::fromLatin1("UserName");
+const TQString IRCAccount::CONFIG_REALNAME = TQString::fromLatin1("RealName");
IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const TQString &autoChan, const TQString& netName, const TQString &nickName)
: Kopete::PasswordedAccount(protocol, accountId, 0, true), autoConnect( autoChan ), commandSource(0)
@@ -79,7 +79,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
m_engine->addCustomCtcp( it.key(), it.data() );
- TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").tqarg(kapp->aboutData()->version());
+ TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").arg(kapp->aboutData()->version());
m_engine->setVersionString( version );
TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)),
@@ -100,8 +100,8 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
TQObject::connect(m_engine, TQT_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)),
this, TQT_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &)));
- TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)),
- this, TQT_SLOT(engineStatusChanged(KIRC::Engine::tqStatus)));
+ TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)),
+ this, TQT_SLOT(engineStatusChanged(KIRC::Engine::Status)));
TQObject::connect(m_engine, TQT_SIGNAL(incomingServerLoadTooHigh()),
this, TQT_SLOT(slotServerBusy()));
@@ -173,7 +173,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
/* Could not find this host. Add it to the networks structure */
m_network = new IRCNetwork;
- m_network->name = i18n("Temporary Network - %1").tqarg( hostName );
+ m_network->name = i18n("Temporary Network - %1").arg( hostName );
m_network->description = i18n("Network imported from previous version of Kopete, or an IRC URI");
IRCHost *host = new IRCHost;
@@ -204,7 +204,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
m_contactManager = new IRCContactManager(mNickName, this);
setMyself( m_contactManager->mySelf() );
- setAccountLabel( TQString::tqfromLatin1("%1@%2").tqarg(mNickName,networkName) );
+ setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) );
m_myServer = m_contactManager->myServer();
m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this,
@@ -226,7 +226,7 @@ void IRCAccount::slotNickInUse( const TQString &nick )
{
TQString newNick = KInputDialog::getText(
i18n("IRC Plugin"),
- i18n("The nickname %1 is already in use. Please enter an alternate nickname:").tqarg(nick),
+ i18n("The nickname %1 is already in use. Please enter an alternate nickname:").arg(nick),
nick);
if (newNick.isNull())
@@ -243,23 +243,23 @@ void IRCAccount::slotNickInUse( const TQString &nick )
void IRCAccount::slotNickInUseAlert( const TQString &nick )
{
- KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").tqarg(nick), i18n("IRC Plugin"));
+ KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").arg(nick), i18n("IRC Plugin"));
}
void IRCAccount::setAltNick( const TQString &altNick )
{
- configGroup()->writeEntry(TQString::tqfromLatin1( "altNick" ), altNick);
+ configGroup()->writeEntry(TQString::fromLatin1( "altNick" ), altNick);
}
const TQString IRCAccount::altNick() const
{
- return configGroup()->readEntry(TQString::tqfromLatin1("altNick"));
+ return configGroup()->readEntry(TQString::fromLatin1("altNick"));
}
void IRCAccount::setAutoShowServerWindow( bool show )
{
autoShowServerWindow = show;
- configGroup()->writeEntry(TQString::tqfromLatin1( "AutoShowServerWindow" ), autoShowServerWindow);
+ configGroup()->writeEntry(TQString::fromLatin1( "AutoShowServerWindow" ), autoShowServerWindow);
}
const TQString IRCAccount::networkName() const
@@ -306,8 +306,8 @@ void IRCAccount::setNetwork( const TQString &network )
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
i18n("<qt>The network associated with this account, <b>%1</b>, no longer exists. Please"
- " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").tqarg(network),
- i18n("Problem Loading %1").tqarg( accountId() ), 0 );
+ " ensure that the account has a valid network. The account will not be enabled until you do so.</qt>").arg(network),
+ i18n("Problem Loading %1").arg( accountId() ), 0 );
}
}
@@ -338,29 +338,29 @@ TQTextCodec *IRCAccount::codec() const
// FIXME: Move this to a dictionnary
void IRCAccount::setDefaultPart( const TQString &defaultPart )
{
- configGroup()->writeEntry( TQString::tqfromLatin1( "defaultPart" ), defaultPart );
+ configGroup()->writeEntry( TQString::fromLatin1( "defaultPart" ), defaultPart );
}
// FIXME: Move this to a dictionnary
void IRCAccount::setDefaultQuit( const TQString &defaultQuit )
{
- configGroup()->writeEntry( TQString::tqfromLatin1( "defaultQuit" ), defaultQuit );
+ configGroup()->writeEntry( TQString::fromLatin1( "defaultQuit" ), defaultQuit );
}
// FIXME: Move this to a dictionnary
const TQString IRCAccount::defaultPart() const
{
- TQString partMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultPart"));
+ TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart"));
if( partMsg.isEmpty() )
- return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() );
+ return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg( kapp->aboutData()->version() );
return partMsg;
}
const TQString IRCAccount::defaultQuit() const
{
- TQString quitMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultQuit"));
+ TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit"));
if( quitMsg.isEmpty() )
- return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(kapp->aboutData()->version());
+ return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg(kapp->aboutData()->version());
return quitMsg;
}
@@ -370,7 +370,7 @@ void IRCAccount::setCustomCtcpReplies( const TQMap< TQString, TQString > &replie
for( TQMap< TQString, TQString >::ConstIterator it = replies.begin(); it != replies.end(); ++it )
{
m_engine->addCustomCtcp( it.key(), it.data() );
- val.append( TQString::tqfromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) );
+ val.append( TQString::fromLatin1("%1=%2").arg( it.key() ).arg( it.data() ) );
}
configGroup()->writeEntry( "CustomCtcp", val );
@@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages,
KActionMenu *IRCAccount::actionMenu()
{
- TQString menuTitle = TQString::tqfromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlinetqStatus().description() );
+ TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() );
KActionMenu *mActionMenu = Kopete::Account::actionMenu();
@@ -455,14 +455,14 @@ void IRCAccount::connectWithPassword(const TQString &password)
{
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
- i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").tqarg(m_network->name),
+ i18n("<qt>The network associated with this account, <b>%1</b>, has no valid hosts. Please ensure that the account has a valid network.</qt>").arg(m_network->name),
i18n("Network is Empty"), 0 );
}
else if( currentHost == hosts.count() )
{
KMessageBox::queuedMessageBox(
Kopete::UI::Global::mainWidget(), KMessageBox::Error,
- i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").tqarg(m_network->name),
+ i18n("<qt>Kopete could not connect to any of the servers in the network associated with this account (<b>%1</b>). Please try again later.</qt>").arg(m_network->name),
i18n("Network is Unavailable"), 0 );
currentHost = 0;
@@ -490,7 +490,7 @@ void IRCAccount::connectWithPassword(const TQString &password)
}
IRCHost *host = hosts[ currentHost++ ];
- myServer()->appendMessage( i18n("Connecting to %1...").tqarg( host->host ) );
+ myServer()->appendMessage( i18n("Connecting to %1...").arg( host->host ) );
if( host->ssl )
myServer()->appendMessage( i18n("Using SSL") );
@@ -505,13 +505,13 @@ void IRCAccount::connectWithPassword(const TQString &password)
}
}
-void IRCAccount::engineStatusChanged(KIRC::Engine::tqStatus newtqStatus)
+void IRCAccount::engineStatusChanged(KIRC::Engine::Status newStatus)
{
kdDebug(14120) << k_funcinfo << endl;
- mySelf()->updatetqStatus();
+ mySelf()->updateStatus();
- switch (newtqStatus)
+ switch (newStatus)
{
case KIRC::Engine::Idle:
// Do nothing.
@@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands()
return;
if (!autoConnect.isEmpty())
- Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/join %1").tqarg(autoConnect), manager);
+ Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").arg(autoConnect), manager);
TQStringList commands(connectCommands());
for (TQStringList::Iterator it=commands.begin(); it != commands.end(); ++it)
@@ -597,7 +597,7 @@ void IRCAccount::slotSearchChannels()
if( !m_channelList )
{
m_channelList = new ChannelListDialog( m_engine,
- i18n("Channel List for %1").tqarg( m_engine->currentHost() ), this,
+ i18n("Channel List for %1").arg( m_engine->currentHost() ), this,
TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) );
}
else
@@ -653,17 +653,17 @@ void IRCAccount::slotShowServerWindow()
bool IRCAccount::isConnected()
{
-// return ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline );
+// return ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline );
return m_engine->isConnected();
}
void IRCAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason )
{
if ( status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
connect();
else if (status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
setAway( false );
else if ( status.status() == Kopete::OnlineStatus::Offline )
disconnect();
@@ -700,7 +700,7 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact *
return false;
}
- else if (contactId.startsWith(TQString::tqfromLatin1("#")))
+ else if (contactId.startsWith(TQString::fromLatin1("#")))
{
c = static_cast<IRCContact*>(contactManager()->findChannel(contactId, m));
}
@@ -714,8 +714,8 @@ bool IRCAccount::createContact( const TQString &contactId, Kopete::MetaContact *
{//This should NEVER happen
Kopete::MetaContact *old = c->metaContact();
c->setMetaContact( m );
- Kopete::ContactPtrList tqchildren = old->contacts();
- if (tqchildren.isEmpty())
+ Kopete::ContactPtrList children = old->contacts();
+ if (children.isEmpty())
Kopete::ContactList::self()->removeMetaContact( old );
}
else if( c->metaContact()->isTemporary() )
@@ -781,7 +781,7 @@ void IRCAccount::slotJoinChannel()
}
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").tqarg(chan),
+ i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").arg(chan),
i18n("IRC Plugin")
);
}
@@ -789,15 +789,15 @@ void IRCAccount::slotJoinChannel()
void IRCAccount::slotNewCtcpReply(const TQString &type, const TQString &/*target*/, const TQString &messageReceived)
{
- appendMessage( i18n("CTCP %1 REPLY: %2").tqarg(type).tqarg(messageReceived), InfoReply );
+ appendMessage( i18n("CTCP %1 REPLY: %2").arg(type).arg(messageReceived), InfoReply );
}
void IRCAccount::slotNoSuchNickname( const TQString &nick )
{
if( KIRC::Entity::isChannel(nick) )
- appendMessage( i18n("The channel \"%1\" does not exist").tqarg(nick), UnknownReply );
+ appendMessage( i18n("The channel \"%1\" does not exist").arg(nick), UnknownReply );
else
- appendMessage( i18n("The nickname \"%1\" does not exist").tqarg(nick), UnknownReply );
+ appendMessage( i18n("The nickname \"%1\" does not exist").arg(nick), UnknownReply );
}
void IRCAccount::appendMessage( const TQString &message, MessageType type )
@@ -852,7 +852,7 @@ void IRCAccount::appendMessage( const TQString &message, MessageType type )
if( destination == KNotify )
{
KNotifyClient::event(
- Kopete::UI::Global::mainWidget()->winId(), TQString::tqfromLatin1("irc_event"), message
+ Kopete::UI::Global::mainWidget()->winId(), TQString::fromLatin1("irc_event"), message
);
}
}
diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h
index 3e5bf304..0d8fc313 100644
--- a/kopete/protocols/irc/ircaccount.h
+++ b/kopete/protocols/irc/ircaccount.h
@@ -194,7 +194,7 @@ protected:
virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ;
private slots:
- void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus);
+ void engineStatusChanged(KIRC::Engine::Status newStatus);
void destroyed(IRCContact *contact);
diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp
index 6b19721c..f6c3f68e 100644
--- a/kopete/protocols/irc/ircaddcontactpage.cpp
+++ b/kopete/protocols/irc/ircaddcontactpage.cpp
@@ -23,7 +23,7 @@
#include "ircaccount.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqframe.h>
#include <tqtabwidget.h>
diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp
index 45121c34..94d67d3a 100644
--- a/kopete/protocols/irc/ircchannelcontact.cpp
+++ b/kopete/protocols/irc/ircchannelcontact.cpp
@@ -66,7 +66,7 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ
actionModeI = new KToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionHomePage = 0L;
- updatetqStatus();
+ updateStatus();
}
IRCChannelContact::~IRCChannelContact()
@@ -77,10 +77,10 @@ void IRCChannelContact::slotUpdateInfo()
{
/** This woudl be nice, but it generates server errors too often
- if( !manager(Kopete::Contact::CannotCreate) && onlinetqStatus() == m_protocol->m_ChannelStatusOnline )
- kircEngine()->writeMessage( TQString::tqfromLatin1("LIST %1").tqarg(m_nickName) );
+ if( !manager(Kopete::Contact::CannotCreate) && onlineStatus() == m_protocol->m_ChannelStatusOnline )
+ kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").arg(m_nickName) );
else
- setProperty( TQString::tqfromLatin1("channelMembers"), i18n("Members"), manager()->members().count() );
+ setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() );
*/
KIRC::Engine *engine = kircEngine();
@@ -88,7 +88,7 @@ void IRCChannelContact::slotUpdateInfo()
if (manager(Kopete::Contact::CannotCreate))
{
setProperty(m_protocol->propChannelMembers, manager()->members().count());
- engine->writeMessage(TQString::tqfromLatin1("WHO %1").tqarg(m_nickName));
+ engine->writeMessage(TQString::fromLatin1("WHO %1").arg(m_nickName));
}
else
{
@@ -102,7 +102,7 @@ void IRCChannelContact::slotUpdateInfo()
void IRCChannelContact::slotChannelListed( const TQString &channel, uint members, const TQString &topic )
{
if (!manager(Kopete::Contact::CannotCreate) &&
- onlinetqStatus() == m_protocol->m_ChannelStatusOnline &&
+ onlineStatus() == m_protocol->m_ChannelStatusOnline &&
channel.lower() == m_nickName.lower())
{
mTopic = topic;
@@ -126,9 +126,9 @@ void IRCChannelContact::toggleOperatorActions(bool enabled)
actionModeI->setEnabled(enabled);
}
-void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus)
+void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus)
{
- Q_UNUSED(oldtqStatus);
+ Q_UNUSED(oldStatus);
if (c == account()->myself()) {
if (status.internalStatus() & IRCProtocol::Operator) {
@@ -141,9 +141,9 @@ void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete
}
}
-void IRCChannelContact::updatetqStatus()
+void IRCChannelContact::updateStatus()
{
- KIRC::Engine::tqStatus status = kircEngine()->status();
+ KIRC::Engine::Status status = kircEngine()->status();
switch (status)
{
case KIRC::Engine::Idle:
@@ -251,7 +251,7 @@ void IRCChannelContact::slotAddNicknames()
else if( firstChar == '+')
status = m_protocol->m_UserStatusVoice;
else
- status = user->onlinetqStatus();
+ status = user->onlineStatus();
if( user != account->mySelf() )
manager()->addContact(user , status, true);
@@ -272,12 +272,12 @@ void IRCChannelContact::channelTopic(const TQString &topic)
if (mTopic.isEmpty()) {
Kopete::Message msg((Kopete::Contact*)this, mMyself,
- i18n("Topic for %1 is set empty.").tqarg(m_nickName),
+ i18n("Topic for %1 is set empty.").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
appendMessage(msg);
} else {
Kopete::Message msg((Kopete::Contact*)this, mMyself,
- i18n("Topic for %1 is %2").tqarg(m_nickName).tqarg(mTopic),
+ i18n("Topic for %1 is %2").arg(m_nickName).arg(mTopic),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
appendMessage(msg);
}
@@ -292,7 +292,7 @@ void IRCChannelContact::channelHomePage(const TQString &url)
void IRCChannelContact::join()
{
if (!manager(Kopete::Contact::CannotCreate) &&
- onlinetqStatus().status() == Kopete::OnlineStatus::Online)
+ onlineStatus().status() == Kopete::OnlineStatus::Online)
{
kdDebug() << k_funcinfo << "My nickname:" << m_nickName << endl;
kdDebug() << k_funcinfo << "My manager:" << manager(Kopete::Contact::CannotCreate) << endl;
@@ -362,7 +362,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname)
kdDebug() << k_funcinfo << "My view:" << manager(Kopete::Contact::CannotCreate)->view(false) << endl;
Kopete::Message msg((Kopete::Contact *)this, mMyself,
- i18n("You have joined channel %1").tqarg(m_nickName),
+ i18n("You have joined channel %1").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::PlainText,
CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
@@ -378,7 +378,7 @@ void IRCChannelContact::userJoinedChannel(const TQString &nickname)
contact->setOnlineStatus( m_protocol->m_UserStatusOnline );
manager()->addContact((Kopete::Contact *)contact, true);
Kopete::Message msg((Kopete::Contact *)this, mMyself,
- i18n("User <b>%1</b> joined channel %2").tqarg(nickname).tqarg(m_nickName),
+ i18n("User <b>%1</b> joined channel %2").arg(nickname).arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
manager()->appendMessage(msg);
@@ -413,9 +413,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic
TQString r;
if ((reason != nick) && (reason != nickKicked)) {
- r = i18n( "%1 was kicked by %2. Reason: %3" ).tqarg(nickKicked, nick, reason);
+ r = i18n( "%1 was kicked by %2. Reason: %3" ).arg(nickKicked, nick, reason);
} else {
- r = i18n( "%1 was kicked by %2." ).tqarg(nickKicked, nick);
+ r = i18n( "%1 was kicked by %2." ).arg(nickKicked, nick);
}
manager()->removeContact( c, r );
@@ -434,9 +434,9 @@ void IRCChannelContact::userKicked(const TQString &nick, const TQString &nickKic
TQString r;
if ((reason != nick) && (reason != nickKicked)) {
- r = i18n( "You were kicked from %1 by %2. Reason: %3" ).tqarg(m_nickName, nickKicked, reason);
+ r = i18n( "You were kicked from %1 by %2. Reason: %3" ).arg(m_nickName, nickKicked, reason);
} else {
- r = i18n( "You were kicked from %1 by %2." ).tqarg(m_nickName, nickKicked);
+ r = i18n( "You were kicked from %1 by %2." ).arg(m_nickName, nickKicked);
}
KMessageBox::error(Kopete::UI::Global::mainWidget(), r, i18n("IRC Plugin"));
@@ -468,7 +468,7 @@ void IRCChannelContact::setTopic(const TQString &topic)
else
{
Kopete::Message msg(account->myServer(), manager()->members(),
- i18n("You must be a channel operator on %1 to do that.").tqarg(m_nickName),
+ i18n("You must be a channel operator on %1 to do that.").arg(m_nickName),
Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
manager()->appendMessage(msg);
}
@@ -483,7 +483,7 @@ void IRCChannelContact::topicChanged(const TQString &nick, const TQString &newto
setProperty( m_protocol->propChannelTopic, mTopic );
manager()->setDisplayName( caption() );
Kopete::Message msg(account->myServer(), mMyself,
- i18n("%1 has changed the topic to: %2").tqarg(nick).tqarg(newtopic),
+ i18n("%1 has changed the topic to: %2").arg(nick).arg(newtopic),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW);
msg.setImportance(Kopete::Message::Low); //set the importance manualy to low
appendMessage(msg);
@@ -494,7 +494,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time)
IRCAccount *account = ircAccount();
Kopete::Message msg(account->myServer(), mMyself,
- i18n("Topic set by %1 at %2").tqarg(nick).tqarg(
+ i18n("Topic set by %1 at %2").arg(nick).arg(
KGlobal::locale()->formatDateTime(time, true)
), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
msg.setImportance(Kopete::Message::Low); //set the importance manualy to low
@@ -503,7 +503,7 @@ void IRCChannelContact::topicUser(const TQString &nick, const TQDateTime &time)
void IRCChannelContact::incomingModeChange( const TQString &nick, const TQString &mode )
{
- Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").tqarg(nick).tqarg(mode).tqarg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
+ Kopete::Message msg(this, mMyself, i18n("%1 sets mode %2 on %3").arg(nick).arg(mode).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW);
msg.setImportance( Kopete::Message::Low); //set the importance manualy to low
appendMessage(msg);
@@ -564,7 +564,7 @@ void IRCChannelContact::failedChanBanned()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because you have been banned.</qt>").tqarg(m_nickName),
+ i18n("<qt>You can not join %1 because you have been banned.</qt>").arg(m_nickName),
i18n("IRC Plugin") );
}
@@ -572,14 +572,14 @@ void IRCChannelContact::failedChanInvite()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").tqarg(m_nickName), i18n("IRC Plugin") );
+ i18n("<qt>You can not join %1 because it is set to invite only, and no one has invited you.</qt>").arg(m_nickName), i18n("IRC Plugin") );
}
void IRCChannelContact::failedChanFull()
{
manager()->deleteLater();
KMessageBox::error( Kopete::UI::Global::mainWidget(),
- i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").tqarg(m_nickName),
+ i18n("<qt>You can not join %1 because it has reached its user limit.</qt>").arg(m_nickName),
i18n("IRC Plugin") );
}
@@ -587,7 +587,7 @@ void IRCChannelContact::failedChankey()
{
bool ok;
TQString diaPassword = KInputDialog::getText( i18n( "IRC Plugin" ),
- i18n( "Please enter key for channel %1: ").tqarg(m_nickName),
+ i18n( "Please enter key for channel %1: ").arg(m_nickName),
TQString(),
&ok );
@@ -636,9 +636,9 @@ void IRCChannelContact::toggleMode( TQChar mode, bool enabled, bool update )
if( modeMap[mode] != enabled )
{
if( enabled )
- setMode( TQString::tqfromLatin1("+") + mode );
+ setMode( TQString::fromLatin1("+") + mode );
else
- setMode( TQString::tqfromLatin1("-") + mode );
+ setMode( TQString::fromLatin1("-") + mode );
}
}
@@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage()
const TQString IRCChannelContact::caption() const
{
- TQString cap = TQString::tqfromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
+ TQString cap = TQString::fromLatin1("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost());
if(!mTopic.isEmpty())
- cap.append( TQString::tqfromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) );
+ cap.append( TQString::fromLatin1(" - %1").arg(Kopete::Message::unescape(mTopic)) );
return cap;
}
diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h
index 67fa46c9..7906e0d1 100644
--- a/kopete/protocols/irc/ircchannelcontact.h
+++ b/kopete/protocols/irc/ircchannelcontact.h
@@ -96,7 +96,7 @@ public:
void newAction(const TQString &from, const TQString &action);
public slots:
- void updatetqStatus();
+ void updateStatus();
/**
* Sets the topic of this channel
@@ -128,7 +128,7 @@ private slots:
void slotUpdateInfo();
void slotHomepage();
void slotChannelListed(const TQString &channel, uint members, const TQString &topic);
- void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus);
+ void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus);
private:
KAction *actionJoin;
diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp
index 7df5894c..1ed783e1 100644
--- a/kopete/protocols/irc/irccontact.cpp
+++ b/kopete/protocols/irc/irccontact.cpp
@@ -22,7 +22,7 @@
#include <tqregexp.h>
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include "ircaccount.h"
#include "kopeteglobal.h"
@@ -67,8 +67,8 @@ IRCContact::IRCContact(IRCContactManager *contactManager, const TQString &nick,
TQObject::connect(engine, TQT_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)),
this, TQT_SLOT( slotUserDisconnected(const TQString&, const TQString&)));
- TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)),
- this, TQT_SLOT(updatetqStatus()));
+ TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)),
+ this, TQT_SLOT(updateStatus()));
engine->setCodec( m_nickName, codec() );
}
@@ -94,8 +94,8 @@ KIRC::Engine *IRCContact::kircEngine() const
bool IRCContact::isReachable()
{
- if (onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
- onlinetqStatus().status() != Kopete::OnlineStatus::Unknown)
+ if (onlineStatus().status() != Kopete::OnlineStatus::Offline &&
+ onlineStatus().status() != Kopete::OnlineStatus::Unknown)
return true;
return false;
@@ -111,7 +111,7 @@ const TQString IRCContact::formatedName() const
return TQString();
}
*/
-void IRCContact::updatetqStatus()
+void IRCContact::updateStatus()
{
}
@@ -122,12 +122,12 @@ void IRCContact::privateMessage(IRCContact *, IRCContact *, const TQString &)
void IRCContact::setCodec(const TQTextCodec *codec)
{
kircEngine()->setCodec(m_nickName, codec);
- metaContact()->setPluginData(m_protocol, TQString::tqfromLatin1("Codec"), TQString::number(codec->mibEnum()));
+ metaContact()->setPluginData(m_protocol, TQString::fromLatin1("Codec"), TQString::number(codec->mibEnum()));
}
const TQTextCodec *IRCContact::codec()
{
- TQString codecId = metaContact()->pluginData(m_protocol, TQString::tqfromLatin1("Codec"));
+ TQString codecId = metaContact()->pluginData(m_protocol, TQString::fromLatin1("Codec"));
TQTextCodec *codec = ircAccount()->codec();
if( !codecId.isEmpty() )
@@ -186,7 +186,7 @@ void IRCContact::slotUserDisconnected(const TQString &user, const TQString &reas
Kopete::Contact *c = locateUser( nickname );
if ( c )
{
- m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(reason), Kopete::Message::RichText);
+ m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").arg(reason), Kopete::Message::RichText);
c->setOnlineStatus(m_protocol->m_UserStatusOffline);
}
}
@@ -229,9 +229,9 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *)
// Two-liner in color:
// <span style="color:#403897">Hello<br />World</span>
- if (htmlString.find(TQString::tqfromLatin1("</span")) > -1)
+ if (htmlString.find(TQString::fromLatin1("</span")) > -1)
{
- TQRegExp findTags( TQString::tqfromLatin1("<span style=\"(.*)\">(.*)</span>") );
+ TQRegExp findTags( TQString::fromLatin1("<span style=\"(.*)\">(.*)</span>") );
findTags.setMinimal( true );
int pos = 0;
@@ -249,19 +249,19 @@ void IRCContact::slotSendMsg(Kopete::Message &message, Kopete::ChatSession *)
TQString attribute = (*attrPair).section(':',0,0);
TQString value = (*attrPair).section(':',1);
- if( attribute == TQString::tqfromLatin1("color") )
+ if( attribute == TQString::fromLatin1("color") )
{
int ircColor = KSParser::colorForHTML( value );
if( ircColor > -1 )
replacement.prepend( TQString( TQChar(0x03) ).append( TQString::number(ircColor) ) ).append( TQChar( 0x03 ) );
}
- else if( attribute == TQString::tqfromLatin1("font-weight") &&
- value == TQString::tqfromLatin1("600") ) {
+ else if( attribute == TQString::fromLatin1("font-weight") &&
+ value == TQString::fromLatin1("600") ) {
// Bolding
replacement.prepend( TQChar(0x02) ).append( TQChar(0x02) );
}
- else if( attribute == TQString::tqfromLatin1("text-decoration") &&
- value == TQString::tqfromLatin1("underline") ) {
+ else if( attribute == TQString::fromLatin1("text-decoration") &&
+ value == TQString::fromLatin1("underline") ) {
replacement.prepend( TQChar(31) ).append( TQChar(31) );
}
}
diff --git a/kopete/protocols/irc/irccontact.h b/kopete/protocols/irc/irccontact.h
index 823f23ae..a415929d 100644
--- a/kopete/protocols/irc/irccontact.h
+++ b/kopete/protocols/irc/irccontact.h
@@ -121,7 +121,7 @@ signals:
public slots:
void setCodec( const TQTextCodec *codec );
- virtual void updatetqStatus();
+ virtual void updateStatus();
protected slots:
virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *);
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index b60f5a58..a8b39299 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -72,7 +72,7 @@ IRCProtocol *IRCProtocol::s_protocol = 0L;
IRCProtocolHandler::IRCProtocolHandler() : Kopete::MimeTypeHandler( false )
{
- registerAsProtocolHandler( TQString::tqfromLatin1("irc") );
+ registerAsProtocolHandler( TQString::fromLatin1("irc") );
}
void IRCProtocolHandler::handleURL( const KURL &url ) const
@@ -90,7 +90,7 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const
return;
KUser user( getuid() );
- TQString accountId = TQString::tqfromLatin1("%1@%2:%3").tqarg(
+ TQString accountId = TQString::fromLatin1("%1@%2:%3").arg(
user.loginName(),
url.host(),
TQString::number(port)
@@ -149,141 +149,141 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList
m_StatusUnknown(Kopete::OnlineStatus::Unknown,
999, this, 999, "status_unknown", i18n("Status not available")),
- propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ),
- propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")),
- propHomepage(TQString::tqfromLatin1("homePage"), i18n("Home Page")),
+ propChannelTopic(TQString::fromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ),
+ propChannelMembers(TQString::fromLatin1("channelMembers"), i18n("Members")),
+ propHomepage(TQString::fromLatin1("homePage"), i18n("Home Page")),
propLastSeen(Kopete::Global::Properties::self()->lastSeen()),
- propUserInfo(TQString::tqfromLatin1("userInfo"), i18n("IRC User")),
- propServer(TQString::tqfromLatin1("ircServer"), i18n("IRC Server")),
- propChannels( TQString::tqfromLatin1("ircChannels"), i18n("IRC Channels")),
- propHops(TQString::tqfromLatin1("ircHops"), i18n("IRC Hops")),
- propFullName(TQString::tqfromLatin1("FormattedName"), i18n("Full Name")),
- propIsIdentified(TQString::tqfromLatin1("identifiedUser"), i18n("User Is Authenticated"))
+ propUserInfo(TQString::fromLatin1("userInfo"), i18n("IRC User")),
+ propServer(TQString::fromLatin1("ircServer"), i18n("IRC Server")),
+ propChannels( TQString::fromLatin1("ircChannels"), i18n("IRC Channels")),
+ propHops(TQString::fromLatin1("ircHops"), i18n("IRC Hops")),
+ propFullName(TQString::fromLatin1("FormattedName"), i18n("Full Name")),
+ propIsIdentified(TQString::fromLatin1("identifiedUser"), i18n("User Is Authenticated"))
{
// kdDebug(14120) << k_funcinfo << endl;
s_protocol = this;
- //m_status = m_unknowntqStatus = m_Unknown;
+ //m_status = m_unknownStatus = m_Unknown;
addAddressBookField("messaging/irc", Kopete::Plugin::MakeIndexField);
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("raw"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("raw"),
TQT_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /raw <text> - Sends the text in raw form to the server."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quote"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quote"),
TQT_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /quote <text> - Sends the text in quoted form to the server."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ctcp"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ctcp"),
TQT_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."), 2 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ping"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ping"),
TQT_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."), 1, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("motd"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("motd"),
TQT_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /motd [<server>] - Shows the message of the day for the current or the given server.") );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("list"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("list"),
TQT_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /list - List the public channels on the server.") );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("join"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("join"),
TQT_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /join <#channel 1> [<password>] - Joins the specified channel."), 1, 2 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("topic"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("topic"),
TQT_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /topic [<topic>] - Sets and/or displays the topic for the active channel.") );
//FIXME: Update help text
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whois"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whois"),
TQT_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /whois <nickname> - Display whois info on this user."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whowas"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whowas"),
TQT_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /whowas <nickname> - Display whowas info on this user."), 1, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("who"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("who"),
TQT_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /who <nickname|channel> - Display who info on this user/channel."), 1, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("query"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("query"),
TQT_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /query <nickname> [<message>] - Open a private chat with this user."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("mode"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("mode"),
TQT_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /mode <channel> <modes> - Set modes on the given channel."), 2 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("nick"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("nick"),
TQT_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /nick <nickname> - Change your nickname to the given one."), 1, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("me"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("me"),
TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /me <action> - Do something."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ame"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ame"),
TQT_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /ame <action> - Do something in every open chat."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("kick"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("kick"),
TQT_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires operator status).")
, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ban"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ban"),
TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator status)."),
1, 1 );
- Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("bannick"),
- TQString::tqfromLatin1("ban %1!*@*"),
+ Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("bannick"),
+ TQString::fromLatin1("ban %1!*@*"),
i18n("USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("op"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("op"),
TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to someone (requires operator status)."),
1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("deop"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("deop"),
TQT_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status from someone (requires operator status)."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("voice"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("voice"),
TQT_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to someone (requires operator status)."),
1);
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("devoice"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("devoice"),
TQT_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status from someone (requires operator status)."), 1 );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quit"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quit"),
TQT_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message.") );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("part"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("part"),
TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /part [<reason>] - Part from a channel, optionally leaving a message.") );
- Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("invite"),
+ Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("invite"),
TQT_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ),
i18n("USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."), 1 );
- Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("j"),
- TQString::tqfromLatin1("join %1"),
+ Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("j"),
+ TQString::fromLatin1("join %1"),
i18n("USAGE: /j <#channel 1> [<password>] - Alias for JOIN."), Kopete::CommandHandler::SystemAlias,
1, 2 );
- Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("msg"),
- TQString::tqfromLatin1("query %s"),
+ Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("msg"),
+ TQString::fromLatin1("query %s"),
i18n("USAGE: /msg <nickname> [<message>] - Alias for TQUERY <nickname> <message>."), Kopete::CommandHandler::SystemAlias, 1 );
TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)),
@@ -313,7 +313,7 @@ IRCProtocol::~IRCProtocol()
delete m_protocolHandler;
}
-const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCtqStatus status ) const
+const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCStatus status ) const
{
kdDebug(14120) << k_funcinfo << "Looking up status for " << status << endl;
@@ -376,7 +376,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg )
TQString messageText = msg.escapedBody();
//Add right click for channels, only replace text not in HTML tags
- messageText.replace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") );
+ messageText.replace( TQRegExp( TQString::fromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::fromLatin1("<span class=\"KopeteLink\" type=\"IRCChannel\">\\1</span>") );
msg.setBody( messageText, Kopete::Message::RichText );
}
@@ -391,7 +391,7 @@ TQPtrList<KAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Mes
{
activeNode = n;
activeAccount = static_cast<IRCAccount*>( m.from()->account() );
- if( e.getAttribute( TQString::tqfromLatin1("type") ) == TQString::tqfromLatin1("IRCChannel") )
+ if( e.getAttribute( TQString::fromLatin1("type") ) == TQString::fromLatin1("IRCChannel") )
return activeAccount->contactManager()->findChannel(
e.innerText().string() )->customContextMenuActions();
}
@@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m
else
{
static_cast<IRCAccount*>(manager->account())->engine()->
- writeRawMessage(TQString::tqfromLatin1("TOPIC %1").tqarg(chan->nickName()));
+ writeRawMessage(TQString::fromLatin1("TOPIC %1").arg(chan->nickName()));
}
}
else
@@ -536,7 +536,7 @@ void IRCProtocol::slotJoinCommand( const TQString &arg, Kopete::ChatSession *man
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.")
- .tqarg(args[0]), IRCAccount::ErrorReply );
+ .arg(args[0]), IRCAccount::ErrorReply );
}
}
@@ -556,7 +556,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession *
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.")
- .tqarg(argsList[1]), IRCAccount::ErrorReply );
+ .arg(argsList[1]), IRCAccount::ErrorReply );
}
}
else
@@ -568,7 +568,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession *
if( c && c->manager()->contactOnlineStatus( manager->myself() ) == m_UserStatusOp )
{
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::tqfromLatin1("INVITE %1 %2").tqarg( argsList[0] ).
+ TQString::fromLatin1("INVITE %1 %2").arg( argsList[0] ).
arg( c->nickName() )
);
}
@@ -599,7 +599,7 @@ void IRCProtocol::slotQueryCommand( const TQString &args, Kopete::ChatSession *m
else
{
static_cast<IRCAccount*>( manager->account() )->appendMessage(
- i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").tqarg(user),
+ i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").arg(user),
IRCAccount::ErrorReply );
}
}
@@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man
{
TQStringList argsList = Kopete::CommandHandler::parseArguments( args );
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::tqfromLatin1("WHO %1").tqarg( argsList.first() ) );
+ TQString::fromLatin1("WHO %1").arg( argsList.first() ) );
static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager );
}
@@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession *
{
TQStringList argsList = Kopete::CommandHandler::parseArguments( args );
static_cast<IRCAccount*>( manager->account() )->engine()->writeMessage(
- TQString::tqfromLatin1("WHOWAS %1").tqarg( argsList.first() ) );
+ TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) );
static_cast<IRCAccount*>( manager->account() )->setCurrentCommandSource( manager );
}
@@ -641,7 +641,7 @@ void IRCProtocol::slotModeCommand(const TQString &args, Kopete::ChatSession *man
{
TQStringList argsList = Kopete::CommandHandler::parseArguments( args );
static_cast<IRCAccount*>( manager->account() )->engine()->mode( argsList.front(),
- args.section( TQRegExp(TQString::tqfromLatin1("\\s+")), 1 ) );
+ args.section( TQRegExp(TQString::fromLatin1("\\s+")), 1 ) );
}
void IRCProtocol::slotMeCommand(const TQString &args, Kopete::ChatSession *manager)
@@ -668,7 +668,7 @@ void IRCProtocol::slotKickCommand(const TQString &args, Kopete::ChatSession *man
{
if (manager->contactOnlineStatus( manager->myself() ) == m_UserStatusOp)
{
- TQRegExp spaces(TQString::tqfromLatin1("\\s+"));
+ TQRegExp spaces(TQString::fromLatin1("\\s+"));
TQString nick = args.section( spaces, 0, 0);
TQString reason = args.section( spaces, 1);
Kopete::ContactPtrList members = manager->members();
@@ -691,7 +691,7 @@ void IRCProtocol::slotBanCommand( const TQString &args, Kopete::ChatSession *man
Kopete::ContactPtrList members = manager->members();
IRCChannelContact *chan = static_cast<IRCChannelContact*>( members.first() );
if( chan && chan->locateUser( argsList.front() ) )
- chan->setMode( TQString::tqfromLatin1("+b %1").tqarg( argsList.front() ) );
+ chan->setMode( TQString::fromLatin1("+b %1").arg( argsList.front() ) );
}
else
{
@@ -724,22 +724,22 @@ void IRCProtocol::slotPartCommand( const TQString &args, Kopete::ChatSession *ma
void IRCProtocol::slotOpCommand( const TQString &args, Kopete::ChatSession *manager )
{
- simpleModeChange( args, manager, TQString::tqfromLatin1("+o") );
+ simpleModeChange( args, manager, TQString::fromLatin1("+o") );
}
void IRCProtocol::slotDeopCommand( const TQString &args, Kopete::ChatSession *manager )
{
- simpleModeChange( args, manager, TQString::tqfromLatin1("-o") );
+ simpleModeChange( args, manager, TQString::fromLatin1("-o") );
}
void IRCProtocol::slotVoiceCommand( const TQString &args, Kopete::ChatSession *manager )
{
- simpleModeChange( args, manager, TQString::tqfromLatin1("+v") );
+ simpleModeChange( args, manager, TQString::fromLatin1("+v") );
}
void IRCProtocol::slotDevoiceCommand( const TQString &args, Kopete::ChatSession *manager )
{
- simpleModeChange( args, manager, TQString::tqfromLatin1("-v") );
+ simpleModeChange( args, manager, TQString::fromLatin1("-v") );
}
void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *manager, const TQString &mode )
@@ -754,7 +754,7 @@ void IRCProtocol::simpleModeChange( const TQString &args, Kopete::ChatSession *m
for( TQStringList::iterator it = argsList.begin(); it != argsList.end(); ++it )
{
if( chan->locateUser( *it ) )
- chan->setMode( TQString::tqfromLatin1("%1 %2").tqarg( mode ).tqarg( *it ) );
+ chan->setMode( TQString::fromLatin1("%1 %2").arg( mode ).arg( *it ) );
}
}
}
@@ -770,7 +770,7 @@ void IRCProtocol::editNetworks( const TQString &networkName )
if( !netConf )
{
netConf = new NetworkConfig( Kopete::UI::Global::mainWidget(), "network_config", true );
- netConf->host->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) );
+ netConf->host->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) );
netConf->upButton->setIconSet( SmallIconSet( "up" ) );
netConf->downButton->setIconSet( SmallIconSet( "down" ) );
@@ -827,7 +827,7 @@ void IRCProtocol::slotUpdateNetworkConfig()
netConf->hostList->clear();
for( TQValueList<IRCHost*>::iterator it = net->hosts.begin(); it != net->hosts.end(); ++it )
- netConf->hostList->insertItem( (*it)->host + TQString::tqfromLatin1(":") + TQString::number((*it)->port) );
+ netConf->hostList->insertItem( (*it)->host + TQString::fromLatin1(":") + TQString::number((*it)->port) );
// prevent nested event loop crash
disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
@@ -871,7 +871,7 @@ void IRCProtocol::storeCurrentHost()
void IRCProtocol::slotHostPortChanged( int value )
{
- TQString entryText = m_uiCurrentHostSelection + TQString::tqfromLatin1(":") + TQString::number( value );
+ TQString entryText = m_uiCurrentHostSelection + TQString::fromLatin1(":") + TQString::number( value );
// changeItem causes a take() and insert, and we don't want a selectionChanged() signal that sets all this off again.
disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
netConf->hostList->changeItem( entryText, netConf->hostList->currentItem() );
@@ -918,8 +918,8 @@ void IRCProtocol::slotDeleteNetwork()
if( KMessageBox::warningContinueCancel(
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>"
"Any accounts which use this network will have to be modified.</qt>")
- .tqarg(network), i18n("Deleting Network"),
- KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::tqfromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue )
+ .arg(network), i18n("Deleting Network"),
+ KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue )
{
disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) );
disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
@@ -944,14 +944,14 @@ void IRCProtocol::slotDeleteHost()
TQString hostName = netConf->host->text();
if ( KMessageBox::warningContinueCancel(
Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>")
- .tqarg(hostName), i18n("Deleting Host"),
- KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::tqfromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue )
+ .arg(hostName), i18n("Deleting Host"),
+ KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue )
{
IRCHost *host = m_hosts[ hostName ];
if ( host )
{
disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
- TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port);
+ TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port);
TQListBoxItem * justAdded = netConf->hostList->findItem( entryText );
netConf->hostList->removeItem( netConf->hostList->index( justAdded ) );
connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
@@ -971,12 +971,12 @@ void IRCProtocol::slotNewNetwork()
// create a new network struct
IRCNetwork *net = new IRCNetwork;
// give it the name of 'New Network' (incrementing number if needed)
- TQString netName = TQString::tqfromLatin1( "New Network" );
+ TQString netName = TQString::fromLatin1( "New Network" );
if ( m_networks.find( netName ) )
{
int newIdx = 1;
do {
- netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ );
+ netName = TQString::fromLatin1( "New Network #%1" ).arg( newIdx++ );
}
while ( m_networks.find( netName ) && newIdx < 100 );
if ( newIdx == 100 ) // pathological case
@@ -1019,7 +1019,7 @@ void IRCProtocol::slotNewHost()
IRCNetwork *net = m_networks[ netConf->networkList->currentText() ];
net->hosts.append( host );
// add it to the gui
- TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port);
+ TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port);
netConf->hostList->insertItem( entryText );
// select it in the gui
TQListBoxItem * justAdded = netConf->hostList->findItem( entryText );
@@ -1203,7 +1203,7 @@ void IRCProtocol::slotMoveServerUp()
if( currentPos > 0 )
{
netConf->hostList->removeItem( currentPos );
- TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + TQString::number( selectedHost->port );
+ TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port );
netConf->hostList->insertItem( entryText, --currentPos );
netConf->hostList->setSelected( currentPos, true );
}
@@ -1228,7 +1228,7 @@ void IRCProtocol::slotMoveServerDown()
if( currentPos < ( netConf->hostList->count() - 1 ) )
{
netConf->hostList->removeItem( currentPos );
- TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + TQString::number( selectedHost->port );
+ TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port );
netConf->hostList->insertItem( entryText, ++currentPos );
netConf->hostList->setSelected( currentPos, true );
}
diff --git a/kopete/protocols/irc/ircprotocol.h b/kopete/protocols/irc/ircprotocol.h
index 725f078a..662b7f8a 100644
--- a/kopete/protocols/irc/ircprotocol.h
+++ b/kopete/protocols/irc/ircprotocol.h
@@ -56,7 +56,7 @@ class IRCProtocolHandler : public Kopete::MimeTypeHandler
void handleURL( const KURL &url ) const;
};
-static const TQString CHAT_VIEW( TQString::tqfromLatin1("kopete_chatwindow") );
+static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") );
/**
* @author Nick Betcher <nbetcher@kde.org>
@@ -67,7 +67,7 @@ class IRCProtocol : public Kopete::Protocol
TQ_OBJECT
public:
- enum IRCtqStatus
+ enum IRCStatus
{
Offline = 1, //! An offline user.
Connecting = 2, //! User that is connecting.
@@ -105,7 +105,7 @@ public:
/**
* Maps the given IRC status to Kopete::OnlineStatus.
*/
- const Kopete::OnlineStatus statusLookup( IRCtqStatus status ) const;
+ const Kopete::OnlineStatus statusLookup( IRCStatus status ) const;
const Kopete::OnlineStatus m_ServerStatusOnline;
const Kopete::OnlineStatus m_ServerStatusOffline;
diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp
index 9188963f..5be40dff 100644
--- a/kopete/protocols/irc/ircservercontact.cpp
+++ b/kopete/protocols/irc/ircservercontact.cpp
@@ -63,12 +63,12 @@ IRCServerContact::IRCServerContact(IRCContactManager *contactManager, const TQSt
TQObject::connect(Kopete::ChatSessionManager::self(), TQT_SIGNAL(viewCreated(KopeteView*)),
this, TQT_SLOT(slotViewCreated(KopeteView*)) );
- updatetqStatus();
+ updateStatus();
}
-void IRCServerContact::updatetqStatus()
+void IRCServerContact::updateStatus()
{
- KIRC::Engine::tqStatus status = kircEngine()->status();
+ KIRC::Engine::Status status = kircEngine()->status();
switch( status )
{
case KIRC::Engine::Idle:
@@ -92,7 +92,7 @@ void IRCServerContact::updatetqStatus()
const TQString IRCServerContact::caption() const
{
- return i18n("%1 @ %2").tqarg(ircAccount()->mySelf()->nickName() ).tqarg(
+ return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg(
kircEngine()->currentHost().isEmpty() ? ircAccount()->networkName() : kircEngine()->currentHost()
);
}
@@ -147,7 +147,7 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString
// Prefix missing.
// NOTICE AUTH :*** Checking Ident
- ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(kircEngine()->currentHost(), notice),
+ ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(kircEngine()->currentHost(), notice),
IRCAccount::NoticeReply);
} else {
@@ -155,13 +155,13 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString
// :somenick!~fooobar@somehostname.fi NOTICE foobar :hello
if (orig.contains('!')) {
- ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg(
+ ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").arg(
orig.section('!', 0, 0),
orig.section('!', 1, 1),
notice),
IRCAccount::NoticeReply);
} else {
- ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(
+ ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(
orig, notice), IRCAccount::NoticeReply);
}
}
@@ -184,7 +184,7 @@ void IRCServerContact::slotIncomingMotd(const TQString &message)
void IRCServerContact::slotCannotSendToChannel(const TQString &channel, const TQString &message)
{
- ircAccount()->appendMessage(TQString::tqfromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply);
+ ircAccount()->appendMessage(TQString::fromLatin1("%1: %2").arg(channel).arg(message), IRCAccount::ErrorReply);
}
void IRCServerContact::appendMessage(Kopete::Message &msg)
diff --git a/kopete/protocols/irc/ircservercontact.h b/kopete/protocols/irc/ircservercontact.h
index b715a65b..f5167a9f 100644
--- a/kopete/protocols/irc/ircservercontact.h
+++ b/kopete/protocols/irc/ircservercontact.h
@@ -61,7 +61,7 @@ class IRCServerContact
virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *);
private slots:
- virtual void updatetqStatus();
+ virtual void updateStatus();
void slotViewCreated( KopeteView* );
void slotDumpMessages();
diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp
index f4b5af10..e579e94a 100644
--- a/kopete/protocols/irc/irctransferhandler.cpp
+++ b/kopete/protocols/irc/irctransferhandler.cpp
@@ -164,7 +164,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
// if (t->)
// kt->userAbort(i18n("User canceled transfer."));
// else
-// kt->userAbort(i18n("User canceled transfer for file:%1").tqarg(t->fileName()));
+// kt->userAbort(i18n("User canceled transfer for file:%1").arg(t->fileName()));
break;
default:
kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl;
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index bec7c4b7..c4607cb9 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -53,39 +53,39 @@ IRCUserContact::IRCUserContact(IRCContactManager *contactManager, const TQString
mInfo.away = false;
mInfo.online = metaContact()->isTemporary();
- updatetqStatus();
+ updateStatus();
}
-void IRCUserContact::updatetqStatus()
+void IRCUserContact::updateStatus()
{
//kdDebug(14120) << k_funcinfo << endl;
- Kopete::OnlineStatus newtqStatus;
+ Kopete::OnlineStatus newStatus;
switch (kircEngine()->status())
{
case KIRC::Engine::Idle:
- newtqStatus = m_protocol->m_UserStatusOffline;
+ newStatus = m_protocol->m_UserStatusOffline;
break;
case KIRC::Engine::Connecting:
case KIRC::Engine::Authentifying:
if (this == ircAccount()->mySelf())
- newtqStatus = m_protocol->m_UserStatusConnecting;
+ newStatus = m_protocol->m_UserStatusConnecting;
else
- newtqStatus = m_protocol->m_UserStatusOffline;
+ newStatus = m_protocol->m_UserStatusOffline;
break;
case KIRC::Engine::Connected:
case KIRC::Engine::Closing:
if (mInfo.away)
- newtqStatus = m_protocol->m_UserStatusAway;
+ newStatus = m_protocol->m_UserStatusAway;
else if (mInfo.online)
- newtqStatus = m_protocol->m_UserStatusOnline;
+ newStatus = m_protocol->m_UserStatusOnline;
break;
default:
- newtqStatus = m_protocol->m_StatusUnknown;
+ newStatus = m_protocol->m_StatusUnknown;
}
// Try hard not to emit several onlineStatusChanged() signals.
@@ -105,31 +105,31 @@ void IRCUserContact::updatetqStatus()
for( TQValueList<IRCChannelContact*>::iterator it = channels.begin(); it != channels.end(); ++it )
{
IRCChannelContact *channel = *it;
- Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this);
+ Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this);
- //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currenttqStatus.internalStatus() << endl;
+ //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currentStatus.internalStatus() << endl;
- if( currenttqStatus.internalStatus() >= IRCProtocol::Online )
+ if( currentStatus.internalStatus() >= IRCProtocol::Online )
{
onlineStatusChanged = true;
- if( !(currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusAway )
+ if( !(currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusAway )
{
- setOnlineStatus( newtqStatus );
+ setOnlineStatus( newStatus );
//kdDebug(14120) << k_funcinfo << "was NOT away, but is now, channel " << channel->nickName() << endl;
adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, AddBits);
}
- else if( (currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusOnline )
+ else if( (currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusOnline )
{
- setOnlineStatus( newtqStatus );
+ setOnlineStatus( newStatus );
//kdDebug(14120) << k_funcinfo << "was away, but not anymore, channel " << channel->nickName() << endl;
adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, RemoveBits);
}
- else if( newtqStatus.internalStatus() < IRCProtocol::Away )
+ else if( newStatus.internalStatus() < IRCProtocol::Away )
{
//kdDebug(14120) << k_funcinfo << "offline or connecting?" << endl;
- channel->manager()->setContactOnlineStatus( this, newtqStatus );
+ channel->manager()->setContactOnlineStatus( this, newStatus );
}
}
}
@@ -137,7 +137,7 @@ void IRCUserContact::updatetqStatus()
if (!onlineStatusChanged) {
//kdDebug(14120) << k_funcinfo << "setting status at last" << endl;
- setOnlineStatus( newtqStatus );
+ setOnlineStatus( newStatus );
}
}
@@ -162,10 +162,10 @@ void IRCUserContact::slotUserOffline()
mInfo.online = false;
mInfo.away = false;
- updatetqStatus();
+ updateStatus();
if( !metaContact()->isTemporary() )
- kircEngine()->writeMessage( TQString::tqfromLatin1("WHOWAS %1").tqarg(m_nickName) );
+ kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").arg(m_nickName) );
removeProperty( m_protocol->propUserInfo );
removeProperty( m_protocol->propServer );
@@ -177,7 +177,7 @@ void IRCUserContact::setAway(bool isAway)
//kdDebug(14120) << k_funcinfo << isAway << endl;
mInfo.away = isAway;
- updatetqStatus();
+ updateStatus();
}
void IRCUserContact::incomingUserIsAway(const TQString &reason)
@@ -185,7 +185,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason)
if( manager( Kopete::Contact::CannotCreate ) )
{
Kopete::Message msg( (Kopete::Contact*)ircAccount()->myServer(), mMyself,
- i18n("%1 is away (%2)").tqarg( m_nickName ).tqarg( reason ),
+ i18n("%1 is away (%2)").arg( m_nickName ).arg( reason ),
Kopete::Message::Internal, Kopete::Message::RichText, CHAT_VIEW );
manager(Kopete::Contact::CanCreate)->appendMessage(msg);
}
@@ -194,7 +194,7 @@ void IRCUserContact::incomingUserIsAway(const TQString &reason)
void IRCUserContact::userOnline()
{
mInfo.online = true;
- updatetqStatus();
+ updateStatus();
if (this != ircAccount()->mySelf() && !metaContact()->isTemporary() && ircAccount()->isConnected())
{
mOnlineTimer->start( 45000, true );
@@ -216,27 +216,27 @@ void IRCUserContact::slotUserInfo()
const TQString IRCUserContact::caption() const
{
- return i18n("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost());
+ return i18n("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost());
}
void IRCUserContact::slotOp()
{
- contactMode( TQString::tqfromLatin1("+o") );
+ contactMode( TQString::fromLatin1("+o") );
}
void IRCUserContact::slotDeop()
{
- contactMode( TQString::tqfromLatin1("-o") );
+ contactMode( TQString::fromLatin1("-o") );
}
void IRCUserContact::slotVoice()
{
- contactMode( TQString::tqfromLatin1("+v") );
+ contactMode( TQString::fromLatin1("+v") );
}
void IRCUserContact::slotDevoice()
{
- contactMode( TQString::tqfromLatin1("-v") );
+ contactMode( TQString::fromLatin1("-v") );
}
void IRCUserContact::slotBanHost()
@@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce()
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@%1").tqarg(mInfo.hostName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").arg(mInfo.hostName));
}
void IRCUserContact::slotBanUserHost()
@@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce()
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").arg(mInfo.userName, mInfo.hostName));
}
void IRCUserContact::slotBanDomain()
@@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce()
TQString domain = mInfo.hostName.section('.', 1);
- kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@*.%1").tqarg(domain));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").arg(domain));
}
void IRCUserContact::slotBanUserDomain()
@@ -336,7 +336,7 @@ void IRCUserContact::slotBanUserDomainOnce()
TQString domain = mInfo.hostName.section('.', 1);
- kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain));
+ kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").arg(mInfo.userName, domain));
}
void IRCUserContact::slotKick()
@@ -350,7 +350,7 @@ void IRCUserContact::contactMode(const TQString &mode)
{
Kopete::ContactPtrList members = mActiveManager->members();
TQString channelName = static_cast<IRCContact*>(members.first())->nickName();
- kircEngine()->mode(channelName, TQString::tqfromLatin1("%1 %2").tqarg(mode).tqarg(m_nickName));
+ kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").arg(mode).arg(m_nickName));
}
void IRCUserContact::slotCtcpPing()
@@ -370,10 +370,10 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host
mInfo.hostName = hostname;
mInfo.realName = realname;
- if( onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
+ if( onlineStatus().status() == Kopete::OnlineStatus::Offline )
{
- setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2")
- .tqarg(mInfo.userName).tqarg(mInfo.hostName) );
+ setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2")
+ .arg(mInfo.userName).arg(mInfo.hostName) );
setProperty( m_protocol->propServer, mInfo.serverName );
setProperty( m_protocol->propFullName, mInfo.realName );
}
@@ -382,8 +382,8 @@ void IRCUserContact::newWhoIsUser(const TQString &username, const TQString &host
void IRCUserContact::newWhoIsServer(const TQString &servername, const TQString &serverinfo)
{
mInfo.serverName = servername;
- if( metaContact()->isTemporary() || onlinetqStatus().status() == Kopete::OnlineStatus::Online
- || onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ if( metaContact()->isTemporary() || onlineStatus().status() == Kopete::OnlineStatus::Online
+ || onlineStatus().status() == Kopete::OnlineStatus::Away )
mInfo.serverInfo = serverinfo;
else
{
@@ -433,26 +433,26 @@ void IRCUserContact::whoIsComplete()
{
//User info
TQString msg = i18n("%1 is (%2@%3): %4<br/>")
- .tqarg(m_nickName)
- .tqarg(mInfo.userName)
- .tqarg(mInfo.hostName)
- .tqarg(mInfo.realName);
+ .arg(m_nickName)
+ .arg(mInfo.userName)
+ .arg(mInfo.hostName)
+ .arg(mInfo.realName);
if( mInfo.isIdentified )
- msg += i18n("%1 is authenticated with NICKSERV<br/>").tqarg(m_nickName);
+ msg += i18n("%1 is authenticated with NICKSERV<br/>").arg(m_nickName);
if( mInfo.isOperator )
- msg += i18n("%1 is an IRC operator<br/>").tqarg(m_nickName);
+ msg += i18n("%1 is an IRC operator<br/>").arg(m_nickName);
//Channels
- msg += i18n("on channels %1<br/>").tqarg(mInfo.channels.join(" ; "));
+ msg += i18n("on channels %1<br/>").arg(mInfo.channels.join(" ; "));
//Server
- msg += i18n("on IRC via server %1 ( %2 )<br/>").tqarg(mInfo.serverName).tqarg(mInfo.serverInfo);
+ msg += i18n("on IRC via server %1 ( %2 )<br/>").arg(mInfo.serverName).arg(mInfo.serverInfo);
//Idle
TQString idleTime = formattedIdleTime();
- msg += i18n("idle: %2<br/>").tqarg( idleTime.isEmpty() ? TQString::number(0) : idleTime );
+ msg += i18n("idle: %2<br/>").arg( idleTime.isEmpty() ? TQString::number(0) : idleTime );
//End
ircAccount()->appendMessage(msg, IRCAccount::InfoReply );
@@ -466,12 +466,12 @@ void IRCUserContact::whoWasComplete()
{
//User info
TQString msg = i18n("%1 was (%2@%3): %4\n")
- .tqarg(m_nickName)
- .tqarg(mInfo.userName)
- .tqarg(mInfo.hostName)
- .tqarg(mInfo.realName);
+ .arg(m_nickName)
+ .arg(mInfo.userName)
+ .arg(mInfo.hostName)
+ .arg(mInfo.realName);
- msg += i18n("Last Online: %1\n").tqarg(
+ msg += i18n("Last Online: %1\n").arg(
KGlobal::locale()->formatDateTime(
property( m_protocol->propLastSeen ).value().toDateTime()
)
@@ -489,8 +489,8 @@ TQString IRCUserContact::formattedName() const
void IRCUserContact::updateInfo()
{
- setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2")
- .tqarg(mInfo.userName).tqarg(mInfo.hostName) );
+ setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2")
+ .arg(mInfo.userName).arg(mInfo.hostName) );
setProperty( m_protocol->propServer, mInfo.serverName );
setProperty( m_protocol->propChannels, mInfo.channels.join(" ") );
setProperty( m_protocol->propHops, TQString::number(mInfo.hops) );
@@ -667,32 +667,32 @@ void IRCUserContact::slotIncomingModeChange( const TQString &channel, const TQSt
void IRCUserContact::adjustInternalOnlineStatusBits(IRCChannelContact *channel, unsigned statusAdjustment, bitAdjustment adj)
{
- Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this);
- Kopete::OnlineStatus newtqStatus;
+ Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this);
+ Kopete::OnlineStatus newStatus;
if (adj == RemoveBits) {
// If the bit is not set in the current internal status, stop here.
- if ((currenttqStatus.internalStatus() & ~statusAdjustment) == currenttqStatus.internalStatus())
+ if ((currentStatus.internalStatus() & ~statusAdjustment) == currentStatus.internalStatus())
return;
- newtqStatus = m_protocol->statusLookup(
- (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() & ~statusAdjustment)
+ newStatus = m_protocol->statusLookup(
+ (IRCProtocol::IRCStatus)(currentStatus.internalStatus() & ~statusAdjustment)
);
} else if (adj == AddBits) {
// If the bit is already set in the current internal status, stop here.
- if ((currenttqStatus.internalStatus() | statusAdjustment) == currenttqStatus.internalStatus())
+ if ((currentStatus.internalStatus() | statusAdjustment) == currentStatus.internalStatus())
return;
- newtqStatus = m_protocol->statusLookup(
- (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() | statusAdjustment)
+ newStatus = m_protocol->statusLookup(
+ (IRCProtocol::IRCStatus)(currentStatus.internalStatus() | statusAdjustment)
);
}
- channel->manager()->setContactOnlineStatus(this, newtqStatus);
+ channel->manager()->setContactOnlineStatus(this, newStatus);
}
void IRCUserContact::privateMessage(IRCContact *from, IRCContact *to, const TQString &message)
diff --git a/kopete/protocols/irc/ircusercontact.h b/kopete/protocols/irc/ircusercontact.h
index 269cd40c..dbf4b51c 100644
--- a/kopete/protocols/irc/ircusercontact.h
+++ b/kopete/protocols/irc/ircusercontact.h
@@ -94,7 +94,7 @@ public:
public slots:
/** \brief Updates online status for channels based on current internal status.
*/
- virtual void updatetqStatus();
+ virtual void updateStatus();
virtual void sendFile(const KURL &sourceURL, const TQString&, unsigned int);
diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp
index 5dca8771..1560ea9b 100644
--- a/kopete/protocols/irc/kcodecaction.cpp
+++ b/kopete/protocols/irc/kcodecaction.cpp
@@ -15,7 +15,7 @@
*************************************************************************
*/
#include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kcharsets.h>
#include "kcodecaction.h"
diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp
index 79ff605e..ab7f1127 100644
--- a/kopete/protocols/irc/ksparser.cpp
+++ b/kopete/protocols/irc/ksparser.cpp
@@ -25,7 +25,7 @@ Modified by Jason Keirstead <jason@keirstead.org>
#include <kdebug.h>
#include <tqbuffer.h>
#include <tqdatastream.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include "ksparser.h"
#include <stdlib.h>
@@ -117,17 +117,17 @@ TQCString KSParser::_parse(const TQCString &message)
}
else
{
- toAppend = popTag(TQString::tqfromLatin1("span"));
+ toAppend = popTag(TQString::fromLatin1("span"));
}
break;
case 0x07: //System bell: ^G
- KNotifyClient::beep( TQString::tqfromLatin1("IRC beep event received in a message") );
+ KNotifyClient::beep( TQString::fromLatin1("IRC beep event received in a message") );
break;
case '\t': // 0x09
- toAppend = TQString::tqfromLatin1("&nbsp;&nbsp;&nbsp;&nbsp;");
+ toAppend = TQString::fromLatin1("&nbsp;&nbsp;&nbsp;&nbsp;");
break;
case '\n': // 0x0D
- toAppend= TQString::tqfromLatin1("<br/>");
+ toAppend= TQString::fromLatin1("<br/>");
break;
case 0x0D: // Italics: ^N
toAppend = toggleTag("i");
@@ -145,14 +145,14 @@ TQCString KSParser::_parse(const TQCString &message)
toAppend = toggleTag("u");
break;
case '<':
- toAppend = TQString::tqfromLatin1("&lt;");
+ toAppend = TQString::fromLatin1("&lt;");
break;
case '>':
- toAppend = TQString::tqfromLatin1("&gt;");
+ toAppend = TQString::fromLatin1("&gt;");
break;
default:
if (cur < TQChar(' ')) // search for control characters
- toAppend = TQString::tqfromLatin1("&lt;%1&gt;").tqarg(cur, 2, 16).upper();
+ toAppend = TQString::fromLatin1("&lt;%1&gt;").arg(cur, 2, 16).upper();
else
toAppend = TQStyleSheet::escape(cur);
}
@@ -193,14 +193,14 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor)
TQString tagStyle;
if (fgColor.isValid())
- tagStyle += TQString::tqfromLatin1("color:%1;").tqarg(fgColor.name());
+ tagStyle += TQString::fromLatin1("color:%1;").arg(fgColor.name());
if (bgColor.isValid())
- tagStyle += TQString::tqfromLatin1("background-color:%1;").tqarg(bgColor.name());
+ tagStyle += TQString::fromLatin1("background-color:%1;").arg(bgColor.name());
if(!tagStyle.isEmpty())
- tagStyle = TQString::tqfromLatin1("style=\"%1\"").tqarg(tagStyle);
+ tagStyle = TQString::fromLatin1("style=\"%1\"").arg(tagStyle);
- return pushTag(TQString::tqfromLatin1("span"), tagStyle);;
+ return pushTag(TQString::fromLatin1("span"), tagStyle);;
}
TQString KSParser::popTag(const TQString &tag)
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index ac1fd698..8a81d848 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqtimer.h>
//Needed for getuid / getpwuid
@@ -51,10 +51,10 @@ using namespace KIRC;
/* Please note that the regular expression "[\\r\\n]*$" is used in a TQString::replace statement many times.
* This gets rid of trailing \r\n, \r, \n, and \n\r characters.
*/
-const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") );
+const TQRegExp Engine::m_RemoveLinefeeds( TQString::fromLatin1("[\\r\\n]*$") );
Engine::Engine(TQObject *parent, const char *name)
- : TQObject(parent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()),
+ : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()),
m_status(Idle),
m_FailedNickOnLogin(false),
m_useSSL(false),
@@ -74,9 +74,9 @@ Engine::Engine(TQObject *parent, const char *name)
bindNumericReplies();
bindCtcp();
- m_VersionString = TQString::tqfromLatin1("Anonymous client using the KIRC engine.");
- m_UserString = TQString::tqfromLatin1("Response not supplied by user.");
- m_SourceString = TQString::tqfromLatin1("Unknown client, known source.");
+ m_VersionString = TQString::fromLatin1("Anonymous client using the KIRC engine.");
+ m_UserString = TQString::fromLatin1("Response not supplied by user.");
+ m_SourceString = TQString::fromLatin1("Unknown client, known source.");
defaultCodec = TQTextCodec::codecForMib(106); // UTF8 mib is 106
kdDebug(14120) << "Setting default engine codec, " << defaultCodec->name() << endl;
@@ -133,14 +133,14 @@ void Engine::setUseSSL( bool useSSL )
}
}
-void Engine::settqStatus(Engine::tqStatus status)
+void Engine::setStatus(Engine::Status status)
{
kdDebug(14120) << k_funcinfo << status << endl;
if (m_status == status)
return;
-// Engine::tqStatus oldtqStatus = m_status;
+// Engine::Status oldStatus = m_status;
m_status = status;
emit statusChanged(status);
@@ -169,16 +169,16 @@ void Engine::settqStatus(Engine::tqStatus status)
case Closing:
m_sock->close();
m_sock->reset();
- settqStatus(Idle);
+ setStatus(Idle);
break;
case AuthentifyingFailed:
- settqStatus(Closing);
+ setStatus(Closing);
break;
case Timeout:
- settqStatus(Closing);
+ setStatus(Closing);
break;
case Disconnected:
- settqStatus(Closing);
+ setStatus(Closing);
break;
}
}
@@ -200,23 +200,23 @@ void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQStrin
if( m_sock->startAsyncConnect() == 0 )
{
kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl;
- settqStatus(Connecting);
+ setStatus(Connecting);
}
else
{
kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl;
- settqStatus(Disconnected);
+ setStatus(Disconnected);
}
}
void Engine::slotConnected()
{
- settqStatus(Authentifying);
+ setStatus(Authentifying);
}
void Engine::slotConnectionClosed()
{
- settqStatus(Disconnected);
+ setStatus(Disconnected);
}
void Engine::error(int errCode)
@@ -225,7 +225,7 @@ void Engine::error(int errCode)
if (m_sock->socketStatus () != KExtendedSocket::connecting)
{
// Connection in progress.. This is a signal fired wrong
- settqStatus(Disconnected);
+ setStatus(Disconnected);
}
}
@@ -250,7 +250,7 @@ void Engine::setSourceString(const TQString &newString)
void Engine::setUserName(const TQString &newName)
{
if(newName.isEmpty())
- m_Username = TQString::tqfromLatin1(getpwuid(getuid())->pw_name);
+ m_Username = TQString::fromLatin1(getpwuid(getuid())->pw_name);
else
m_Username = newName;
m_Username.remove(m_RemoveLinefeeds);
@@ -259,7 +259,7 @@ void Engine::setUserName(const TQString &newName)
void Engine::setRealName(const TQString &newName)
{
if(newName.isEmpty())
- m_realName = TQString::tqfromLatin1(getpwuid(getuid())->pw_gecos);
+ m_realName = TQString::fromLatin1(getpwuid(getuid())->pw_gecos);
else
m_realName = newName;
m_realName.remove(m_RemoveLinefeeds);
@@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict<MessageRedirector> &map, Me
kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl;
writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(),
- TQString::tqfromLatin1("%1 internal error(s)").tqarg(errors.size()));
+ TQString::fromLatin1("%1 internal error(s)").arg(errors.size()));
}
else
{
diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h
index 1be8651c..9f488d47 100644
--- a/kopete/protocols/irc/libkirc/kircengine.h
+++ b/kopete/protocols/irc/libkirc/kircengine.h
@@ -72,7 +72,7 @@ class Engine
// TQ_PROPERTY(TQString nick READ nick)
// TQ_PROPERTY(TQStringList portList)
- Q_ENUMS(tqStatus)
+ Q_ENUMS(Status)
public:
enum Error
@@ -84,7 +84,7 @@ public:
MethodFailed
};
- enum tqStatus
+ enum Status
{
Idle,
Connecting,
@@ -165,7 +165,7 @@ public:
KExtendedSocket *socket()
{ return m_sock; };
- inline KIRC::Engine::tqStatus status() const
+ inline KIRC::Engine::Status status() const
{ return m_status; }
inline bool isDisconnected() const
@@ -275,7 +275,7 @@ public slots:
void showInfoDialog();
signals:
- void statusChanged(KIRC::Engine::tqStatus newtqStatus);
+ void statusChanged(KIRC::Engine::Status newStatus);
void internalError(KIRC::Engine::Error, KIRC::Message &);
void receivedMessage(KIRC::Message &);
@@ -479,7 +479,7 @@ private:
void bindNumericReplies();
void bindCtcp();
- void settqStatus(KIRC::Engine::tqStatus status);
+ void setStatus(KIRC::Engine::Status status);
bool invokeCtcpCommandOfMessage(const TQDict<KIRC::MessageRedirector> &map, KIRC::Message &message);
/*
@@ -493,7 +493,7 @@ private:
//Static regexes
static const TQRegExp m_RemoveLinefeeds;
- KIRC::Engine::tqStatus m_status;
+ KIRC::Engine::Status m_status;
TQString m_Host;
TQ_UINT16 m_Port;
diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
index e0e63909..acea30e7 100644
--- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp
@@ -48,7 +48,7 @@ void Engine::away(bool isAway, const TQString &awayMessage)
if( !awayMessage.isEmpty() )
writeMessage("AWAY", TQString(), awayMessage);
else
- writeMessage("AWAY", TQString(), TQString::tqfromLatin1("I'm away."));
+ writeMessage("AWAY", TQString(), TQString::fromLatin1("I'm away."));
else
writeMessage("AWAY", TQString());
}
@@ -56,20 +56,20 @@ void Engine::away(bool isAway, const TQString &awayMessage)
// FIXME: Really handle this message
void Engine::error(Message &)
{
- settqStatus(Closing);
+ setStatus(Closing);
}
void Engine::ison(const TQStringList &nickList)
{
if (!nickList.isEmpty())
{
- TQString statement = TQString::tqfromLatin1("ISON");
+ TQString statement = TQString::fromLatin1("ISON");
for (TQStringList::ConstIterator it = nickList.begin(); it != nickList.end(); ++it)
{
if ((statement.length()+(*it).length())>509) // 512(max buf)-2("\r\n")-1(<space separator>)
{
writeMessage(statement);
- statement = TQString::tqfromLatin1("ISON ") + (*it);
+ statement = TQString::fromLatin1("ISON ") + (*it);
}
else
statement.append(TQChar(' ') + (*it));
@@ -201,7 +201,7 @@ void Engine::quit(const TQString &reason, bool /*now*/)
if (isConnected())
writeMessage("QUIT", TQString(), reason);
- settqStatus(Closing);
+ setStatus(Closing);
}
void Engine::quit(Message &msg)
diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
index 05477710..0159f790 100644
--- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp
@@ -109,10 +109,10 @@ bool Engine::CtcpReply_action(Message &msg)
// FIXME: the API can now answer to help commands.
void Engine::CtcpQuery_clientinfo(Message &msg)
{
- TQString clientinfo = customCtcpMap[ TQString::tqfromLatin1("clientinfo") ];
+ TQString clientinfo = customCtcpMap[ TQString::fromLatin1("clientinfo") ];
if (clientinfo.isNull())
- clientinfo = TQString::tqfromLatin1("The following commands are supported, but "
+ clientinfo = TQString::fromLatin1("The following commands are supported, but "
"without sub-command help: VERSION, CLIENTINFO, USERINFO, TIME, SOURCE, PING,"
"ACTION.");
@@ -132,8 +132,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
case Transfer::Chat:
{
writeCtcpQueryMessage(nickname, TQString(),
- TQString::tqfromLatin1("DCC"),
- TQStringList(TQString::tqfromLatin1("CHAT")) << TQString::tqfromLatin1("chat") <<
+ TQString::fromLatin1("DCC"),
+ TQStringList(TQString::fromLatin1("CHAT")) << TQString::fromLatin1("chat") <<
m_sock->localAddress()->nodeName() << TQString::number(port)
);
break;
@@ -154,8 +154,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName,
kdDebug(14120) << "Starting DCC file outgoing transfer." << endl;
writeCtcpQueryMessage(nickname, TQString(),
- TQString::tqfromLatin1("DCC"),
- TQStringList(TQString::tqfromLatin1("SEND")) << noWhiteSpace << ipNumber <<
+ TQString::fromLatin1("DCC"),
+ TQStringList(TQString::fromLatin1("SEND")) << noWhiteSpace << ipNumber <<
TQString::number(server->port()) << TQString::number(file.size())
);
break;
@@ -173,7 +173,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
Message &ctcpMsg = msg.ctcpMessage();
TQString dccCommand = ctcpMsg.arg(0).upper();
- if (dccCommand == TQString::tqfromLatin1("CHAT"))
+ if (dccCommand == TQString::fromLatin1("CHAT"))
{
// if(ctcpMsg.argsSize()!=4) return false;
@@ -196,7 +196,7 @@ void Engine::CtcpQuery_dcc(Message &msg)
Transfer::Chat );
}
}
- else if (dccCommand == TQString::tqfromLatin1("SEND"))
+ else if (dccCommand == TQString::fromLatin1("SEND"))
{
// if(ctcpMsg.argsSize()!=5) return false;
@@ -253,7 +253,7 @@ void Engine::CtcpRequest_ping(const TQString &target)
TQString timeReply;
if( Entity::isChannel(target) )
- timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+ timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
else
timeReply = TQString::number( time.tv_sec );
@@ -275,7 +275,7 @@ void Engine::CtcpReply_ping(Message &msg)
if (gettimeofday(&time, 0) == 0)
{
// FIXME: the time code is wrong for usec
- TQString timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
+ TQString timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec);
double newTime = timeReply.toDouble();
double oldTime = msg.suffix().section(' ',0, 0).toDouble();
double difference = newTime - oldTime;
@@ -295,10 +295,10 @@ void Engine::CtcpReply_ping(Message &msg)
TQString millSec = diffString.section('.', 1, 1);
millSec.remove(millSec.find('.'), 1);
millSec.truncate(3);
- diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
+ diffString = TQString::fromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec);
}
- emit incomingCtcpReply(TQString::tqfromLatin1("PING"), msg.nickFromPrefix(), diffString);
+ emit incomingCtcpReply(TQString::fromLatin1("PING"), msg.nickFromPrefix(), diffString);
}
// else
// ((MessageRedirector *)sender())->error("failed to get current time");
@@ -313,13 +313,13 @@ void Engine::CtcpQuery_source(Message &msg)
void Engine::CtcpQuery_time(Message &msg)
{
writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(),
- msg.ctcpMessage().command(), TQDateTime::tqcurrentDateTime().toString(),
+ msg.ctcpMessage().command(), TQDateTime::currentDateTime().toString(),
TQString(), false);
}
void Engine::CtcpQuery_userinfo(Message &msg)
{
- TQString userinfo = customCtcpMap[ TQString::tqfromLatin1("userinfo") ];
+ TQString userinfo = customCtcpMap[ TQString::fromLatin1("userinfo") ];
if (userinfo.isNull())
userinfo = m_UserString;
@@ -335,7 +335,7 @@ void Engine::CtcpRequest_version(const TQString &target)
void Engine::CtcpQuery_version(Message &msg)
{
- TQString response = customCtcpMap[ TQString::tqfromLatin1("version") ];
+ TQString response = customCtcpMap[ TQString::fromLatin1("version") ];
kdDebug(14120) << "Version check: " << response << endl;
if (response.isNull())
diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
index 3d7b896b..67d3a842 100644
--- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp
@@ -117,7 +117,7 @@ void Engine::numericReply_001(Message &msg)
*/
emitSuffix(msg);
- settqStatus(Connected);
+ setStatus(Connected);
}
/* 002: ":Your host is <servername>, running version <ver>"
diff --git a/kopete/protocols/irc/libkirc/kircentity.cpp b/kopete/protocols/irc/libkirc/kircentity.cpp
index 2086ab9d..74781e48 100644
--- a/kopete/protocols/irc/libkirc/kircentity.cpp
+++ b/kopete/protocols/irc/libkirc/kircentity.cpp
@@ -29,16 +29,16 @@ using namespace KNetwork;
* where user and host are optionnal.
* NOTE: If changes are done to the regexp string, update also the sm_userStrictRegExp regexp string.
*/
-const TQRegExp Entity::sm_userRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$"));
+const TQRegExp Entity::sm_userRegExp(TQString::fromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$"));
/**
* Regexp to match strictly the complete user definition:
* nick!user@host
* NOTE: If changes are done to the regexp string, update also the sm_userRegExp regexp string.
*/
-const TQRegExp Entity::sm_userStrictRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$"));
+const TQRegExp Entity::sm_userStrictRegExp(TQString::fromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$"));
-const TQRegExp Entity::sm_channelRegExp( TQString::tqfromLatin1("^[#!+&][^\\s,]+$") );
+const TQRegExp Entity::sm_channelRegExp( TQString::fromLatin1("^[#!+&][^\\s,]+$") );
Entity::Entity(const TQString &, const Type type)
: TQObject(0, "KIRC::Entity"),
diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp
index 6f45b0c1..8a48ce52 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessage.cpp
@@ -99,14 +99,14 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ
return;
}
- TQString txt = str + TQString::tqfromLatin1("\r\n");
+ TQString txt = str + TQString::fromLatin1("\r\n");
TQCString s(codec->fromUnicode(txt));
kdDebug(14120) << "Message is " << s.length() << " chars" << endl;
// FIXME: Should check the amount of data really writen.
int wrote = engine->socket()->writeBlock(s.data(), s.length());
- kdDebug(14121) << TQString::tqfromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(str) << endl;
+ kdDebug(14121) << TQString::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl;
}
void Message::writeMessage(Engine *engine, const TQTextCodec *codec, const TQString &message)
@@ -123,7 +123,7 @@ void Message::writeMessage(Engine *engine, const TQTextCodec *codec,
msg += TQChar(' ') + args.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here
if (!suffix.isNull())
- msg = msg.stripWhiteSpace() + TQString::tqfromLatin1(" :") + suffix;
+ msg = msg.stripWhiteSpace() + TQString::fromLatin1(" :") + suffix;
writeMessage(engine, codec, msg);
}
@@ -145,7 +145,7 @@ void Message::writeCtcpMessage(Engine *engine, const TQTextCodec *codec,
ctcpMsg += TQChar(' ') + ctcpArgs.join(TQChar(' ')).stripWhiteSpace(); // some extra check should be done here
if (!ctcpSuffix.isNull())
- ctcpMsg += TQString::tqfromLatin1(" :") + ctcpSuffix;
+ ctcpMsg += TQString::fromLatin1(" :") + ctcpSuffix;
writeMessage(engine, codec, command, to, suffix + TQChar(0x01) + ctcpQuote(ctcpMsg) + TQChar(0x01));
}
@@ -169,10 +169,10 @@ Message Message::parse(Engine *engine, const TQTextCodec *codec, bool *parseSucc
// Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending.
if (length > 1 && raw.at(length-2) == '\n') {
- raw.tqat(length-2) = '\0';
+ raw.at(length-2) = '\0';
}
if (length > 2 && raw.at(length-3) == '\r') {
- raw.tqat(length-3) = '\0';
+ raw.at(length-3) = '\0';
}
kdDebug(14121) << "<< " << raw << endl;
@@ -202,9 +202,9 @@ TQString Message::quote(const TQString &str)
TQString tmp = str;
TQChar q('\020');
tmp.replace(q, q+TQString(q));
- tmp.replace(TQChar('\r'), q+TQString::tqfromLatin1("r"));
- tmp.replace(TQChar('\n'), q+TQString::tqfromLatin1("n"));
- tmp.replace(TQChar('\0'), q+TQString::tqfromLatin1("0"));
+ tmp.replace(TQChar('\r'), q+TQString::fromLatin1("r"));
+ tmp.replace(TQChar('\n'), q+TQString::fromLatin1("n"));
+ tmp.replace(TQChar('\0'), q+TQString::fromLatin1("0"));
return tmp;
}
@@ -230,8 +230,8 @@ TQString Message::unquote(const TQString &str)
TQString Message::ctcpQuote(const TQString &str)
{
TQString tmp = str;
- tmp.replace( TQChar('\\'), TQString::tqfromLatin1("\\\\"));
- tmp.replace( (char)1, TQString::tqfromLatin1("\\1"));
+ tmp.replace( TQChar('\\'), TQString::fromLatin1("\\\\"));
+ tmp.replace( (char)1, TQString::fromLatin1("\\1"));
return tmp;
}
@@ -317,7 +317,7 @@ TQString Message::toString() const
for (TQStringList::ConstIterator it = m_args.begin(); it != m_args.end(); ++it)
msg += TQChar(' ') + *it;
if (!m_suffix.isNull())
- msg += TQString::tqfromLatin1(" :") + m_suffix;
+ msg += TQString::fromLatin1(" :") + m_suffix;
return msg;
}
diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h
index fb38a476..cd409323 100644
--- a/kopete/protocols/irc/libkirc/kircmessage.h
+++ b/kopete/protocols/irc/libkirc/kircmessage.h
@@ -25,7 +25,7 @@
#include <tqdict.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqregexp.h>
#include <kopetemessage.h>
diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
index ae9854f1..2e1d0b4c 100644
--- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
+++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp
@@ -80,9 +80,9 @@ bool MessageRedirector::checkValidity(const Message &msg)
/*
if ( msg.isNumeric() &&
( msg.argsSize() > 0 && (
- msg.tqarg(0) == m_Nickname ||
- msg.tqarg(0) == m_PendingNick ||
- msg.tqarg(0) == TQString::tqfromLatin1("*")
+ msg.arg(0) == m_Nickname ||
+ msg.arg(0) == m_PendingNick ||
+ msg.arg(0) == TQString::fromLatin1("*")
)
)
)
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index 3c6d1907..68e28f0c 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -94,11 +94,11 @@ Transfer::~Transfer()
// m_file is automatically closed on destroy.
}
-Transfer::tqStatus Transfer::status() const
+Transfer::Status Transfer::status() const
{
if(m_socket)
{
-// return (Transfer::tqStatus)m_socket->socketStatus();
+// return (Transfer::Status)m_socket->socketStatus();
return Connected;
}
return Error_NoSocket;
diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h
index 950c0e96..a64a9ddb 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.h
+++ b/kopete/protocols/irc/libkirc/kirctransfer.h
@@ -22,7 +22,7 @@
#include <tqfile.h>
#include <tqhostaddress.h>
#include <tqobject.h>
-#include <tqtextstream.h>
+#include <textstream.h>
class KExtendedSocket;
@@ -47,7 +47,7 @@ public:
FileIncoming
};
- enum tqStatus {
+ enum Status {
Error_NoSocket = -2,
Error = -1,
Idle = 0,
@@ -101,7 +101,7 @@ public:
{ return m_nick; }
Type type() const
{ return m_type; }
- tqStatus status() const;
+ Status status() const;
/* Start the transfer.
* If not connected connect to client.
diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
index 3a5ef27c..00d893da 100644
--- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include "kirctransferserver.h"
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 2bf3910a..6d6c2ba2 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -372,7 +372,7 @@ int KSSLSocket::verifyCertificate()
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.tqarg(ourHost),
+ msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
i18n("Co&ntinue") );
@@ -382,7 +382,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
- msg.tqarg(ourHost),
+ msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
i18n("Co&ntinue") );
diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 6426224a..ea2c5d19 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -32,7 +32,7 @@
#include <tqpushbutton.h>
#include <tqheader.h>
#include <klistview.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqtimer.h>
#include <tqspinbox.h>
@@ -106,7 +106,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
const BackgroundMode bgmode = lv->viewport()->backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
- if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+ if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) )
p->fillRect( 0, 0, width, height(), _cg.brush( crole ) );
else
{
@@ -118,8 +118,8 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
if ( lv->isEnabled() )
how |= TQStyle::Style_Enabled;
- lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
- p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(),
+ lv->tqstyle().drawComplexControl( TQStyle::CC_ListView,
+ p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(),
how, TQStyle::SC_ListView, TQStyle::SC_None,
opt );
}
@@ -143,7 +143,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
textheight++;
if ( textheight < height() ) {
int w = lv->treeStepSize() / 2;
- lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, p, lv,
+ lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv,
TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg,
lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default,
TQStyle::SC_ListViewExpand,
@@ -170,21 +170,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
{
ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout");
- tqlayout72_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout72_2");
+ layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2");
textLabel1_2 = new TQLabel( this, "textLabel1_2" );
- tqlayout72_2->addWidget( textLabel1_2 );
+ layout72_2->addWidget( textLabel1_2 );
channelSearch = new TQLineEdit( this, "channelSearch" );
- tqlayout72_2->addWidget( channelSearch );
+ layout72_2->addWidget( channelSearch );
numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" );
numUsers->setSuffix( i18n(" members") );
- tqlayout72_2->addWidget( numUsers );
+ layout72_2->addWidget( numUsers );
mSearchButton = new TQPushButton( this, "mSearchButton" );
- tqlayout72_2->addWidget( mSearchButton );
- ChannelListLayout->addLayout( tqlayout72_2 );
+ layout72_2->addWidget( mSearchButton );
+ ChannelListLayout->addLayout( layout72_2 );
mChannelList = new KListView( this, "mChannelList" );
mChannelList->addColumn( i18n( "Channel" ) );
@@ -226,8 +226,8 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) );
- connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::tqStatus) ),
- this, TQT_SLOT( slotStatusChanged(KIRC::Engine::tqStatus) ) );
+ connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ),
+ this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) );
show();
}
@@ -242,9 +242,9 @@ void ChannelList::slotItemSelected( TQListViewItem *i )
emit channelSelected( i->text(0) );
}
-void ChannelList::slotStatusChanged(KIRC::Engine::tqStatus newtqStatus)
+void ChannelList::slotStatusChanged(KIRC::Engine::Status newStatus)
{
- switch(newtqStatus) {
+ switch(newStatus) {
case KIRC::Engine::Connected:
this->reset();
break;
diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h
index a5963b6b..1a528bb9 100644
--- a/kopete/protocols/irc/ui/channellist.h
+++ b/kopete/protocols/irc/ui/channellist.h
@@ -58,7 +58,7 @@ class ChannelList
void slotChannelListed( const TQString & channel, uint users, const TQString & topic );
void slotListEnd();
void slotSearchCache();
- void slotStatusChanged( KIRC::Engine::tqStatus );
+ void slotStatusChanged( KIRC::Engine::Status );
private:
void checkSearchResult( const TQString & channel, uint users, const TQString & topic );
@@ -69,7 +69,7 @@ class ChannelList
TQPushButton* mSearchButton;
KListView* mChannelList;
TQVBoxLayout* ChannelListLayout;
- TQHBoxLayout* tqlayout72_2;
+ TQHBoxLayout* layout72_2;
KIRC::Engine *m_engine;
bool mSearching;
TQString mSearch;
diff --git a/kopete/protocols/irc/ui/channellistdialog.cpp b/kopete/protocols/irc/ui/channellistdialog.cpp
index e344d227..f68f3d10 100644
--- a/kopete/protocols/irc/ui/channellistdialog.cpp
+++ b/kopete/protocols/irc/ui/channellistdialog.cpp
@@ -22,7 +22,7 @@
#include "kopeteuiglobal.h"
-#include "tqlayout.h"
+#include "layout.h"
ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan)
: KDialogBase(Kopete::UI::Global::mainWidget(), "channel_list_widget", false, caption, Close)
diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui
index c899eca8..a85681cd 100644
--- a/kopete/protocols/irc/ui/ircadd.ui
+++ b/kopete/protocols/irc/ui/ircadd.ui
@@ -45,7 +45,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<hbox>
<property name="name">
@@ -88,7 +88,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe_bob or #somechannel)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index e2e33f69..c184b92e 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -82,7 +82,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -91,7 +91,7 @@
<property name="text">
<string>&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Most IRC servers do not require a password, and only a nickname is required to connect&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -261,7 +261,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<grid>
<property name="name">
@@ -269,7 +269,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -293,7 +293,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>20</height>
@@ -304,7 +304,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>392</width>
<height>20</height>
@@ -395,7 +395,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout25</cstring>
+ <cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@@ -427,7 +427,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -505,7 +505,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -554,7 +554,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<grid>
<property name="name">
@@ -646,7 +646,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<grid>
<property name="name">
@@ -744,7 +744,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>130</height>
@@ -809,7 +809,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout153</cstring>
+ <cstring>layout153</cstring>
</property>
<hbox>
<property name="name">
@@ -871,7 +871,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>130</height>
@@ -886,7 +886,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout29</cstring>
+ <cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index 8a7cdcfb..c0d5a87a 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
new TQListViewItem( ctcpList, it.key(), it.data() );
}
- mUserName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
- mNickName->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
- mAltNickname->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
+ mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), TQT_TQOBJECT(mUserName) ) );
+ mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mNickName) ) );
+ mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), TQT_TQOBJECT(mAltNickname) ) );
charset->insertStringList( KCodecAction::supportedEncodings() );
@@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network )
TQString nextId = network;
uint accountNumber = 1;
- while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) )
+ while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) )
{
- nextId = TQString::tqfromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber );
+ nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber );
}
kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl;
return nextId;
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui
index 0f15dee5..09121e54 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networkconfig.ui
@@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</width>
<height>20</height>
@@ -240,7 +240,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>151</height>
@@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>20</height>
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index a86fc490..a8597658 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -111,7 +111,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI
TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) );
- m_initialPresence = XMPP::tqStatus ( "", "", 5, true );
+ m_initialPresence = XMPP::Status ( "", "", 5, true );
}
@@ -323,8 +323,8 @@ void JabberAccount::connectWithPassword ( const TQString &password )
this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) );
TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ),
this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) );
- TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ),
- this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::tqStatus & ) ) );
+ TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ),
+ this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) );
TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ),
this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) );
TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ),
@@ -414,7 +414,7 @@ void JabberAccount::connectWithPassword ( const TQString &password )
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connecting to Jabber server " << server() << ":" << port() << endl;
- setPresence( XMPP::tqStatus ("connecting", "", 0, true) );
+ setPresence( XMPP::Status ("connecting", "", 0, true) );
switch ( m_jabberClient->connect ( XMPP::Jid ( accountId () + TQString("/") + resource () ), password ) )
{
@@ -609,13 +609,13 @@ void JabberAccount::slotIncomingFileTransfer ()
void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason)
{
- XMPP::tqStatus xmpptqStatus = m_protocol->kosTotqStatus( status, reason);
+ XMPP::Status xmppStatus = m_protocol->kosToStatus( status, reason);
if( status.status() == Kopete::OnlineStatus::Offline )
{
- xmpptqStatus.setIsAvailable( false );
+ xmppStatus.setIsAvailable( false );
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD" << endl;
- disconnect (Manual, xmpptqStatus);
+ disconnect (Manual, xmppStatus);
return;
}
@@ -628,12 +628,12 @@ void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const
if ( !isConnected () )
{
// we are not connected yet, so connect now
- m_initialPresence = xmpptqStatus;
+ m_initialPresence = xmppStatus;
connect ( status );
}
else
{
- setPresence ( xmpptqStatus );
+ setPresence ( xmppStatus );
}
}
@@ -650,8 +650,8 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason )
// make sure that the connection animation gets stopped if we're still
// in the process of connecting
- setPresence ( XMPP::tqStatus ("", "", 0, false) );
- m_initialPresence = XMPP::tqStatus ("", "", 5, true);
+ setPresence ( XMPP::Status ("", "", 0, false) );
+ m_initialPresence = XMPP::Status ("", "", 5, true);
/* FIXME:
* We should delete the JabberClient instance here,
@@ -666,7 +666,7 @@ void JabberAccount::disconnect ( Kopete::Account::DisconnectReason reason )
disconnected ( reason );
}
-void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status )
+void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status )
{
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "disconnect( reason, status ) called" << endl;
@@ -787,7 +787,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("There was an error in the protocol stream: %1").tqarg(errorCondition);
+ errorText = i18n("There was an error in the protocol stream: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrConnection:
@@ -845,7 +845,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
if(!errorCondition.isEmpty())
- errorText = i18n("There was a connection error: %1").tqarg(errorCondition);
+ errorText = i18n("There was a connection error: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrNeg:
@@ -870,7 +870,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("There was a negotiation error: %1").tqarg(errorCondition);
+ errorText = i18n("There was a negotiation error: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrTLS:
@@ -887,7 +887,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(errorCondition);
+ errorText = i18n("There was a Transport Layer Security (TLS) error: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrAuth:
@@ -931,7 +931,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("There was an error authenticating with the server: %1").tqarg(errorCondition);
+ errorText = i18n("There was an error authenticating with the server: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrSecurityLayer:
@@ -948,7 +948,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("There was an error in the security layer: %1").tqarg(errorCondition);
+ errorText = i18n("There was an error in the security layer: %1").arg(errorCondition);
break;
case XMPP::ClientStream::ErrBind:
@@ -965,7 +965,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
break;
}
- errorText = i18n("Could not bind a resource: %1").tqarg(errorCondition);
+ errorText = i18n("Could not bind a resource: %1").arg(errorCondition);
break;
default:
@@ -981,7 +981,7 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
if(!errorText.isEmpty())
KMessageBox::error (Kopete::UI::Global::mainWidget (),
errorText,
- i18n("Connection problem with Jabber server %1").tqarg(server));
+ i18n("Connection problem with Jabber server %1").arg(server));
}
@@ -1015,27 +1015,27 @@ void JabberAccount::slotCSError ( int error )
}
/* Set presence (usually called by dialog widget). */
-void JabberAccount::setPresence ( const XMPP::tqStatus &status )
+void JabberAccount::setPresence ( const XMPP::Status &status )
{
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl;
// fetch input status
- XMPP::tqStatus newtqStatus = status;
+ XMPP::Status newStatus = status;
// TODO: Check if Caps is enabled
// Send entity capabilities
if( client() )
{
- newtqStatus.setCapsNode( client()->capsNode() );
- newtqStatus.setCapsVersion( client()->capsVersion() );
- newtqStatus.setCapsExt( client()->capsExt() );
+ newStatus.setCapsNode( client()->capsNode() );
+ newStatus.setCapsVersion( client()->capsVersion() );
+ newStatus.setCapsExt( client()->capsExt() );
}
// make sure the status gets the correct priority
- newtqStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) );
+ newStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) );
XMPP::Jid jid ( myself()->contactId () );
- XMPP::Resource newResource ( resource (), newtqStatus );
+ XMPP::Resource newResource ( resource (), newStatus );
// update our resource in the resource pool
resourcePool()->addResource ( jid, newResource );
@@ -1057,7 +1057,7 @@ void JabberAccount::setPresence ( const XMPP::tqStatus &status )
XMPP::JT_Presence * task = new XMPP::JT_Presence ( client()->rootTask ());
- task->pres ( newtqStatus );
+ task->pres ( newStatus );
task->go ( true );
}
else
@@ -1299,11 +1299,11 @@ void JabberAccount::slotContactUpdated (const XMPP::RosterItem & item)
*/
if ( !item.ask().isEmpty () )
{
- contact->setProperty ( protocol()->propAuthorizationtqStatus, i18n ( "Waiting for authorization" ) );
+ contact->setProperty ( protocol()->propAuthorizationStatus, i18n ( "Waiting for authorization" ) );
}
else
{
- contact->removeProperty ( protocol()->propAuthorizationtqStatus );
+ contact->removeProperty ( protocol()->propAuthorizationStatus );
}
}
else if(c) //we don't need to add it, and it is in the contactlist
@@ -1469,7 +1469,7 @@ void JabberAccount::slotGroupChatLeft (const XMPP::Jid & jid)
}
-void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::tqStatus & status)
+void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::Status & status)
{
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Received groupchat presence for room " << jid.full () << endl;
@@ -1512,7 +1512,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
case JabberClient::InvalidPasswordForMUC:
{
TQCString password;
- int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(jid.node()));
+ int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").arg(jid.node()));
if (result == KPasswordDialog::Accepted)
m_jabberClient->joinGroupChat(jid.domain(), jid.node(), jid.resource(), password);
}
@@ -1521,7 +1521,7 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
case JabberClient::NicknameConflict:
{
bool ok;
- TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(jid.node(), jid.resource()),
+ TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").arg(jid.node(), jid.resource()),
i18n("Give your nickname"),
TQString(),
&ok);
@@ -1535,14 +1535,14 @@ void JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const T
case JabberClient::BannedFromThisMUC:
KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (),
KMessageBox::Error,
- i18n ("You can't join the room %1 because you were banned").tqarg(jid.node()),
+ i18n ("You can't join the room %1 because you were banned").arg(jid.node()),
i18n ("Jabber Group Chat") );
break;
case JabberClient::MaxUsersReachedForThisMuc:
KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (),
KMessageBox::Error,
- i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(jid.node()),
+ i18n ("You can't join the room %1 because the maximum users has been reached").arg(jid.node()),
i18n ("Jabber Group Chat") );
break;
@@ -1659,7 +1659,7 @@ void JabberAccount::slotIncomingVoiceCall( const Jid &jid )
// if(sessionType == "http://www.google.com/session/phone")
// {
// TQString from = ((XMPP::Jid)session->peers().first()).full();
-// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) );
+// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").arg(from) );
// JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast<JingleVoiceSession*>(session) );
// voiceDialog->show();
// }
@@ -1687,7 +1687,7 @@ bool JabberAccount::removeAccount( )
int result=KMessageBox::warningYesNoCancel( Kopete::UI::Global::mainWidget () ,
i18n( "Do you want to also unregister \"%1\" from the Jabber server ?\n"
"If you unregister, all your contact list may be removed on the server,"
- "And you will never be able to connect to this account with any client").tqarg( accountLabel() ),
+ "And you will never be able to connect to this account with any client").arg( accountLabel() ),
i18n("Unregister"),
KGuiItem(i18n( "Remove and Unregister" ), "editdelete"),
KGuiItem(i18n( "Remove from kopete only"), "edittrash"),
@@ -1734,7 +1734,7 @@ void JabberAccount::slotUnregisterFinished( )
if ( task && ! task->success ())
{
KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error,
- i18n ("An error occured when trying to remove the account:\n%1").tqarg(task->statusString()),
+ i18n ("An error occured when trying to remove the account:\n%1").arg(task->statusString()),
i18n ("Jabber Account Unregistration"));
m_removing=false;
return;
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h
index 17286a90..9ce7c9c4 100644
--- a/kopete/protocols/jabber/jabberaccount.h
+++ b/kopete/protocols/jabber/jabberaccount.h
@@ -147,7 +147,7 @@ public slots:
void disconnect ( Kopete::Account::DisconnectReason reason );
/* Disconnect with a reason, and status */
- void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status );
+ void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status );
/* Reimplemented from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString());
@@ -199,13 +199,13 @@ private:
void cleanup ();
/* Initial presence to set after connecting. */
- XMPP::tqStatus m_initialPresence;
+ XMPP::Status m_initialPresence;
/**
* Sets our own presence. Updates our resource in the
* resource pool and sends a presence packet to the server.
*/
- void setPresence ( const XMPP::tqStatus &status );
+ void setPresence ( const XMPP::Status &status );
/**
* Returns if a connection attempt is currently in progress.
@@ -257,7 +257,7 @@ private slots:
void slotJoinNewChat ();
void slotGroupChatJoined ( const XMPP::Jid &jid );
void slotGroupChatLeft ( const XMPP::Jid &jid );
- void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status );
+ void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status );
void slotGroupChatError ( const XMPP::Jid &jid, int error, const TQString &reason );
/* Incoming subscription request. */
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index 2ee8423e..5dac2e18 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -129,19 +129,19 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
switch ( item.subscription().type () )
{
case XMPP::Subscription::None:
- setProperty ( protocol()->propSubscriptiontqStatus,
+ setProperty ( protocol()->propSubscriptionStatus,
i18n ( "You cannot see each others' status." ) );
break;
case XMPP::Subscription::To:
- setProperty ( protocol()->propSubscriptiontqStatus,
+ setProperty ( protocol()->propSubscriptionStatus,
i18n ( "You can see this contact's status but they cannot see your status." ) );
break;
case XMPP::Subscription::From:
- setProperty ( protocol()->propSubscriptiontqStatus,
+ setProperty ( protocol()->propSubscriptionStatus,
i18n ( "This contact can see your status but you cannot see their status." ) );
break;
case XMPP::Subscription::Both:
- setProperty ( protocol()->propSubscriptiontqStatus,
+ setProperty ( protocol()->propSubscriptionStatus,
i18n ( "You can see each others' status." ) );
break;
}
@@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item )
setDontSync ( false );
//can't do it now because it's called from contructor at a point some virtual function are not available
- TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus()));
+ TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus()));
}
@@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList ()
setProperty ( protocol()->propAvailableResources, resourceListStr );
}
-void JabberBaseContact::reevaluatetqStatus ()
+void JabberBaseContact::reevaluateStatus ()
{
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Determining new status for " << contactId () << endl;
@@ -390,7 +390,7 @@ void JabberBaseContact::serialize (TQMap < TQString, TQString > &serializedData,
// Contact id and display name are already set for us, only add the rest
serializedData["JID"] = mRosterItem.jid().full();
- serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (","));
+ serializedData["groups"] = mRosterItem.groups ().join (TQString::fromLatin1 (","));
}
void JabberBaseContact::slotUserInfo( )
@@ -414,7 +414,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
// update vCard cache timestamp if this is not a temporary contact
if ( metaContact() && !metaContact()->isTemporary () )
{
- setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
+ setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
}
diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h
index c3453344..2dcc26b7 100644
--- a/kopete/protocols/jabber/jabberbasecontact.h
+++ b/kopete/protocols/jabber/jabberbasecontact.h
@@ -158,7 +158,7 @@ public slots:
* whenever a resource is added, removed, or
* changed in the resource pool.
*/
- void reevaluatetqStatus ();
+ void reevaluateStatus ();
protected:
/**
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
index bb637870..1d5657e8 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp
@@ -24,7 +24,7 @@
#include <tqtimer.h>
#include <tqpair.h>
#include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@@ -240,7 +240,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::setFeatures(const TQStr
void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen()
{
- m_lastSeen = TQDate::tqcurrentDate();
+ m_lastSeen = TQDate::currentDate();
}
TQDomElement JabberCapabilitiesManager::CapabilitiesInformation::toXml(TQDomDocument *doc) const
@@ -351,7 +351,7 @@ void JabberCapabilitiesManager::removeAccount(JabberAccount *account)
}
}
-void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status )
+void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status )
{
if( !account->client() || !account->client()->rootTask() )
return;
@@ -400,7 +400,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const
{
if( !d->capabilitiesInformationMap[*newCapsIt].discovered() && d->capabilitiesInformationMap[*newCapsIt].pendingRequests() == 0 )
{
- kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node + "#" + (*newCapsIt).extensions()) << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl;
d->capabilitiesInformationMap[*newCapsIt].setPendingRequests(1);
requestDiscoInfo(account, jid, node + "#" + (*newCapsIt).extensions());
@@ -410,7 +410,7 @@ void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const
else
{
// Remove all caps specifications
- kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(node).tqarg(version) << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl;
d->jidCapabilitiesMap.remove( jid.full() );
}
@@ -448,7 +448,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
DiscoItem item = discoInfo->item();
Jid jid = discoInfo->jid();
- kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).replace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl;
TQStringList tokens = TQStringList::split("#",discoInfo->node());
@@ -486,7 +486,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
TQPair<Jid,JabberAccount*> jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent());
if( jidAccountPair.second )
{
- kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl;
requestDiscoInfo( jidAccountPair.second, jidAccountPair.first, discoInfo->node() );
}
else
@@ -497,7 +497,7 @@ void JabberCapabilitiesManager::discoRequestFinished()
}
}
else
- kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl;
+ kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").arg(jidCapabilities.node()).arg(node) << endl;
//for (unsigned int i = 0; i < item.features().list().count(); i++)
// printf(" Feature: %s\n",item.features().list()[i].latin1());
diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
index f314d760..8e2a95a6 100644
--- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h
+++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h
@@ -81,12 +81,12 @@ public slots:
/**
* Update if necessary the capabities for the JID passed in args.
* Caps are received in Presence messages so that's why we are
- * passing a XMPP::tqStatus object.
+ * passing a XMPP::Status object.
*
* @param jid JID that capabilities was updated.
- * @param status The XMPP::tqStatus that contain the caps.
+ * @param status The XMPP::Status that contain the caps.
*/
- void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status);
+ void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status);
private slots:
/**
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index d10f4201..c18c9071 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -118,7 +118,7 @@ void JabberChatSession::slotUpdateDisplayName ()
jid.setResource ( mResource );
TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)")
- .tqarg( chatMembers.first()->onlinetqStatus().description() );
+ .arg( chatMembers.first()->onlineStatus().description() );
if ( jid.resource().isEmpty () )
setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText );
else
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index cf37ffd8..fddd588f 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -724,8 +724,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt
this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) );
TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ),
this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) );
- TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const tqStatus &) ),
- this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const tqStatus &) ) );
+ TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ),
+ this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) );
TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ),
this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) );
//TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ),
@@ -769,7 +769,7 @@ void JabberClient::disconnect ()
}
-void JabberClient::disconnect( XMPP::tqStatus &reason )
+void JabberClient::disconnect( XMPP::Status &reason )
{
if ( d->jabberClient )
{
@@ -823,12 +823,12 @@ void JabberClient::leaveGroupChat ( const TQString &host, const TQString &room )
}
-void JabberClient::setGroupChattqStatus( const TQString & host, const TQString & room, const XMPP::tqStatus & status )
+void JabberClient::setGroupChatStatus( const TQString & host, const TQString & room, const XMPP::Status & status )
{
- client()->groupChatSettqStatus( host, room, status);
+ client()->groupChatSetStatus( host, room, status);
}
-void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::tqStatus & status )
+void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::Status & status )
{
client()->groupChatChangeNick( host, room, nick, status );
}
@@ -1112,7 +1112,7 @@ void JabberClient::slotGroupChatLeft ( const Jid &jid )
}
-void JabberClient::slotGroupChatPresence ( const Jid &jid, const tqStatus &status)
+void JabberClient::slotGroupChatPresence ( const Jid &jid, const Status &status)
{
emit groupChatPresence ( jid, status );
diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h
index 05324824..7ba389f9 100644
--- a/kopete/protocols/jabber/jabberclient.h
+++ b/kopete/protocols/jabber/jabberclient.h
@@ -96,7 +96,7 @@ public:
* Disconnect from Jabber server with reason
* @param reason The reason for disconnecting
*/
- void disconnect (XMPP::tqStatus &reason);
+ void disconnect (XMPP::Status &reason);
/**
* Returns if this instance is connected to a server.
@@ -379,11 +379,11 @@ public:
/**
* change the status of a group chat
*/
- void setGroupChattqStatus(const TQString &host, const TQString &room, const XMPP::tqStatus &);
+ void setGroupChatStatus(const TQString &host, const TQString &room, const XMPP::Status &);
/**
* change the nick in a group chat
*/
- void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::tqStatus &status =XMPP::tqStatus());
+ void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::Status &status =XMPP::Status());
/**
* Send a message.
@@ -492,7 +492,7 @@ signals:
/**
* A presence to a group chat has been signalled.
*/
- void groupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status );
+ void groupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status );
/**
* An error was encountered joining or processing a group chat.
@@ -590,7 +590,7 @@ private slots:
/* Slots for handling group chats. */
void slotGroupChatJoined (const Jid & jid);
void slotGroupChatLeft (const Jid & jid);
- void slotGroupChatPresence (const Jid & jid, const tqStatus & status);
+ void slotGroupChatPresence (const Jid & jid, const Status & status);
void slotGroupChatError (const Jid & jid, int error, const TQString & reason);
/* Incoming subscription request. */
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index c6147ae1..5fa3dad7 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -23,7 +23,7 @@
#include <tqtimer.h>
#include <tqdatetime.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqimage.h>
#include <tqregexp.h>
#include <tqbuffer.h>
@@ -107,7 +107,7 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun
* Trigger update once if we're already connected for contacts
* that are being added while we are online.
*/
- if ( account()->myself()->onlinetqStatus().isDefinitelyOnline() )
+ if ( account()->myself()->onlineStatus().isDefinitelyOnline() )
{
slotGetTimedVCard ();
}
@@ -170,7 +170,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
// if the contact is online, display the resources we have for it,
// otherwise disable the menu
- if (onlinetqStatus ().status () == Kopete::OnlineStatus::Offline)
+ if (onlineStatus ().status () == Kopete::OnlineStatus::Offline)
{
actionSelectResource->setEnabled ( false );
}
@@ -263,11 +263,11 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message)
{
TQString room=message.invite();
TQString originalBody=message.body().isEmpty() ? TQString() :
- i18n( "The original message is : <i>\" %1 \"</i><br>" ).tqarg(TQStyleSheet::escape(message.body()));
+ i18n( "The original message is : <i>\" %1 \"</i><br>" ).arg(TQStyleSheet::escape(message.body()));
TQString mes=i18n("<qt><i>%1</i> invited you to join the conference <b>%2</b><br>%3<br>"
"If you want to accept and join, just <b>enter your nickname</b> and press ok<br>"
"If you want to decline, press cancel</qt>")
- .tqarg(message.from().full(), room , originalBody);
+ .arg(message.from().full(), room , originalBody);
bool ok=false;
TQString futureNewNickName = KInputDialog::getText( i18n( "Invited to a conference - Jabber Plugin" ),
@@ -299,7 +299,7 @@ void JabberContact::handleIncomingMessage (const XMPP::Message & message)
if(mManager->view( Kopete::Contact::CannotCreate ))
{ //show an internal message if the user has not already closed his window
Kopete::Message m=Kopete::Message ( this, mManager->members(),
- i18n("%1 has ended their participation in the chat session.").tqarg(metaContact()->displayName()),
+ i18n("%1 has ended their participation in the chat session.").arg(metaContact()->displayName()),
Kopete::Message::Internal );
m.setImportance(Kopete::Message::Low);
mManager->view()->appendMessage ( m ); //use KopeteView::AppendMessage to bypass notifications
@@ -415,7 +415,7 @@ void JabberContact::slotCheckVCard ()
Kopete::ContactProperty cacheDateString = property ( protocol()->propVCardCacheTimeStamp );
// don't do anything while we are offline
- if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+ if ( !account()->myself()->onlineStatus().isDefinitelyOnline () )
{
return;
}
@@ -440,13 +440,13 @@ void JabberContact::slotCheckVCard ()
// avoid warning if key does not exist in configuration file
if ( cacheDateString.isNull () )
- cacheDate = TQDateTime::tqcurrentDateTime().addDays ( -2 );
+ cacheDate = TQDateTime::currentDateTime().addDays ( -2 );
else
cacheDate = TQDateTime::fromString ( cacheDateString.value().toString (), Qt::ISODate );
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Cached vCard data for " << contactId () << " from " << cacheDate.toString () << endl;
- if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::tqcurrentDateTime () ) )
+ if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::currentDateTime () ) )
{
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling update." << endl;
@@ -463,7 +463,7 @@ void JabberContact::slotGetTimedVCard ()
mVCardUpdateInProgress = false;
// check if we are still connected - eventually we lost our connection in the meantime
- if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+ if ( !account()->myself()->onlineStatus().isDefinitelyOnline () )
{
// we are not connected, discard this update
return;
@@ -506,7 +506,7 @@ void JabberContact::slotGotVCard ()
// update timestamp of last vCard retrieval
if ( metaContact() && !metaContact()->isTemporary () )
{
- setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) );
+ setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::currentDateTime().toString ( Qt::ISODate ) );
}
mVCardUpdateInProgress = false;
@@ -527,7 +527,7 @@ void JabberContact::slotGotVCard ()
}
-void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus )
+void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus )
{
/*
@@ -541,13 +541,13 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl
* to query its activity after we are already connected.
*/
- if ( onlinetqStatus().isDefinitelyOnline () )
+ if ( onlineStatus().isDefinitelyOnline () )
{
// Kopete already deals with lastSeen if the contact is online
return;
}
- if ( ( oldtqStatus.status () == Kopete::OnlineStatus::Connecting ) && newtqStatus.isDefinitelyOnline () )
+ if ( ( oldStatus.status () == Kopete::OnlineStatus::Connecting ) && newStatus.isDefinitelyOnline () )
{
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl;
@@ -567,13 +567,13 @@ void JabberContact::slotGetTimedLastActivity ()
* maintained by Kopete)
*/
- if ( onlinetqStatus().isDefinitelyOnline () )
+ if ( onlineStatus().isDefinitelyOnline () )
{
// Kopete already deals with setting lastSeen if the contact is online
return;
}
- if ( account()->myself()->onlinetqStatus().isDefinitelyOnline () )
+ if ( account()->myself()->onlineStatus().isDefinitelyOnline () )
{
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl;
@@ -591,7 +591,7 @@ void JabberContact::slotGotLastActivity ()
if ( task->success () )
{
- setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::tqcurrentDateTime().addSecs ( -task->seconds () )));
+ setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::currentDateTime().addSecs ( -task->seconds () )));
if( !task->message().isEmpty() )
{
setProperty( protocol()->propAwayMessage, task->message() );
@@ -1110,7 +1110,7 @@ void JabberContact::slotSelectResource ()
}
-void JabberContact::sendPresence ( const XMPP::tqStatus status )
+void JabberContact::sendPresence ( const XMPP::Status status )
{
if ( !account()->isConnected () )
@@ -1119,15 +1119,15 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status )
return;
}
- XMPP::tqStatus newtqStatus = status;
+ XMPP::Status newStatus = status;
// honour our priority
- if(newtqStatus.isAvailable())
- newtqStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) );
+ if(newStatus.isAvailable())
+ newStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) );
XMPP::JT_Presence * task = new XMPP::JT_Presence ( account()->client()->rootTask () );
- task->pres ( bestAddress (), newtqStatus);
+ task->pres ( bestAddress (), newStatus);
task->go ( true );
}
@@ -1136,7 +1136,7 @@ void JabberContact::sendPresence ( const XMPP::tqStatus status )
void JabberContact::slotStatusOnline ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setShow("");
sendPresence ( status );
@@ -1146,7 +1146,7 @@ void JabberContact::slotStatusOnline ()
void JabberContact::slotStatusChatty ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setShow ("chat");
sendPresence ( status );
@@ -1156,7 +1156,7 @@ void JabberContact::slotStatusChatty ()
void JabberContact::slotStatusAway ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setShow ("away");
sendPresence ( status );
@@ -1166,7 +1166,7 @@ void JabberContact::slotStatusAway ()
void JabberContact::slotStatusXA ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setShow ("xa");
sendPresence ( status );
@@ -1176,7 +1176,7 @@ void JabberContact::slotStatusXA ()
void JabberContact::slotStatusDND ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setShow ("dnd");
sendPresence ( status );
@@ -1187,7 +1187,7 @@ void JabberContact::slotStatusDND ()
void JabberContact::slotStatusInvisible ()
{
- XMPP::tqStatus status;
+ XMPP::Status status;
status.setIsAvailable( false );
sendPresence ( status );
@@ -1299,7 +1299,7 @@ void JabberContact::slotDiscoFinished( )
XMPP::RosterItem ri = rosterItem();
Kopete::MetaContact *mc=metaContact();
JabberAccount *parentAccount=account();
- Kopete::OnlineStatus status=onlinetqStatus();
+ Kopete::OnlineStatus status=onlineStatus();
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl;
diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h
index ce40be30..15b5096e 100644
--- a/kopete/protocols/jabber/jabbercontact.h
+++ b/kopete/protocols/jabber/jabbercontact.h
@@ -228,7 +228,7 @@ private:
/**
* Sends a presence packet to this contact
*/
- void sendPresence ( const XMPP::tqStatus status );
+ void sendPresence ( const XMPP::Status status );
/**
* This variable keeps a list of message managers.
diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp
index de789f44..3344f802 100644
--- a/kopete/protocols/jabber/jabberformtranslator.cpp
+++ b/kopete/protocols/jabber/jabberformtranslator.cpp
@@ -31,12 +31,12 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget *
emptyForm = privForm;
- /* Add instructions to tqlayout. */
+ /* Add instructions to layout. */
TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4);
TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel");
- label->tqsetAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter));
- label->tqsetSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true);
+ label->setAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter));
+ label->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true);
label->show ();
innerLayout->addWidget (label, 0);
diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h
index 2ee316d6..41d12279 100644
--- a/kopete/protocols/jabber/jabberformtranslator.h
+++ b/kopete/protocols/jabber/jabberformtranslator.h
@@ -19,7 +19,7 @@
#define JABBERFORMTRANSLATOR_H
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "xmpp_tasks.h"
diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
index f536a1c9..e098fdad 100644
--- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp
+++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp
@@ -145,7 +145,7 @@ void JabberGroupChatManager::inviteContact( const TQString & contactId )
jabberMessage.setFrom ( account()->client()->jid() );
jabberMessage.setTo ( contactId );
jabberMessage.setInvite( mRoomJid.userHost() );
- jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) );
+ jabberMessage.setBody( i18n("You have been invited to %1").arg( mRoomJid.userHost() ) );
// send the message
account()->client()->sendMessage ( jabberMessage );
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 7ddf4041..1fa6d884 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( )
}
//TODO: away message
- XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
- account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus );
+ XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
+ account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus );
}
void JabberGroupContact::slotChangeNick( )
@@ -354,14 +354,14 @@ void JabberGroupContact::slotChangeNick( )
bool ok;
TQString futureNewNickName = KInputDialog::getText( i18n( "Change nickanme - Jabber Plugin" ),
- i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).tqarg(rosterItem().jid().userHost()),
+ i18n( "Please enter the new nick name you want to have on the room <i>%1</i>" ).arg(rosterItem().jid().userHost()),
mNick, &ok );
if ( !ok || !account()->isConnected())
return;
mNick=futureNewNickName;
- XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() );
+ XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() );
account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user() , mNick , status);
}
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index 0b73f38b..a7cf3a78 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -90,8 +90,8 @@ JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStr
propWorkPhone(Kopete::Global::Properties::self()->workPhone()),
propWorkMobilePhone(Kopete::Global::Properties::self()->workMobilePhone()),
propNickName(Kopete::Global::Properties::self()->nickName()),
- propSubscriptiontqStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
- propAuthorizationtqStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
+ propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString(), true, false),
+ propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString(), true, false),
propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true),
propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true),
propPhoto(Kopete::Global::Properties::self()->photo()),
@@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC
return account->contacts()[contactId];
}
-XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message )
+XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message )
{
- XMPP::tqStatus xmpptqStatus ( "", message );
+ XMPP::Status xmppStatus ( "", message );
if( status.status() == Kopete::OnlineStatus::Offline )
{
- xmpptqStatus.setIsAvailable( false );
+ xmppStatus.setIsAvailable( false );
}
switch ( status.internalStatus () )
{
case JabberProtocol::JabberFreeForChat:
- xmpptqStatus.setShow ( "chat" );
+ xmppStatus.setShow ( "chat" );
break;
case JabberProtocol::JabberOnline:
- xmpptqStatus.setShow ( "" );
+ xmppStatus.setShow ( "" );
break;
case JabberProtocol::JabberAway:
- xmpptqStatus.setShow ( "away" );
+ xmppStatus.setShow ( "away" );
break;
case JabberProtocol::JabberXA:
- xmpptqStatus.setShow ( "xa" );
+ xmppStatus.setShow ( "xa" );
break;
case JabberProtocol::JabberDND:
- xmpptqStatus.setShow ( "dnd" );
+ xmppStatus.setShow ( "dnd" );
break;
case JabberProtocol::JabberInvisible:
- xmpptqStatus.setIsInvisible ( true );
+ xmppStatus.setIsInvisible ( true );
break;
}
- return xmpptqStatus;
+ return xmppStatus;
}
#include "jabberprotocol.moc"
diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h
index 0e79c357..6e647f74 100644
--- a/kopete/protocols/jabber/jabberprotocol.h
+++ b/kopete/protocols/jabber/jabberprotocol.h
@@ -39,11 +39,11 @@
namespace XMPP
{
class Resource;
- class tqStatus;
+ class Status;
}
class JabberContact;
-class dlgJabbertqStatus;
+class dlgJabberStatus;
class dlgJabberSendRaw;
class JabberCapabilitiesManager;
@@ -95,8 +95,8 @@ public:
const Kopete::ContactPropertyTmpl propWorkPhone;
const Kopete::ContactPropertyTmpl propWorkMobilePhone;
const Kopete::ContactPropertyTmpl propNickName;
- const Kopete::ContactPropertyTmpl propSubscriptiontqStatus;
- const Kopete::ContactPropertyTmpl propAuthorizationtqStatus;
+ const Kopete::ContactPropertyTmpl propSubscriptionStatus;
+ const Kopete::ContactPropertyTmpl propAuthorizationStatus;
const Kopete::ContactPropertyTmpl propAvailableResources;
const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp;
const Kopete::ContactPropertyTmpl propPhoto;
@@ -141,9 +141,9 @@ public:
Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource );
/**
- * Convert an online status to a XMPP::tqStatus
+ * Convert an online status to a XMPP::Status
*/
- XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
+ XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() );
/**
* Return the Entity Capabilities(JEP-0115) manager instance.
diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp
index cddffd64..19492790 100644
--- a/kopete/protocols/jabber/jabberresourcepool.cpp
+++ b/kopete/protocols/jabber/jabberresourcepool.cpp
@@ -95,7 +95,7 @@ void JabberResourcePool::notifyRelevantContacts ( const XMPP::Jid &jid )
for(JabberBaseContact *mContact = list.first (); mContact; mContact = list.next ())
{
- mContact->reevaluatetqStatus ();
+ mContact->reevaluateStatus ();
}
}
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 218c9aae..26d16b28 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -123,11 +123,11 @@ JabberTransport::~JabberTransport ()
KActionMenu *JabberTransport::actionMenu ()
{
- KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this );
+ KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
- menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
- nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick )
+ menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
+ nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick )
);
TQPtrList<KAction> *customActions = myself()->customContextMenuActions( );
@@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status , con
return;
}
- XMPP::tqStatus xmpptqStatus ( "", reason );
+ XMPP::Status xmppStatus ( "", reason );
switch ( status.internalStatus () )
{
case JabberProtocol::JabberFreeForChat:
- xmpptqStatus.setShow ( "chat" );
+ xmppStatus.setShow ( "chat" );
break;
case JabberProtocol::JabberOnline:
- xmpptqStatus.setShow ( "" );
+ xmppStatus.setShow ( "" );
break;
case JabberProtocol::JabberAway:
- xmpptqStatus.setShow ( "away" );
+ xmppStatus.setShow ( "away" );
break;
case JabberProtocol::JabberXA:
- xmpptqStatus.setShow ( "xa" );
+ xmppStatus.setShow ( "xa" );
break;
case JabberProtocol::JabberDND:
- xmpptqStatus.setShow ( "dnd" );
+ xmppStatus.setShow ( "dnd" );
break;
case JabberProtocol::JabberInvisible:
- xmpptqStatus.setIsInvisible ( true );
+ xmppStatus.setIsInvisible ( true );
break;
}
if ( !isConnected () )
{
// we are not connected yet, so connect now
- m_initialPresence = xmpptqStatus;
+ m_initialPresence = xmppStatus;
connect ();
}
else
{
- setPresence ( xmpptqStatus );
+ setPresence ( xmppStatus );
}
#endif
}
@@ -277,7 +277,7 @@ void JabberTransport::removeAllContacts( )
/* if ( ! task->success ())
KMessageBox::queuedMessageBox ( 0L, KMessageBox::Error,
- i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()),
+ i18n ("An error occured when trying to remove the transport:\n%1").arg(task->statusString()),
i18n ("Jabber Service Unregistration"));
*/ //we don't really care, we remove everithing anyway.
@@ -328,7 +328,7 @@ void JabberTransport::eatContacts( )
{
XMPP::RosterItem item=contact->rosterItem();
Kopete::MetaContact *mc=contact->metaContact();
- Kopete::OnlineStatus status = contact->onlinetqStatus();
+ Kopete::OnlineStatus status = contact->onlineStatus();
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << item.jid().full() << " will be soon eat - " << contact << endl;
delete contact;
Kopete::Contact *c2=account()->contactPool()->addContact( item , mc , false ); //not sure this is false;
diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h
index f0a2ab81..2cfcd4c1 100644
--- a/kopete/protocols/jabber/jabbertransport.h
+++ b/kopete/protocols/jabber/jabbertransport.h
@@ -80,8 +80,8 @@ public:
virtual bool removeAccount();
- enum TransporttqStatus { Normal , Creating, Removing , AccountRemoved };
- TransporttqStatus transporttqStatus() { return m_status; };
+ enum TransportStatus { Normal , Creating, Removing , AccountRemoved };
+ TransportStatus transportStatus() { return m_status; };
/**
* return the legacyId conrresponding to the jid
@@ -132,7 +132,7 @@ protected:
private:
JabberAccount *m_account;
- TransporttqStatus m_status;
+ TransportStatus m_status;
};
diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
index 4208e0d8..f6911a3b 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp
@@ -114,7 +114,7 @@ void JingleClientSlots::callDestroyed(cricket::Call *call)
qDebug("JingleClientSlots: Call destroyed");
Jid jid(call->sessions()[0]->remote_address().c_str());
if (voiceCaller_->calling(jid)) {
- qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full()));
+ qDebug(TQString("Removing unterminated call to %1").arg(jid.full()));
voiceCaller_->removeCall(jid);
emit voiceCaller_->terminated(jid);
}
@@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling()
void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state)
{
- qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(state));
+ qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state));
// Why is c_str() stuff needed to make it compile on OS X ?
Jid jid(session->remote_address().c_str());
@@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess
}
else if (state == cricket::Session::STATE_SENTMODIFY) { }
else if (state == cricket::Session::STATE_RECEIVEDMODIFY) {
- qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+ qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
}
else if (state == cricket::Session::STATE_SENTREJECT) { }
else if (state == cricket::Session::STATE_RECEIVEDREJECT) {
@@ -195,7 +195,7 @@ void JingleVoiceCaller::initialize()
return;
TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full();
- qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid));
+ qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid));
if (jid.isEmpty()) {
qWarning("jinglevoicecaller.cpp: Empty JID");
return;
@@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid)
void JingleVoiceCaller::call(const Jid& jid)
{
- qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(jid.full()));
+ qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full()));
cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall();
c->InitiateSession(buzz::Jid(jid.full().ascii()));
phone_client_->SetFocus(c);
@@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j)
void JingleVoiceCaller::terminate(const Jid& j)
{
- qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full()));
+ qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full()));
cricket::Call* call = calls_[j.full()];
if (call != NULL) {
call->Terminate();
@@ -327,7 +327,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call)
void JingleVoiceCaller::removeCall(const Jid& j)
{
- qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full()));
+ qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full()));
calls_.remove(j.full());
}
@@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza)
// Spread the word
if (ok) {
- qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza));
+ qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza));
buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii());
phone_client_->OnIncomingStanza(e);
}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
index c5bc775d..daa0d7c0 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp
@@ -115,7 +115,7 @@ public:
{}
else if (state == cricket::Session::STATE_RECEIVEDMODIFY)
{
- //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full()));
+ //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full()));
}
else if (state == cricket::Session::STATE_SENTREJECT)
{}
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
index a389730b..86fc606f 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp
@@ -44,7 +44,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
: JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming)
{
TQString contactJid = m_peerJid.full();
- setCaption( i18n("Voice session with %1").tqarg(contactJid) );
+ setCaption( i18n("Voice session with %1").arg(contactJid) );
connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked()));
connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked()));
@@ -69,7 +69,7 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall
setContactInformation( peerContact );
}
- labelSessiontqStatus->setText( i18n("Incoming Session...") );
+ labelSessionStatus->setText( i18n("Incoming Session...") );
buttonAccept->setEnabled(true);
buttonDecline->setEnabled(true);
}
@@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact)
void JingleVoiceSessionDialog::start()
{
- labelSessiontqStatus->setText( i18n("Waiting for other peer...") );
+ labelSessionStatus->setText( i18n("Waiting for other peer...") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(true);
@@ -106,7 +106,7 @@ void JingleVoiceSessionDialog::start()
void JingleVoiceSessionDialog::slotAcceptClicked()
{
- labelSessiontqStatus->setText( i18n("Session accepted.") );
+ labelSessionStatus->setText( i18n("Session accepted.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(true);
@@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked()
void JingleVoiceSessionDialog::slotDeclineClicked()
{
- labelSessiontqStatus->setText( i18n("Session declined.") );
+ labelSessionStatus->setText( i18n("Session declined.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(false);
@@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked()
void JingleVoiceSessionDialog::slotTerminateClicked()
{
- labelSessiontqStatus->setText( i18n("Session terminated.") );
+ labelSessionStatus->setText( i18n("Session terminated.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(false);
@@ -147,7 +147,7 @@ void JingleVoiceSessionDialog::sessionStarted(const Jid &jid)
{
if( m_peerJid.compare(jid) )
{
- labelSessiontqStatus->setText( i18n("Session in progress.") );
+ labelSessionStatus->setText( i18n("Session in progress.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(true);
@@ -159,7 +159,7 @@ void JingleVoiceSessionDialog::sessionAccepted(const Jid &jid)
{
if( m_peerJid.compare(jid) )
{
- labelSessiontqStatus->setText( i18n("Session accepted.") );
+ labelSessionStatus->setText( i18n("Session accepted.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(true);
@@ -171,7 +171,7 @@ void JingleVoiceSessionDialog::sessionDeclined(const Jid &jid)
{
if( m_peerJid.compare(jid) )
{
- labelSessiontqStatus->setText( i18n("Session declined.") );
+ labelSessionStatus->setText( i18n("Session declined.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(false);
@@ -183,7 +183,7 @@ void JingleVoiceSessionDialog::sessionTerminated(const Jid &jid)
{
if( m_peerJid.compare(jid) )
{
- labelSessiontqStatus->setText( i18n("Session terminated.") );
+ labelSessionStatus->setText( i18n("Session terminated.") );
buttonAccept->setEnabled(false);
buttonDecline->setEnabled(false);
buttonTerminate->setEnabled(false);
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index 72e3827c..bea1ac4e 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -97,7 +97,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -116,7 +116,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>128</width>
<height>128</height>
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -147,7 +147,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -209,7 +209,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -232,7 +232,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -248,7 +248,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -298,7 +298,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -309,7 +309,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -325,7 +325,7 @@
</widget>
<widget class="TQLabel">
<property name="name">
- <cstring>labelSessiontqStatus</cstring>
+ <cstring>labelSessionStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -351,7 +351,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 6d85cb0d..a5a94941 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -194,12 +194,12 @@ int Task::Process(int state) {
void
Task::AddChild(Task * child) {
- tqchildren_.insert(child);
+ children_.insert(child);
}
bool
Task::AllChildrenDone() {
- for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) {
+ for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) {
if (!(*it)->IsDone())
return false;
}
@@ -213,8 +213,8 @@ Task::AnyChildError() {
void
Task::AbortAllChildren() {
- if (tqchildren_.size() > 0) {
- ChildSet copy = tqchildren_;
+ if (children_.size() > 0) {
+ ChildSet copy = children_;
for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) {
(*it)->Abort(true); // Note we do not wake
}
@@ -231,7 +231,7 @@ void
Task::OnChildStopped(Task * child) {
if (child->HasError())
child_error_ = true;
- tqchildren_.erase(child);
+ children_.erase(child);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 7140b691..5a486198 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -61,13 +61,13 @@
// might be working on something as you send it infomration, you may want
// to have a queue in the task.
//
-// (3) Finally it helps manage parent tasks and tqchildren. If a parent
-// task gets aborted, all the tqchildren tasks are too. The nice thing
+// (3) Finally it helps manage parent tasks and children. If a parent
+// task gets aborted, all the children tasks are too. The nice thing
// about this, for example, is if you have one parent task that
// represents, say, and Xmpp connection, then you can spawn a whole bunch
// of infinite lifetime child tasks and now worry about cleaning them up.
// When the parent task goes to STATE_DONE, the task engine will make
-// sure all those tqchildren are aborted and get deleted.
+// sure all those children are aborted and get deleted.
//
// Notice that Task has a few built-in states, e.g.,
//
@@ -122,7 +122,7 @@ public:
// Called from outside to stop task without any more callbacks
void Abort(bool nowake = false);
- // For managing tqchildren
+ // For managing children
bool AllChildrenDone();
bool AnyChildError();
@@ -153,7 +153,7 @@ protected:
virtual int ProcessStart() = 0;
virtual int ProcessResponse() { return STATE_DONE; }
- // for managing tqchildren (if any)
+ // for managing children (if any)
void AddChild(Task * child);
void AbortAllChildren();
@@ -172,9 +172,9 @@ private:
bool child_error_;
unsigned long long start_time_;
- // for managing tqchildren
+ // for managing children
typedef std::set<Task *> ChildSet;
- ChildSet tqchildren_;
+ ChildSet children_;
};
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
index 43728eb7..b5ecc55e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
@@ -33,7 +33,7 @@
namespace buzz {
TaskRunner::~TaskRunner() {
- // this kills and deletes tqchildren silently!
+ // this kills and deletes children silently!
AbortAllChildren();
RunTasks();
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
index 40c1fbfe..6d818932 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
@@ -188,13 +188,13 @@ private:
CallClient* call_client_;
};
-const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) {
+const char* DescribeStatus(buzz::Status::Show show, const std::string& desc) {
switch (show) {
- case buzz::tqStatus::SHOW_XA: return desc.c_str();
- case buzz::tqStatus::SHOW_ONLINE: return "online";
- case buzz::tqStatus::SHOW_AWAY: return "away";
- case buzz::tqStatus::SHOW_DND: return "do not disturb";
- case buzz::tqStatus::SHOW_CHAT: return "ready to chat";
+ case buzz::Status::SHOW_XA: return desc.c_str();
+ case buzz::Status::SHOW_ONLINE: return "online";
+ case buzz::Status::SHOW_AWAY: return "away";
+ case buzz::Status::SHOW_DND: return "do not disturb";
+ case buzz::Status::SHOW_CHAT: return "ready to chat";
delault: return "offline";
}
}
@@ -320,11 +320,11 @@ void CallClient::InitPresence() {
this, &CallClient::OnStatusUpdate);
presence_push_->Start();
- buzz::tqStatus my_status;
+ buzz::Status my_status;
my_status.set_jid(xmpp_client_->jid());
my_status.set_available(true);
my_status.set_invisible(false);
- my_status.set_show(buzz::tqStatus::SHOW_ONLINE);
+ my_status.set_show(buzz::Status::SHOW_ONLINE);
my_status.set_priority(0);
my_status.set_know_capabilities(true);
my_status.set_phone_capability(true);
@@ -337,7 +337,7 @@ void CallClient::InitPresence() {
presence_out_->Start();
}
-void CallClient::OnStatusUpdate(const buzz::tqStatus& status) {
+void CallClient::OnStatusUpdate(const buzz::Status& status) {
RosterItem item;
item.jid = status.jid();
item.show = status.show();
@@ -362,7 +362,7 @@ void CallClient::PrintRoster() {
while (iter != roster_->end()) {
Console()->Printf("%s - %s",
iter->second.jid.BareJid().Str().c_str(),
- DescribetqStatus(iter->second.show, iter->second.status));
+ DescribeStatus(iter->second.show, iter->second.status));
iter++;
}
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
index 24ce1545..d35a6114 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.h
@@ -29,7 +29,7 @@
namespace buzz {
class PresencePushTask;
-class tqStatus;
+class Status;
}
namespace cricket {
@@ -43,7 +43,7 @@ class Call;
struct RosterItem {
buzz::Jid jid;
- buzz::tqStatus::Show show;
+ buzz::Status::Show show;
std::string status;
};
@@ -82,7 +82,7 @@ private:
void OnSendStanza(cricket::SessionClient *client, const buzz::XmlElement* stanza);
void InitPresence();
- void OnStatusUpdate(const buzz::tqStatus& status);
+ void OnStatusUpdate(const buzz::Status& status);
};
#endif // CRICKET_EXAMPLES_CALL_CALLCLIENT_H__
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
index 7fd68120..a15a6c83 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
@@ -42,27 +42,27 @@ bool ToString(const T &t,
return !oss.fail();
}
-XmppReturntqStatus
-PresenceOutTask::Send(const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::Send(const Status & s) {
if (GetState() != STATE_INIT)
return XMPP_RETURN_BADSTATE;
- stanza_.reset(TranslatetqStatus(s));
+ stanza_.reset(TranslateStatus(s));
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
-PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) {
+XmppReturnStatus
+PresenceOutTask::SendDirected(const Jid & j, const Status & s) {
if (GetState() != STATE_INIT)
return XMPP_RETURN_BADSTATE;
- XmlElement * presence = TranslatetqStatus(s);
+ XmlElement * presence = TranslateStatus(s);
presence->AddAttr(TQN_TO, j.Str());
stanza_.reset(presence);
return XMPP_RETURN_OK;
}
-XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) {
+XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) {
if (GetState() != STATE_INIT)
return XMPP_RETURN_BADSTATE;
@@ -82,7 +82,7 @@ PresenceOutTask::ProcessStart() {
}
XmlElement *
-PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
+PresenceOutTask::TranslateStatus(const Status & s) {
XmlElement * result = new XmlElement(TQN_PRESENCE);
if (!s.available()) {
result->AddAttr(TQN_TYPE, STR_UNAVAILABLE);
@@ -92,19 +92,19 @@ PresenceOutTask::TranslatetqStatus(const tqStatus & s) {
result->AddAttr(TQN_TYPE, STR_INVISIBLE);
}
- if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) {
+ if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) {
result->AddElement(new XmlElement(TQN_SHOW));
switch (s.show()) {
default:
result->AddText(STR_SHOW_AWAY, 1);
break;
- case tqStatus::SHOW_XA:
+ case Status::SHOW_XA:
result->AddText(STR_SHOW_XA, 1);
break;
- case tqStatus::SHOW_DND:
+ case Status::SHOW_DND:
result->AddText(STR_SHOW_DND, 1);
break;
- case tqStatus::SHOW_CHAT:
+ case Status::SHOW_CHAT:
result->AddText(STR_SHOW_CHAT, 1);
break;
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
index 47660514..2b65a553 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h
@@ -31,13 +31,13 @@ public:
PresenceOutTask(Task * parent) : XmppTask(parent) {}
virtual ~PresenceOutTask() {}
- XmppReturntqStatus Send(const tqStatus & s);
- XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s);
- XmppReturntqStatus SendProbe(const Jid& jid);
+ XmppReturnStatus Send(const Status & s);
+ XmppReturnStatus SendDirected(const Jid & j, const Status & s);
+ XmppReturnStatus SendProbe(const Jid& jid);
virtual int ProcessStart();
private:
- XmlElement * TranslatetqStatus(const tqStatus & s);
+ XmlElement * TranslateStatus(const Status & s);
scoped_ptr<XmlElement> stanza_;
};
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
index cee7058a..31d1ae77 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
@@ -77,7 +77,7 @@ PresencePushTask::ProcessStart() {
const XmlElement * stanza = NextStanza();
if (stanza == NULL)
return STATE_BLOCKED;
- tqStatus s;
+ Status s;
s.set_jid(Jid(stanza->Attr(TQN_FROM)));
@@ -114,23 +114,23 @@ PresencePushTask::ProcessStart() {
const XmlElement * show = stanza->FirstNamed(TQN_SHOW);
if (show == NULL || show->FirstChild() == NULL) {
- s.set_show(tqStatus::SHOW_ONLINE);
+ s.set_show(Status::SHOW_ONLINE);
}
else {
if (show->BodyText() == "away") {
- s.set_show(tqStatus::SHOW_AWAY);
+ s.set_show(Status::SHOW_AWAY);
}
else if (show->BodyText() == "xa") {
- s.set_show(tqStatus::SHOW_XA);
+ s.set_show(Status::SHOW_XA);
}
else if (show->BodyText() == "dnd") {
- s.set_show(tqStatus::SHOW_DND);
+ s.set_show(Status::SHOW_DND);
}
else if (show->BodyText() == "chat") {
- s.set_show(tqStatus::SHOW_CHAT);
+ s.set_show(Status::SHOW_CHAT);
}
else {
- s.set_show(tqStatus::SHOW_ONLINE);
+ s.set_show(Status::SHOW_ONLINE);
}
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
index 06c68015..77459647 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h
@@ -32,7 +32,7 @@ class PresencePushTask : public XmppTask {
public:
PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {}
virtual int ProcessStart();
- sigslot::signal1<const tqStatus &>SignalStatusUpdate;
+ sigslot::signal1<const Status &>SignalStatusUpdate;
protected:
virtual bool HandleStanza(const XmlElement * stanza);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
index 264ed725..cab9312f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/status.h
@@ -26,9 +26,9 @@
namespace buzz {
-class tqStatus {
+class Status {
public:
- tqStatus() :
+ Status() :
pri_(0),
show_(SHOW_NONE),
available_(false),
@@ -39,7 +39,7 @@ public:
is_google_client_(false),
feedback_probation_(false) {};
- ~tqStatus() {}
+ ~Status() {}
// These are arranged in "priority order", i.e., if we see
// two statuses at the same priority but with different Shows,
@@ -86,7 +86,7 @@ public:
void set_feedback_probation(bool f) { feedback_probation_ = f; }
void set_sent_time(const std::string& time) { sent_time_ = time; }
- void UpdateWith(const tqStatus & new_value) {
+ void UpdateWith(const Status & new_value) {
if (!new_value.know_capabilities()) {
bool k = know_capabilities();
bool i = is_google_client();
@@ -105,15 +105,15 @@ public:
}
}
- bool HasQuiettqStatus() const {
+ bool HasQuietStatus() const {
if (status_.empty())
return false;
- return !(QuiettqStatus().empty());
+ return !(QuietStatus().empty());
}
// Knowledge of other clients' silly automatic status strings -
// Don't show these.
- std::string QuiettqStatus() const {
+ std::string QuietStatus() const {
if (jid_.resource().find("Psi") != std::string::npos) {
if (status_ == "Online" ||
status_.find("Auto Status") != std::string::npos)
@@ -123,18 +123,18 @@ public:
if (status_ == "Sorry, I ran out for a bit!")
return STR_EMPTY;
}
- return TrimtqStatus(status_);
+ return TrimStatus(status_);
}
- std::string ExplicittqStatus() const {
- std::string result = QuiettqStatus();
+ std::string ExplicitStatus() const {
+ std::string result = QuietStatus();
if (result.empty()) {
- result = ShowtqStatus();
+ result = ShowStatus();
}
return result;
}
- std::string ShowtqStatus() const {
+ std::string ShowStatus() const {
std::string result;
if (!available()) {
result = "Offline";
@@ -159,7 +159,7 @@ public:
return result;
}
- static std::string TrimtqStatus(const std::string & st) {
+ static std::string TrimStatus(const std::string & st) {
std::string s(st);
int j = 0;
bool collapsing = true;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
index 40e694e2..7d966fb3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
@@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) {
RunTasks();
}
-buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
+buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
return client_->SendStanza(stanza);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
index 0314b2fd..fd6f88bb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
@@ -62,7 +62,7 @@ public:
void OnMessage(cricket::Message *pmsg);
- buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza);
+ buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza);
private:
buzz::XmppClient *client_;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
index 8456a90f..f3244c54 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
@@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) {
sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
}
-void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) {
- play_ = ptqlayout;
+void LinphoneMediaChannel::SetPlayout(bool playout) {
+ play_ = playout;
}
void LinphoneMediaChannel::SetSend(bool send) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
index 2639c7ac..0c00be75 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
@@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel {
virtual void SetCodec(const char *codec);
virtual void OnPacketReceived(const void *data, int len);
- virtual void SetPtqlayout(bool ptqlayout);
+ virtual void SetPlayout(bool playout);
virtual void SetSend(bool send);
virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
index 4a2e4560..db2f9654 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
@@ -41,7 +41,7 @@ class MediaChannel {
void SetInterface(NetworkInterface *iface) {network_interface_ = iface;}
virtual void SetCodec(const char *codec) = 0;
virtual void OnPacketReceived(const void *data, int len) = 0;
- virtual void SetPtqlayout(bool ptqlayout) = 0;
+ virtual void SetPlayout(bool playout) = 0;
virtual void SetSend(bool send) = 0;
virtual float GetCurrentQuality() = 0;
virtual int GetOutputLevel() = 0;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
index 90092283..24036b02 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
@@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len)
}
}
-void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
+void PortAudioMediaChannel::SetPlayout(bool playout)
{
if (!stream_)
return;
- if (play_ && !ptqlayout) {
+ if (play_ && !playout) {
int err = Pa_StopStream(stream_);
if (err != paNoError) {
fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err));
@@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
}
play_ = false;
}
- else if (!play_ && ptqlayout) {
+ else if (!play_ && playout) {
int err = Pa_StartStream(stream_);
if (err != paNoError) {
fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err));
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
index 89922e77..95c39a1a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
@@ -15,7 +15,7 @@ public:
virtual void SetCodec(const char *codec);
virtual void OnPacketReceived(const void *data, int len);
- virtual void SetPtqlayout(bool ptqlayout);
+ virtual void SetPlayout(bool playout);
virtual void SetSend(bool send);
virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
index c55ef287..58e1db60 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
@@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) {
void VoiceChannel::ChangeState() {
if (paused_ || !enabled_ || !socket_writable_) {
- channel_->SetPtqlayout(false);
+ channel_->SetPlayout(false);
channel_->SetSend(false);
} else {
if (muted_) {
channel_->SetSend(false);
- channel_->SetPtqlayout(true);
+ channel_->SetPlayout(true);
} else {
channel_->SetSend(true);
- channel_->SetPtqlayout(true);
+ channel_->SetPlayout(true);
}
}
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
index a021f67a..08ccd288 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
@@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) :
}
pLastAttr_ = newAttr;
- // copy tqchildren
+ // copy children
XmlChild * pChild;
XmlChild ** ppLast = &pFirstChild_;
XmlChild * newChild = NULL;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
index 8e36ac02..e0d2c006 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
@@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) {
i += 2;
}
- // now the tqchildren
+ // now the children
const XmlChild * pchild = element->FirstChild();
if (pchild == NULL)
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
index fa6a14a6..959b6f88 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
@@ -86,7 +86,7 @@ public:
void OnSocketClosed();
};
-XmppReturntqStatus
+XmppReturnStatus
XmppClient::Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * pre_auth) {
if (socket == NULL)
return XMPP_RETURN_BADARGUMENT;
@@ -237,7 +237,7 @@ XmppClient::ProcessResponse() {
return STATE_BLOCKED;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppClient::Disconnect() {
if (d_->socket_.get() == NULL)
return XMPP_RETURN_BADSTATE;
@@ -263,17 +263,17 @@ XmppClient::NextId() {
return d_->engine_->NextId();
}
-XmppReturntqStatus
+XmppReturnStatus
XmppClient::SendStanza(const XmlElement * stanza) {
return d_->engine_->SendStanza(stanza);
}
-XmppReturntqStatus
+XmppReturnStatus
XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) {
return d_->engine_->SendStanzaError(old_stanza, xse, message);
}
-XmppReturntqStatus
+XmppReturnStatus
XmppClient::SendRaw(const std::string & text) {
return d_->engine_->SendRaw(text);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
index fd65c39c..f8b4798c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h
@@ -74,14 +74,14 @@ public:
XmppClient(Task * parent);
~XmppClient();
- XmppReturntqStatus Connect(const XmppClientSettings & settings,
+ XmppReturnStatus Connect(const XmppClientSettings & settings,
AsyncSocket * socket,
PreXmppAuth * preauth);
virtual Task * GetParent(int code);
virtual int ProcessStart();
virtual int ProcessResponse();
- XmppReturntqStatus Disconnect();
+ XmppReturnStatus Disconnect();
const Jid & jid();
sigslot::signal1<XmppEngine::State> SignalStateChange;
@@ -97,9 +97,9 @@ public:
std::string GetAuthCookie();
std::string NextId();
- XmppReturntqStatus SendStanza(const XmlElement *stanza);
- XmppReturntqStatus SendRaw(const std::string & text);
- XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+ XmppReturnStatus SendStanza(const XmlElement *stanza);
+ XmppReturnStatus SendRaw(const std::string & text);
+ XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
XmppStanzaError code,
const std::string & text);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
index 58576328..1497c3ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h
@@ -66,9 +66,9 @@ enum XmppStanzaError {
XSE_UNEXPECTED_REQUEST,
};
-// XmppReturntqStatus
+// XmppReturnStatus
// This is used by API functions to synchronously return status.
-enum XmppReturntqStatus {
+enum XmppReturnStatus {
XMPP_RETURN_OK,
XMPP_RETURN_BADARGUMENT,
XMPP_RETURN_BADSTATE,
@@ -171,34 +171,34 @@ public:
// SOCKET INPUT AND OUTPUT ------------------------------------------------
//! Registers the handler for socket output
- virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
+ virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0;
//! Provides socket input to the engine
- virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0;
+ virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0;
//! Advises the engine that the socket has closed
- virtual XmppReturntqStatus ConnectionClosed() = 0;
+ virtual XmppReturnStatus ConnectionClosed() = 0;
// SESSION SETUP ---------------------------------------------------------
//! Indicates the (bare) JID for the user to use.
- virtual XmppReturntqStatus SetUser(const Jid & jid)= 0;
+ virtual XmppReturnStatus SetUser(const Jid & jid)= 0;
//! Get the login (bare) JID.
virtual const Jid & GetUser() = 0;
//! Provides different methods for credentials for login.
//! Takes ownership of this object; deletes when login is done
- virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0;
+ virtual XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0;
//! Sets whether TLS will be used within the connection (default true).
- virtual XmppReturntqStatus SetUseTls(bool useTls) = 0;
+ virtual XmppReturnStatus SetUseTls(bool useTls) = 0;
//! Sets an alternate domain from which we allows TLS certificates.
//! This is for use in the case where a we want to allow a proxy to
//! serve up its own certificate rather than one owned by the underlying
//! domain.
- virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
+ virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0;
//! Gets whether TLS will be used within the connection.
virtual bool GetUseTls() = 0;
@@ -206,7 +206,7 @@ public:
//! Sets the request resource name, if any (optional).
//! Note that the resource name may be overridden by the server; after
//! binding, the actual resource name is available as part of FullJid().
- virtual XmppReturntqStatus SetRequestedResource(const std::string& resource) = 0;
+ virtual XmppReturnStatus SetRequestedResource(const std::string& resource) = 0;
//! Gets the request resource name.
virtual const std::string & GetRequestedResource() = 0;
@@ -214,12 +214,12 @@ public:
// SESSION MANAGEMENT ---------------------------------------------------
//! Set callback for state changes.
- virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
+ virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0;
//! Initiates the XMPP connection.
//! After supplying connection settings, call this once to initiate,
//! (optionally) encrypt, authenticate, and bind the connection.
- virtual XmppReturntqStatus Connect() = 0;
+ virtual XmppReturnStatus Connect() = 0;
//! The current engine state.
virtual State GetState() = 0;
@@ -240,7 +240,7 @@ public:
//! Sends CloseConnection to output, and disconnects and registered
//! session handlers. After Disconnect completes, it is guaranteed
//! that no further callbacks will be made.
- virtual XmppReturntqStatus Disconnect() = 0;
+ virtual XmppReturnStatus Disconnect() = 0;
// APPLICATION USE -------------------------------------------------------
@@ -257,33 +257,33 @@ public:
//! Adds a listener for session events.
//! Stanza delivery is chained to session handlers; the first to
//! return 'true' is the last to get each stanza.
- virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
+ virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0;
//! Removes a listener for session events.
- virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
+ virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0;
//! Sends a stanza to the server.
- virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0;
+ virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0;
//! Sends raw text to the server
- virtual XmppReturntqStatus SendRaw(const std::string & text) = 0;
+ virtual XmppReturnStatus SendRaw(const std::string & text) = 0;
//! Sends an iq to the server, and registers a callback for the result.
//! Returns the cookie passed to the result handler.
- virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+ virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
XmppIqHandler* iq_handler,
XmppIqCookie* cookie) = 0;
//! Unregisters an iq callback handler given its cookie.
//! No callback will come to this handler after it's unregistered.
- virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+ virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
XmppIqHandler** iq_handler) = 0;
//! Forms and sends an error in response to the given stanza.
//! Swaps to and from, sets type to "error", and adds error information
//! based on the passed code. Text is optional and may be STR_EMPTY.
- virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+ virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
XmppStanzaError code,
const std::string & text) = 0;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
index c9569524..3d363a78 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
@@ -85,7 +85,7 @@ XmppEngineImpl::~XmppEngineImpl() {
DeleteIqCookies();
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -95,7 +95,7 @@ XmppEngineImpl::SetOutputHandler(XmppOutputHandler* output_handler) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -105,7 +105,7 @@ XmppEngineImpl::SetSessionHandler(XmppSessionHandler* session_handler) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
if (state_ < STATE_OPENING || state_ > STATE_OPEN)
return XMPP_RETURN_BADSTATE;
@@ -117,7 +117,7 @@ XmppEngineImpl::HandleInput(const char * bytes, size_t len) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::ConnectionClosed() {
if (state_ != STATE_CLOSED) {
EnterExit ee(this);
@@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetUseTls(bool useTls) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetTlsServerDomain(const std::string & tls_server_domain) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -153,7 +153,7 @@ XmppEngineImpl::GetUseTls() {
return tls_needed_;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetUser(const Jid & jid) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() {
return user_jid_;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -177,7 +177,7 @@ XmppEngineImpl::SetSaslHandler(SaslHandler * sasl_handler) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SetRequestedResource(const std::string & resource) {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() {
return requested_resource_;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
XmppEngine::HandlerLevel level) {
if (state_ == STATE_CLOSED)
@@ -203,7 +203,7 @@ XmppEngineImpl::AddStanzaHandler(XmppStanzaHandler * stanza_handler,
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
bool found = false;
@@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::Connect() {
if (state_ != STATE_START)
return XMPP_RETURN_BADSTATE;
@@ -245,7 +245,7 @@ XmppEngineImpl::Connect() {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SendStanza(const XmlElement * element) {
if (state_ == STATE_CLOSED)
return XMPP_RETURN_BADSTATE;
@@ -263,7 +263,7 @@ XmppEngineImpl::SendStanza(const XmlElement * element) {
return XMPP_RETURN_OK;
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SendRaw(const std::string & text) {
if (state_ == STATE_CLOSED || login_task_.get())
return XMPP_RETURN_BADSTATE;
@@ -282,7 +282,7 @@ XmppEngineImpl::NextId() {
return ss.str();
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::Disconnect() {
if (state_ != STATE_CLOSED) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
index 6011d9e8..c36f168c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h
@@ -57,33 +57,33 @@ public:
// SOCKET INPUT AND OUTPUT ------------------------------------------------
//! Registers the handler for socket output
- virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh);
+ virtual XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh);
//! Provides socket input to the engine
- virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len);
+ virtual XmppReturnStatus HandleInput(const char * bytes, size_t len);
//! Advises the engine that the socket has closed
- virtual XmppReturntqStatus ConnectionClosed();
+ virtual XmppReturnStatus ConnectionClosed();
// SESSION SETUP ---------------------------------------------------------
//! Indicates the (bare) JID for the user to use.
- virtual XmppReturntqStatus SetUser(const Jid & jid);
+ virtual XmppReturnStatus SetUser(const Jid & jid);
//! Get the login (bare) JID.
virtual const Jid & GetUser();
//! Indicates the autentication to use. Takes ownership of the object.
- virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler);
+ virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler);
//! Sets whether TLS will be used within the connection (default true).
- virtual XmppReturntqStatus SetUseTls(bool useTls);
+ virtual XmppReturnStatus SetUseTls(bool useTls);
//! Sets an alternate domain from which we allows TLS certificates.
//! This is for use in the case where a we want to allow a proxy to
//! serve up its own certificate rather than one owned by the underlying
//! domain.
- virtual XmppReturntqStatus SetTlsServerDomain(const std::string & proxy_domain);
+ virtual XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain);
//! Gets whether TLS will be used within the connection.
virtual bool GetUseTls();
@@ -91,7 +91,7 @@ public:
//! Sets the request resource name, if any (optional).
//! Note that the resource name may be overridden by the server; after
//! binding, the actual resource name is available as part of FullJid().
- virtual XmppReturntqStatus SetRequestedResource(const std::string& resource);
+ virtual XmppReturnStatus SetRequestedResource(const std::string& resource);
//! Gets the request resource name.
virtual const std::string & GetRequestedResource();
@@ -99,12 +99,12 @@ public:
// SESSION MANAGEMENT ---------------------------------------------------
//! Set callback for state changes.
- virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler);
+ virtual XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler);
//! Initiates the XMPP connection.
//! After supplying connection settings, call this once to initiate,
//! (optionally) encrypt, authenticate, and bind the connection.
- virtual XmppReturntqStatus Connect();
+ virtual XmppReturnStatus Connect();
//! The current engine state.
virtual State GetState() { return state_; }
@@ -125,40 +125,40 @@ public:
//! Sends CloseConnection to output, and disconnects and registered
//! session handlers. After Disconnect completes, it is guaranteed
//! that no further callbacks will be made.
- virtual XmppReturntqStatus Disconnect();
+ virtual XmppReturnStatus Disconnect();
// APPLICATION USE -------------------------------------------------------
//! Adds a listener for session events.
//! Stanza delivery is chained to session handlers; the first to
//! return 'true' is the last to get each stanza.
- virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler,
+ virtual XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler,
XmppEngine::HandlerLevel level);
//! Removes a listener for session events.
- virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
+ virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler);
//! Sends a stanza to the server.
- virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza);
+ virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza);
//! Sends raw text to the server
- virtual XmppReturntqStatus SendRaw(const std::string & text);
+ virtual XmppReturnStatus SendRaw(const std::string & text);
//! Sends an iq to the server, and registers a callback for the result.
//! Returns the cookie passed to the result handler.
- virtual XmppReturntqStatus SendIq(const XmlElement* pelStanza,
+ virtual XmppReturnStatus SendIq(const XmlElement* pelStanza,
XmppIqHandler* iq_handler,
XmppIqCookie* cookie);
//! Unregisters an iq callback handler given its cookie.
//! No callback will come to this handler after it's unregistered.
- virtual XmppReturntqStatus RemoveIqHandler(XmppIqCookie cookie,
+ virtual XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie,
XmppIqHandler** iq_handler);
//! Forms and sends an error in response to the given stanza.
//! Swaps to and from, sets type to "error", and adds error information
//! based on the passed code. Text is optional and may be STR_EMPTY.
- virtual XmppReturntqStatus SendStanzaError(const XmlElement * pelOriginal,
+ virtual XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal,
XmppStanzaError code,
const std::string & text);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
index 38f268b9..cdcfa9e7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
@@ -54,7 +54,7 @@ private:
};
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
XmppIqCookie* cookie) {
if (state_ == STATE_CLOSED)
@@ -85,7 +85,7 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler,
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie,
XmppIqHandler ** iq_handler) {
@@ -199,7 +199,7 @@ AddErrorCode(XmlElement * error_element, XmppStanzaError code) {
}
-XmppReturntqStatus
+XmppReturnStatus
XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
XmppStanzaError code,
const std::string & text) {
@@ -223,7 +223,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original,
error_element.AddAttr(name, attribute->Value());
}
- // copy tqchildren
+ // copy children
for (const XmlChild * child = element_original->FirstChild();
child;
child = child->NextChild()) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
index e7ac0e04..c9d86ba6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
@@ -55,14 +55,14 @@ XmppTask::StopImpl() {
}
}
-XmppReturntqStatus
+XmppReturnStatus
XmppTask::SendStanza(const XmlElement * stanza) {
if (client_ == NULL)
return XMPP_RETURN_BADSTATE;
return client_->SendStanza(stanza);
}
-XmppReturntqStatus
+XmppReturnStatus
XmppTask::SendStanzaError(const XmlElement * element_original,
XmppStanzaError code,
const std::string & text) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
index a1ed3dd3..0bd7c4b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h
@@ -78,9 +78,9 @@ public:
protected:
friend class XmppClient;
- XmppReturntqStatus SendStanza(const XmlElement * stanza);
- XmppReturntqStatus SetResult(const std::string & code);
- XmppReturntqStatus SendStanzaError(const XmlElement * element_original,
+ XmppReturnStatus SendStanza(const XmlElement * stanza);
+ XmppReturnStatus SetResult(const std::string & code);
+ XmppReturnStatus SendStanzaError(const XmlElement * element_original,
XmppStanzaError code,
const std::string & text);
diff --git a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
index 4632af45..058825db 100644
--- a/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
+++ b/kopete/protocols/jabber/libiris/005_join_muc_with_password.patch
@@ -7,8 +7,8 @@ Index: iris/include/im.h
bool groupChatJoin(const QString &host, const QString &room, const QString &nick);
+ bool groupChatJoin(const QString &host, const QString &room, const QString &nick, const QString &password);
- void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &);
- void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &);
+ void groupChatSetStatus(const QString &host, const QString &room, const Status &);
+ void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &);
void groupChatLeave(const QString &host, const QString &room);
Index: iris/xmpp-im/client.cpp
===================================================================
@@ -34,20 +34,20 @@ Index: iris/xmpp-im/client.cpp
+ ++it;
+ }
+
-+ debug(QString("Client: Joined: [%1]\n").tqarg(jid.full()));
++ debug(QString("Client: Joined: [%1]\n").arg(jid.full()));
+ GroupChat i;
+ i.j = jid;
+ i.status = GroupChat::Connecting;
+ d->groupChatList += i;
+
+ JT_MucPresence *j = new JT_MucPresence(rootTask());
-+ j->pres(jid, tqStatus(), password);
++ j->pres(jid, Status(), password);
+ j->go(true);
+
+ return true;
+}
+
- void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s)
+ void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s)
{
Jid jid(room + "@" + host);
Index: iris/xmpp-im/xmpp_tasks.h
@@ -66,8 +66,8 @@ Index: iris/xmpp-im/xmpp_tasks.h
+ JT_MucPresence(Task *parent);
+ ~JT_MucPresence();
+
-+ void pres(const tqStatus &);
-+ void pres(const Jid &, const tqStatus &, const QString &password);
++ void pres(const Status &);
++ void pres(const Jid &, const Status &, const QString &password);
+
+ void onGo();
+
@@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
+{
+}
+
-+void JT_MucPresence::pres(const tqStatus &s)
++void JT_MucPresence::pres(const Status &s)
+{
+ type = 0;
+
@@ -121,7 +121,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
+ if(!s.status().isEmpty())
+ tag.appendChild(textTag(doc(), "status", s.status()));
+
-+ tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(s.priority()) ) );
++ tag.appendChild( textTag(doc(), "priority", QString("%1").arg(s.priority()) ) );
+
+ if(!s.keyID().isEmpty()) {
+ QDomElement x = textTag(doc(), "x", s.keyID());
@@ -146,7 +146,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp
+ }
+}
+
-+void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password)
++void JT_MucPresence::pres(const Jid &to, const Status &s, const QString &password)
+{
+ pres(s);
+ tag.setAttribute("to", to.full());
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index cd5b2f64..f20c054f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -358,7 +358,7 @@ void HttpPoll::resetKey()
fprintf(stderr, "HttpPoll: reset key!\n");
#endif
TQByteArray a = randomArray(64);
- TQString str = TQString::tqfromLatin1(a.data(), a.size());
+ TQString str = TQString::fromLatin1(a.data(), a.size());
d->key_n = POLL_KEYS;
for(int n = 0; n < POLL_KEYS; ++n)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index 16f02e07..e4e1b182 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -122,7 +122,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s)
return 0;
TQCString cs(host_len+1);
memcpy(cs.data(), from->data() + 5, host_len);
- host = TQString::tqfromLatin1(cs);
+ host = TQString::fromLatin1(cs);
}
else if(atype == 0x04) {
full_len += 16;
@@ -467,7 +467,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s)
return 0;
TQCString cs(host_len+1);
memcpy(cs.data(), from->data() + 5, host_len);
- host = TQString::tqfromLatin1(cs);
+ host = TQString::fromLatin1(cs);
}
else if(atype == 0x04) {
full_len += 16;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index c9726d75..fcdd3d49 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -146,7 +146,7 @@ TQString Base64::arrayToString(const TQByteArray &a)
TQCString c;
c.resize(b.size()+1);
memcpy(c.data(), b.data(), b.size());
- return TQString::tqfromLatin1(c);
+ return TQString::fromLatin1(c);
}
//!
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 0c8b46df..6339d14a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -20,11 +20,11 @@
#include"showtextdlg.h"
-#include<tqlayout.h>
-#include<tqtextedit.h>
+#include<layout.h>
+#include<textedit.h>
#include<tqpushbutton.h>
#include<tqfile.h>
-#include<tqtextstream.h>
+#include<textstream.h>
ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name)
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 8387d48a..835eed62 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -136,11 +136,11 @@ namespace XMPP
SubType value;
};
- class tqStatus
+ class Status
{
public:
- tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
- ~tqStatus();
+ Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true);
+ ~Status();
int priority() const;
const TQString & show() const;
@@ -162,7 +162,7 @@ namespace XMPP
void setPriority(int);
void setShow(const TQString &);
- void settqStatus(const TQString &);
+ void setStatus(const TQString &);
void setTimeStamp(const TQDateTime &);
void setKeyID(const TQString &);
void setIsAvailable(bool);
@@ -197,19 +197,19 @@ namespace XMPP
class Resource
{
public:
- Resource(const TQString &name="", const tqStatus &s=tqStatus());
+ Resource(const TQString &name="", const Status &s=Status());
~Resource();
const TQString & name() const;
int priority() const;
- const tqStatus & status() const;
+ const Status & status() const;
void setName(const TQString &);
- void settqStatus(const tqStatus &);
+ void setStatus(const Status &);
private:
TQString v_name;
- tqStatus v_status;
+ Status v_status;
class ResourcePrivate *d;
};
@@ -570,7 +570,7 @@ namespace XMPP
void rosterRequest();
void sendMessage(const Message &);
void sendSubscription(const Jid &, const TQString &);
- void setPresence(const tqStatus &);
+ void setPresence(const Status &);
void debug(const TQString &);
TQString genUniqueId();
@@ -610,8 +610,8 @@ namespace XMPP
bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick);
bool groupChatJoin(const TQString &host, const TQString &room, const TQString &nick, const TQString &password);
- void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &);
- void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &);
+ void groupChatSetStatus(const TQString &host, const TQString &room, const Status &);
+ void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &);
void groupChatLeave(const TQString &host, const TQString &room);
signals:
@@ -632,7 +632,7 @@ namespace XMPP
void xmlOutgoing(const TQString &);
void groupChatJoined(const Jid &);
void groupChatLeft(const Jid &);
- void groupChatPresence(const Jid &, const tqStatus &);
+ void groupChatPresence(const Jid &, const Status &);
void groupChatError(const Jid &, int, const TQString &);
void incomingJidLink();
@@ -652,7 +652,7 @@ namespace XMPP
// basic daemons
void ppSubscription(const Jid &, const TQString &);
- void ppPresence(const Jid &, const tqStatus &);
+ void ppPresence(const Jid &, const Status &);
void pmMessage(const Message &);
void prRoster(const Roster &);
@@ -666,8 +666,8 @@ namespace XMPP
void distribute(const TQDomElement &);
void importRoster(const Roster &);
void importRosterItem(const RosterItem &);
- void updateSelfPresence(const Jid &, const tqStatus &);
- void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &);
+ void updateSelfPresence(const Jid &, const Status &);
+ void updatePresence(LiveRosterItem *, const Jid &, const Status &);
class ClientPrivate;
ClientPrivate *d;
@@ -689,15 +689,15 @@ namespace XMPP
ResourceList::ConstIterator priority() const;
bool isAvailable() const;
- const tqStatus & lastUnavailabletqStatus() const;
+ const Status & lastUnavailableStatus() const;
bool flagForDelete() const;
- void setLastUnavailabletqStatus(const tqStatus &);
+ void setLastUnavailableStatus(const Status &);
void setFlagForDelete(bool);
private:
ResourceList v_resourceList;
- tqStatus v_lastUnavailabletqStatus;
+ Status v_lastUnavailableStatus;
bool v_flagForDelete;
class LiveRosterItemPrivate;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 3fa7d6c3..edd2398b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -49,7 +49,7 @@
#include"parser.h"
-#include<tqtextcodec.h>
+#include<textcodec.h>
#include<tqptrlist.h>
#include<string.h>
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index 89c98a91..f96fd795 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -1109,7 +1109,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
e.setAttribute("mechanism", sasl_mech);
if(!sasl_step.isEmpty()) {
#ifdef XMPP_TEST
- TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+ TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
#endif
e.appendChild(doc.createTextNode(Base64::arrayToString(sasl_step)));
}
@@ -1143,7 +1143,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
else {
TQByteArray stepData = sasl_step;
#ifdef XMPP_TEST
- TD::msg(TQString("SASL OUT: [%1]").tqarg(printArray(sasl_step)));
+ TD::msg(TQString("SASL OUT: [%1]").arg(printArray(sasl_step)));
#endif
TQDomElement e = doc.createElementNS(NS_SASL, "response");
if(!stepData.isEmpty())
@@ -1289,7 +1289,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
#ifdef XMPP_TEST
TQString s = "SASL mechs:";
for(TQStringList::ConstIterator it = f.sasl_mechs.begin(); it != f.sasl_mechs.end(); ++it)
- s += TQString(" [%1]").tqarg((*it));
+ s += TQString(" [%1]").arg((*it));
TD::msg(s);
#endif
}
@@ -1341,7 +1341,7 @@ bool CoreProtocol::normalStep(const TQDomElement &e)
if(e.tagName() == "challenge") {
TQByteArray a = Base64::stringToArray(e.text());
#ifdef XMPP_TEST
- TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a)));
+ TD::msg(TQString("SASL IN: [%1]").arg(printArray(a)));
#endif
sasl_step = a;
need = NSASLNext;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 0e324cb1..c2f3083e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -44,7 +44,7 @@
#include"xmpp.h"
-#include<tqtextstream.h>
+#include<textstream.h>
#include<tqguardedptr.h>
#include<tqtimer.h>
#include<qca.h>
@@ -1358,9 +1358,9 @@ void ClientStream::processNext()
#endif
#ifdef XMPP_TEST
- TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang);
+ TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang);
if(!d->client.from.isEmpty())
- s += TQString(", from=[%1]").tqarg(d->client.from);
+ s += TQString(", from=[%1]").arg(d->client.from);
s += ')';
TD::msg(s);
#endif
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index d1650842..93748aa8 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e)
i.setAttributeNodeNS(a);
}
- // copy tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index 973b6c73..b7d5e00c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p
d->pass = pass;
d->resource = _resource;
- tqStatus stat;
+ Status stat;
stat.setIsAvailable(false);
d->resourceList += Resource(resource(), stat);
JT_PushPresence *pp = new JT_PushPresence(rootTask());
connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &)));
- connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &)));
+ connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &)));
JT_PushMessage *pm = new JT_PushMessage(rootTask());
connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &)));
@@ -267,7 +267,7 @@ bool Client::isActive() const
return d->active;
}
-void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s)
+void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s)
{
Jid jid(room + "@" + host + "/" + nick);
for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -275,7 +275,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con
if(i.j.compare(jid, false)) {
i.j = jid;
- tqStatus s = _s;
+ Status s = _s;
s.setIsAvailable(true);
JT_Presence *j = new JT_Presence(rootTask());
@@ -303,14 +303,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
++it;
}
- debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+ debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
GroupChat i;
i.j = jid;
i.status = GroupChat::Connecting;
d->groupChatList += i;
JT_Presence *j = new JT_Presence(rootTask());
- j->pres(jid, tqStatus());
+ j->pres(jid, Status());
j->go(true);
return true;
@@ -332,20 +332,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS
++it;
}
- debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full()));
+ debug(TQString("Client: Joined: [%1]\n").arg(jid.full()));
GroupChat i;
i.j = jid;
i.status = GroupChat::Connecting;
d->groupChatList += i;
JT_MucPresence *j = new JT_MucPresence(rootTask());
- j->pres(jid, tqStatus(), password);
+ j->pres(jid, Status(), password);
j->go(true);
return true;
}
-void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s)
+void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s)
{
Jid jid(room + "@" + host);
bool found = false;
@@ -360,7 +360,7 @@ void Client::groupChatSettqStatus(const TQString &host, const TQString &room, co
if(!found)
return;
- tqStatus s = _s;
+ Status s = _s;
s.setIsAvailable(true);
JT_Presence *j = new JT_Presence(rootTask());
@@ -378,10 +378,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room)
continue;
i.status = GroupChat::Closing;
- debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full()));
+ debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full()));
JT_Presence *j = new JT_Presence(rootTask());
- tqStatus s;
+ Status s;
s.setIsAvailable(false);
j->pres(i.j, s);
j->go(true);
@@ -410,7 +410,7 @@ void Client::close(bool)
i.status = GroupChat::Closing;
JT_Presence *j = new JT_Presence(rootTask());
- tqStatus s;
+ Status s;
s.setIsAvailable(false);
j->pres(i.j, s);
j->go(true);
@@ -493,7 +493,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
if(!noShowNS)
i.setAttribute("xmlns", e.namespaceURI());
- // copy tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
@@ -514,7 +514,7 @@ void Client::streamReadyRead()
Stanza s = d->stream->read();
TQString out = s.toString();
- debug(TQString("Client: incoming: [\n%1]\n").tqarg(out));
+ debug(TQString("Client: incoming: [\n%1]\n").arg(out));
xmlIncoming(out);
TQDomElement x = oldStyleNS(s.element());
@@ -607,7 +607,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
i.setAttributeNodeNS(a.cloneNode().toAttr());
}
- // copy tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
@@ -631,7 +631,7 @@ void Client::send(const TQDomElement &x)
//x.save(ts, 0);
//TQString out = Stream::xmlToString(x);
- //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+ //debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
//xmlOutgoing(out);
TQDomElement e = addCorrectNS(x);
@@ -642,7 +642,7 @@ void Client::send(const TQDomElement &x)
}
TQString out = s.toString();
- debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
+ debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
xmlOutgoing(out);
//printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1());
@@ -654,7 +654,7 @@ void Client::send(const TQString &str)
if(!d->stream)
return;
- debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str));
+ debug(TQString("Client: outgoing: [\n%1]\n").arg(str));
xmlOutgoing(str);
static_cast<ClientStream*>(d->stream)->writeDirect(str);
}
@@ -713,12 +713,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s)
subscription(j, s);
}
-void Client::ppPresence(const Jid &j, const tqStatus &s)
+void Client::ppPresence(const Jid &j, const Status &s)
{
if(s.isAvailable())
- debug(TQString("Client: %1 is available.\n").tqarg(j.full()));
+ debug(TQString("Client: %1 is available.\n").arg(j.full()));
else
- debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full()));
+ debug(TQString("Client: %1 is unavailable.\n").arg(j.full()));
for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
GroupChat &i = *it;
@@ -726,7 +726,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
if(i.j.compare(j, false)) {
bool us = (i.j.resource() == j.resource() || j.resource().isEmpty()) ? true: false;
- debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us));
+ debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").arg(i.j.full()).arg(j.full()).arg(us));
switch(i.status) {
case GroupChat::Connecting:
if(us && s.hasError()) {
@@ -789,7 +789,7 @@ void Client::ppPresence(const Jid &j, const tqStatus &s)
}
}
-void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
+void Client::updateSelfPresence(const Jid &j, const Status &s)
{
ResourceList::Iterator rit = d->resourceList.find(j.resource());
bool found = (rit == d->resourceList.end()) ? false: true;
@@ -797,8 +797,8 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
// unavailable? remove the resource
if(!s.isAvailable()) {
if(found) {
- debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource()));
- (*rit).settqStatus(s);
+ debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource()));
+ (*rit).setStatus(s);
resourceUnavailable(j, *rit);
d->resourceList.remove(rit);
}
@@ -809,19 +809,19 @@ void Client::updateSelfPresence(const Jid &j, const tqStatus &s)
if(!found) {
r = Resource(j.resource(), s);
d->resourceList += r;
- debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource()));
+ debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource()));
}
else {
- (*rit).settqStatus(s);
+ (*rit).setStatus(s);
r = *rit;
- debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource()));
+ debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource()));
}
resourceAvailable(j, r);
}
}
-void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
+void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s)
{
ResourceList::Iterator rit = i->resourceList().find(j.resource());
bool found = (rit == i->resourceList().end()) ? false: true;
@@ -829,11 +829,11 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
// unavailable? remove the resource
if(!s.isAvailable()) {
if(found) {
- (*rit).settqStatus(s);
- debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+ (*rit).setStatus(s);
+ debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
resourceUnavailable(j, *rit);
i->resourceList().remove(rit);
- i->setLastUnavailabletqStatus(s);
+ i->setLastUnavailableStatus(s);
}
}
// available? add/update the resource
@@ -842,12 +842,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
if(!found) {
r = Resource(j.resource(), s);
i->resourceList() += r;
- debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+ debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
}
else {
- (*rit).settqStatus(s);
+ (*rit).setStatus(s);
r = *rit;
- debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource()));
+ debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource()));
}
resourceAvailable(j, r);
@@ -856,7 +856,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s)
void Client::pmMessage(const Message &m)
{
- debug(TQString("Client: Message from %1\n").tqarg(m.from().full()));
+ debug(TQString("Client: Message from %1\n").arg(m.from().full()));
if(m.type() == "groupchat") {
for(TQValueList<GroupChat>::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) {
@@ -994,7 +994,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type)
j->go(true);
}
-void Client::setPresence(const tqStatus &s)
+void Client::setPresence(const Status &s)
{
JT_Presence *j = new JT_Presence(rootTask());
j->pres(s);
@@ -1004,7 +1004,7 @@ void Client::setPresence(const tqStatus &s)
ppPresence(jid(), s);
//ResourceList::Iterator rit = d->resourceList.find(resource());
//Resource &r = *rit;
- //r.settqStatus(s);
+ //r.setStatus(s);
}
TQString Client::OSName() const
@@ -1363,7 +1363,7 @@ void Task::debug(const char *fmt, ...)
void Task::debug(const TQString &str)
{
- client()->debug(TQString("%1: ").tqarg(className()) + str);
+ client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns)
@@ -1462,9 +1462,9 @@ bool LiveRosterItem::isAvailable() const
return false;
}
-const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const
+const Status & LiveRosterItem::lastUnavailableStatus() const
{
- return v_lastUnavailabletqStatus;
+ return v_lastUnavailableStatus;
}
bool LiveRosterItem::flagForDelete() const
@@ -1472,9 +1472,9 @@ bool LiveRosterItem::flagForDelete() const
return v_flagForDelete;
}
-void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s)
+void LiveRosterItem::setLastUnavailableStatus(const Status &s)
{
- v_lastUnavailabletqStatus = s;
+ v_lastUnavailableStatus = s;
}
void LiveRosterItem::setFlagForDelete(bool b)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index 9e742d10..f33e428f 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -295,7 +295,7 @@ Stanza::Error Message::error() const
return d->error;
}
-//! \brief Set tqreceivers information
+//! \brief Set receivers information
//!
//! \param to - Receivers Jabber id
void Message::setTo(const Jid &j)
@@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset)
d->spooled = true;
}
else {
- d->timeStamp = TQDateTime::tqcurrentDateTime();
+ d->timeStamp = TQDateTime::currentDateTime();
d->spooled = false;
}
@@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s)
//---------------------------------------------------------------------------
-// tqStatus
+// Status
//---------------------------------------------------------------------------
-tqStatus::tqStatus(const TQString &show, const TQString &status, int priority, bool available)
+Status::Status(const TQString &show, const TQString &status, int priority, bool available)
{
v_isAvailable = available;
v_show = show;
v_status = status;
v_priority = priority;
- v_timeStamp = TQDateTime::tqcurrentDateTime();
+ v_timeStamp = TQDateTime::currentDateTime();
v_isInvisible = false;
ecode = -1;
}
-tqStatus::~tqStatus()
+Status::~Status()
{
}
-bool tqStatus::hasError() const
+bool Status::hasError() const
{
return (ecode != -1);
}
-void tqStatus::setError(int code, const TQString &str)
+void Status::setError(int code, const TQString &str)
{
ecode = code;
estr = str;
}
-void tqStatus::setIsAvailable(bool available)
+void Status::setIsAvailable(bool available)
{
v_isAvailable = available;
}
-void tqStatus::setIsInvisible(bool invisible)
+void Status::setIsInvisible(bool invisible)
{
v_isInvisible = invisible;
}
-void tqStatus::setPriority(int x)
+void Status::setPriority(int x)
{
v_priority = x;
}
-void tqStatus::setShow(const TQString & _show)
+void Status::setShow(const TQString & _show)
{
v_show = _show;
}
-void tqStatus::settqStatus(const TQString & _status)
+void Status::setStatus(const TQString & _status)
{
v_status = _status;
}
-void tqStatus::setTimeStamp(const TQDateTime & _timestamp)
+void Status::setTimeStamp(const TQDateTime & _timestamp)
{
v_timeStamp = _timestamp;
}
-void tqStatus::setKeyID(const TQString &key)
+void Status::setKeyID(const TQString &key)
{
v_key = key;
}
-void tqStatus::setXSigned(const TQString &s)
+void Status::setXSigned(const TQString &s)
{
v_xsigned = s;
}
-void tqStatus::setSongTitle(const TQString & _songtitle)
+void Status::setSongTitle(const TQString & _songtitle)
{
v_songTitle = _songtitle;
}
-void tqStatus::setCapsNode(const TQString & _capsNode)
+void Status::setCapsNode(const TQString & _capsNode)
{
v_capsNode = _capsNode;
}
-void tqStatus::setCapsVersion(const TQString & _capsVersion)
+void Status::setCapsVersion(const TQString & _capsVersion)
{
v_capsVersion = _capsVersion;
}
-void tqStatus::setCapsExt(const TQString & _capsExt)
+void Status::setCapsExt(const TQString & _capsExt)
{
v_capsExt = _capsExt;
}
-bool tqStatus::isAvailable() const
+bool Status::isAvailable() const
{
return v_isAvailable;
}
-bool tqStatus::isAway() const
+bool Status::isAway() const
{
if(v_show == "away" || v_show == "xa" || v_show == "dnd")
return true;
@@ -902,66 +902,66 @@ bool tqStatus::isAway() const
return false;
}
-bool tqStatus::isInvisible() const
+bool Status::isInvisible() const
{
return v_isInvisible;
}
-int tqStatus::priority() const
+int Status::priority() const
{
return v_priority;
}
-const TQString & tqStatus::show() const
+const TQString & Status::show() const
{
return v_show;
}
-const TQString & tqStatus::status() const
+const TQString & Status::status() const
{
return v_status;
}
-TQDateTime tqStatus::timeStamp() const
+TQDateTime Status::timeStamp() const
{
return v_timeStamp;
}
-const TQString & tqStatus::keyID() const
+const TQString & Status::keyID() const
{
return v_key;
}
-const TQString & tqStatus::xsigned() const
+const TQString & Status::xsigned() const
{
return v_xsigned;
}
-const TQString & tqStatus::songTitle() const
+const TQString & Status::songTitle() const
{
return v_songTitle;
}
-const TQString & tqStatus::capsNode() const
+const TQString & Status::capsNode() const
{
return v_capsNode;
}
-const TQString & tqStatus::capsVersion() const
+const TQString & Status::capsVersion() const
{
return v_capsVersion;
}
-const TQString & tqStatus::capsExt() const
+const TQString & Status::capsExt() const
{
return v_capsExt;
}
-int tqStatus::errorCode() const
+int Status::errorCode() const
{
return ecode;
}
-const TQString & tqStatus::errorString() const
+const TQString & Status::errorString() const
{
return estr;
}
@@ -970,7 +970,7 @@ const TQString & tqStatus::errorString() const
//---------------------------------------------------------------------------
// Resource
//---------------------------------------------------------------------------
-Resource::Resource(const TQString &name, const tqStatus &stat)
+Resource::Resource(const TQString &name, const Status &stat)
{
v_name = name;
v_status = stat;
@@ -990,7 +990,7 @@ int Resource::priority() const
return v_status.priority();
}
-const tqStatus & Resource::status() const
+const Status & Resource::status() const
{
return v_status;
}
@@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name)
v_name = _name;
}
-void Resource::settqStatus(const tqStatus & _status)
+void Resource::setStatus(const Status & _status)
{
v_status = _status;
}
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 89d66796..edc8762e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -485,7 +485,7 @@ JT_Presence::~JT_Presence()
{
}
-void JT_Presence::pres(const tqStatus &s)
+void JT_Presence::pres(const Status &s)
{
type = 0;
@@ -504,7 +504,7 @@ void JT_Presence::pres(const tqStatus &s)
if(!s.status().isEmpty())
tag.appendChild(textTag(doc(), "status", s.status()));
- tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+ tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
if(!s.keyID().isEmpty()) {
TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -529,7 +529,7 @@ void JT_Presence::pres(const tqStatus &s)
}
}
-void JT_Presence::pres(const Jid &to, const tqStatus &s)
+void JT_Presence::pres(const Jid &to, const Status &s)
{
pres(s);
tag.setAttribute("to", to.full());
@@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
return false;
Jid j(e.attribute("from"));
- tqStatus p;
+ Status p;
if(e.hasAttribute("type")) {
TQString type = e.attribute("type");
@@ -593,7 +593,7 @@ bool JT_PushPresence::take(const TQDomElement &e)
tag = findSubTag(e, "status", &found);
if(found)
- p.settqStatus(tagContent(tag));
+ p.setStatus(tagContent(tag));
tag = findSubTag(e, "show", &found);
if(found)
p.setShow(tagContent(tag));
@@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e)
if(!noShowNS)
i.setAttribute("xmlns", e.namespaceURI());
- // copy tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
@@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e)
i.setAttributeNodeNS(al.item(x).cloneNode().toAttr());
}
- // copy tqchildren
+ // copy children
TQDomNodeList nl = e.childNodes();
for(x = 0; x < nl.count(); ++x) {
TQDomNode n = nl.item(x);
@@ -1338,12 +1338,12 @@ bool JT_ServInfo::take(const TQDomElement &e)
// TQDomElement query = doc()->createElement("query");
// query.setAttribute("xmlns", "jabber:iq:time");
// iq.appendChild(query);
- // TQDateTime local = TQDateTime::tqcurrentDateTime();
+ // TQDateTime local = TQDateTime::currentDateTime();
// TQDateTime utc = local.addSecs(-getTZOffset() * 3600);
// TQString str = getTZString();
// query.appendChild(textTag("utc", TS2stamp(utc)));
// query.appendChild(textTag("tz", str));
- // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str)));
+ // query.appendChild(textTag("display", TQString("%1 %2").arg(local.toString()).arg(str)));
// send(iq);
// return TRUE;
//}
@@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence()
{
}
-void JT_MucPresence::pres(const tqStatus &s)
+void JT_MucPresence::pres(const Status &s)
{
type = 0;
@@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const tqStatus &s)
if(!s.status().isEmpty())
tag.appendChild(textTag(doc(), "status", s.status()));
- tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) );
+ tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) );
if(!s.keyID().isEmpty()) {
TQDomElement x = textTag(doc(), "x", s.keyID());
@@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const tqStatus &s)
}
}
-void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password)
+void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password)
{
pres(s);
tag.setAttribute("to", to.full());
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 9a8041e9..0a1fdac5 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -30,7 +30,7 @@
namespace XMPP
{
class Roster;
- class tqStatus;
+ class Status;
class JT_Register : public Task
{
@@ -135,8 +135,8 @@ namespace XMPP
JT_Presence(Task *parent);
~JT_Presence();
- void pres(const tqStatus &);
- void pres(const Jid &, const tqStatus &);
+ void pres(const Status &);
+ void pres(const Jid &, const Status &);
void sub(const Jid &, const TQString &subType);
void onGo();
@@ -160,7 +160,7 @@ namespace XMPP
bool take(const TQDomElement &);
signals:
- void presence(const Jid &, const tqStatus &);
+ void presence(const Jid &, const Status &);
void subscription(const Jid &, const TQString &);
private:
@@ -468,8 +468,8 @@ namespace XMPP
JT_MucPresence(Task *parent);
~JT_MucPresence();
- void pres(const tqStatus &);
- void pres(const Jid &, const tqStatus &, const TQString &password);
+ void pres(const Status &);
+ void pres(const Jid &, const Status &, const TQString &password);
void onGo();
diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch
index 489afab4..41acad0e 100644
--- a/kopete/protocols/jabber/libiris/jingle_iris.patch
+++ b/kopete/protocols/jabber/libiris/jingle_iris.patch
@@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp
v_songTitle = _songtitle;
}
-+void tqStatus::setCapsNode(const QString & _capsNode)
++void Status::setCapsNode(const QString & _capsNode)
+{
+ v_capsNode = _capsNode;
+}
+
-+void tqStatus::setCapsVersion(const QString & _capsVersion)
++void Status::setCapsVersion(const QString & _capsVersion)
+{
+ v_capsVersion = _capsVersion;
+}
+
-+void tqStatus::setCapsExt(const QString & _capsExt)
++void Status::setCapsExt(const QString & _capsExt)
+{
+ v_capsExt = _capsExt;
+}
+
- bool tqStatus::isAvailable() const
+ bool Status::isAvailable() const
{
return v_isAvailable;
@@ -836,6 +851,21 @@
return v_songTitle;
}
-+const QString & tqStatus::capsNode() const
++const QString & Status::capsNode() const
+{
+ return v_capsNode;
+}
+
-+const QString & tqStatus::capsVersion() const
++const QString & Status::capsVersion() const
+{
+ return v_capsVersion;
+}
+
-+const QString & tqStatus::capsExt() const
++const QString & Status::capsExt() const
+{
+ return v_capsExt;
+}
+
- int tqStatus::errorCode() const
+ int Status::errorCode() const
{
return ecode;
@@ -1427,6 +1457,15 @@
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
index 1996b103..bad05fcd 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
@@ -586,7 +586,7 @@ TQString RSAKey::toPEM(bool publicOnly) const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::tqfromLatin1(cs);
+ return TQString::fromLatin1(cs);
}
bool RSAKey::fromPEM(const TQString &str)
@@ -794,7 +794,7 @@ TQString Cert::toPEM() const
TQCString cs;
cs.resize(out.size()+1);
memcpy(cs.data(), out.data(), out.size());
- return TQString::tqfromLatin1(cs);
+ return TQString::fromLatin1(cs);
}
bool Cert::fromPEM(const TQString &str)
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui
index c0b3d1cc..30a609a0 100644
--- a/kopete/protocols/jabber/ui/dlgaddcontact.ui
+++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@@ -40,7 +40,7 @@
<property name="text">
<string>&amp;Jabber ID:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="buddy" stdset="0">
@@ -73,7 +73,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe@jabber.org)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>190</height>
diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui
index cb0f1cc2..66cfcfc5 100644
--- a/kopete/protocols/jabber/ui/dlgbrowse.ui
+++ b/kopete/protocols/jabber/ui/dlgbrowse.ui
@@ -47,7 +47,7 @@
<property name="text">
<string>Please wait while retrieving search form...</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui
index 29ae6d33..bed6e8d4 100644
--- a/kopete/protocols/jabber/ui/dlgchangepassword.ui
+++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui
@@ -57,7 +57,7 @@
</widget>
<widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>lbltqStatus</cstring>
+ <cstring>lblStatus</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -71,7 +71,7 @@
<string>Please enter your current password first
and then your new password twice.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui
index aa124cc2..f5f40392 100644
--- a/kopete/protocols/jabber/ui/dlgchatjoin.ui
+++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui
@@ -57,7 +57,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index 31f5b201..b158db62 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -97,7 +97,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index d130fa97..be558388 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm ()
// translate the form and create it inside the display widget
translator = new JabberFormTranslator (task->form (), dynamicForm);
- dynamicForm->tqlayout()->add( translator );
+ dynamicForm->layout()->add( translator );
translator->show();
// enable the send button
diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
index a1b732db..ad52240e 100644
--- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui
@@ -12,7 +12,7 @@
<height>343</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>300</height>
@@ -87,7 +87,7 @@
</widget>
<widget class="TQLabel" row="1" column="0">
<property name="name">
- <cstring>lbltqStatus</cstring>
+ <cstring>lblStatus</cstring>
</property>
<property name="text">
<string></string>
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index e3599536..e0a14f1c 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -57,7 +57,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout61</cstring>
+ <cstring>layout61</cstring>
</property>
<hbox>
<property name="name">
@@ -153,7 +153,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -162,7 +162,7 @@
<property name="text">
<string>To connect to the Jabber network, you will need an account on a Jabber server. If you do not yet have an account, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -227,7 +227,7 @@
<property name="text">
<string>If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -243,7 +243,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -312,7 +312,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout66</cstring>
+ <cstring>layout66</cstring>
</property>
<hbox>
<property name="name">
@@ -469,7 +469,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>32767</height>
@@ -495,7 +495,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -517,7 +517,7 @@
<property name="text">
<string>P&amp;riority:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -542,13 +542,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>100</width>
<height>32767</height>
@@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>200</height>
@@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout70</cstring>
+ <cstring>layout70</cstring>
</property>
<grid>
<property name="name">
@@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout68</cstring>
+ <cstring>layout68</cstring>
</property>
<hbox>
<property name="name">
@@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co
&lt;li&gt;Changes to these fields will only take effect the next time you start Kopete.&lt;/li&gt;
&lt;li&gt;The "Proxy JID" can be configured per account.&lt;/li&gt;&lt;/ul&gt;&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>241</height>
@@ -748,7 +748,7 @@ If two resources have the same priority, the messages will be sent to the one co
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -814,7 +814,7 @@ If two resources have the same priority, the messages will be sent to the one co
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>110</height>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index 8d1324ca..ff324085 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -59,9 +59,9 @@ void dlgJabberRegister::slotGotForm ()
// translate the form and create it inside the box widget
translator = new JabberFormTranslator (task->form (), grpForm);
- static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator);
+ static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator);
translator->show();
- resize(tqsizeHint());
+ resize(sizeHint());
// enable the send button
btnRegister->setEnabled (true);
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h
index bc0bfe44..8fe905ce 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.h
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.h
@@ -20,7 +20,7 @@
#define DLGJABBERREGISTER_H
#include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index 32749c18..ea3d51c0 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -12,7 +12,7 @@
<height>376</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>300</width>
<height>350</height>
@@ -40,13 +40,13 @@
<property name="name">
<cstring>pixPasswordVerify</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -135,13 +135,13 @@
<property name="name">
<cstring>pixJID</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -185,13 +185,13 @@
<property name="name">
<cstring>pixServer</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -213,13 +213,13 @@
<property name="name">
<cstring>pixPassword</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -247,7 +247,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -257,7 +257,7 @@
<property name="name">
<cstring>lblJIDInformation</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
@@ -266,7 +266,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -280,7 +280,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -294,7 +294,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
index 4b9192dc..97753bb2 100644
--- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
#include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kdebug.h>
#include "jabberclient.h"
diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
index 29b2b617..1bd1310c 100644
--- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp
@@ -122,7 +122,7 @@ void dlgJabberServices::slotServiceFinished ()
if (!task->success ())
{
TQString error = task->statusString();
- KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error"));
+ KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").arg(error), i18n ("Jabber Error"));
return;
}
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 2e81801d..425890af 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -23,7 +23,7 @@
#include "dlgjabbervcard.h"
// TQt includes
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqwidgetstack.h>
#include <tqregexp.h>
#include <tqbuffer.h>
@@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state)
void dlgJabberVCard::slotSaveVCard()
{
setEnabled(false);
- m_mainWidget->lbltqStatus->setText( i18n("Saving vCard to server...") );
+ m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") );
XMPP::VCard vCard;
XMPP::VCard::AddressList addressList;
@@ -418,12 +418,12 @@ void dlgJabberVCard::slotVCardSaved()
if( vCard->success() )
{
- m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") );
+ m_mainWidget->lblStatus->setText( i18n("vCard save sucessful.") );
m_contact->setPropertiesFromVCard( vCard->vcard() );
}
else
{
- m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") );
+ m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") );
}
setEnabled(true);
@@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved()
void dlgJabberVCard::slotGetVCard()
{
- m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") );
+ m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") );
setReadOnly(true);
setEnabled(false);
@@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard()
assignContactProperties();
- m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") );
+ m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") );
}
else
{
- m_mainWidget->lbltqStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") );
+ m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") );
//it is maybe possible to anyway edit our own vCard (if it is new
if(m_account->myself() == m_contact)
setEnabled( true );
@@ -547,7 +547,7 @@ void dlgJabberVCard::slotClearPhoto()
void dlgJabberVCard::slotOpenURL(const TQString &url)
{
- if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) )
+ if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) )
new KRun(KURL( url ) );
}
diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui
index 8a883b65..8ea5d423 100644
--- a/kopete/protocols/jabber/ui/dlgregister.ui
+++ b/kopete/protocols/jabber/ui/dlgregister.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui
index 9d56f7bc..eaaf5aa6 100644
--- a/kopete/protocols/jabber/ui/dlgsendraw.ui
+++ b/kopete/protocols/jabber/ui/dlgsendraw.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -42,7 +42,7 @@
<string>Type in the packet that should be sent to the server:</string>
</property>
<property name="buddy" stdset="0">
- <cstring>lblRealtqStatus</cstring>
+ <cstring>lblRealStatus</cstring>
</property>
</widget>
<widget class="TQTextEdit">
@@ -63,7 +63,7 @@
</item>
<item>
<property name="text">
- <string>Availability tqStatus</string>
+ <string>Availability Status</string>
</property>
</item>
<item>
@@ -102,7 +102,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>25</height>
diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui
index fda7bf4a..da690a97 100644
--- a/kopete/protocols/jabber/ui/dlgservices.ui
+++ b/kopete/protocols/jabber/ui/dlgservices.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -112,7 +112,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -128,7 +128,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>21</height>
diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui
index 8a4aa790..6daa3a4e 100644
--- a/kopete/protocols/jabber/ui/dlgvcard.ui
+++ b/kopete/protocols/jabber/ui/dlgvcard.ui
@@ -33,7 +33,7 @@
</property>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -64,7 +64,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -90,7 +90,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -159,7 +159,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -190,7 +190,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -221,7 +221,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -255,7 +255,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -294,7 +294,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -311,7 +311,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -357,13 +357,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
@@ -386,7 +386,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -403,7 +403,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -427,7 +427,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout36</cstring>
+ <cstring>layout36</cstring>
</property>
<grid>
<property name="name">
@@ -472,7 +472,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -586,7 +586,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -625,7 +625,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout37</cstring>
+ <cstring>layout37</cstring>
</property>
<grid>
<property name="name">
@@ -641,7 +641,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -720,7 +720,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -823,7 +823,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<grid>
<property name="name">
@@ -849,7 +849,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -915,7 +915,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<grid>
<property name="name">
@@ -931,7 +931,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1015,7 +1015,7 @@
</widget>
<widget class="TQLabel" row="1" column="0">
<property name="name">
- <cstring>lbltqStatus</cstring>
+ <cstring>lblStatus</cstring>
</property>
<property name="text">
<string></string>
diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
index 076b92b8..fea94d86 100644
--- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
+++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp
@@ -20,7 +20,7 @@
#include "jabberaddcontactpage.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <klineedit.h>
#include <klocale.h>
#include <kopeteaccount.h>
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index 95272833..63339158 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -41,7 +41,7 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch
mMainWidget = new DlgJabberChooseServer ( this );
setMainWidget ( mMainWidget );
- mMainWidget->lbltqStatus->setText ( i18n ( "Retrieving server list...") );
+ mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") );
mMainWidget->listServers->setLeftMargin ( 0 );
@@ -108,7 +108,7 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job )
if ( job->error () || mTransferJob->isErrorPage () )
{
- mMainWidget->lbltqStatus->setText ( i18n ( "Could not retrieve server list." ) );
+ mMainWidget->lblStatus->setText ( i18n ( "Could not retrieve server list." ) );
return;
}
else
@@ -116,14 +116,14 @@ void JabberChooseServer::slotTransferResult ( KIO::Job *job )
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Received server list ok!" << endl;
// clear status message
- mMainWidget->lbltqStatus->setText ( "" );
+ mMainWidget->lblStatus->setText ( "" );
// parse XML list
TQDomDocument doc;
if ( !doc.setContent ( xmlServerList ) )
{
- mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") );
+ mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") );
return;
}
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 758322cf..b8a9c080 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -88,7 +88,7 @@ void JabberEditAccountWidget::reopen ()
mPass->load (&account()->password ());
cbAutoConnect->setChecked (account()->excludeConnect());
- mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete")));
+ mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete")));
mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5));
mServer->setText (account()->configGroup()->readEntry ("Server", TQString()));
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 2641ed41..631ec3f4 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData ()
}
if ( valid &&
- ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
- TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
+ ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () ||
+ TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) )
{
mMainWidget->lblStatusMessage->setText ( i18n ( "Please enter the same password twice." ) );
valid = false;
@@ -155,8 +155,8 @@ void JabberRegisterAccount::validateData ()
}
if ( valid &&
- ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) !=
- TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
+ ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ) !=
+ TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) )
{
mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) );
valid = false;
diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp
index d0fe10bc..03f8e008 100644
--- a/kopete/protocols/meanwhile/meanwhileaccount.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp
@@ -71,7 +71,7 @@ bool MeanwhileAccount::createContact(
MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
if ((newContact != 0L) && (m_session != 0L)
- && (myself()->onlinetqStatus() !=
+ && (myself()->onlineStatus() !=
p->statusOffline))
m_session->addContact(newContact);
@@ -109,7 +109,7 @@ void MeanwhileAccount::connectWithPassword(const TQString &password)
if (!m_session->isConnected() && !m_session->isConnecting())
m_session->connect(password);
- m_session->setStatus(initialtqStatus());
+ m_session->setStatus(initialStatus());
}
void MeanwhileAccount::disconnect()
@@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason)
return;
MeanwhileProtocol *p = static_cast<MeanwhileProtocol *>(protocol());
- setAllContactstqStatus(p->statusOffline);
+ setAllContactsStatus(p->statusOffline);
disconnected(reason);
emit isConnectedChanged();
@@ -139,7 +139,7 @@ KActionMenu * MeanwhileAccount::actionMenu()
#if 0
menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0,
- this, TQT_SLOT(meanwhileChangetqStatus()), this,
+ this, TQT_SLOT(meanwhileChangeStatus()), this,
"meanwhileChangeStatus"));
//infoPlugin->addCustomMenus(theMenu);
#endif
@@ -219,7 +219,7 @@ void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status,
const TQString &reason)
{
HERE;
- Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
+ Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
mwDebug() << "From: " << oldstatus.description() << "(" <<
oldstatus.internalStatus() << "):" << oldstatus.isDefinitelyOnline()
@@ -256,7 +256,7 @@ void MeanwhileAccount::syncContactsToServer()
void MeanwhileAccount::slotSessionStateChange(Kopete::OnlineStatus status)
{
HERE;
- Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus();
+ Kopete::OnlineStatus oldstatus = myself()->onlineStatus();
myself()->setOnlineStatus(status);
if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) {
diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
index 57dca0c0..909afe41 100644
--- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
+++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp
@@ -16,7 +16,7 @@
*/
#include "meanwhileaddcontactpage.h"
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kopeteaccount.h>
#include <kopetemetacontact.h>
#include <tqlineedit.h>
diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
index 58c70f68..5fcb3b1c 100644
--- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
+++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp
@@ -14,7 +14,7 @@
* *
*************************************************************************
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
@@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList()
for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) {
TQString name = TQString("%1 (0x%2)")
- .tqarg(TQString(id->name))
- .tqarg(id->id, 0, 16);
+ .arg(TQString(id->name))
+ .arg(id->id, 0, 16);
mClientID->insertItem(name, i);
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
index 3347f6da..5f443f36 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp
@@ -59,7 +59,7 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0,
TQString(), i18n("Account Offline")),
- statusMessage(TQString::tqfromLatin1("statusMessage"),
+ statusMessage(TQString::fromLatin1("statusMessage"),
i18n("Status Message"), TQString(), false, true),
awayMessage(Kopete::Global::Properties::self()->awayMessage())
@@ -113,14 +113,14 @@ Kopete::Contact *MeanwhileProtocol::deserializeContact(
return theAccount->contacts()[contactId];
}
-const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus()
+const Kopete::OnlineStatus MeanwhileProtocol::accountOfflineStatus()
{
return statusAccountOffline;
}
-const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus(
+const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus(
enum Kopete::OnlineStatusManager::Categories cats)
{
- return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats);
+ return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats);
}
#include "meanwhileprotocol.moc"
diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h
index dab52878..9b550c9e 100644
--- a/kopete/protocols/meanwhile/meanwhileprotocol.h
+++ b/kopete/protocols/meanwhile/meanwhileprotocol.h
@@ -58,9 +58,9 @@ public:
const TQMap<TQString,TQString> &serializedData,
const TQMap<TQString, TQString> &addressBookData);
- const Kopete::OnlineStatus accountOfflinetqStatus();
+ const Kopete::OnlineStatus accountOfflineStatus();
- const Kopete::OnlineStatus lookuptqStatus(
+ const Kopete::OnlineStatus lookupStatus(
enum Kopete::OnlineStatusManager::Categories cats);
const Kopete::OnlineStatus statusOffline;
diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
index 6920d7e3..170f5b90 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<hbox>
<property name="name">
@@ -84,7 +84,7 @@
<property name="text">
<string>&lt;i&gt;(for example: johndoe)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
index 5f85cac2..914d1533 100644
--- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
+++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui
@@ -47,7 +47,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout81</cstring>
+ <cstring>layout81</cstring>
</property>
<hbox>
<property name="name">
@@ -127,7 +127,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -135,7 +135,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<hbox>
<property name="name">
@@ -173,7 +173,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<hbox>
<property name="name">
@@ -241,7 +241,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<grid>
<property name="name">
@@ -271,7 +271,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -298,7 +298,7 @@
<property name="text">
<string>.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -357,7 +357,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui
index 701d564d..13817584 100644
--- a/kopete/protocols/msn/config/msnprefs.ui
+++ b/kopete/protocols/msn/config/msnprefs.ui
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>70</height>
diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp
index 34aa7425..8576748e 100644
--- a/kopete/protocols/msn/dispatcher.cpp
+++ b/kopete/protocols/msn/dispatcher.cpp
@@ -40,8 +40,8 @@ using P2P::OutgoingTransfer;
#include <tqdatastream.h>
#include <tqfile.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
// Kopete includes
#include <kopetechatsession.h> // Just for getting the contact
@@ -140,14 +140,14 @@ void Dispatcher::sendFile(const TQString& path, TQ_INT64 fileSize, const TQStrin
// Write the file name in utf-16 to the stream.
TQTextStream ts(header, IO_WriteOnly);
ts.setEncoding(TQTextStream::RawUnicode);
- ts.tqdevice()->tqat(20);
+ ts.device()->at(20);
ts << path.section('/', -1);
// NOTE Background Sharing base64 [540..569]
// TODO add support for background sharing.
// Write file exchange type to the stream.
// NOTE File - 0xFFFFFFFF
// NOTE Background Sharing - 0xFFFFFFFE
- writer.tqdevice()->tqat(570);
+ writer.device()->at(570);
writer << (TQ_UINT32)0xFFFFFFFF;
// Encode the file context header to base64 encoding.
@@ -250,7 +250,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream
if(m_messageBuffer.contains(receivedMessage.header.identifier))
{
kdDebug(14140) << k_funcinfo
- << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier)
+ << TQString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier)
<< endl;
// The message was split, try to reconstruct the message
@@ -347,7 +347,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
// The entire message has not been received;
// buffer the recevied portion of the original message.
kdDebug(14140) << k_funcinfo
- << TQString("Buffering messsage, %1").tqarg(message.header.identifier)
+ << TQString("Buffering messsage, %1").arg(message.header.identifier)
<< endl;
m_messageBuffer.insert(message.header.identifier, message);
return;
@@ -427,7 +427,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
current->m_ackSessionIdentifier = message.header.identifier;
current->m_ackUniqueIdentifier = message.header.ackSessionIdentifier;
// Send a 200 OK message to the recipient.
- TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
current->sendMessage(OK, content);
}
else if(applicationId == 2)
@@ -457,7 +457,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
reader.setByteOrder(TQDataStream::LittleEndian);
//Retrieve the file info from the context field.
// File Size [8..15] Int64
- reader.tqdevice()->tqat(8);
+ reader.device()->at(8);
TQ_INT64 fileSize;
reader >> fileSize;
// Flag [15..18] Int32
@@ -478,7 +478,7 @@ void Dispatcher::dispatch(const P2P::Message& message)
emit incomingTransfer(from, fileName, fileSize);
kdDebug(14140) <<
- TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize))
+ TQString("%1, %2 bytes.").arg(fileName, TQString::number(fileSize))
<< endl
<< endl;
diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp
index b7b90296..dd616a1b 100644
--- a/kopete/protocols/msn/incomingtransfer.cpp
+++ b/kopete/protocols/msn/incomingtransfer.cpp
@@ -68,7 +68,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ
TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort()));
m_transfer = transfer;
- TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
sendMessage(OK, content);
TQObject::disconnect(Kopete::TransferManager::transferManager(), 0l, this, 0l);
@@ -80,7 +80,7 @@ void IncomingTransfer::slotTransferRefused(const Kopete::FileTransferInfo& info)
if(sessionId!=m_sessionId)
return;
- TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId);
// Send the sending client a cancelation message.
sendMessage(DECLINE, content);
m_state=Finished;
@@ -141,7 +141,7 @@ void IncomingTransfer::processMessage(const Message& message)
{
// UserDisplayIcon data or File data is in this message.
// Write the recieved data to the file.
- kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(message.header.dataSize) << endl;
+ kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").arg(message.header.dataSize) << endl;
m_file->writeBlock(message.body.data(), message.header.dataSize);
if(m_transfer){
@@ -254,9 +254,9 @@ void IncomingTransfer::processMessage(const Message& message)
content = "Bridge: TCPv1\r\n"
"Listening: true\r\n" +
- TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) +
- TQString("IPv4Internal-Addrs: %1\r\n").tqarg(m_listener->localAddress().nodeName()) +
- TQString("IPv4Internal-Port: %1\r\n").tqarg(m_listener->localAddress().serviceName()) +
+ TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) +
+ TQString("IPv4Internal-Addrs: %1\r\n").arg(m_listener->localAddress().nodeName()) +
+ TQString("IPv4Internal-Port: %1\r\n").arg(m_listener->localAddress().serviceName()) +
"\r\n";
}
else
diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp
index 40bd8877..0ca71789 100644
--- a/kopete/protocols/msn/messageformatter.cpp
+++ b/kopete/protocols/msn/messageformatter.cpp
@@ -75,7 +75,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact)
reader.setByteOrder(TQDataStream::LittleEndian);
// Seek to the start position of the message
// transport header.
- reader.tqdevice()->tqat(index);
+ reader.device()->at(index);
// Read the message transport headers from the stream.
reader >> inbound.header.sessionId;
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index fbf43221..6c4aa9cc 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -231,7 +231,7 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port )
TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ),
TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) );
- m_notifySocket->settqStatus( m_connectstatus );
+ m_notifySocket->setStatus( m_connectstatus );
m_notifySocket->connect(host, port);
}
@@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS
disconnect();
else if ( m_notifySocket )
{
- m_notifySocket->settqStatus( status );
+ m_notifySocket->setStatus( status );
}
else
{
@@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed()
m_notifySocket->deleteLater();
m_notifySocket = 0l;
myself()->setOnlineStatus( MSNProtocol::protocol()->FLN );
- setAllContactstqStatus( MSNProtocol::protocol()->FLN );
+ setAllContactsStatus( MSNProtocol::protocol()->FLN );
disconnected(reason);
@@ -951,7 +951,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list,
if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) )
c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid );
- if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK )
+ if ( c->onlineStatus() == MSNProtocol::protocol()->UNK )
c->setOnlineStatus( MSNProtocol::protocol()->FLN );
if ( c->metaContact() && c->metaContact()->isTemporary() )
@@ -1189,7 +1189,7 @@ void MSNAccount::slotCreateChat( const TQString& ID, const TQString& address, co
if ( !ID.isEmpty() && notifyNewChat )
{
// this temporary message should open the window if they not exist
- TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
+ TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() );
Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
manager->appendMessage( tmpMsg );
}
@@ -1488,7 +1488,7 @@ void MSNAccount::resetPictureObject(bool silent, bool force)
if(old!=m_pictureObj && isConnected() && m_notifySocket && !silent)
{
//update the msn pict
- m_notifySocket->settqStatus( myself()->onlinetqStatus() );
+ m_notifySocket->setStatus( myself()->onlineStatus() );
}
}
diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp
index 8bdf77a1..a33ab93c 100644
--- a/kopete/protocols/msn/msnaddcontactpage.cpp
+++ b/kopete/protocols/msn/msnaddcontactpage.cpp
@@ -13,7 +13,7 @@
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <klocale.h>
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index 2b7fe8bb..6709f0f1 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -408,7 +408,7 @@ void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack)
if ( !ack )
{
Kopete::Message m = m_messagesSent[ id ];
- TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( m.plainBody() );
+ TQString body = i18n( "The following message has not been sent correctly:\n%1" ).arg( m.plainBody() );
Kopete::Message msg = Kopete::Message( m.to().first(), members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
appendMessage( msg );
//stop the stupid animation
@@ -467,7 +467,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg)
TQString body = i18n(
"%1 has sent an unimplemented invitation, the invitation was rejected.\n"
"The invitation was: %2" )
- .tqarg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName );
+ .arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName );
Kopete::Message tmpMsg = Kopete::Message( c , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText);
appendMessage(tmpMsg);
@@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture()
if( !c->object().isEmpty() )
m_chatService->requestDisplayPicture();
}
- else if(myself()->onlinetqStatus().isDefinitelyOnline() && myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
+ else if(myself()->onlineStatus().isDefinitelyOnline() && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
startChatSession();
}
else
@@ -548,7 +548,7 @@ void MSNChatSession::slotDisplayPictureChanged()
int sz=22;
// get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know
- KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+ KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
if(w)
{
//We connected that in the constructor. we don't need to keep this slot active.
@@ -621,7 +621,7 @@ void MSNChatSession::receivedTypingMsg( const TQString &contactId, bool b )
if ( notifyNewChat )
{
// this internal message should open the window if they not exist
- TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() );
+ TQString body = i18n( "%1 has started a chat with you" ).arg( c->metaContact()->displayName() );
Kopete::Message tmpMsg = Kopete::Message( c, members(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
appendMessage( tmpMsg );
}
@@ -715,14 +715,14 @@ void MSNChatSession::cleanMessageQueue( const TQString & reason )
else
m=m_messagesSent.begin().data();
- TQString body=i18n("The following message has not been sent correctly (%1): \n%2").tqarg(reason, m.plainBody());
+ TQString body=i18n("The following message has not been sent correctly (%1): \n%2").arg(reason, m.plainBody());
Kopete::Message msg = Kopete::Message(m.to().first() , members() , body , Kopete::Message::Internal, Kopete::Message::PlainText);
appendMessage(msg);
}
else
{
Kopete::Message m;
- TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").tqarg(reason);
+ TQString body=i18n("These messages have not been sent correctly (%1): <br /><ul>").arg(reason);
for ( TQMap<unsigned int , Kopete::Message>::iterator it = m_messagesSent.begin(); it!=m_messagesSent.end(); it = m_messagesSent.begin() )
{
m=it.data();
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 304029bf..700bf213 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -89,7 +89,7 @@ MSNContact::~MSNContact()
bool MSNContact::isReachable()
{
- if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN )
+ if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN )
return true;
MSNChatSession *kmm=dynamic_cast<MSNChatSession*>(manager(Kopete::Contact::CannotCreate));
@@ -98,13 +98,13 @@ bool MSNContact::isReachable()
// When we are invisible we can't start a chat with others, make isReachable return false
// (This is an MSN limitation, not a problem in Kopete)
- if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == MSNProtocol::protocol()->HDN )
+ if ( !account()->isConnected() || account()->myself()->onlineStatus() == MSNProtocol::protocol()->HDN )
return false;
//if the contact is offline, it is impossible to send it a message. but it is impossible
//to be sure the contact is realy offline. For example, if the contact is not on the contactlist for
//some reason.
- if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
+ if( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() )
return false;
return true;
@@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked )
{
m_blocked = blocked;
//update the status
- setOnlineStatus(m_currenttqStatus);
- //m_currenttqStatus is used here. previously it was onlinetqStatus() but this may cause problem when
+ setOnlineStatus(m_currentStatus);
+ //m_currentStatus is used here. previously it was onlineStatus() but this may cause problem when
// the account is offline because of the Kopete::Contact::OnlineStatus() account offline hack.
}
}
@@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName )
void MSNContact::slotShowProfile()
{
- KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
+ KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" );
}
@@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
protocol() ,
status.internalStatus()+15 ,
status.overlayIcons() + TQStringList("msn_blocked") ,
- i18n("%1|Blocked").tqarg( status.description() ) ) );
+ i18n("%1|Blocked").arg( status.description() ) ) );
}
else if(!isBlocked() && status.internalStatus() >= 15)
{ //the user is not blocked, but the status is blocked
@@ -655,7 +655,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status)
}
else
Kopete::Contact::setOnlineStatus(status);
- m_currenttqStatus=status;
+ m_currentStatus=status;
}
void MSNContact::slotSendMail()
@@ -703,7 +703,7 @@ void MSNContact::setObject(const TQString &obj)
KConfig *config = KGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
- && account()->myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Invisible )
+ && account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )
manager(Kopete::Contact::CanCreate); //create the manager which will download the photo automatically.
}
diff --git a/kopete/protocols/msn/msncontact.h b/kopete/protocols/msn/msncontact.h
index 97039fed..42667682 100644
--- a/kopete/protocols/msn/msncontact.h
+++ b/kopete/protocols/msn/msncontact.h
@@ -185,10 +185,10 @@ private:
TQString m_obj; //the MSNObject
/**
- * keep the current status here. (it's normally already in Kopete::Contact::d->onlinetqStatus)
+ * keep the current status here. (it's normally already in Kopete::Contact::d->onlineStatus)
* This is a workaround to prevent problems with the account offline status.
*/
- Kopete::OnlineStatus m_currenttqStatus;
+ Kopete::OnlineStatus m_currentStatus;
//MSNProtocol::deserializeContact need to acess some contact insternals
friend class MSNProtocol;
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index 72b5f1f8..157209e9 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
void MSNFileTransferSocket::slotTimer()
{
- if(onlinetqStatus() != Disconnected)
+ if(onlineStatus() != Disconnected)
return;
kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl;
if( m_kopeteTransfer)
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 93dc2f0e..b9dbb921 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -90,14 +90,14 @@ void MSNNotifySocket::disconnect()
m_isLogged = false;
if( m_disconnectReason==Kopete::Account::Unknown )
m_disconnectReason=Kopete::Account::Manual;
- if( onlinetqStatus() == Connected )
+ if( onlineStatus() == Connected )
sendCommand( "OUT", TQString(), false );
if( m_keepaliveTimer )
m_keepaliveTimer->stop();
// the socket is not connected yet, so I should force the signals
- if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting )
+ if ( onlineStatus() == Disconnected || onlineStatus() == Connecting )
emit socketClosed();
else
MSNSocket::disconnect();
@@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
case 205:
case 208:
{
- msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).tqarg( handle );
+ msg = i18n( "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>" ).arg( handle );
type = MSNSocket::ErrorServerError;
break;
}
@@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
"MSN Error: %1<br>"
"please send us a detailed bug report "
"at kopete-devel@kde.org containing the raw debug output on the "
- "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code);
+ "console (in gzipped format, as it is probably a lot of output.)" ).arg(code);
type = MSNSocket::ErrorServerError;
break;
}
@@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
msg = i18n( "<qt>The user '%1' already exists in this group on the MSN server;<br>"
"if Kopete does not show the user, please send us a detailed bug report "
"at kopete-devel@kde.org containing the raw debug output on the "
- "console (in gzipped format, as it is probably a lot of output.)</qt>" ).tqarg(handle);
+ "console (in gzipped format, as it is probably a lot of output.)</qt>" ).arg(handle);
type = MSNSocket::ErrorInformation;
break;
}
@@ -180,7 +180,7 @@ void MSNNotifySocket::handleError( uint code, uint id )
}
case 219:
{
- msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle);
+ msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).arg(handle);
type = MSNSocket::ErrorServerError;
break;
}
@@ -563,7 +563,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
kdDebug(14140) << k_funcinfo << "Contact list up-to-date." << endl;
// set the status
- settqStatus( m_newstatus );
+ setStatus( m_newstatus );
}
else if( cmd == "BPR" )
{
@@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString
"<input type=\"hidden\" name=\"sl\" value=\"" + sl +"\">\n"
"<input type=\"hidden\" name=\"rru\" value=\"" + rru + "\">\n"
"<input type=\"hidden\" name=\"auth\" value=\"" + m_MSPAuth + "\">\n"
- "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::tqfromLatin1( md5.hexDigest() ) + "\">\n"
+ "<input type=\"hidden\" name=\"creds\" value=\"" + TQString::fromLatin1( md5.hexDigest() ) + "\">\n"
"<input type=\"hidden\" name=\"svc\" value=\"mail\">\n"
"<input type=\"hidden\" name=\"js\" value=\"yes\">\n"
"</form></body>\n</html>\n";
@@ -775,7 +775,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
mailCount++;
//TODO: it is also possible to get the subject (but warning about the encoding)
- TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m),
+ TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m),
0 , 0 , i18n( "Open Inbox..." ) ),
TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
}
@@ -909,7 +909,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes )
m_msnAlertURLs.append(subscString);
// Don't do any MSN alerts notification for new blog updates
- if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("a.htm") )
+ if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") )
{
KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions);
TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int)));
@@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement )
currentMedia = format;
for(uint i=0; i<formatterStrings.size(); i++)
{
- currentMedia = currentMedia.replace(TQString("{%1}").tqarg(i), formatterStrings[i]);
+ currentMedia = currentMedia.replace(TQString("{%1}").arg(i), formatterStrings[i]);
}
if( type == TQString::fromUtf8("Music") )
{
// the "♫" is encoded in utf8 (and should be in utf8)
- currentMedia = i18n("Now Listening: ♫ %1 ♫").tqarg(currentMedia);
+ currentMedia = i18n("Now Listening: ♫ %1 ♫").arg(currentMedia);
}
kdDebug(1414) << "Current Media received: " << currentMedia << endl;
@@ -1049,25 +1049,25 @@ void MSNNotifySocket::addContact( const TQString &handle, int list, const TQStri
// Adding the contact to a group
if( !contactGuid.isEmpty() )
{
- args = TQString("FL C=%1 %2").tqarg( contactGuid ).tqarg( groupGuid );
+ args = TQString("FL C=%1 %2").arg( contactGuid ).arg( groupGuid );
kdDebug(14140) << k_funcinfo << "In adding contact to a group" << endl;
}
// Adding a new contact
else
{
- args = TQString("FL N=%1 F=%2").tqarg( handle ).tqarg( escape( publicName ) );
+ args = TQString("FL N=%1 F=%2").arg( handle ).arg( escape( publicName ) );
kdDebug(14140) << k_funcinfo << "In adding contact to a new contact" << endl;
}
break;
}
case MSNProtocol::AL:
- args = TQString("AL N=%1").tqarg( handle );
+ args = TQString("AL N=%1").arg( handle );
break;
case MSNProtocol::BL:
- args = TQString("BL N=%1").tqarg( handle );
+ args = TQString("BL N=%1").arg( handle );
break;
case MSNProtocol::RL:
- args = TQString("RL N=%1").tqarg( handle );
+ args = TQString("RL N=%1").arg( handle );
break;
default:
kdDebug(14140) << k_funcinfo <<"WARNING! Unknown list " << list << "!" << endl;
@@ -1105,11 +1105,11 @@ void MSNNotifySocket::removeContact( const TQString &handle, int list, const TQS
m_tmpHandles[id]=handle;
}
-void MSNNotifySocket::settqStatus( const Kopete::OnlineStatus &status )
+void MSNNotifySocket::setStatus( const Kopete::OnlineStatus &status )
{
// kdDebug( 14140 ) << k_funcinfo << statusToString( status ) << endl;
- if( onlinetqStatus() == Disconnected )
+ if( onlineStatus() == Disconnected )
m_newstatus = status;
else
sendCommand( "CHG", statusToString( status ) + " " + m_account->myselfClientId() + " " + escape(m_account->pictureObject()) );
@@ -1185,17 +1185,17 @@ void MSNNotifySocket::changePersonalMessage( MSNProtocol::PersonalMessageType ty
if( !mediaList[0].isEmpty() ) // Current Track
{
xmlCurrentMedia += "{0}";
- formatterArguments += TQString("%1\\0").tqarg(mediaList[0]);
+ formatterArguments += TQString("%1\\0").arg(mediaList[0]);
}
if( !mediaList[1].isEmpty() ) // Current Artist
{
xmlCurrentMedia += " - {1}";
- formatterArguments += TQString("%1\\0").tqarg(mediaList[1]);
+ formatterArguments += TQString("%1\\0").arg(mediaList[1]);
}
if( !mediaList[2].isEmpty() ) // Current Album
{
xmlCurrentMedia += " ({2})";
- formatterArguments += TQString("%1\\0").tqarg(mediaList[2]);
+ formatterArguments += TQString("%1\\0").arg(mediaList[2]);
}
xmlCurrentMedia += "\\0" + formatterArguments + "\\0";
break;
diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h
index 805e427c..ccec2e89 100644
--- a/kopete/protocols/msn/msnnotifysocket.h
+++ b/kopete/protocols/msn/msnnotifysocket.h
@@ -50,7 +50,7 @@ public:
virtual void disconnect();
- void settqStatus( const Kopete::OnlineStatus &status );
+ void setStatus( const Kopete::OnlineStatus &status );
void addContact( const TQString &handle, int list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid );
void removeContact( const TQString &handle, int list, const TQString &contactGuid, const TQString &groupGuid );
@@ -86,7 +86,7 @@ public slots:
signals:
void newContactList();
void contactList(const TQString& handle, const TQString& publicName, const TQString &contactGuid, uint lists, const TQString& groups);
- void contacttqStatus(const TQString&, const TQString&, const TQString& );
+ void contactStatus(const TQString&, const TQString&, const TQString& );
void contactAdded(const TQString& handle, const TQString& list, const TQString& publicName, const TQString& contactGuid, const TQString& groupGuid);
//void contactRemoved(const TQString&, const TQString&, uint);
void contactRemoved(const TQString& handle, const TQString& list, const TQString& contactGuid, const TQString& groupGuid);
@@ -99,7 +99,7 @@ signals:
void invitedToChat(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& );
void startChat( const TQString&, const TQString& );
- void statusChanged( const Kopete::OnlineStatus &newtqStatus );
+ void statusChanged( const Kopete::OnlineStatus &newStatus );
void hotmailSeted(bool) ;
@@ -165,7 +165,7 @@ private:
Kopete::OnlineStatus m_newstatus;
/**
- * Convert an entry of the tqStatus enum back to a string
+ * Convert an entry of the Status enum back to a string
*/
TQString statusToString( const Kopete::OnlineStatus &status ) const;
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index a3ab2532..b7eaf57b 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -74,7 +74,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
setCapabilities( Kopete::Protocol::BaseFgColor | Kopete::Protocol::BaseFont | Kopete::Protocol::BaseFormatting );
- // m_status = m_unknowntqStatus = UNK;
+ // m_status = m_unknownStatus = UNK;
}
Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap<TQString, TQString> &serializedData,
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index f238a507..e098e27b 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -56,7 +56,7 @@ class MimeMessage
MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
{
- m_onlinetqStatus = Disconnected;
+ m_onlineStatus = Disconnected;
m_socket = 0L;
m_useHttp = false;
m_timer = 0L;
@@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent)
MSNSocket::~MSNSocket()
{
- //if ( m_onlinetqStatus != Disconnected )
+ //if ( m_onlineStatus != Disconnected )
// disconnect();
delete m_timer;
m_timer = 0L;
@@ -75,13 +75,13 @@ MSNSocket::~MSNSocket()
void MSNSocket::connect( const TQString &server, uint port )
{
- if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting )
+ if ( m_onlineStatus == Connected || m_onlineStatus == Connecting )
{
kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl;
return;
}
- if( m_onlinetqStatus == Disconnecting )
+ if( m_onlineStatus == Disconnecting )
{
// Cleanup first.
// FIXME: More generic!!!
@@ -166,10 +166,10 @@ void MSNSocket::doneDisconnect()
void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
{
- if ( m_onlinetqStatus == status )
+ if ( m_onlineStatus == status )
return;
- m_onlinetqStatus = status;
+ m_onlineStatus = status;
emit onlineStatusChanged( status );
}
@@ -183,7 +183,7 @@ void MSNSocket::slotSocketError( int error )
TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
if ( error == KSocketBase::LookupFailure )
- errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().nodeName() );
+ errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() );
else
errormsg += m_socket->KSocketBase::errorString() ;
@@ -594,7 +594,7 @@ void MSNSocket::handleError( uint code, uint /* id */ )
default:
// FIXME: if the error causes a disconnect, it will crash, but we can't disconnect every time
msg = i18n( "Unhandled MSN error code %1 \n"
- "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code );
+ "Please fill a bug report with a detailed description and if possible the last console debug output." ).arg( code );
// "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes."
break;
}
@@ -762,7 +762,7 @@ TQString MSNSocket::escape( const TQString &str )
for ( int i = 0; i < old_length; i++ )
{
- unsigned short character = str[i].tqunicode();
+ unsigned short character = str[i].unicode();
if( character <= 32 || character == '%' )
{
@@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed()
{
kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl;
- if ( !m_socket || m_onlinetqStatus == Disconnected )
+ if ( !m_socket || m_onlineStatus == Disconnected )
{
kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl;
return;
@@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp )
m_gateway = "gateway.messenger.hotmail.com";
}
- if ( m_onlinetqStatus != Disconnected )
+ if ( m_onlineStatus != Disconnected )
disconnect();
m_useHttp = useHttp;
diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h
index e4238a59..aa5a5922 100644
--- a/kopete/protocols/msn/msnsocket.h
+++ b/kopete/protocols/msn/msnsocket.h
@@ -76,11 +76,11 @@ public:
* handshake likely has to follow first.
*/
enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected };
- enum LookuptqStatus { Processing, Success, Failed };
+ enum LookupStatus { Processing, Success, Failed };
enum Transport { TcpTransport, HttpTransport };
enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation};
- OnlineStatus onlinetqStatus() { return m_onlinetqStatus; }
+ OnlineStatus onlineStatus() { return m_onlineStatus; }
/*
* return the local ip.
@@ -279,7 +279,7 @@ private:
void parseLine( const TQString &str );
KNetwork::KBufferedSocket *m_socket;
- OnlineStatus m_onlinetqStatus;
+ OnlineStatus m_onlineStatus;
TQString m_server;
uint m_port;
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 319df782..3b5fafd4 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -26,7 +26,7 @@
#include <cmath>
// qt
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqregexp.h>
#include <tqimage.h>
#include <tqtimer.h>
@@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
}
case 215:
{
- msg = i18n( "The user %1 is already in this chat." ).tqarg( m_msgHandle );
+ msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle );
type = MSNSocket::ErrorServerError;
//userLeftChat(m_msgHandle , i18n("user was twice in this chat") ); //(the user shouln't join there
@@ -136,7 +136,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
}
case 216:
{
- msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( m_msgHandle );
+ msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).arg( m_msgHandle );
type = MSNSocket::ErrorInformation;
userLeftChat(m_msgHandle, i18n("user blocked you"));
@@ -145,7 +145,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
case 217:
{
// TODO: we need to know the nickname instead of the handle.
- msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( m_msgHandle );
+ msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).arg( m_msgHandle );
type = MSNSocket::ErrorServerError;
userLeftChat(m_msgHandle, i18n("user disconnected"));
@@ -153,7 +153,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id )
}
case 713:
{
- TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle );
+ TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).arg( m_msgHandle );
type = MSNSocket::ErrorInformation;
userLeftChat(m_msgHandle, i18n("user blocked you"));
@@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping )
if( !isTyping )
return;
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
@@ -653,7 +653,7 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin
// this sends a short message to the server
int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
{
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
// m_messagesQueue.append(msg);
return -1;
@@ -768,7 +768,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
int nb=(int)ceil((float)(len_M)/(float)(futurmessages_size));
if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a parent somewere*/ ,
- i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) ,
+ i18n("The message you are trying to send is too long; it will be split into %1 messages.").arg(nb) ,
i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" )
== KMessageBox::Continue )
{
@@ -920,7 +920,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin
}
else if(msnObj == "inkformatgif")
{
- TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).tqarg( file->name() );
+ TQString msg=i18n("<img src=\"%1\" alt=\"Typewrited message\" />" ).arg( file->name() );
kdDebug(14140) << k_funcinfo << file->name() <<endl;
@@ -1021,19 +1021,19 @@ Kopete::Message &MSNSwitchBoardSocket::parseCustomEmoticons(Kopete::Message &kms
* emoticons like that. So, in that case, we show like the MSN client */
#if 0
TQString em = TQRegExp::escape( es );
- message.replace( TQRegExp(TQString::tqfromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).tqarg(em).tqarg(em)),
- TQString::tqfromLatin1("\\1<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).arg(em).arg(em)),
+ TQString::fromLatin1("\\1<img align=\"center\" width=\"") +
#endif
//match any occurence which is not in a html tag.
- message.replace( TQRegExp(TQString::tqfromLatin1("%1(?![^><]*>)").tqarg(TQRegExp::escape(es))),
- TQString::tqfromLatin1("<img align=\"center\" width=\"") +
+ message.replace( TQRegExp(TQString::fromLatin1("%1(?![^><]*>)").arg(TQRegExp::escape(es))),
+ TQString::fromLatin1("<img align=\"center\" width=\"") +
TQString::number(iconImage.width()) +
- TQString::tqfromLatin1("\" height=\"") +
+ TQString::fromLatin1("\" height=\"") +
TQString::number(iconImage.height()) +
- TQString::tqfromLatin1("\" src=\"") + imgPath +
- TQString::tqfromLatin1("\" title=\"") + es +
- TQString::tqfromLatin1("\" alt=\"") + es +
- TQString::tqfromLatin1( "\"/>" ) );
+ TQString::fromLatin1("\" src=\"") + imgPath +
+ TQString::fromLatin1("\" title=\"") + es +
+ TQString::fromLatin1("\" alt=\"") + es +
+ TQString::fromLatin1( "\"/>" ) );
kmsg.setBody(message, Kopete::Message::RichText);
}
}
@@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( )
the bad side effect: some switchboard connection may be maintained for really long time!
*/
- if ( onlinetqStatus() != Connected || m_chatMembers.empty())
+ if ( onlineStatus() != Connected || m_chatMembers.empty())
{
//we are not yet in a chat.
//if we send that command now, we may get disconnected.
diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp
index 39d3c5d0..604df5d1 100644
--- a/kopete/protocols/msn/outgoingtransfer.cpp
+++ b/kopete/protocols/msn/outgoingtransfer.cpp
@@ -101,7 +101,7 @@ void OutgoingTransfer::slotSendData()
buffer.resize(bytesRead);
}
- kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(bytesRead) << endl;
+ kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").arg(bytesRead) << endl;
if((m_offset + bytesRead) < m_file->size())
{
@@ -254,11 +254,11 @@ void OutgoingTransfer::processMessage(const Message& message)
// Send the direct connection invitation message.
TQString content = "Bridges: TRUDPv1 TCPv1\r\n" +
- TQString("NetID: %1\r\n").tqarg("-123657987") +
- TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") +
+ TQString("NetID: %1\r\n").arg("-123657987") +
+ TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") +
"UPnPNat: false\r\n"
"ICF: false\r\n" +
- TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) +
+ TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) +
"\r\n";
sendMessage(INVITE, content);
}
diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp
index da0b856e..57b1f356 100644
--- a/kopete/protocols/msn/transport.cpp
+++ b/kopete/protocols/msn/transport.cpp
@@ -213,7 +213,7 @@ void TcpTransportBridge::slotOnDisconnect()
void TcpTransportBridge::slotOnError(int errorCode)
{
kdDebug(14140) << k_funcinfo << "Bridge (" << name() << ") ERROR occurred on {" << mSocket->localAddress().toString() << " <-> " << mSocket->peerAddress().toString() << "} - " << mSocket->errorString() << endl;
- emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(mSocket->errorString()));
+ emit bridgeError(TQString("Bridge ERROR %1: %2").arg(errorCode).arg(mSocket->errorString()));
if (mConnected){
mSocket->disconnect();
mConnected = false;
diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui
index 283ea56f..fab496d3 100644
--- a/kopete/protocols/msn/ui/msnadd.ui
+++ b/kopete/protocols/msn/ui/msnadd.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<hbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="text">
<string>&amp;MSN Passport ID:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<property name="buddy" stdset="0">
@@ -70,7 +70,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe@hotmail.com)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui
index 674248a1..0a764c57 100644
--- a/kopete/protocols/msn/ui/msneditaccountui.ui
+++ b/kopete/protocols/msn/ui/msneditaccountui.ui
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>146</height>
@@ -92,7 +92,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -101,7 +101,7 @@
<property name="text">
<string>To connect to the Microsoft network, you will need a Microsoft Passport.&lt;br&gt;&lt;br&gt;If you do not currently have a Passport, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -128,7 +128,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -229,7 +229,7 @@
<property name="text">
<string>&lt;qt&gt;&lt;b&gt;Note:&lt;/b&gt; These settings are applicable to all MSN accounts</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -265,7 +265,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13_2</cstring>
+ <cstring>layout13_2</cstring>
</property>
<hbox>
<property name="name">
@@ -408,7 +408,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout28</cstring>
+ <cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@@ -449,7 +449,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -468,7 +468,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -482,7 +482,7 @@ Only works for emoticons in the PNG format.</string>
<property name="text">
<string>There are also privacy options in the "Contacts" tab</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -498,7 +498,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -641,7 +641,7 @@ Only works for emoticons in the PNG format.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<vbox>
<property name="name">
@@ -673,13 +673,13 @@ Only works for emoticons in the PNG format.</string>
<property name="text">
<string>Please select a square image. The image will be scaled to 96x96.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@@ -706,7 +706,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -725,7 +725,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -736,7 +736,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -760,13 +760,13 @@ Only works for emoticons in the PNG format.</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
@@ -789,7 +789,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>1</height>
@@ -810,7 +810,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -836,7 +836,7 @@ Only works for emoticons in the PNG format.</string>
<property name="text">
<string>WARNING: You need to be connected to modify this page.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -865,7 +865,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -889,7 +889,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -921,7 +921,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -950,7 +950,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -966,7 +966,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -994,7 +994,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -1005,7 +1005,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<hbox>
<property name="name">
@@ -1021,7 +1021,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>20</height>
@@ -1032,7 +1032,7 @@ Only works for emoticons in the PNG format.</string>
<property name="name">
<cstring>m_RLButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>200</width>
<height>32767</height>
@@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>111</width>
<height>20</height>
@@ -1086,7 +1086,7 @@ Only works for emoticons in the PNG format.</string>
<property name="text">
<string>WARNING: You need to be connected to modify this page</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -1124,7 +1124,7 @@ Only works for emoticons in the PNG format.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<hbox>
<property name="name">
@@ -1132,7 +1132,7 @@ Only works for emoticons in the PNG format.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -1236,7 +1236,7 @@ Only check this option if the normal connection doesn't work.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>70</height>
@@ -1304,7 +1304,7 @@ Only check this option if the normal connection doesn't work.</string>
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 4bb246a2..a3ac755a 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -22,7 +22,7 @@
#include <tqgroupbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui
index 42a0f0b6..59d50be6 100644
--- a/kopete/protocols/msn/ui/msninfo.ui
+++ b/kopete/protocols/msn/ui/msninfo.ui
@@ -98,7 +98,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index e2024a94..88fe7d33 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -87,12 +87,12 @@ void Webcam::askIncommingInvitation()
TQString message= (m_who==wProducer) ?
i18n("<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see it?</qt>") :
i18n("The contact %1 wants to show you his/her webcam, do you want to see it?") ;
- int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient),
+ int result=KMessageBox::questionYesNo( 0L , message.arg(m_recipient),
i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline"));
if(!_this)
return;
- TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(m_sessionId);
+ TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId);
if(result==KMessageBox::Yes)
{
//Send two message, an OK, and an invite.
@@ -268,7 +268,7 @@ void Webcam::processMessage(const Message& message)
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::tqfromLatin1(&C,1);
+ echoS+=TQString::fromLatin1(&C,1);
}
f+=16;
}
@@ -305,7 +305,7 @@ void Webcam::processMessage(const Message& message)
{
uint sess=rand()%1000+5000;
uint rid=rand()%100+50;
- m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(sess);
+ m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid).arg(sess);
kdDebug(14140) << k_funcinfo << "m_myAuth= " << m_myAuth << endl;
TQString producerxml=xml(sess , rid);
kdDebug(14140) << k_funcinfo << "producerxml= " << producerxml << endl;
@@ -324,12 +324,12 @@ void Webcam::processMessage(const Message& message)
TQString viewerxml=xml(sess.toUInt() , rid.toUInt());
kdDebug(14140) << k_funcinfo << "vewerxml= " << viewerxml << endl;
makeSIPMessage( viewerxml ,0x00,0x09,0x00 );
- m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess);
+ m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess);
kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl;
}
else
{
- m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess);
+ m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess);
makeSIPMessage("receivedViewerData", 0xec , 0xda , 0x03);
}
@@ -346,7 +346,7 @@ void Webcam::processMessage(const Message& message)
TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int)));
// Listen for incoming connections.
bool isListening = m_listener->listen();
- kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;
+ kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl;
rx=TQRegExp("<tcpport>([^<]*)</tcpport>");
rx.search(m_content);
@@ -370,9 +370,9 @@ void Webcam::processMessage(const Message& message)
while(true)
{
an++;
- if(!m_content.contains( TQString("<tcpipaddress%1>").tqarg(an) ))
+ if(!m_content.contains( TQString("<tcpipaddress%1>").arg(an) ))
break;
- rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").tqarg(an).tqarg(an));
+ rx=TQRegExp(TQString("<tcpipaddress%1>([^<]*)</tcpipaddress%2>").arg(an).arg(an));
rx.search(m_content);
TQString ip=rx.cap(1);
if(ip.isNull())
@@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY ,
{
unsigned char X=dataMessage[q+f];
char C=((char)(( X<128 && X>31 ) ? X : '.'));
- echoS+=TQString::tqfromLatin1(&C,1);
+ echoS+=TQString::fromLatin1(&C,1);
}
f+=16;
}
@@ -503,7 +503,7 @@ TQString Webcam::xml(uint session , uint rid)
TQStringList ips=m_dispatcher->localIp();
for ( it = ips.begin(); it != ips.end(); ++it )
{
- ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").tqarg(ip_number).tqarg(*it).tqarg(ip_number);
+ ip+=TQString("<tcpipaddress%1>%2</tcpipaddress%3>").arg(ip_number).arg(*it).arg(ip_number);
++ip_number;
}
diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h
index 75e742d3..459f7fca 100644
--- a/kopete/protocols/msn/webcam.h
+++ b/kopete/protocols/msn/webcam.h
@@ -57,7 +57,7 @@ class Webcam : public TransferContext
KNetwork::KServerSocket *m_listener;
KNetwork::KBufferedSocket *m_webcamSocket;
- enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
+ enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;
Who m_who;
@@ -68,7 +68,7 @@ class Webcam : public TransferContext
MSNWebcamDialog *m_widget;
TQValueList<KNetwork::KBufferedSocket* > m_allSockets;
- TQMap<KNetwork::KBufferedSocket*, WebcamtqStatus> m_webcamStates;
+ TQMap<KNetwork::KBufferedSocket*, WebcamStatus> m_webcamStates;
int m_timerId;
int m_timerFps;
diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
index 31e5dbfc..39b7049b 100644
--- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
+++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp
@@ -28,7 +28,7 @@
MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name )
- : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ),
+ : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contact ),
KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ),
m_imageContainer( this )
{
@@ -48,7 +48,7 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co
{
kdDebug(14180) << k_funcinfo << "Adding webcam image container" << endl;
//m_imageContainer.setText( i18n( "No webcam image received" ) );
- //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
+ //m_imageContainer.setAlignment( TQt::AlignCenter );
m_imageContainer.setMinimumSize(320,240);
}
show();
@@ -72,8 +72,8 @@ void MSNWebcamDialog::webcamClosed( int reason )
{
kdDebug(14180) << k_funcinfo << "webcam closed with reason?? " << reason <<endl;
//m_imageContainer.clear();
- //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).tqarg( TQString::number( reason ) ) );
- //m_imageContainer.tqsetAlignment( TQt::AlignCenter );
+ //m_imageContainer.setText( i18n( "Webcam closed with reason %1" ).arg( TQString::number( reason ) ) );
+ //m_imageContainer.setAlignment( TQt::AlignCenter );
//show();
}
diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp
index 33a4b365..ee9c0c4a 100644
--- a/kopete/protocols/oscar/aim/aimaccount.cpp
+++ b/kopete/protocols/oscar/aim/aimaccount.cpp
@@ -118,7 +118,7 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio
return;
//okay, now we need to change the message.escapedBody from real HTML to aimhtml.
//looking right now for docs on that "format".
- //looks like everything except for tqalignment codes comes in the format of spans
+ //looks like everything except for alignment codes comes in the format of spans
//font-style:italic -> <i>
//font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold)
@@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio
//font-size:xxpt -> <font ptsize=xx>
s=message.escapedBody();
- s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
- TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+ TQString::fromLatin1("<style>\\1;\"\\2</style>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("\\2"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("\\2"));
//okay now change the <font ptsize="xx"> to <font size="xx">
//0-9 are size 1
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
- TQString::tqfromLatin1("<font size=\"1\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")),
+ TQString::fromLatin1("<font size=\"1\">"));
//10-11 are size 2
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
- TQString::tqfromLatin1("<font size=\"2\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")),
+ TQString::fromLatin1("<font size=\"2\">"));
//12-13 are size 3
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
- TQString::tqfromLatin1("<font size=\"3\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")),
+ TQString::fromLatin1("<font size=\"3\">"));
//14-16 are size 4
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
- TQString::tqfromLatin1("<font size=\"4\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")),
+ TQString::fromLatin1("<font size=\"4\">"));
//17-22 are size 5
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
- TQString::tqfromLatin1("<font size=\"5\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+ TQString::fromLatin1("<font size=\"5\">"));
//23-29 are size 6
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">"));
//30- (and any I missed) are size 7
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+ s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
kdDebug(14190) << k_funcinfo << "sending "
<< s << endl;
@@ -300,13 +300,13 @@ KActionMenu* AIMAccount::actionMenu()
// mActionMenu is managed by Kopete::Account. It is deleted when
// it is no longer shown, so we can (safely) just make a new one here.
KActionMenu *mActionMenu = new KActionMenu(accountId(),
- myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu");
+ myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu");
AIMProtocol *p = AIMProtocol::protocol();
TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString();
- mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ),
- i18n( "%2 <%1>" ).tqarg( accountId(), accountNick ));
+ mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
+ i18n( "%2 <%1>" ).arg( accountId(), accountNick ));
mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this,
TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") );
@@ -344,14 +344,14 @@ void AIMAccount::setAway(bool away, const TQString &awayReason)
// kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl;
if ( away )
{
- engine()->settqStatus( Client::Away, awayReason );
+ engine()->setStatus( Client::Away, awayReason );
AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() );
me->setLastAwayMessage(awayReason);
me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason );
}
else
{
- engine()->settqStatus( Client::Online );
+ engine()->setStatus( Client::Online );
AIMMyselfContact* me = static_cast<AIMMyselfContact *> ( myself() );
me->setLastAwayMessage(TQString());
me->removeProperty( Kopete::Global::Properties::self()->awayMessage() );
@@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile)
AIMMyselfContact* aimmc = dynamic_cast<AIMMyselfContact*>( myself() );
if ( aimmc )
aimmc->setOwnProfile( profile );
- configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile );
+ configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile );
}
void AIMAccount::slotEditInfo()
@@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat()
void AIMAccount::slotGoOnline()
{
- if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
{
kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl;
- engine()->settqStatus( Client::Online );
+ engine()->setStatus( Client::Online );
myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() );
}
- else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
+ else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
{
kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl;
OscarAccount::connect();
@@ -606,7 +606,7 @@ void AIMAccount::messageReceived( const Oscar::Message& message )
// Might be duplicate code from the parent class to get some needed information
// Perhaps a refactoring is needed.
kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl;
- if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ if( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
{
TQString sender = Oscar::normalize( message.sender() );
AIMContact* aimSender = static_cast<AIMContact *> ( contacts()[sender] ); //should exist now
@@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & )
// Get the screen name for this account
TQString screenName = accountId();
- TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) );
+ TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) );
uint port = configGroup()->readNumEntry( "Port", 5190 );
Connection* c = setupConnection( server, port );
@@ -771,7 +771,7 @@ void AIMAccount::connectWithPassword( const TQString & )
<< "AIM network because no password was specified in the "
<< "preferences." << endl;
}
- else if ( myself()->onlinetqStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline )
+ else if ( myself()->onlineStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline )
{
kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ;
updateVersionUpdaterStamp();
diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index ffa81067..7a5de795 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -19,7 +19,7 @@
#include <tqimage.h>
#include <tqregexp.h>
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kapplication.h>
#include <kactionclasses.h>
@@ -56,7 +56,7 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::
m_haveAwayMessage = false;
m_mobile = false;
// Set the last autoresponse time to the current time yesterday
- m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1);
+ m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1);
TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ),
this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) );
@@ -128,15 +128,15 @@ void AIMContact::setAwayMessage(const TQString &message)
"Called for '" << contactId() << "', away msg='" << message << "'" << endl;
TQString filteredMessage = message;
filteredMessage.replace(
- TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")),
- TQString::tqfromLatin1("\\1"));
+ TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")),
+ TQString::fromLatin1("\\1"));
filteredMessage.replace(
- TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
- TQString::tqfromLatin1("\\1") );
- TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") );
+ TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
+ TQString::fromLatin1("\\1") );
+ TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") );
fontRemover.setMinimal(true);
while ( filteredMessage.find( fontRemover ) != -1 )
- filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") );
+ filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") );
setProperty(mProtocol->awayMessage, filteredMessage);
}
@@ -148,7 +148,7 @@ int AIMContact::warningLevel() const
void AIMContact::updateSSIItem()
{
if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
- onlinetqStatus() == Kopete::OnlineStatus::Unknown )
+ onlineStatus() == Kopete::OnlineStatus::Unknown )
{
//make sure they're offline
setOnlineStatus( static_cast<AIMProtocol*>( protocol() )->statusOffline );
@@ -351,11 +351,11 @@ void AIMContact::warnUser()
"(Warning a user on AIM will result in a \"Warning Level\"" \
" increasing for the user you warn. Once this level has reached a" \
" certain point, they will not be able to sign on. Please do not abuse" \
- " this function, it is meant for legitimate practices.)</qt>" ).tqarg( nick );
+ " this function, it is meant for legitimate practices.)</qt>" ).arg( nick );
int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message,
- i18n( "Warn User %1?" ).tqarg( nick ),
+ i18n( "Warn User %1?" ).arg( nick ),
i18n( "Warn Anonymously" ), i18n( "Warn" ) );
if ( result == KMessageBox::Yes )
@@ -383,7 +383,7 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
return;
//okay, now we need to change the message.escapedBody from real HTML to aimhtml.
//looking right now for docs on that "format".
- //looks like everything except for tqalignment codes comes in the format of spans
+ //looks like everything except for alignment codes comes in the format of spans
//font-style:italic -> <i>
//font-weight:600 -> <b> (anything > 400 should be <b>, 400 is not bold)
@@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
//font-size:xxpt -> <font ptsize=xx>
s=message.escapedBody();
- s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
- TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+ TQString::fromLatin1("<style>\\1;\"\\2</style>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
- s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
- TQString::tqfromLatin1("\\2"));
+ s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+ TQString::fromLatin1("\\2"));
//okay now change the <font ptsize="xx"> to <font size="xx">
//0-9 are size 1
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
- TQString::tqfromLatin1("<font size=\"1\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")),
+ TQString::fromLatin1("<font size=\"1\">"));
//10-11 are size 2
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
- TQString::tqfromLatin1("<font size=\"2\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")),
+ TQString::fromLatin1("<font size=\"2\">"));
//12-13 are size 3
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
- TQString::tqfromLatin1("<font size=\"3\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")),
+ TQString::fromLatin1("<font size=\"3\">"));
//14-16 are size 4
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
- TQString::tqfromLatin1("<font size=\"4\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")),
+ TQString::fromLatin1("<font size=\"4\">"));
//17-22 are size 5
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
- TQString::tqfromLatin1("<font size=\"5\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+ TQString::fromLatin1("<font size=\"5\">"));
//23-29 are size 6
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">"));
//30- (and any I missed) are size 7
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
+ s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
// strip left over line break
- s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$")));
+ s.remove(TQRegExp(TQString::fromLatin1("<br\b[^>]*>$")));
- s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+ s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
// strip left over line break
- s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) );
+ s.remove( TQRegExp( TQString::fromLatin1( "<br>$" ) ) );
kdDebug(14190) << k_funcinfo << "sending "
<< s << endl;
@@ -475,9 +475,9 @@ void AIMContact::updateFeatures()
void AIMContact::sendAutoResponse(Kopete::Message& msg)
{
// The target time is 2 minutes later than the last message
- int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() );
+ int delta = m_lastAutoresponseTime.secsTo( TQDateTime::currentDateTime() );
kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl;
- kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << endl;
+ kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl;
kdDebug(14152) << k_funcinfo << "Difference: " << delta << endl;
// Check to see if we're past that time
if(delta > 120)
@@ -509,7 +509,7 @@ void AIMContact::sendAutoResponse(Kopete::Message& msg)
manager(Kopete::Contact::CanCreate)->appendMessage(msg);
manager(Kopete::Contact::CanCreate)->messageSucceeded();
// Update the last autoresponse time
- m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime();
+ m_lastAutoresponseTime = TQDateTime::currentDateTime();
}
else
{
diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp
index fe4dbf22..0b70ac89 100644
--- a/kopete/protocols/oscar/aim/aimprotocol.cpp
+++ b/kopete/protocols/oscar/aim/aimprotocol.cpp
@@ -46,7 +46,7 @@ AIMProtocol* AIMProtocol::protocolStatic_ = 0L;
AIMProtocolHandler::AIMProtocolHandler() : Kopete::MimeTypeHandler(false)
{
- registerAsProtocolHandler(TQString::tqfromLatin1("aim"));
+ registerAsProtocolHandler(TQString::fromLatin1("aim"));
}
void AIMProtocolHandler::handleURL(const KURL &url) const
@@ -189,7 +189,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const
}
if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(),
- i18n("Do you want to add '%1' to your contact list?").tqarg(command),
+ i18n("Do you want to add '%1' to your contact list?").arg(command),
TQString(), i18n("Add"), i18n("Do Not Add"))
!= KMessageBox::Yes)
{
@@ -212,7 +212,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const
else
KMessageBox::sorry( Kopete::UI::Global::mainWidget(),
i18n( "Unable to connect to the chat room %1 because the account"
- " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ),
+ " for %2 is not connected." ).arg( firstParam ).arg( aimAccount->accountId() ),
TQString() );
}
@@ -286,8 +286,8 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac
if ( serializedData.contains( "ssi_type" ) )
{
ssiName = serializedData["ssi_name"];
- TQString authtqStatus = serializedData["ssi_waitingAuth"];
- if ( authtqStatus == "true" )
+ TQString authStatus = serializedData["ssi_waitingAuth"];
+ if ( authStatus == "true" )
ssiWaitingAuth = true;
ssiGid = serializedData["ssi_gid"].toUInt();
ssiBid = serializedData["ssi_bid"].toUInt();
diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp
index 2ed71d94..fd4ba096 100644
--- a/kopete/protocols/oscar/aim/aimuserinfo.cpp
+++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp
@@ -23,7 +23,7 @@
#include <tqlineedit.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqtimer.h>
@@ -39,7 +39,7 @@
AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal,
TQWidget *parent, const char* name )
: KDialogBase( parent, name, modal, i18n( "User Information on %1" )
- .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ),
+ .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ),
Cancel | Ok , Ok, true )
{
kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl;
@@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked()
{
//m_contact->rename(newNick);
//emit updateNickname(newNick);
- setCaption(i18n("User Information on %1").tqarg(newNick));
+ setCaption(i18n("User Information on %1").arg(newNick));
}
}
@@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked()
{
//m_contact->rename(newNick);
//emit updateNickname(newNick);
- setCaption(i18n("User Information on %1").tqarg(newNick));
+ setCaption(i18n("User Information on %1").arg(newNick));
}
mAccount->setUserProfile(userInfoEdit->text());
diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
index f00741c9..c59ac675 100644
--- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp
@@ -20,7 +20,7 @@
#include "kopeteaccount.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
index deaa2ff2..c2ec9844 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui
@@ -40,7 +40,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -72,7 +72,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -165,7 +165,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -174,7 +174,7 @@
<property name="text">
<string>To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.&lt;br&gt;&lt;br&gt;If you do not currently have an AIM screen name, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -242,7 +242,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -342,7 +342,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>200</height>
@@ -455,7 +455,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>225</height>
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
index 2e0100ab..818543d7 100644
--- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp
@@ -1,7 +1,7 @@
#include "aimeditaccountwidget.h"
#include "aimeditaccountui.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
index 9457068e..188e4aad 100644
--- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui
+++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui
@@ -12,7 +12,7 @@
<height>408</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>360</width>
<height>400</height>
@@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@@ -134,7 +134,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -173,7 +173,7 @@
<property name="text">
<string>Away message:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -213,7 +213,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>64</width>
<height>16</height>
diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
index fdfe2a53..5b2d084b 100644
--- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
+++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>60</width>
<height>20</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp
index 245e365c..f2a9bce9 100644
--- a/kopete/protocols/oscar/icq/icqaccount.cpp
+++ b/kopete/protocols/oscar/icq/icqaccount.cpp
@@ -50,9 +50,9 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acc
void ICQMyselfContact::userInfoUpdated()
{
- DWORD extendedtqStatus = details().extendedtqStatus();
- kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedtqStatus, 16 ) << endl;
- ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( extendedtqStatus & 0xffff );
+ DWORD extendedStatus = details().extendedStatus();
+ kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedStatus, 16 ) << endl;
+ ICQ::Presence presence = ICQ::Presence::fromOscarStatus( extendedStatus & 0xffff );
setOnlineStatus( presence.toOnlineStatus() );
setProperty( Kopete::Global::Properties::self()->awayMessage(), static_cast<ICQAccount*>( account() )->engine()->statusMessage() );
}
@@ -100,7 +100,7 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char
{
kdDebug(14153) << k_funcinfo <<
"sending status to reflect HideIP and WebAware settings" << endl;
- //settqStatus(mtqStatus, TQString());
+ //setStatus(mStatus, TQString());
}*/
}
@@ -116,7 +116,7 @@ ICQProtocol* ICQAccount::protocol()
ICQ::Presence ICQAccount::presence()
{
- return ICQ::Presence::fromOnlineStatus( myself()->onlinetqStatus() );
+ return ICQ::Presence::fromOnlineStatus( myself()->onlineStatus() );
}
@@ -150,21 +150,21 @@ void ICQAccount::connectWithPassword( const TQString &password )
kdDebug(14153) << k_funcinfo << "accountId='" << accountId() << "'" << endl;
- Kopete::OnlineStatus status = initialtqStatus();
+ Kopete::OnlineStatus status = initialStatus();
if ( status == Kopete::OnlineStatus() &&
status.status() == Kopete::OnlineStatus::Unknown )
//use default online in case of invalid online status for connecting
status = Kopete::OnlineStatus( Kopete::OnlineStatus::Online );
ICQ::Presence pres = ICQ::Presence::fromOnlineStatus( status );
bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline ||
- myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() );
+ myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() );
if ( accountIsOffline )
{
- myself()->setOnlineStatus( protocol()->statusManager()->connectingtqStatus() );
+ myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() );
TQString icqNumber = accountId();
kdDebug(14153) << k_funcinfo << "Logging in as " << icqNumber << endl ;
- TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) );
+ TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) );
uint port = configGroup()->readNumEntry( "Port", 5190 );
Connection* c = setupConnection( server, port );
@@ -172,15 +172,15 @@ void ICQAccount::connectWithPassword( const TQString &password )
Oscar::Settings* oscarSettings = engine()->clientSettings();
oscarSettings->setWebAware( configGroup()->readBoolEntry( "WebAware", false ) );
oscarSettings->setHideIP( configGroup()->readBoolEntry( "HideIP", true ) );
- //FIXME: also needed for the other call to settqStatus (in setPresenceTarget)
- DWORD status = pres.toOscartqStatus();
+ //FIXME: also needed for the other call to setStatus (in setPresenceTarget)
+ DWORD status = pres.toOscarStatus();
if ( !mHideIP )
status |= ICQ::StatusCode::SHOWIP;
if ( mWebAware )
status |= ICQ::StatusCode::WEBAWARE;
- engine()->settqStatus( status, mInitialStatusMessage );
+ engine()->setStatus( status, mInitialStatusMessage );
updateVersionUpdaterStamp();
engine()->start( server, port, accountId(), password );
engine()->connectToServer( c, server, true /* doAuth */ );
@@ -250,7 +250,7 @@ void ICQAccount::slotSetVisiblility()
if ( oc )
{ //for better orientation in lists use nickName and icq number
TQString screenName( "%1 (%2)" );
- screenName = screenName.tqarg( oc->nickName(), contactId);
+ screenName = screenName.arg( oc->nickName(), contactId);
contactMap.insert( screenName, contactId );
revContactMap.insert( contactId, screenName );
}
@@ -331,7 +331,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString
{
bool targetIsOffline = (newPres.type() == ICQ::Presence::Offline);
bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline ||
- myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() );
+ myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() );
if ( targetIsOffline )
{
@@ -346,7 +346,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString
}
else
{
- engine()->settqStatus( newPres.toOscartqStatus(), message );
+ engine()->setStatus( newPres.toOscarStatus(), message );
}
}
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index a5335dbc..f3a62c73 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -84,7 +84,7 @@ private:
void setPresenceType( ICQ::Presence::Type, const TQString &awayMessage = TQString() );
void setPresenceTarget( const ICQ::Presence &presence, const TQString &message = TQString() );
- //const unsigned long fulltqStatus( const unsigned long plaintqStatus );
+ //const unsigned long fullStatus( const unsigned long plainStatus );
private slots:
void slotToggleInvisible();
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 30563ae0..e4943c37 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -103,7 +103,7 @@ void ICQContact::updateSSIItem()
setOnlineStatus( mProtocol->statusManager()->waitingForAuth() );
if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
- onlinetqStatus() == Kopete::OnlineStatus::Unknown )
+ onlineStatus() == Kopete::OnlineStatus::Unknown )
{
//make sure they're offline
setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() );
@@ -117,12 +117,12 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
if ( Oscar::normalize( contact ) != Oscar::normalize( contactId() ) )
return;
- // tqinvalidate old away message if user was offline
+ // invalidate old away message if user was offline
if ( !isOnline() )
removeProperty( mProtocol->awayMessage );
- kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedtqStatus() << endl;
- ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 0xffff );
+ kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedStatus() << endl;
+ ICQ::Presence presence = ICQ::Presence::fromOscarStatus( details.extendedStatus() & 0xffff );
setOnlineStatus( presence.toOnlineStatus() );
// ICQ does not support status messages for state Online
@@ -133,7 +133,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
}
else
{
- if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlinetqStatus() ).visibility() == ICQ::Presence::Visible )
+ if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlineStatus() ).visibility() == ICQ::Presence::Visible )
{
switch ( presence.type() )
{
@@ -276,8 +276,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas
if( granted )
{
message = i18n( "User %1 has granted your authorization request.\nReason: %2" )
- .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
- .tqarg( reason );
+ .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
+ .arg( reason );
// remove the unknown status
setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() );
@@ -285,8 +285,8 @@ void ICQContact::slotGotAuthReply( const TQString& contact, const TQString& reas
else
{
message = i18n( "User %1 has rejected the authorization request.\nReason: %2" )
- .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
- .tqarg( reason );
+ .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() )
+ .arg( reason );
}
KNotifyClient::event( Kopete::UI::Global::sysTrayWId(), "icq_authorization", message );
}
@@ -539,7 +539,7 @@ void ICQContact::slotContactChanged(const UserInfo &u)
if (!mInfo.clientVersion.isEmpty())
{
capList << i18n("Translators: client-name client-version",
- "%1 %2").tqarg(mInfo.clientName, mInfo.clientVersion);
+ "%1 %2").arg(mInfo.clientName, mInfo.clientVersion);
}
else
{
@@ -561,27 +561,27 @@ void ICQContact::slotContactChanged(const UserInfo &u)
else
removeProperty(mProtocol->clientFeatures);
- unsigned int newtqStatus = 0;
+ unsigned int newStatus = 0;
mInvisible = (mInfo.icqextstatus & ICQ_STATUS_IS_INVIS);
if (mInfo.icqextstatus & ICQ_STATUS_IS_FFC)
- newtqStatus = OSCAR_FFC;
+ newStatus = OSCAR_FFC;
else if (mInfo.icqextstatus & ICQ_STATUS_IS_DND)
- newtqStatus = OSCAR_DND;
+ newStatus = OSCAR_DND;
else if (mInfo.icqextstatus & ICQ_STATUS_IS_OCC)
- newtqStatus = OSCAR_OCC;
+ newStatus = OSCAR_OCC;
else if (mInfo.icqextstatus & ICQ_STATUS_IS_NA)
- newtqStatus = OSCAR_NA;
+ newStatus = OSCAR_NA;
else if (mInfo.icqextstatus & ICQ_STATUS_IS_AWAY)
- newtqStatus = OSCAR_AWAY;
+ newStatus = OSCAR_AWAY;
else
- newtqStatus = OSCAR_ONLINE;
+ newStatus = OSCAR_ONLINE;
if (this != account()->myself())
{
- if(newtqStatus != onlinetqStatus().internalStatus())
+ if(newStatus != onlineStatus().internalStatus())
{
- if(newtqStatus != OSCAR_ONLINE) // if user changed to some state other than online
+ if(newStatus != OSCAR_ONLINE) // if user changed to some state other than online
{
mAccount->engine()->requestAwayMessage(this);
}
@@ -592,7 +592,7 @@ void ICQContact::slotContactChanged(const UserInfo &u)
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
void ICQContact::slotOffgoingBuddy(TQString sender)
@@ -655,7 +655,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
/*
TQString awTxt;
TQString awIcn;
- unsigned int status = onlinetqStatus().internalStatus();
+ unsigned int status = onlineStatus().internalStatus();
if (status >= 15)
status -= 15; // get rid of invis addon
switch(status)
diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp
index 520153a6..b0a051d7 100644
--- a/kopete/protocols/oscar/icq/icqpresence.cpp
+++ b/kopete/protocols/oscar/icq/icqpresence.cpp
@@ -49,7 +49,7 @@ struct PresenceTypeData
static const PresenceTypeData *all();
static const PresenceTypeData &forType( Presence::Type type );
- static const PresenceTypeData &fortqStatus( unsigned long status );
+ static const PresenceTypeData &forStatus( unsigned long status );
static const PresenceTypeData &forOnlineStatusType( const Kopete::OnlineStatus::StatusType statusType );
};
@@ -89,7 +89,7 @@ const PresenceTypeData &PresenceTypeData::forType( Presence::Type type )
return array[0];
}
-const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status )
+const PresenceTypeData &PresenceTypeData::forStatus( unsigned long status )
{
const PresenceTypeData *array = all();
for ( uint n = 0; n < Presence::TypeCount; ++n )
@@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen
return d->invisibleStatusList[ presence.type() ];
}
-Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus()
+Kopete::OnlineStatus OnlineStatusManager::connectingStatus()
{
return d->connecting;
}
-Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus()
+Kopete::OnlineStatus OnlineStatusManager::unknownStatus()
{
return d->unknown;
}
@@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const
}
-unsigned long Presence::toOscartqStatus() const
+unsigned long Presence::toOscarStatus() const
{
- unsigned long basictqStatus = basicOscartqStatus();
+ unsigned long basicStatus = basicOscarStatus();
if ( _visibility == Invisible )
- basictqStatus |= StatusCode::INVISIBLE;
- return basictqStatus;
+ basicStatus |= StatusCode::INVISIBLE;
+ return basicStatus;
}
-Presence Presence::fromOscartqStatus( unsigned long code )
+Presence Presence::fromOscarStatus( unsigned long code )
{
- Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE );
+ Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE );
bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE;
return Presence( type, invisible ? Invisible : Visible );
}
-unsigned long Presence::basicOscartqStatus() const
+unsigned long Presence::basicOscarStatus() const
{
const PresenceTypeData &data = PresenceTypeData::forType( _type );
return data.setFlag;
}
-Presence::Type Presence::typeFromOscartqStatus( unsigned long status )
+Presence::Type Presence::typeFromOscarStatus( unsigned long status )
{
- const PresenceTypeData &data = PresenceTypeData::fortqStatus( status );
+ const PresenceTypeData &data = PresenceTypeData::forStatus( status );
return data.type;
}
diff --git a/kopete/protocols/oscar/icq/icqpresence.h b/kopete/protocols/oscar/icq/icqpresence.h
index 360cadeb..d7ef9ed2 100644
--- a/kopete/protocols/oscar/icq/icqpresence.h
+++ b/kopete/protocols/oscar/icq/icqpresence.h
@@ -78,8 +78,8 @@ public:
~OnlineStatusManager();
ICQ::Presence presenceOf( uint internalStatus );
Kopete::OnlineStatus onlineStatusOf( const ICQ::Presence &presence );
- Kopete::OnlineStatus connectingtqStatus();
- Kopete::OnlineStatus unknowntqStatus();
+ Kopete::OnlineStatus connectingStatus();
+ Kopete::OnlineStatus unknownStatus();
Kopete::OnlineStatus waitingForAuth();
private:
@@ -117,23 +117,23 @@ public:
Kopete::OnlineStatus toOnlineStatus() const;
/**
- * Get the status code to pass to liboscar to set us to this tqStatus.
+ * Get the status code to pass to liboscar to set us to this Status.
* @note This is not the opposite of fromOnlineStatus(). The set and get codes don't match.
*/
- unsigned long toOscartqStatus() const;
+ unsigned long toOscarStatus() const;
/**
* Get the status a contact is at based on liboscar's view of its status.
* @note This is not the opposite of toOnlineStatus().
*/
- static Presence fromOscartqStatus( unsigned long code );
+ static Presence fromOscarStatus( unsigned long code );
bool operator==( const Presence &other ) const { return other._type == _type && other._visibility == _visibility; }
bool operator!=( const Presence &other ) const { return !(*this == other); }
private:
- unsigned long basicOscartqStatus() const;
- static Type typeFromOscartqStatus( unsigned long status );
+ unsigned long basicOscarStatus() const;
+ static Type typeFromOscarStatus( unsigned long status );
private:
Type _type;
Visibility _visibility;
diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp
index dad58726..3e55838e 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.cpp
+++ b/kopete/protocols/oscar/icq/icqprotocol.cpp
@@ -28,7 +28,7 @@
#include <tqhostaddress.h>
#include <tqlistbox.h>
#include <tqspinbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <kdatewidget.h>*/
#include <tqvaluelist.h>
@@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_icq, ICQProtocolFactory( "kopete_icq" ) )
ICQProtocolHandler::ICQProtocolHandler() : Kopete::MimeTypeHandler(false)
{
- registerAsMimeHandler(TQString::tqfromLatin1("application/x-icq"));
+ registerAsMimeHandler(TQString::fromLatin1("application/x-icq"));
}
void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) const
@@ -141,11 +141,11 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c
}
TQString nickuin = nick.isEmpty() ?
- i18n("'%1'").tqarg(uin) :
- i18n("'%1' (%2)").tqarg(nick, uin);
+ i18n("'%1'").arg(uin) :
+ i18n("'%1' (%2)").arg(nick, uin);
if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(),
- i18n("Do you want to add %1 to your contact list?").tqarg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add"))
+ i18n("Do you want to add %1 to your contact list?").arg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add"))
!= KMessageBox::Yes)
{
kdDebug(14153) << k_funcinfo << "Cancelled" << endl;
@@ -219,7 +219,7 @@ void ICQProtocol::initGenders()
void ICQProtocol::initCountries()
{
mCountries.insert(0, ""); // unspecified
- KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete"));
+ KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete"));
mCountries.insert(93, kl->twoAlphaToCountryName("af"));
mCountries.insert(355, kl->twoAlphaToCountryName("al"));
@@ -468,7 +468,7 @@ void ICQProtocol::initCountries()
void ICQProtocol::initLang()
{
- KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete"));
+ KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete"));
mLanguages.insert(0 , "");
mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/);
@@ -775,8 +775,8 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta
if ( serializedData.contains( "ssi_waitingAuth" ) )
{
- TQString authtqStatus = serializedData["ssi_waitingAuth"];
- if ( authtqStatus == "true" )
+ TQString authStatus = serializedData["ssi_waitingAuth"];
+ if ( authStatus == "true" )
ssiWaitingAuth = true;
}
diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp
index 94eaa063..772650fb 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.cpp
+++ b/kopete/protocols/oscar/icq/icqreadaway.cpp
@@ -37,7 +37,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name)
mAccount = static_cast<ICQAccount*>(c->account());
mContact = c;
- setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlinetqStatus().description()));
+ setCaption(i18n("'%2' Message for %1").arg(c->displayName()).arg(c->onlineStatus().description()));
TQVBox *mMainWidget = makeVBoxMainWidget();
@@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage()
mAccount->engine()->requestAwayMessage(mContact);
- setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description()));
+ setCaption(i18n("Fetching '%2' Message for %1...").arg(mContact->displayName()).arg(mContact->onlineStatus().description()));
} // END slotFetchAwayMessage()
void ICQReadAway::slotAwayMessageChanged()
{
- setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description()));
+ setCaption(i18n("'%2' Message for %1").arg(mContact->displayName()).arg(mContact->onlineStatus().description()));
awayMessageBrowser->setText(mContact->awayMessage());
awayMessageBrowser->setDisabled(false);
diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui
index 5ac8d973..9ee07372 100644
--- a/kopete/protocols/oscar/icq/ui/icqadd.ui
+++ b/kopete/protocols/oscar/icq/ui/icqadd.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>47</width>
<height>26</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
index 935b9853..833c97c3 100644
--- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp
@@ -18,7 +18,7 @@
#include <ctype.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
index 59b6ce82..9041a131 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp
@@ -50,9 +50,9 @@ void ICQAuthReplyDialog::setUser( const TQString & user )
{
if ( m_wasRequested )
m_ui->lblUserReq->setText(
- i18n( "<b>%1</b> requested authorization to add you to his/her contact list." ).tqarg( user ) );
+ i18n( "<b>%1</b> requested authorization to add you to his/her contact list." ).arg( user ) );
else
- m_ui->lblUserReq->setText( i18n( "Authorization reply to <b>%1</b>." ).tqarg( user ) );
+ m_ui->lblUserReq->setText( i18n( "Authorization reply to <b>%1</b>." ).arg( user ) );
}
void ICQAuthReplyDialog::setRequestReason( const TQString & reason )
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
index 61fc84cb..5296c154 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout22</cstring>
+ <cstring>layout22</cstring>
</property>
<hbox>
<property name="name">
@@ -52,7 +52,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>tqlayout23</cstring>
+ <cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@@ -68,7 +68,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>50</width>
<height>20</height>
@@ -131,7 +131,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>21</height>
@@ -150,7 +150,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout24</cstring>
+ <cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index 1bc5d379..bd9f2f8e 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -149,7 +149,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -159,7 +159,7 @@
<string>To connect to the ICQ network, you will need an ICQ account.&lt;br&gt;&lt;br&gt;
If you do not currently have an ICQ account, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -183,7 +183,7 @@ If you do not currently have an ICQ account, please click the button to create o
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -372,7 +372,7 @@ If you do not currently have an ICQ account, please click the button to create o
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -411,7 +411,7 @@ If you do not currently have an ICQ account, please click the button to create o
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
index 04a312a4..ceb0d3eb 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp
@@ -17,11 +17,11 @@
#include "icqeditaccountwidget.h"
#include "icqeditaccountui.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqspinbox.h>
#include <tqpushbutton.h>
diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
index c48e8ff9..1af12007 100644
--- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
+++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
@@ -331,7 +331,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
@@ -579,7 +579,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
index 009780f0..1dd7134b 100644
--- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>220</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
index d5d77c09..088fc302 100644
--- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
@@ -26,7 +26,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index 140f17fa..161444f6 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>190</height>
@@ -162,7 +162,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>105</height>
@@ -328,7 +328,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>166</width>
<height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
index f8b16198..198e3e54 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
+++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp
@@ -21,8 +21,8 @@
#include <tqlineedit.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
#include <tqtabwidget.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 1eb1c934..c409f45c 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -18,12 +18,12 @@
#include "icquserinfowidget.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
#include <tqobject.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdatewidget.h>
#include <kdebug.h>
@@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name )
TQFrame* genInfo = addPage( i18n( "General Info" ),
i18n( "General ICQ Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" );
genLayout->addWidget( m_genInfoWidget );
TQFrame* workInfo = addPage( i18n( "Work Info" ),
i18n( "Work Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" );
workLayout->addWidget( m_workInfoWidget );
TQFrame* otherInfo = addPage( i18n( "Other Info" ),
i18n( "Other ICQ Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information" );
otherLayout->addWidget( m_otherInfoWidget );
TQFrame* interestInfo = addPage( i18n( "Interest Info" ),
i18n( "Interest" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo );
m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" );
interestLayout->addWidget( m_interestInfoWidget );
diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
index 4707dbe8..8f243f20 100644
--- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>70</height>
diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp
index c778d382..48f68349 100644
--- a/kopete/protocols/oscar/liboscar/buffer.cpp
+++ b/kopete/protocols/oscar/liboscar/buffer.cpp
@@ -376,7 +376,7 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange,
void Buffer::expandBuffer(unsigned int inc)
{
- mBuffer.tqresize(mBuffer.size()+inc, TQGArray::SpeedOptim);
+ mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim);
}
TQCString Buffer::getLNTS()
@@ -477,7 +477,7 @@ TQString Buffer::toString() const
if ( c < 0x10 )
hex.append("0");
- hex.append(TQString("%1 ").tqarg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
index 23136db4..3004af0c 100644
--- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp
@@ -262,7 +262,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t )
kdDebug(OSCAR_RAW_DEBUG) << "moderator" << endl;
break;
case 0x6D:
- kdDebug(OSCAR_RAW_DEBUG) << "num tqchildren" << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << "num children" << endl;
break;
case 0x06F:
kdDebug(OSCAR_RAW_DEBUG) << "occupancy" << endl;
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index ff3159f4..5e264923 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include "connection.h"
#include "transfer.h"
@@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage()
Oscar::Message omessage;
omessage.setReceiver( client()->userId() );
omessage.setSender( sender );
- omessage.setTimestamp( TQDateTime::tqcurrentDateTime() );
+ omessage.setTimestamp( TQDateTime::currentDateTime() );
omessage.setText( Oscar::Message::UTF8, msgText );
omessage.setType( 0x03 );
omessage.setExchange( m_exchange );
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index 00431434..7cb994f8 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -21,7 +21,7 @@
#include "client.h"
#include <tqtimer.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdebug.h> //for kdDebug()
#include <klocale.h>
@@ -98,7 +98,7 @@ public:
TQValueList<WORD> redirectionServices;
WORD currentRedirect;
TQByteArray cookie;
- DWORD connectAstqStatus; // icq only
+ DWORD connectAsStatus; // icq only
TQString connectWithMessage; // icq only
Oscar::Settings* settings;
@@ -128,7 +128,7 @@ public:
struct AwayMsgRequest
{
TQString contact;
- ICQtqStatus contacttqStatus;
+ ICQStatus contactStatus;
};
TQValueList<AwayMsgRequest> awayMsgRequestQueue;
TQTimer* awayMsgRequestTimer;
@@ -149,7 +149,7 @@ Client::Client( TQObject* parent )
d->isIcq = false; //default to AIM
d->redirectRequested = false;
d->currentRedirect = 0;
- d->connectAstqStatus = 0x0; // default to online
+ d->connectAsStatus = 0x0; // default to online
d->ssiManager = new SSIManager( this );
d->settings = new Oscar::Settings();
d->errorTask = 0L;
@@ -222,7 +222,7 @@ void Client::close()
//don't clear the stored status between stage one and two
if ( d->stage == ClientPrivate::StageTwo )
{
- d->connectAstqStatus = 0x0;
+ d->connectAsStatus = 0x0;
d->connectWithMessage = TQString();
}
@@ -233,7 +233,7 @@ void Client::close()
d->ssiManager->clear();
}
-void Client::settqStatus( AIMtqStatus status, const TQString &_message )
+void Client::setStatus( AIMStatus status, const TQString &_message )
{
// AIM: you're away exactly when your away message isn't empty.
// can't use TQString() as a message either; ProfileTask
@@ -257,7 +257,7 @@ void Client::settqStatus( AIMtqStatus status, const TQString &_message )
pt->go( true );
}
-void Client::settqStatus( DWORD status, const TQString &message )
+void Client::setStatus( DWORD status, const TQString &message )
{
// remember the message to reply with, when requested
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting status message to "<< message << endl;
@@ -292,7 +292,7 @@ void Client::settqStatus( DWORD status, const TQString &message )
}
else
{
- d->connectAstqStatus = status;
+ d->connectAsStatus = status;
d->connectWithMessage = message;
}
}
@@ -399,7 +399,7 @@ void Client::serviceSetupFinished()
d->active = true;
if ( isIcq() )
- settqStatus( d->connectAstqStatus, d->connectWithMessage );
+ setStatus( d->connectAsStatus, d->connectWithMessage );
d->ownStatusTask->go();
@@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact )
d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage );
}
-void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus )
+void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl;
Oscar::Message msg;
msg.setType( 2 );
msg.setReceiver( contact );
msg.addProperty( Oscar::Message::StatusMessageRequest );
- switch ( contacttqStatus )
+ switch ( contactStatus )
{
case ICQAway:
msg.setMessageType( 0xE8 ); // away
@@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contact
sendMessage( msg );
}
-void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus )
+void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus )
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for "
<< contact << " to queue" << endl;
@@ -902,7 +902,7 @@ void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus cont
//remove old request if still exists
removeICQAwayMessageRequest( contact );
- ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus };
+ ClientPrivate::AwayMsgRequest amr = { contact, contactStatus };
d->awayMsgRequestQueue.prepend( amr );
if ( !d->awayMsgRequestTimer->isActive() )
@@ -959,7 +959,7 @@ void Client::nextICQAwayMessageRequest()
amr = d->awayMsgRequestQueue.back();
d->awayMsgRequestQueue.pop_back();
- requestICQAwayMessage( amr.contact, amr.contacttqStatus );
+ requestICQAwayMessage( amr.contact, amr.contactStatus );
}
void Client::requestStatusInfo( const TQString& contact )
@@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo
else
{
realHost = host;
- realPort = TQString::tqfromLatin1("5190");
+ realPort = TQString::fromLatin1("5190");
}
Connection* c = createConnection( realHost, realPort );
diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h
index 976f43be..b09be40e 100644
--- a/kopete/protocols/oscar/liboscar/client.h
+++ b/kopete/protocols/oscar/liboscar/client.h
@@ -68,8 +68,8 @@ public:
FatalProtocolError = 3
};
- enum AIMtqStatus { Online = 0, Away };
- enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat };
+ enum AIMStatus { Online = 0, Away };
+ enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat };
/*************
EXTERNAL API
@@ -103,9 +103,9 @@ public:
/** Logout and disconnect */
void close();
/** Set our status for AIM */
- void settqStatus( AIMtqStatus status, const TQString &message = TQString() );
+ void setStatus( AIMStatus status, const TQString &message = TQString() );
/** Set our status for ICQ */
- void settqStatus( DWORD status, const TQString &message = TQString() );
+ void setStatus( DWORD status, const TQString &message = TQString() );
/** Retrieve our user info */
UserDetails ourInfo() const;
@@ -256,7 +256,7 @@ public:
* Add the icq away message request to queue
* \param contact the contact to get info for
*/
- void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus );
+ void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus );
/**
* Remove the icq away message request from queue
@@ -505,7 +505,7 @@ private:
* \param contact the contact to get info for
*/
//TODO only made a default for testing w/o frontend
- void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway );
+ void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway );
private:
class ClientPrivate;
diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
index 638ed6c0..6ba825c7 100644
--- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp
+++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp
@@ -26,7 +26,7 @@
#include <tqdatastream.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
#include <ctype.h>
@@ -54,7 +54,7 @@ static TQString toString( const TQByteArray& buffer )
if ( c < 0x10 )
hex.append("0");
- hex.append(TQString("%1 ").tqarg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
index 1bbe6622..ab20d852 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
@@ -16,7 +16,7 @@
#include "messagereceivertask.h"
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdebug.h>
#include "transfer.h"
#include "buffer.h"
@@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message()
msg.setSender( m_fromUser );
msg.setReceiver( client()->userId() );
- msg.setTimestamp( TQDateTime::tqcurrentDateTime() );
+ msg.setTimestamp( TQDateTime::currentDateTime() );
msg.setType( 0x01 );
emit receivedMessage( msg );
@@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message()
}
msg.setType( 0x04 );
- msg.setTimestamp( TQDateTime::tqcurrentDateTime() );
+ msg.setTimestamp( TQDateTime::currentDateTime() );
msg.setSender( msgSender );
msg.setReceiver( client()->userId() );
msg.setEncoding( Oscar::Message::UserDefined );
@@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
msg->setSender( m_fromUser );
msg->setReceiver( client()->userId() );
- msg->setTimestamp( TQDateTime::tqcurrentDateTime() );
+ msg->setTimestamp( TQDateTime::currentDateTime() );
msg->setType( 0x02 );
msg->setIcbmCookie( m_icbmCookie );
msg->setProtocolVersion( protocolVersion );
diff --git a/kopete/protocols/oscar/liboscar/oscarmessage.cpp b/kopete/protocols/oscar/liboscar/oscarmessage.cpp
index c0b5a1b8..ddeb963d 100644
--- a/kopete/protocols/oscar/liboscar/oscarmessage.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarmessage.cpp
@@ -20,7 +20,7 @@
#include "oscarmessage.h"
#include <tqdeepcopy.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
Oscar::Message::Message()
diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
index 958a5d49..97751352 100644
--- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
+++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
@@ -224,7 +224,7 @@ TQByteArray Oscar::SSI::iconHash( ) const
TQString Oscar::SSI::toString() const
{
- TQString ssiString = TQString::tqfromLatin1( "name: " );
+ TQString ssiString = TQString::fromLatin1( "name: " );
ssiString += m_name;
ssiString += " gid: ";
ssiString += TQString::number( m_gid );
diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc
index e9048c21..67753b20 100644
--- a/kopete/protocols/oscar/liboscar/rtf.cc
+++ b/kopete/protocols/oscar/liboscar/rtf.cc
@@ -2078,7 +2078,7 @@ void Level::clearParagraphFormatting()
// implicitly start a paragraph
if (!isParagraphOpen())
startParagraph();
- // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+ // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
// we don't clean up anything here. Note that \pard does NOT clean character
// formatting (such as font size, font weight, italics...).
p->parStyle.clearFormatting();
diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll
index 47d1bdf7..c43aeaea 100644
--- a/kopete/protocols/oscar/liboscar/rtf.ll
+++ b/kopete/protocols/oscar/liboscar/rtf.ll
@@ -515,7 +515,7 @@ void Level::clearParagraphFormatting()
// implicitly start a paragraph
if (!isParagraphOpen())
startParagraph();
- // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment),
+ // Since we don't implement any of the paragraph formatting tags (e.g. alignment),
// we don't clean up anything here. Note that \pard does NOT clean character
// formatting (such as font size, font weight, italics...).
p->parStyle.clearFormatting();
diff --git a/kopete/protocols/oscar/liboscar/rtf2html.h b/kopete/protocols/oscar/liboscar/rtf2html.h
index 5685e4a1..3a3122d8 100644
--- a/kopete/protocols/oscar/liboscar/rtf2html.h
+++ b/kopete/protocols/oscar/liboscar/rtf2html.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <stdio.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqcolor.h>
#include <tqregexp.h>
#include <kdebug.h>
diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
index 3bd07cb5..1a0e57c8 100644
--- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
@@ -25,7 +25,7 @@
#include "oscarutils.h"
#include "transfer.h"
-SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status)
+SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mStatus(status)
{
}
@@ -70,7 +70,7 @@ void SendDCInfoTask::onGo()
statusFlag |= 0x10000000; // Direct connection upon authorization, hides IP
}
- buffer->addDWord( statusFlag | mtqStatus );
+ buffer->addDWord( statusFlag | mStatus );
/* Fill in the DC Info
* We don't support Direct Connection yet. So fill in some
diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h
index a98b9612..d130cc40 100644
--- a/kopete/protocols/oscar/liboscar/senddcinfotask.h
+++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h
@@ -33,7 +33,7 @@ public:
virtual void onGo();
private:
- DWORD mtqStatus;
+ DWORD mStatus;
};
#endif
diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
index 596e6791..1b8cbfbc 100644
--- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
+++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp
@@ -379,8 +379,8 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) )
utfMessage=new unsigned char[length];
for(unsigned int l=0; l<message.length(); l++)
{
- utfMessage[l*2]=message.tqunicode()[l].row();
- utfMessage[(l*2)+1]=message.tqunicode()[l].cell();
+ utfMessage[l*2]=message.unicode()[l].row();
+ utfMessage[(l*2)+1]=message.unicode()[l].cell();
}
charset=0x0002; // send UTF-16BE
}
@@ -393,7 +393,7 @@ if(!codec && charset != 0x0002 && contact->encoding() != 0)
charset=0x0003; //send as ISO-8859-1
}
-if(!codec && charset != 0x0002) // it's neither tqunicode nor did we find a codec so far!
+if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec so far!
{
kdDebug(14151) << k_funcinfo <<
"Couldn't find suitable encoding for outgoing message, " <<
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp
index ce39965f..1351c237 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp
@@ -141,7 +141,7 @@ void SSIManager::setParameters( WORD maxContacts, WORD maxGroups, WORD maxVisibl
{
//I'm not using k_funcinfo for these debug statements because of
//the function's long signature
- TQString funcName = TQString::tqfromLatin1( "[void SSIManager::setParameters] " );
+ TQString funcName = TQString::fromLatin1( "[void SSIManager::setParameters] " );
kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of contacts allowed in SSI: "
<< maxContacts << endl;
kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of groups allowed in SSI: "
diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp
index 9e637d45..d797031d 100644
--- a/kopete/protocols/oscar/liboscar/task.cpp
+++ b/kopete/protocols/oscar/liboscar/task.cpp
@@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer)
if(p.isEmpty())
return false;
- // pass along the transfer to our tqchildren
+ // pass along the transfer to our children
TQObjectListIt it(p);
Task *t;
for(; it.current(); ++it) {
@@ -271,7 +271,7 @@ void Task::debug(const TQString &str)
{
//black hole
Q_UNUSED( str );
- //client()->debug(TQString("%1: ").tqarg(className()) + str);
+ //client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index 6f62ebe6..a7c16cea 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest()
void ClientStreamTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
index 540aa35c..1d3728aa 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index 9849bbbb..6ca733cc 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
void LoginTest::runAddGroupTest()
{
qDebug( "running ssi group add test" );
- TQString group = TQString::tqfromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->addGroup( group );
TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
}
@@ -65,7 +65,7 @@ void LoginTest::runAddGroupTest()
void LoginTest::runDelGroupTest()
{
qDebug( "running ssi group del test" );
- TQString group = TQString::tqfromLatin1( "dummygroup" );
+ TQString group = TQString::fromLatin1( "dummygroup" );
myClient->removeGroup( group );
}
diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
index 9c2202a6..7669a945 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp
@@ -53,28 +53,28 @@ void SSITest::testIt()
//try to find a group by name
ssi = m_manager->findGroup("SecondGroup");
if ( ssi )
- qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( ssi->gid() ).latin1());
+ qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1());
else
qDebug( "Oops, group SecondGroup not found" );
//try to find a group by gid
ssi = m_manager->findGroup( 3 );
if ( ssi )
- qDebug( TQString("Found group 3 with name=%1").tqarg( ssi->name() ).latin1() );
+ qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() );
else
qDebug( "Oops, group 3 not found" );
//try to find a contact by name
ssi = m_manager->findContact("ThirdContact");
if ( ssi )
- qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( ssi->gid() ).latin1() );
+ qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() );
else
qDebug( "Oops, contact ThirdContact not found" );
//try to find a contact using the name and the group name
ssi = m_manager->findContact("FourthContact","SecondGroup");
if ( ssi )
- qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() );
+ qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() );
else
qDebug( "Oops, contact FourthContact not found" );
@@ -89,13 +89,13 @@ void SSITest::testIt()
TQValueList<SSI*>::iterator it;
qDebug( "Contacts from group FirtsGroup:" );
for ( it = list.begin(); it != list.end(); ++it)
- qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
//the group list
TQValueList<SSI*> list2 = m_manager->groupList();
qDebug( "Group list:" );
for ( it = list2.begin(); it != list2.end(); ++it)
- qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() );
+ qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() );
//remove a group - this shouldn't report any debug line
m_manager->removeGroup( "SecondGroup" );
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index 663ec2fb..fb346d26 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+ TQString server = TQString::fromLatin1("login.oscar.aol.com");
// connect to server
qDebug( "connecting to server ");
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
void LoginTest::runUserInfoTest()
{
qDebug( "running user info test" );
- TQString contact = TQString::tqfromLatin1( "userid" );
+ TQString contact = TQString::fromLatin1( "userid" );
myClient->requestFullInfo( contact );
}
diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp
index 100bcf9d..9af57b30 100644
--- a/kopete/protocols/oscar/liboscar/transfer.cpp
+++ b/kopete/protocols/oscar/liboscar/transfer.cpp
@@ -90,7 +90,7 @@ TQString Transfer::toString() const
if(c < 0x10)
hex.append("0");
- hex.append(TQString("%1 ").tqarg(c, 0, 16));
+ hex.append(TQString("%1 ").arg(c, 0, 16));
ascii.append(isprint(c) ? c : '.');
diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index 77a6c72b..8a1b6c4e 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.cpp
+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
@@ -34,7 +34,7 @@ UserDetails::UserDetails()
m_warningLevel = 0;
m_userClass = 0;
m_idleTime = 0;
- m_extendedtqStatus = 0;
+ m_extendedStatus = 0;
m_capabilities = 0;
m_dcPort = 0;
m_dcType = 0;
@@ -107,9 +107,9 @@ int UserDetails::userClass() const
return m_userClass;
}
-DWORD UserDetails::extendedtqStatus() const
+DWORD UserDetails::extendedStatus() const
{
- return m_extendedtqStatus;
+ return m_extendedStatus;
}
BYTE UserDetails::iconCheckSumType() const
@@ -126,7 +126,7 @@ TQString UserDetails::clientName() const
{
if ( !m_clientVersion.isEmpty() )
return i18n("Translators: client-name client-version",
- "%1 %2").tqarg(m_clientName, m_clientVersion);
+ "%1 %2").arg(m_clientName, m_clientVersion);
else
return m_clientName;
}
@@ -183,10 +183,10 @@ void UserDetails::fill( Buffer * buffer )
#endif
break;
case 0x0006: //extended user status
- m_extendedtqStatus = b.getDWord();
+ m_extendedStatus = b.getDWord();
m_extendedStatusSpecified = true;
#ifdef OSCAR_USERINFO_DEBUG
- kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 16 ) << endl;
+ kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl;
#endif
break;
case 0x000A: //external IP address
@@ -366,9 +366,9 @@ void UserDetails::detectClient()
case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda
{
if (m_dcLastExtStatusUpdateTime & 0x80000000)
- m_clientName=TQString::tqfromLatin1("Miranda alpha");
+ m_clientName=TQString::fromLatin1("Miranda alpha");
else
- m_clientName=TQString::tqfromLatin1("Miranda");
+ m_clientName=TQString::fromLatin1("Miranda");
DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF);
BYTE major1 = ((version >> 24) & 0xFF);
@@ -391,25 +391,25 @@ void UserDetails::detectClient()
}
break;
case 0xFFFFFF8FL:
- m_clientName = TQString::tqfromLatin1("StrICQ");
+ m_clientName = TQString::fromLatin1("StrICQ");
break;
case 0xFFFFFF42L:
- m_clientName = TQString::tqfromLatin1("mICQ");
+ m_clientName = TQString::fromLatin1("mICQ");
break;
case 0xFFFFFFBEL:
- m_clientName = TQString::tqfromLatin1("alicq");
+ m_clientName = TQString::fromLatin1("alicq");
break;
case 0xFFFFFF7FL:
- m_clientName = TQString::tqfromLatin1("&RQ");
+ m_clientName = TQString::fromLatin1("&RQ");
break;
case 0xFFFFFFABL:
- m_clientName = TQString::tqfromLatin1("YSM");
+ m_clientName = TQString::fromLatin1("YSM");
break;
case 0x3AA773EEL:
if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) &&
(m_dcLastExtInfoUpdateTime == 0x3A877A42L))
{
- m_clientName=TQString::tqfromLatin1("libicq2000");
+ m_clientName=TQString::fromLatin1("libicq2000");
}
break;
default:
@@ -427,48 +427,48 @@ void UserDetails::detectClient()
switch (m_dcProtoVersion)
{
case 10:
- m_clientName=TQString::tqfromLatin1("ICQ 2003b");
+ m_clientName=TQString::fromLatin1("ICQ 2003b");
break;
case 9:
- m_clientName=TQString::tqfromLatin1("ICQ Lite");
+ m_clientName=TQString::fromLatin1("ICQ Lite");
break;
case 8:
- m_clientName=TQString::tqfromLatin1("Miranda");
+ m_clientName=TQString::fromLatin1("Miranda");
break;
default:
- m_clientName=TQString::tqfromLatin1("ICQ2go");
+ m_clientName=TQString::fromLatin1("ICQ2go");
}
}
else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ
{
- m_clientName = TQString::tqfromLatin1("Gaim");
+ m_clientName = TQString::fromLatin1("Gaim");
}
else if (hasCap(CAP_XTRAZ))
{
- m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite");
+ m_clientName = TQString::fromLatin1("ICQ 4.0 Lite");
}
else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
hasCap(CAP_IS_2001))
{
- m_clientName = TQString::tqfromLatin1( "ICQ 2001");
+ m_clientName = TQString::fromLatin1( "ICQ 2001");
}
else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
hasCap(CAP_STR_2002))
{
- m_clientName = TQString::tqfromLatin1("ICQ 2002");
+ m_clientName = TQString::fromLatin1("ICQ 2002");
}
else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) &&
hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
{
- m_clientName = TQString::tqfromLatin1("ICQ 2003a");
+ m_clientName = TQString::fromLatin1("ICQ 2003a");
}
else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
{
- m_clientName =TQString::tqfromLatin1("ICQ 2001b");
+ m_clientName =TQString::fromLatin1("ICQ 2001b");
}
else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS))
{
- m_clientName = TQString::tqfromLatin1("GnomeICU");
+ m_clientName = TQString::fromLatin1("GnomeICU");
}
}
@@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud )
}
if ( ud.m_extendedStatusSpecified )
{
- m_extendedtqStatus = ud.m_extendedtqStatus;
+ m_extendedStatus = ud.m_extendedStatus;
m_extendedStatusSpecified = true;
}
if ( ud.m_capabilitiesSpecified )
diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h
index 367d8999..8835f6f9 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.h
+++ b/kopete/protocols/oscar/liboscar/userdetails.h
@@ -44,7 +44,7 @@ public:
TQDateTime onlineSinceTime() const; //! Online since accessor
TQDateTime memberSinceTime() const; //! Member since accessor
int userClass() const; //! User class accessor
- DWORD extendedtqStatus() const; //!User status accessor
+ DWORD extendedStatus() const; //!User status accessor
BYTE iconCheckSumType() const; //!Buddy icon hash type
TQByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor
TQString clientName() const; //! Client name and version
@@ -85,7 +85,7 @@ private:
TQDateTime m_onlineSince; /// how long the contact's been online - TLV 0x03
DWORD m_numSecondsOnline; /// how long the contact's been online in seconds
WORD m_idleTime; /// the idle time of the contact - TLV 0x0F
- DWORD m_extendedtqStatus; /// the extended status of the contact - TLV 0x06
+ DWORD m_extendedStatus; /// the extended status of the contact - TLV 0x06
DWORD m_capabilities; //TLV 0x05
TQString m_clientVersion; /// the version of client they're using
TQString m_clientName; /// the name of the client they're using
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 89d72641..0fe4cde8 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -34,10 +34,10 @@
#include <tqapplication.h>
#include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <tqtimer.h>
#include <tqptrlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <tqimage.h>
#include <tqfile.h>
@@ -276,7 +276,7 @@ void OscarAccount::processSSIList()
}
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "the following contacts are not on the server side list"
<< nonServerContactList << endl;
- bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::tqfromLatin1("ShowMissingContactsDialog"), true);
+ bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::fromLatin1("ShowMissingContactsDialog"), true);
if ( !nonServerContactList.isEmpty() && showMissingContactsDialog )
{
d->olnscDialog = new OscarListNonServerContacts( Kopete::UI::Global::mainWidget() );
@@ -334,7 +334,7 @@ void OscarAccount::nonServerAddContactDialogClosed()
}
bool showOnce = d->olnscDialog->onlyShowOnce();
- configGroup()->writeEntry( TQString::tqfromLatin1("ShowMissingContactsDialog") , !showOnce);
+ configGroup()->writeEntry( TQString::fromLatin1("ShowMissingContactsDialog") , !showOnce);
configGroup()->sync();
d->olnscDialog->delayedDestruct();
@@ -429,15 +429,15 @@ void OscarAccount::messageReceived( const Oscar::Message& message )
void OscarAccount::setServerAddress(const TQString &server)
{
- configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server );
+ configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server );
}
void OscarAccount::setServerPort(int port)
{
if ( port > 0 )
- configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port );
+ configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port );
else //set to default 5190
- configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), 5190 );
+ configGroup()->writeEntry( TQString::fromLatin1( "Port" ), 5190 );
}
TQTextCodec* OscarAccount::defaultCodec() const
@@ -727,9 +727,9 @@ void OscarAccount::userStoppedTyping( const TQString & contact )
void OscarAccount::slotSocketError( int errCode, const TQString& errString )
{
Q_UNUSED( errCode );
- KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ),
+ KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ),
errString,
- myself()->onlinetqStatus().protocolIcon(),
+ myself()->onlineStatus().protocolIcon(),
Kopete::UI::Global::mainWidget() );
logOff( Kopete::Account::ConnectionReset );
}
@@ -744,8 +744,8 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal )
if ( s.family == 0 && s.subtype == 0 )
{
message = getFLAPErrorMessage( code );
- KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ),
- message, myself()->onlinetqStatus().protocolIcon(),
+ KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).arg( accountId() ),
+ message, myself()->onlineStatus().protocolIcon(),
Kopete::UI::Global::mainWidget() );
switch ( code )
{
@@ -772,7 +772,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal )
else
message = i18n("There was an error in the protocol handling; automatic reconnection occurring.");
- KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlinetqStatus().protocolIcon(),
+ KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlineStatus().protocolIcon(),
Kopete::UI::Global::mainWidget() );
if ( fatal )
logOff( Kopete::Account::ConnectionReset );
@@ -819,44 +819,44 @@ TQString OscarAccount::getFLAPErrorMessage( int code )
{
reason = i18n( "You have logged in more than once with the same %1," \
" account %2 is now disconnected.")
- .tqarg( acctDescription ).tqarg( accountId() );
+ .arg( acctDescription ).arg( accountId() );
}
else // error while logging in
{
reason = i18n( "Sign on failed because either your %1 or " \
"password are invalid. Please check your settings for account %2.")
- .tqarg( acctDescription ).tqarg( accountId() );
+ .arg( acctDescription ).arg( accountId() );
}
break;
case 0x0002: // Service temporarily unavailable
case 0x0014: // Reservation map error
reason = i18n("The %1 service is temporarily unavailable. Please try again later.")
- .tqarg( acctType );
+ .arg( acctType );
break;
case 0x0004: // Incorrect nick or password, re-enter
case 0x0005: // Mismatch nick or password, re-enter
reason = i18n("Could not sign on to %1 with account %2 because the " \
- "password was incorrect.").tqarg( acctType ).tqarg( accountId() );
+ "password was incorrect.").arg( acctType ).arg( accountId() );
break;
case 0x0007: // non-existant ICQ#
case 0x0008: // non-existant ICQ#
reason = i18n("Could not sign on to %1 with nonexistent account %2.")
- .tqarg( acctType ).tqarg( accountId() );
+ .arg( acctType ).arg( accountId() );
break;
case 0x0009: // Expired account
reason = i18n("Sign on to %1 failed because your account %2 expired.")
- .tqarg( acctType ).tqarg( accountId() );
+ .arg( acctType ).arg( accountId() );
break;
case 0x0011: // Suspended account
reason = i18n("Sign on to %1 failed because your account %2 is " \
- "currently suspended.").tqarg( acctType ).tqarg( accountId() );
+ "currently suspended.").arg( acctType ).arg( accountId() );
break;
case 0x0015: // too many clients from same IP
case 0x0016: // too many clients from same IP
case 0x0017: // too many clients from same IP (reservation)
reason = i18n("Could not sign on to %1 as there are too many clients" \
- " from the same computer.").tqarg( acctType );
+ " from the same computer.").arg( acctType );
break;
case 0x0018: // rate exceeded (turboing)
if ( isConnected() )
@@ -866,7 +866,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code )
" Wait ten minutes and try again." \
" If you continue to try, you will" \
" need to wait even longer.")
- .tqarg( accountId() ).tqarg( acctType );
+ .arg( accountId() ).arg( acctType );
}
else
{
@@ -875,7 +875,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code )
" Wait ten minutes and try again." \
" If you continue to try, you will" \
" need to wait even longer.")
- .tqarg( accountId() ).tqarg( acctType) ;
+ .arg( accountId() ).arg( acctType) ;
}
break;
case 0x001C:
@@ -883,7 +883,7 @@ TQString OscarAccount::getFLAPErrorMessage( int code )
if ( !d->versionAlreadyUpdated )
{
reason = i18n("Sign on to %1 with your account %2 failed.")
- .tqarg( acctType ).tqarg( accountId() );
+ .arg( acctType ).arg( accountId() );
d->versionAlreadyUpdated = true;
}
@@ -891,19 +891,19 @@ TQString OscarAccount::getFLAPErrorMessage( int code )
{
reason = i18n("The %1 server thinks the client you are using is " \
"too old. Please report this as a bug at http://bugs.kde.org")
- .tqarg( acctType );
+ .arg( acctType );
}
break;
case 0x0022: // Account suspended because of your age (age < 13)
reason = i18n("Account %1 was disabled on the %2 server because " \
"of your age (less than 13).")
- .tqarg( accountId() ).tqarg( acctType );
+ .arg( accountId() ).arg( acctType );
break;
default:
if ( !isConnected() )
{
reason = i18n("Sign on to %1 with your account %2 failed.")
- .tqarg( acctType ).tqarg( accountId() );
+ .arg( acctType ).arg( accountId() );
}
break;
}
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index ada01291..ef011ee5 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -19,7 +19,7 @@
#include <time.h>
#include <tqapplication.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kaction.h>
#include <kdebug.h>
@@ -66,7 +66,7 @@ void OscarContact::serialize(TQMap<TQString, TQString> &serializedData,
serializedData["ssi_gid"] = TQString::number( m_ssiItem.gid() );
serializedData["ssi_bid"] = TQString::number( m_ssiItem.bid() );
serializedData["ssi_alias"] = m_ssiItem.alias();
- serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::tqfromLatin1( "true" ) : TQString::tqfromLatin1( "false" );
+ serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::fromLatin1( "true" ) : TQString::fromLatin1( "false" );
}
bool OscarContact::isOnServer() const
@@ -177,7 +177,7 @@ void OscarContact::userInfoUpdated( const TQString& contact, const UserDetails&
if ( !m_details.clientName().isEmpty() )
{
capList << i18n( "Translators: client name and version",
- "%1").tqarg( m_details.clientName() );
+ "%1").arg( m_details.clientName() );
}
}
diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui
index 97ef3f74..7a6d82ff 100644
--- a/kopete/protocols/oscar/oscarencodingselectionbase.ui
+++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui
@@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui
index 4a3bb1a1..b7db0d40 100644
--- a/kopete/protocols/oscar/oscarvisibilitybase.ui
+++ b/kopete/protocols/oscar/oscarvisibilitybase.ui
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>40</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>40</height>
diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp
index b3f497be..0ebbe7fa 100644
--- a/kopete/protocols/sms/serviceloader.cpp
+++ b/kopete/protocols/sms/serviceloader.cpp
@@ -43,7 +43,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac
#endif
else
{
- KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name),
+ KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").arg(name),
i18n("Error Loading Service"));
s = 0L;
}
diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp
index 1d4836a1..d4acc515 100644
--- a/kopete/protocols/sms/services/gsmlib.cpp
+++ b/kopete/protocols/sms/services/gsmlib.cpp
@@ -16,7 +16,7 @@
#ifdef INCLUDE_SMSGSM
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqapplication.h>
#include <tqevent.h>
#include <tqmutex.h>
@@ -308,7 +308,7 @@ void GSMLib::saveConfig()
{
KConfigGroup* c = m_account->configGroup();
- c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device);
+ c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device);
}
}
@@ -320,7 +320,7 @@ void GSMLib::loadConfig()
TQString temp;
KConfigGroup* c = m_account->configGroup();
- temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString());
+ temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString());
if( temp != TQString() )
m_device = temp;
}
@@ -348,12 +348,12 @@ void GSMLib::disconnect()
}
-void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
+void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
{
m_parent = parent;
- m_layout = tqlayout;
+ m_layout = layout;
TQWidget *configWidget = configureWidget(parent);
- tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
+ layout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
configWidget->show();
}
@@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e)
const TQString& GSMLib::description()
{
TQString url = "http://www.pxh.de/fs/gsmlib/";
- m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url);
+ m_description = i18n("<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
return m_description;
}
diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui
index b0bcd890..8cccfe81 100644
--- a/kopete/protocols/sms/services/gsmlibprefs.ui
+++ b/kopete/protocols/sms/services/gsmlibprefs.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>16</height>
@@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp
index 05712501..0139b8b3 100644
--- a/kopete/protocols/sms/services/smsclient.cpp
+++ b/kopete/protocols/sms/services/smsclient.cpp
@@ -15,7 +15,7 @@
*/
#include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kurlrequester.h>
@@ -41,13 +41,13 @@ SMSClient::~SMSClient()
{
}
-void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
+void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
{
- kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
+ kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
m_parent = parent;
- m_layout = tqlayout;
+ m_layout = layout;
TQWidget *configWidget = configureWidget(parent);
- tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
+ layout->addMultiCellWidget(configWidget, 0, 1, 0, 1);
configWidget->show();
}
@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg)
m_msg = msg;
KConfigGroup* c = m_account->configGroup();
- TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString());
+ TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString());
if (provider.isNull())
{
@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg)
return;
}
- TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString());
+ TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString());
if (programName.isNull())
programName = "/usr/bin/sms_client";
@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
prefWidget->configDir->setMode(KFile::Directory);
TQString configDir;
if (m_account)
- configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), TQString());
+ configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString());
if (configDir.isNull())
configDir = "/etc/sms";
prefWidget->configDir->setURL(configDir);
TQString programName;
if (m_account)
- programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"),
+ programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"),
TQString());
if (programName.isNull())
programName = "/usr/bin/sms_client";
@@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent)
if (m_account)
{
- TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"));
+ TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
for (int i=0; i < prefWidget->provider->count(); i++)
{
if (prefWidget->provider->text(i) == pName)
@@ -136,9 +136,9 @@ void SMSClient::savePreferences()
{
KConfigGroup* c = m_account->configGroup();
- c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), prefWidget->program->url());
- c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ConfigDir"), prefWidget->configDir->url());
- c->writeEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), prefWidget->provider->currentText());
+ c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url());
+ c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url());
+ c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), prefWidget->provider->currentText());
}
}
@@ -147,7 +147,7 @@ TQStringList SMSClient::providers()
TQStringList p;
TQDir d;
- d.setPath(TQString("%1/services/").tqarg(prefWidget->configDir->url()));
+ d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url()));
p += d.entryList("*", TQDir::Files);
return p;
@@ -176,7 +176,7 @@ int SMSClient::maxSize()
const TQString& SMSClient::description()
{
TQString url = "http://www.smsclient.org";
- m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").tqarg(url).tqarg(url);
+ m_description = i18n("<qt>SMSClient is a program for sending SMS with the modem. The program can be found on <a href=\"%1\">%1</a></qt>").arg(url).arg(url);
return m_description;
}
diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui
index 1b10799a..36e9f543 100644
--- a/kopete/protocols/sms/services/smsclientprefs.ui
+++ b/kopete/protocols/sms/services/smsclientprefs.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>16</height>
@@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<grid>
<property name="name">
diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp
index 442d7f16..43e158ed 100644
--- a/kopete/protocols/sms/services/smssend.cpp
+++ b/kopete/protocols/sms/services/smssend.cpp
@@ -16,7 +16,7 @@
#include <tqcombobox.h>
#include <tqvgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqtooltip.h>
@@ -73,16 +73,16 @@ void SMSSend::send(const Kopete::Message& msg)
m_provider->send(msg);
}
-void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout)
+void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout)
{
- kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << parent << endl;
+ kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl;
m_parent = parent;
- m_layout = tqlayout;
+ m_layout = layout;
// could end up being deleted twice??
delete prefWidget;
prefWidget = new SMSSendPrefsUI(parent);
- tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
+ layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1);
prefWidget->program->setMode(KFile::Directory);
@@ -181,7 +181,7 @@ void SMSSend::setOptions(const TQString& name)
kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl;
if(!prefWidget) return; // sanity check
- prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name));
+ prefWidget->providerLabel->setText(i18n("%1 Settings").arg(name));
labels.setAutoDelete(true);
labels.clear();
@@ -237,7 +237,7 @@ int SMSSend::maxSize()
const TQString& SMSSend::description()
{
TQString url = "http://zekiller.skytech.org/smssend_en.php";
- m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").tqarg(url).tqarg(url);
+ m_description = i18n("<qt>SMSSend is a program for sending SMS through gateways on the web. It can be found on <a href=\"%1\">%2</a></qt>").arg(url).arg(url);
return m_description;
}
diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui
index cdd2220d..c902d22d 100644
--- a/kopete/protocols/sms/services/smssendprefs.ui
+++ b/kopete/protocols/sms/services/smssendprefs.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>311</width>
<height>16</height>
@@ -65,7 +65,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<grid>
<property name="name">
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>351</width>
<height>16</height>
diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp
index ffd0897e..8feb94a9 100644
--- a/kopete/protocols/sms/services/smssendprovider.cpp
+++ b/kopete/protocols/sms/services/smssendprovider.cpp
@@ -49,7 +49,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p
if (f.open(IO_ReadOnly))
{
TQTextStream t(&f);
- TQString group = TQString("SMSSend-%1").tqarg(provider);
+ TQString group = TQString("SMSSend-%1").arg(provider);
bool exactNumberMatch = false;
TQStringList numberWords;
numberWords.append("Tel");
@@ -87,7 +87,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p
descriptions.append(args[1]);
if (m_account)
- values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]),
+ values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]),
TQString()));
else
values.append("");
@@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args)
kdDebug( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl;
if (!m_account) return; // prevent crash in worst case
- TQString group = TQString("SMSSend-%1").tqarg(provider);
+ TQString group = TQString("SMSSend-%1").arg(provider);
int namesI=0;
for (unsigned i=0; i < args.count(); i++)
@@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList<KLineEdit>& args)
// kdDebug(14160) << k_funcinfo << "saving " << args.at(i) << " to " << names[namesI] << endl;
if (!args.at(i)->text().isEmpty())
{ values[namesI] = args.at(i)->text();
- m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(names[namesI]), values[namesI]);
+ m_account->configGroup()->writeEntry(TQString("%1:%2").arg(group).arg(names[namesI]), values[namesI]);
}
namesI++;
}
@@ -239,9 +239,9 @@ void SMSSendProvider::send(const Kopete::Message& msg)
KProcess* p = new KProcess;
- kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
+ kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl;
- *p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values;
+ *p << TQString("%1/bin/smssend").arg(prefix) << provider << values;
output = "";
connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *)));
diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp
index fc12437c..10e09ae8 100644
--- a/kopete/protocols/sms/smsaccount.cpp
+++ b/kopete/protocols/sms/smsaccount.cpp
@@ -83,7 +83,7 @@ const bool SMSAccount::splitNowMsgTooLong(int msgLength)
int max = theService->maxSize();
if(theLongMsgAction == ACT_CANCEL) return false;
if(theLongMsgAction == ACT_SPLIT) return true;
- if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").tqarg(max).tqarg(msgLength / max + 1),
+ if(KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), i18n("This message is longer than the maximum length (%1). Should it be divided to %2 messages?").arg(max).arg(msgLength / max + 1),
i18n("Message Too Long"), i18n("Divide"), i18n("Do Not Divide")) == KMessageBox::Yes)
return true;
else
@@ -104,7 +104,7 @@ void SMSAccount::connect(const Kopete::OnlineStatus&)
void SMSAccount::slotConnected()
{
myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOnline );
- setAllContactstqStatus( SMSProtocol::protocol()->SMSOnline );
+ setAllContactsStatus( SMSProtocol::protocol()->SMSOnline );
}
void SMSAccount::disconnect()
@@ -116,7 +116,7 @@ void SMSAccount::disconnect()
void SMSAccount::slotDisconnected()
{
myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline );
- setAllContactstqStatus( SMSProtocol::protocol()->SMSOffline );
+ setAllContactsStatus( SMSProtocol::protocol()->SMSOffline );
}
void SMSAccount::slotSendMessage(Kopete::Message &msg)
@@ -186,11 +186,11 @@ KActionMenu* SMSAccount::actionMenu()
void SMSAccount::setOnlineStatus( const Kopete::OnlineStatus & status , const TQString &reason)
{
- if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online )
+ if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online )
connect();
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline )
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline )
disconnect();
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away )
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away )
setAway( true, reason );
}
diff --git a/kopete/protocols/sms/smsaddcontactpage.cpp b/kopete/protocols/sms/smsaddcontactpage.cpp
index c18e5866..bf3fd52f 100644
--- a/kopete/protocols/sms/smsaddcontactpage.cpp
+++ b/kopete/protocols/sms/smsaddcontactpage.cpp
@@ -17,7 +17,7 @@
#include "smsaddcontactpage.h"
#include "kopeteaccount.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp
index c355c287..59a5f000 100644
--- a/kopete/protocols/sms/smseditaccountwidget.cpp
+++ b/kopete/protocols/sms/smseditaccountwidget.cpp
@@ -15,7 +15,7 @@
*/
#include <tqvgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqlineedit.h>
diff --git a/kopete/protocols/sms/smsservice.cpp b/kopete/protocols/sms/smsservice.cpp
index 5fe4bb1a..a0b20025 100644
--- a/kopete/protocols/sms/smsservice.cpp
+++ b/kopete/protocols/sms/smsservice.cpp
@@ -14,7 +14,7 @@
*************************************************************************
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <kdebug.h>
diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h
index c5ea28ab..dc0493bb 100644
--- a/kopete/protocols/sms/smsservice.h
+++ b/kopete/protocols/sms/smsservice.h
@@ -46,10 +46,10 @@ public:
/**
* Called when the settings widget has a place to be. @param parent is the
- * settings widget's parent and @param tqlayout is the 2xn grid tqlayout it may
+ * settings widget's parent and @param layout is the 2xn grid layout it may
* use.
*/
- virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* tqlayout) = 0;
+ virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* layout) = 0;
virtual void send(const Kopete::Message& msg) = 0;
virtual int maxSize() = 0;
diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui
index d04814ef..10f5c235 100644
--- a/kopete/protocols/sms/ui/smsactprefs.ui
+++ b/kopete/protocols/sms/ui/smsactprefs.ui
@@ -118,7 +118,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -187,7 +187,7 @@
<property name="text">
<string>To use SMS, you will need an account with a delivery service.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>181</height>
@@ -236,7 +236,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout119</cstring>
+ <cstring>layout119</cstring>
</property>
<hbox>
<property name="name">
@@ -303,7 +303,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout56</cstring>
+ <cstring>layout56</cstring>
</property>
<hbox>
<property name="name">
@@ -379,7 +379,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -396,7 +396,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui
index 29e75542..cc970bbc 100644
--- a/kopete/protocols/sms/ui/smsadd.ui
+++ b/kopete/protocols/sms/ui/smsadd.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout35</cstring>
+ <cstring>layout35</cstring>
</property>
<hbox>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout33</cstring>
+ <cstring>layout33</cstring>
</property>
<vbox>
<property name="name">
@@ -84,7 +84,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout34</cstring>
+ <cstring>layout34</cstring>
</property>
<vbox>
<property name="name">
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>170</height>
diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui
index 777b16b7..aa719efe 100644
--- a/kopete/protocols/sms/ui/smsuserprefs.ui
+++ b/kopete/protocols/sms/ui/smsuserprefs.ui
@@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp
index 17c1ea73..cc906447 100644
--- a/kopete/protocols/testbed/testbedaccount.cpp
+++ b/kopete/protocols/testbed/testbedaccount.cpp
@@ -75,10 +75,10 @@ void TestbedAccount::setAway( bool away, const TQString & /* reason */ )
void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const TQString &reason )
{
if ( status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline )
slotGoOnline();
else if (status.status() == Kopete::OnlineStatus::Online &&
- myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away )
+ myself()->onlineStatus().status() == Kopete::OnlineStatus::Away )
setAway( false, reason );
else if ( status.status() == Kopete::OnlineStatus::Offline )
slotGoOffline();
@@ -86,7 +86,7 @@ void TestbedAccount::setOnlineStatus(const Kopete::OnlineStatus& status, const T
slotGoAway( /* reason */ );
}
-void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialtqStatus */ )
+void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ )
{
kdDebug ( 14210 ) << k_funcinfo << endl;
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
@@ -114,7 +114,7 @@ void TestbedAccount::slotGoOnline ()
connect ();
else
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline );
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::slotGoAway ()
@@ -125,7 +125,7 @@ void TestbedAccount::slotGoAway ()
connect();
myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedAway );
- updateContacttqStatus();
+ updateContactStatus();
}
@@ -135,7 +135,7 @@ void TestbedAccount::slotGoOffline ()
if (isConnected ())
disconnect ();
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::slotShowVideo ()
@@ -144,7 +144,7 @@ void TestbedAccount::slotShowVideo ()
if (isConnected ())
TestbedWebcamDialog *testbedWebcamDialog = new TestbedWebcamDialog(0, 0, "Testbed video window");
- updateContacttqStatus();
+ updateContactStatus();
}
void TestbedAccount::receivedMessage( const TQString &message )
@@ -165,11 +165,11 @@ void TestbedAccount::receivedMessage( const TQString &message )
kdWarning(14210) << k_funcinfo << "unable to look up contact for delivery" << endl;
}
-void TestbedAccount::updateContacttqStatus()
+void TestbedAccount::updateContactStatus()
{
TQDictIterator<Kopete::Contact> itr( contacts() );
for ( ; itr.current(); ++itr )
- itr.current()->setOnlineStatus( myself()->onlinetqStatus() );
+ itr.current()->setOnlineStatus( myself()->onlineStatus() );
}
diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h
index c9f1517e..8bb310ca 100644
--- a/kopete/protocols/testbed/testbedaccount.h
+++ b/kopete/protocols/testbed/testbedaccount.h
@@ -60,7 +60,7 @@ public:
/**
* 'Connect' to the testbed server. Only sets myself() online.
*/
- virtual void connect( const Kopete::OnlineStatus& initialtqStatus = Kopete::OnlineStatus() );
+ virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() );
/**
* Disconnect from the server. Only sets myself() offline.
*/
@@ -80,7 +80,7 @@ protected:
/**
* This simulates contacts going on and offline in sync with the account's status changes
*/
- void updateContacttqStatus();
+ void updateContactStatus();
TestbedFakeServer* m_server;
protected slots:
diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui
index 4edf08ca..99500ddb 100644
--- a/kopete/protocols/testbed/testbedaccountpreferences.ui
+++ b/kopete/protocols/testbed/testbedaccountpreferences.ui
@@ -53,7 +53,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1_2</cstring>
+ <cstring>layout1_2</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@
<property name="text">
<string>To use the testbed protocol, just make up an account name. This protocol has no real networking capability.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>131</height>
@@ -150,7 +150,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp
index 9250b9a0..15979be0 100644
--- a/kopete/protocols/testbed/testbedaddcontactpage.cpp
+++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp
@@ -16,7 +16,7 @@
#include "testbedaddcontactpage.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqlineedit.h>
#include <kdebug.h>
@@ -48,7 +48,7 @@ bool TestbedAddContactPage::apply( Kopete::Account* a, Kopete::MetaContact* m )
if ( m_testbedAddUI->m_rbEcho->isOn() )
{
type = m_testbedAddUI->m_uniqueName->text();
- name = TQString::tqfromLatin1( "Echo Contact" );
+ name = TQString::fromLatin1( "Echo Contact" );
ok = true;
}
if ( ok )
diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui
index aa0410dd..b9994322 100644
--- a/kopete/protocols/testbed/testbedaddui.ui
+++ b/kopete/protocols/testbed/testbedaddui.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>252</height>
diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp
index 98a52dfc..0e31d639 100644
--- a/kopete/protocols/testbed/testbededitaccountwidget.cpp
+++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp
@@ -16,7 +16,7 @@
#include "testbededitaccountwidget.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <kdebug.h>
#include "kopeteaccount.h"
diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp
index 7740b858..9a4116ca 100644
--- a/kopete/protocols/testbed/testbedfakeserver.cpp
+++ b/kopete/protocols/testbed/testbedfakeserver.cpp
@@ -36,8 +36,8 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message )
kdDebug( 14210 ) << k_funcinfo << "Message for: " << contactId << ", is: " << message << endl;
kdDebug( 14210 ) << "recipient is echo, coming back at you." << endl;
// put the message in a map and start a timer to tell it to deliver itself.
- //emit messageReceived( TQString::tqfromLatin1( "echo: " ) + message );
- TQString messageId = contactId + TQString::tqfromLatin1(": ");
+ //emit messageReceived( TQString::fromLatin1( "echo: " ) + message );
+ TQString messageId = contactId + TQString::fromLatin1(": ");
TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message );
m_incomingMessages.append( msg );
TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) );
diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp
index 301b8a08..867a2647 100644
--- a/kopete/protocols/testbed/testbedprotocol.cpp
+++ b/kopete/protocols/testbed/testbedprotocol.cpp
@@ -55,9 +55,9 @@ Kopete::Contact *TestbedProtocol::deserializeContact(
TQString type = serializedData[ "contactType" ];
TestbedContact::TestbedContactType tbcType;
- if ( type == TQString::tqfromLatin1( "echo" ) )
+ if ( type == TQString::fromLatin1( "echo" ) )
tbcType = TestbedContact::Echo;
- if ( type == TQString::tqfromLatin1( "null" ) )
+ if ( type == TQString::fromLatin1( "null" ) )
tbcType = TestbedContact::Null;
else
tbcType = TestbedContact::Null;
diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
index d5453978..828eb6b2 100644
--- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
+++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp
@@ -22,13 +22,13 @@
#include <tqobject.h>
#include <tqwidget.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <kdebug.h>
#include <klocale.h>
TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
-: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).tqarg( contactId ),
+: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ),
KDialogBase::Close, KDialogBase::Close, true /*seperator*/ )
{
setInitialSize( TQSize(320,290), false );
@@ -43,7 +43,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget *
mImageContainer = new Kopete::WebcamWidget( page );
mImageContainer->setMinimumSize(320,240);
mImageContainer->setText( i18n( "No webcam image received" ) );
- mImageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ mImageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
topLayout->add( mImageContainer );
show();
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
index 15440eda..8efe247a 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp
@@ -107,8 +107,8 @@ bool WinPopupLib::checkMessageDir()
"If you have not configured anything yet (samba) please see\n"
"Install Into Samba (Configure... -> Account -> Edit) information\n"
"on how to do this.\n"
- "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR),
- TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
+ "Should the directory be created? (May need root password)").arg(WP_POPUP_DIR),
+ TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -126,8 +126,8 @@ bool WinPopupLib::checkMessageDir()
"%1 are wrong!\n"
"You will not receive messages if you say no.\n"
"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
- "Fix? (May need root password)").tqarg(WP_POPUP_DIR),
- TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+ "Fix? (May need root password)").arg(WP_POPUP_DIR),
+ TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) return true;
@@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData()
passedInitialHost = false;
todo.clear();
currentGroupsMap.clear();
- currentHost = TQString::tqfromLatin1("LOCALHOST");
+ currentHost = TQString::fromLatin1("LOCALHOST");
startReadProcess(currentHost);
}
@@ -184,7 +184,7 @@ void WinPopupLib::slotReadProcessReady(KProcIO *r)
if (group.search(tmpLine) != -1) currentGroups[group.cap(1)] = group.cap(2);
if (error.search(tmpLine) != -1) {
kdDebug(14170) << "Connection to " << currentHost << " failed!" << endl;
- if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure
+ if (currentHost == TQString::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure
}
}
}
@@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r)
todo += groupMaster;
}
} else {
- if (currentHost == TQString::tqfromLatin1("failed"))
+ if (currentHost == TQString::fromLatin1("failed"))
KMessageBox::error(Kopete::UI::Global::mainWidget(),
i18n("Connection to localhost failed!\n"
"Is your samba server running?"),
- TQString::tqfromLatin1("Winpopup"));
+ TQString::fromLatin1("Winpopup"));
}
}
@@ -303,7 +303,7 @@ void WinPopupLib::readMessages(const KFileItemList &items)
i18n("A message file could not be removed; "
"maybe the permissions are wrong.\n"
"Fix? (May need root password)"),
- TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
+ TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix"));
if (tmpYesNo == KMessageBox::Yes) {
TQStringList tdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path()));
if (KApplication::tdeinitExecWait("tdesu", tdesuArgs) == 0) {
diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
index 686252ea..b4d7dc82 100644
--- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
+++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h
@@ -29,7 +29,7 @@
#include <kprocio.h>
#include <kfileitem.h>
-const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup");
+const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup");
class KDirLister;
diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
index 8049dab1..a594a5b1 100644
--- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
+++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui
@@ -28,7 +28,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout59</cstring>
+ <cstring>layout59</cstring>
</property>
<hbox>
<property name="name">
@@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout57</cstring>
+ <cstring>layout57</cstring>
</property>
<vbox>
<property name="name">
@@ -80,7 +80,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<vbox>
<property name="name">
@@ -117,7 +117,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
index 32c8ead5..ecf97df5 100644
--- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
+++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui
@@ -32,7 +32,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -64,7 +64,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout40</cstring>
+ <cstring>layout40</cstring>
</property>
<hbox>
<property name="name">
@@ -142,7 +142,7 @@
<property name="text">
<string>To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -163,7 +163,7 @@
However, the recommended way is to ask your administrator to create this directory ('mkdir -p -m 0777 /var/lib/winpopup') and add
'message command = _PATH_TO_/winpopup-send.sh %s %m %t &amp;' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -209,7 +209,7 @@ However, the recommended way is to ask your administrator to create this directo
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>135</height>
@@ -266,7 +266,7 @@ However, the recommended way is to ask your administrator to create this directo
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -274,7 +274,7 @@ However, the recommended way is to ask your administrator to create this directo
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
index aaec0dbe..7c87b961 100644
--- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
+++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui
@@ -26,7 +26,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -34,7 +34,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -120,7 +120,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp
index eb881c70..d7439628 100644
--- a/kopete/protocols/winpopup/wpaccount.cpp
+++ b/kopete/protocols/winpopup/wpaccount.cpp
@@ -66,7 +66,7 @@ const TQStringList WPAccount::getHosts(const TQString &Group)
bool WPAccount::checkHost(const TQString &Name)
{
// kdDebug() << "WPAccount::checkHost: " << Name << endl;
- if (Name.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+ if (Name.upper() == TQString::fromLatin1("LOCALHOST")) {
// Assume localhost is always there, but it will not appear in the samba output.
// Should never happen as localhost is now forbidden as contact, just for safety. GF
return true;
@@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu()
/// How to remove an action from Kopete::Account::actionMenu()? GF
- KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this);
- theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId()));
+ KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
+ theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
if (mProtocol)
{
@@ -189,17 +189,17 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio
{
kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl;
- if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
+ if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline);
mProtocol->sendMessage(Body, Destination);
}
void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason)
{
- if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
+ if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online)
connect( status );
- else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
+ else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline)
disconnect();
- else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
+ else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away)
setAway( true, reason );
}
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 25e4b6d8..0ca685dc 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -18,7 +18,7 @@
* *
***************************************************************************/
// QT Includes
-#include <tqlayout.h>
+#include <layout.h>
// KDE Includes
#include <kcombobox.h>
@@ -93,7 +93,7 @@ bool WPAddContact::validateData()
// If our own host is not allowed as contact localhost should be forbidden as well,
// additionally somehow localhost as contact crashes when receiving a message from it?? GF
- if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) {
+ if (tmpHostName.upper() == TQString::fromLatin1("LOCALHOST")) {
KMessageBox::sorry(this, i18n("<qt>LOCALHOST is not allowed as contact.</qt>"), i18n("WinPopup"));
return false;
}
diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp
index 1aff6e32..103a2a85 100644
--- a/kopete/protocols/winpopup/wpcontact.cpp
+++ b/kopete/protocols/winpopup/wpcontact.cpp
@@ -51,8 +51,8 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
// Initialise and start the periodical checking for contact's status
setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline);
- connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus()));
- checktqStatus.start(1000, false);
+ connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus()));
+ checkStatus.start(1000, false);
}
TQPtrList<KAction> * WPContact::customContextMenuActions()
@@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr
bool WPContact::isOnline() const
{
kdDebug(14170) << "[WPContact::isOnline()]" << endl;
- return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+ return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
}
*/
bool WPContact::isReachable()
{
// kdDebug(14170) << "[WPContact::isReachable()]" << endl;
- return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+ return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
}
void WPContact::slotChatSessionDestroyed()
@@ -131,7 +131,7 @@ void deleteContact()
}
*/
-void WPContact::slotChecktqStatus()
+void WPContact::slotCheckStatus()
{
bool oldWasConnected = myWasConnected;
bool newIsOnline = false;
@@ -141,11 +141,11 @@ void WPContact::slotChecktqStatus()
if (acct) newIsOnline = acct->checkHost(contactId());
if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) {
- Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline;
+ Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline;
if (myWasConnected && newIsOnline) {
- tmptqStatus = WPProtocol::protocol()->WPOnline;
+ tmpStatus = WPProtocol::protocol()->WPOnline;
}
- setOnlineStatus(tmptqStatus);
+ setOnlineStatus(tmpStatus);
}
}
diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h
index 6843d6c2..8acd7235 100644
--- a/kopete/protocols/winpopup/wpcontact.h
+++ b/kopete/protocols/winpopup/wpcontact.h
@@ -62,7 +62,7 @@ public:
public slots:
virtual void slotUserInfo();
- void slotChecktqStatus(); // the call back for the checktqStatus timer
+ void slotCheckStatus(); // the call back for the checkStatus timer
void slotNewMessage(const TQString &Body, const TQDateTime &Arrival);
private slots:
@@ -73,7 +73,7 @@ private slots:
private:
bool myWasConnected; // true if protocol connected at last check
- TQTimer checktqStatus; // checks the status of this contact every second or so
+ TQTimer checkStatus; // checks the status of this contact every second or so
// KActionCollection *myActionCollection;
// holds all the protocol specific actions (not many!)
Kopete::ChatSession *m_manager;
diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp
index d16c8e6a..91145338 100644
--- a/kopete/protocols/winpopup/wpprotocol.cpp
+++ b/kopete/protocols/winpopup/wpprotocol.cpp
@@ -58,7 +58,7 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList &
sProtocol = this;
- // Load tqStatus Actions
+ // Load Status Actions
// initActions();
// TODO: Maybe use this in the future?
diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp
index c602b70e..162374b7 100644
--- a/kopete/protocols/winpopup/wpuserinfo.cpp
+++ b/kopete/protocols/winpopup/wpuserinfo.cpp
@@ -38,7 +38,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa
{
// kdDebug( 14170 ) << k_funcinfo << endl;
- setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) );
+ setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) );
m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" );
setMainWidget( m_mainWidget );
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
index a92cfc8f..1943aa6b 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp
@@ -1,6 +1,6 @@
/*
Kopete Yahoo Protocol
- Change our tqStatus
+ Change our Status
Copyright (c) 2005-2006 André Duffeck <duffeck@kde.org>
@@ -41,7 +41,7 @@ void ChangeStatusTask::onGo()
}
else
{
- YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus );
+ YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus );
t->setId( client()->sessionID() );
if( !m_message.isEmpty() )
@@ -55,7 +55,7 @@ void ChangeStatusTask::onGo()
send( t );
- if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> tqStatus
+ if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> Status
sendVisibility( Visible );
}
setSuccess();
@@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg )
m_message = msg;
}
-void ChangeStatusTask::settqStatus( Yahoo::tqStatus status )
+void ChangeStatusTask::setStatus( Yahoo::Status status )
{
m_status = status;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
index ffeb5301..200a6f34 100644
--- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h
+++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h
@@ -1,6 +1,6 @@
/*
Kopete Yahoo Protocol
- Change our tqStatus
+ Change our Status
Copyright (c) 2005 André Duffeck <duffeck@kde.org>
@@ -36,12 +36,12 @@ public:
virtual void onGo();
void setMessage( const TQString &msg );
- void settqStatus( Yahoo::tqStatus status );
+ void setStatus( Yahoo::Status status );
void setType( Yahoo::StatusType type );
private:
enum Visibility { Visible = 1, Invisible = 2 };
TQString m_message;
- Yahoo::tqStatus m_status;
+ Yahoo::Status m_status;
Yahoo::StatusType m_type;
void sendVisibility( Visibility visible );
diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp
index 366b256e..e5ca520d 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/client.cpp
@@ -95,10 +95,10 @@ public:
TQString yCookie;
TQString tCookie;
TQString cCookie;
- Yahoo::tqStatus status;
- Yahoo::tqStatus statusOnConnect;
+ Yahoo::Status status;
+ Yahoo::Status statusOnConnect;
TQString statusMessageOnConnect;
- Yahoo::PicturetqStatus pictureFlag;
+ Yahoo::PictureStatus pictureFlag;
int pictureChecksum;
bool buddyListReady;
TQStringList pictureRequestQueue;
@@ -112,7 +112,7 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient")
d->root = new Task(this, true);
d->statusOnConnect = Yahoo::StatusAvailable;
- settqStatus( Yahoo::StatusDisconnected );
+ setStatus( Yahoo::StatusDisconnected );
d->tasksInitialized = false;
d->stream = 0L;
d->iconLoader = 0L;
@@ -132,8 +132,8 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient")
TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) );
TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ),
TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) );
- TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ),
- TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
+ TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+ TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
}
Client::~Client()
@@ -151,7 +151,7 @@ void Client::connect( const TQString &host, const uint port, const TQString &use
d->port = port;
d->user = userId;
d->pass = pass;
- settqStatus( Yahoo::StatusConnecting );
+ setStatus( Yahoo::StatusConnecting );
m_connector = new KNetworkConnector;
m_connector->setOptHostPort( host, port );
@@ -272,9 +272,9 @@ void Client::slotLoginResponse( int response, const TQString &msg )
if( !(d->statusOnConnect == Yahoo::StatusAvailable ||
d->statusOnConnect == Yahoo::StatusInvisible) ||
!d->statusMessageOnConnect.isEmpty() )
- changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
+ changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway );
d->statusMessageOnConnect = TQString();
- settqStatus( d->statusOnConnect );
+ setStatus( d->statusOnConnect );
/* only send a ping every hour. we get disconnected otherwise */
m_pingTimer->start( 60 * 60 * 1000 );
initTasks();
@@ -344,7 +344,7 @@ void Client::sendBuzz( const TQString &to )
{
SendMessageTask *smt = new SendMessageTask( d->root );
smt->setTarget( to );
- smt->setText( TQString::tqfromLatin1( "<ding>" ) );
+ smt->setText( TQString::fromLatin1( "<ding>" ) );
smt->setPicureFlag( pictureFlag() );
smt->go( true );
}
@@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId )
emit fileTransferCanceled( transferId );
}
-void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type )
+void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo::StatusType type )
{
kdDebug(YAHOO_RAW_DEBUG) << "status: " << status
<< " message: " << message
<< " type: " << type << endl;
ChangeStatusTask *cst = new ChangeStatusTask( d->root );
- cst->settqStatus( status );
+ cst->setStatus( status );
cst->setMessage( message );
cst->setType( type );
cst->go( true );
@@ -418,7 +418,7 @@ void Client::changetqStatus( Yahoo::tqStatus status, const TQString &message, Ya
if( status == Yahoo::StatusInvisible )
stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear );
- settqStatus( status );
+ setStatus( status );
}
void Client::sendAuthReply( const TQString &userId, bool accept, const TQString &msg )
@@ -444,7 +444,7 @@ void Client::sendPing()
// ***** Contactlist handling *****
-void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state)
+void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state)
{
StealthTask *st = new StealthTask( d->root );
st->setTarget( userId );
@@ -575,7 +575,7 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url
spt->go( true );
}
-void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
+void Client::setPictureStatus( Yahoo::PictureStatus status )
{
if( d->pictureFlag == status )
return;
@@ -583,8 +583,8 @@ void Client::setPicturetqStatus( Yahoo::PicturetqStatus status )
kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl;
d->pictureFlag = status;
SendPictureTask *spt = new SendPictureTask( d->root );
- spt->setType( SendPictureTask::SendtqStatus );
- spt->settqStatus( status );
+ spt->setType( SendPictureTask::SendStatus );
+ spt->setStatus( status );
spt->go( true );
}
@@ -710,8 +710,8 @@ void Client::leaveChat()
// ***** other *****
void Client::notifyError( const TQString &info, const TQString & errorString, LogLevel level )
{
- kdDebug(YAHOO_RAW_DEBUG) << TQString::tqfromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3")
- .tqarg(info).tqarg(errorString).tqarg(level) << endl;
+ kdDebug(YAHOO_RAW_DEBUG) << TQString::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3")
+ .arg(info).arg(errorString).arg(level) << endl;
d->errorString = errorString;
d->errorInformation = info;
emit error( level );
@@ -727,18 +727,18 @@ void Client::setUserId( const TQString & userId )
d->user = userId;
}
-Yahoo::tqStatus Client::status()
+Yahoo::Status Client::status()
{
return d->status;
}
-void Client::settqStatus( Yahoo::tqStatus status )
+void Client::setStatus( Yahoo::Status status )
{
d->status = status;
}
-void Client::setStatusOnConnect( Yahoo::tqStatus status )
+void Client::setStatusOnConnect( Yahoo::Status status )
{
d->statusOnConnect = status;
}
@@ -841,8 +841,8 @@ void Client::initTasks()
d->statusTask = new StatusNotifierTask( d->root );
TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ),
TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) );
- TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ),
- TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) );
+ TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ),
+ TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) );
TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ),
TQT_SLOT( slotLoginResponse( int, const TQString& ) ) );
TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ),
diff --git a/kopete/protocols/yahoo/libkyahoo/client.h b/kopete/protocols/yahoo/libkyahoo/client.h
index 586eead5..4e1602eb 100644
--- a/kopete/protocols/yahoo/libkyahoo/client.h
+++ b/kopete/protocols/yahoo/libkyahoo/client.h
@@ -100,7 +100,7 @@ Q_OBJECT
* If status is any other status the Client connects into Online state and changes into the specified state after the login.
* @param status the status to connect with
*/
- void setStatusOnConnect( Yahoo::tqStatus status );
+ void setStatusOnConnect( Yahoo::Status status );
/**
* Specifies the status message we connect with.
@@ -147,7 +147,7 @@ Q_OBJECT
* @param message the status message that will be set
* @param type Yahoo::StatusTypeAvailable means that the user is available, Yahoo::StatusTypeAway means that the user is away from the keyboard
*/
- void changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type);
+ void changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type);
/**
* Set the verification word that is needed for a account verification after
@@ -162,7 +162,7 @@ Q_OBJECT
* @param group the group where the buddy will be placed
* @param message the message that will be sent to the buddy along the authorization request
*/
- void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::tqfromLatin1("Please add me") );
+ void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::fromLatin1("Please add me") );
/**
* Remove a buddy from the contact list
@@ -185,7 +185,7 @@ Q_OBJECT
* @param mode defines the Stealth mode that is changed. That can be "Appear Offline", "Appear Online" or "Apper permanently offline"
* @param state the status of the specified Stealth mode. Active, Not Active or Clear
*/
- void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state );
+ void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthStatus state );
/**
* Request the buddy's picture
@@ -226,7 +226,7 @@ Q_OBJECT
* Notify the buddies about our new status
* @param flag the type of our picture (0=none, 1=avatar, 2=picture)
*/
- void setPicturetqStatus( Yahoo::PicturetqStatus flag );
+ void setPictureStatus( Yahoo::PictureStatus flag );
/**
* Send a response to the webcam invite ( Accept / Decline )
@@ -432,13 +432,13 @@ Q_OBJECT
int pictureChecksum();
/** Get our status */
- Yahoo::tqStatus status();
+ Yahoo::Status status();
/**
* Set our status
* @param status the new status
*/
- void settqStatus( Yahoo::tqStatus status );
+ void setStatus( Yahoo::Status status );
/** Access the root Task for this client, so tasks may be added to it. */
Task* rootTask();
@@ -503,7 +503,7 @@ Q_OBJECT
/**
* Notifies about the stealth status of buddies
*/
- void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus );
+ void stealthStatusChanged( const TQString &, Yahoo::StealthStatus );
/**
* Notifies about mails
*/
diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
index 6ca9ae06..59d3b3fa 100644
--- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp
@@ -178,7 +178,7 @@ void ConferenceTask::addInvite( const TQString &room, const TQStringList &who, c
TQString whoList = who.first();
for( int i = 1; i < who.size(); i++ )
- whoList += TQString(",%1").tqarg( who[i] );
+ whoList += TQString(",%1").arg( who[i] );
t->setParam( 51, whoList.local8Bit() );
t->setParam( 57, room.local8Bit() );
diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
index 573c5ccf..1e4166f7 100644
--- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp
@@ -24,7 +24,7 @@
#include <tqdatastream.h>
#include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <kdebug.h>
#include <kurl.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h
index cd7718e3..8f8e69ba 100644
--- a/kopete/protocols/yahoo/libkyahoo/listtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/listtask.h
@@ -41,7 +41,7 @@ protected:
void parseStealthList( YMSGTransfer *transfer );
signals:
void gotBuddy(const TQString&, const TQString&, const TQString&);
- void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus );
+ void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
};
#endif
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index d653ecf1..f6b8a47e 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -212,7 +212,7 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed)
m_stage1Data= TQString();
/* construct a URL from the seed and request tokens */
TQByteArray encodedUrl;
- TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed);
+ TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
KURL tokenUrl(fullUrl);
KIO::Job* job = KIO::get(tokenUrl, true, false);
connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -292,7 +292,7 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token)
const TQString YahooLoginUrl = "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1";
kdDebug(YAHOO_RAW_DEBUG) << "token:" << token << endl;
m_stage2Data = TQString();
- TQString fullUrl = YahooLoginUrl.tqarg(token);
+ TQString fullUrl = YahooLoginUrl.arg(token);
KURL loginUrl(fullUrl);
KIO::Job* job = KIO::get(loginUrl, true, false);
connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
@@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t)
mState = InitialState;
}
-void LoginTask::setStateOnConnect( Yahoo::tqStatus status )
+void LoginTask::setStateOnConnect( Yahoo::Status status )
{
m_stateOnConnect = status;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h
index 30c01ffe..4ed1ac95 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.h
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.h
@@ -47,7 +47,7 @@ public:
virtual void onGo();
void reset();
- void setStateOnConnect( Yahoo::tqStatus status );
+ void setStateOnConnect( Yahoo::Status status );
void setVerificationWord( const TQString &word );
const TQString &yCookie();
@@ -80,7 +80,7 @@ signals:
void buddyListReady();
private:
State mState;
- Yahoo::tqStatus m_stateOnConnect;
+ Yahoo::Status m_stateOnConnect;
TQString m_yCookie;
TQString m_tCookie;
TQString m_cCookie;
diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
index 133b17cf..de6a1080 100644
--- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp
@@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t )
TQString subject = t->firstParam( 18 );
if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() )
- emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() );
+ emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() );
else
emit mailNotify( TQString(), TQString(), count.toInt());
}
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index 3888bef8..4dd00d90 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i)
{
m_socket->close();
client()->notifyError( i18n( "An error occurred while saving the address book entry." ),
- TQString( "%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+ TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
}
void ModifyYABTask::connectSucceeded()
@@ -99,14 +99,14 @@ void ModifyYABTask::connectSucceeded()
kdDebug(YAHOO_RAW_DEBUG) ;
KBufferedSocket* socket = const_cast<KBufferedSocket*>( static_cast<const KBufferedSocket*>( sender() ) );
- TQString header = TQString::tqfromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
+ TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n"
"Cookie: Y=%1; T=%2; C=%3 ;B=fckeert1kk1nl&b=2\r\n"
"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
"Host: address.yahoo.com\r\n"
"Content-length: %4\r\n"
"Cache-Control: no-cache\r\n\r\n")
- .tqarg(client()->yCookie()).tqarg(client()->tCookie())
- .tqarg(client()->cCookie()).tqarg(m_postData.utf8().size());
+ .arg(client()->yCookie()).arg(client()->tCookie())
+ .arg(client()->cCookie()).arg(m_postData.utf8().size());
TQByteArray buffer;
TQByteArray paket;
@@ -174,21 +174,21 @@ void ModifyYABTask::slotRead()
case EditEntry:
if( !e.attribute( "es" ).isEmpty() && e.attribute( "es" ) != "0" ) // Check for edit errors
{
- emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( e.attribute("ee") ) );
+ emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").arg( e.attribute("es") ).arg( e.attribute("ee") ) );
continue;
}
break;
case AddEntry:
if( !e.attribute( "as" ).isEmpty() && e.attribute( "as" ) != "0" ) // Check for add errors
{
- emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( e.attribute("ae") ) );
+ emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").arg( e.attribute("as") ).arg( e.attribute("ae") ) );
continue;
}
break;
case DeleteEntry:
if( !e.attribute( "ds" ).isEmpty() && e.attribute( "ds" ) != "0" ) // Check for delete errors
{
- emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) );
+ emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").arg( e.attribute("ds") ).arg( e.attribute("de") ) );
continue;
}
break;
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
index a7245fe6..07c3d225 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp
@@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer )
switch( t->service() )
{
- case Yahoo::ServicePicturetqStatus:
- parsePicturetqStatus( t );
+ case Yahoo::ServicePictureStatus:
+ parsePictureStatus( t );
parsePicture( t );
break;
case Yahoo::ServicePictureChecksum:
@@ -80,13 +80,13 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const
t->service() == Yahoo::ServicePicture ||
t->service() == Yahoo::ServicePictureUpdate ||
t->service() == Yahoo::ServicePictureUpload ||
- t->service() == Yahoo::ServicePicturetqStatus )
+ t->service() == Yahoo::ServicePictureStatus )
return true;
else
return false;
}
-void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t )
+void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t )
{
kdDebug(YAHOO_RAW_DEBUG) ;
diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
index 7e09be19..832efc35 100644
--- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h
@@ -39,7 +39,7 @@ public:
protected:
virtual bool forMe( const Transfer *transfer ) const;
void parsePictureChecksum( YMSGTransfer *transfer );
- void parsePicturetqStatus( YMSGTransfer *transfer );
+ void parsePictureStatus( YMSGTransfer *transfer );
void parsePicture( YMSGTransfer *transfer );
void parsePictureUploadResponse( YMSGTransfer *transfer );
signals:
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 3943cd22..ec2e9f5f 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -187,20 +187,20 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
send( t );
// The server expects a HTTP HEAD command prior to the GET
- m_mimetypeJob = KIO::mimetype(TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
- .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false);
+ m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+ .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false);
m_mimetypeJob->addMetaData("cookies", "manual");
- m_mimetypeJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
- .tqarg(client()->tCookie()).tqarg(client()->yCookie()).tqarg(client()->cCookie()) );
+ m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
+ .arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) );
- m_transferJob = KIO::get( TQString::tqfromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
- .tqarg( TQString(transfer->firstParam( 250 )) ).tqarg( TQString(transfer->firstParam( 251 )) ).tqarg(m_userId).tqarg(client()->userId()), false, false );
+ m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
+ .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false );
TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
m_transferJob->addMetaData("cookies", "manual");
- m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;")
- .tqarg(client()->tCookie()).tqarg(client()->yCookie()) );
+ m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;")
+ .arg(client()->tCookie()).arg(client()->yCookie()) );
}
}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
index 3f4f83b2..638a1811 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp
@@ -35,7 +35,7 @@ void SendNotifyTask::onGo()
{
YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify);
t->setId( client()->sessionID() );
- t->settqStatus( Yahoo::StatusNotify );
+ t->setStatus( Yahoo::StatusNotify );
switch( m_type )
{
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index a9e76332..04673c62 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -55,8 +55,8 @@ void SendPictureTask::onGo()
case SendInformation:
sendInformation();
break;
- case SendtqStatus:
- sendtqStatus();
+ case SendStatus:
+ sendStatus();
break;
}
}
@@ -76,7 +76,7 @@ void SendPictureTask::connectFailed( int i)
{
kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl;
- client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
+ client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
setError();
}
@@ -105,18 +105,18 @@ void SendPictureTask::connectSucceeded()
else
{
kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << TQString(file.errorString()).ascii() << endl;
- client()->notifyError(i18n("Error opening file: %1").tqarg(m_path), file.errorString(), Client::Error );
+ client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error );
return;
}
paket = t.serialize();
kdDebug(YAHOO_RAW_DEBUG) << "Sizes: File (" << m_path << "): " << file.size() << " - paket: " << paket.size() << endl;
- TQString header = TQString::tqfromLatin1("POST /notifyft HTTP/1.1\r\n"
+ TQString header = TQString::fromLatin1("POST /notifyft HTTP/1.1\r\n"
"Cookie: Y=%1; T=%2; C=%3 ;\r\n"
"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
"Host: filetransfer.msg.yahoo.com\r\n"
"Content-length: %4\r\n"
- "Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size());
+ "Cache-Control: no-cache\r\n\r\n").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size());
stream.writeRawBytes( header.local8Bit(), header.length() );
stream.writeRawBytes( paket.data(), paket.size() );
stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80;
@@ -208,11 +208,11 @@ void SendPictureTask::sendInformation()
setSuccess();
}
-void SendPictureTask::sendtqStatus()
+void SendPictureTask::sendStatus()
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus);
+ YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus);
t->setId( client()->sessionID() );
t->setParam(3, client()->userId().local8Bit());
t->setParam(213, m_status );
@@ -252,7 +252,7 @@ void SendPictureTask::setChecksum( int checksum )
m_checksum = checksum;
}
-void SendPictureTask::settqStatus( int status )
+void SendPictureTask::setStatus( int status )
{
m_status = status;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
index 861d0dd5..4bac4f31 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
@@ -37,7 +37,7 @@ class SendPictureTask : public Task
Q_OBJECT
TQ_OBJECT
public:
- enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus };
+ enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus };
SendPictureTask(Task *parent);
virtual ~SendPictureTask();
@@ -50,13 +50,13 @@ public:
void setFilesize( int );
void setPath( const TQString & );
void setChecksum( int );
- void settqStatus( int );
+ void setStatus( int );
void setUrl( const TQString & );
private:
void initiateUpload();
void sendChecksum();
void sendInformation();
- void sendtqStatus();
+ void sendStatus();
private slots:
void connectSucceeded();
void connectFailed( int );
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
index 95e06b3c..4038301e 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp
@@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer )
YMSGTransfer *t = static_cast<YMSGTransfer*>(transfer);
if( t->service() == Yahoo::ServiceStealthOffline )
- parseStealthtqStatus( t );
+ parseStealthStatus( t );
else if( t->service() == Yahoo::ServiceAuthorization )
parseAuthorization( t );
else
- parsetqStatus( t );
+ parseStatus( t );
return true;
}
@@ -67,17 +67,17 @@ bool StatusNotifierTask::forMe( const Transfer* transfer ) const
t->service() == Yahoo::ServiceGameLogoff ||
t->service() == Yahoo::ServiceIdAct ||
t->service() == Yahoo::ServiceIddeAct ||
- t->service() == Yahoo::ServicetqStatus ||
+ t->service() == Yahoo::ServiceStatus ||
t->service() == Yahoo::ServiceStealthOffline ||
t->service() == Yahoo::ServiceAuthorization ||
- t->service() == Yahoo::ServiceBuddytqStatus
+ t->service() == Yahoo::ServiceBuddyStatus
)
return true;
else
return false;
}
-void StatusNotifierTask::parsetqStatus( YMSGTransfer* t )
+void StatusNotifierTask::parseStatus( YMSGTransfer* t )
{
kdDebug(YAHOO_RAW_DEBUG) ;
@@ -156,14 +156,14 @@ void StatusNotifierTask::parseAuthorization( YMSGTransfer* t )
TQString lname = t->firstParam( 254 );
TQString name;
if( !fname.isEmpty() || !lname.isEmpty() )
- name = TQString("%1 %2").tqarg(fname).tqarg(lname);
+ name = TQString("%1 %2").arg(fname).arg(lname);
kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl;
emit gotAuthorizationRequest( nick, msg, name );
}
}
-void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t )
+void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t )
{
kdDebug(YAHOO_RAW_DEBUG) ;
diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
index 8ed029f5..4941d479 100644
--- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
+++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h
@@ -38,12 +38,12 @@ public:
protected:
virtual bool forMe( const Transfer *transfer ) const;
- void parsetqStatus( YMSGTransfer *transfer );
- void parseStealthtqStatus( YMSGTransfer *transfer );
+ void parseStatus( YMSGTransfer *transfer );
+ void parseStealthStatus( YMSGTransfer *transfer );
void parseAuthorization( YMSGTransfer *transfer );
signals:
void statusChanged( const TQString &nick, int state, const TQString &message, int away, int idle, int pictureChecksum );
- void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus );
+ void stealthStatusChanged( const TQString&, Yahoo::StealthStatus );
void loginResponse( int, const TQString& );
void authorizationAccepted( const TQString & );
void authorizationRejected( const TQString &, const TQString & );
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
index 9dcc2431..6eba854a 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp
@@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to )
m_target = to;
}
-void StealthTask::setState( Yahoo::StealthtqStatus state)
+void StealthTask::setState( Yahoo::StealthStatus state)
{
m_state = state;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
index aef13038..370f06bc 100644
--- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h
@@ -35,12 +35,12 @@ public:
virtual void onGo();
void setTarget( const TQString &to );
- void setState( Yahoo::StealthtqStatus state );
+ void setState( Yahoo::StealthStatus state );
void setMode( Yahoo::StealthMode mode );
private:
TQString m_target;
Yahoo::StealthMode m_mode;
- Yahoo::StealthtqStatus m_state;
+ Yahoo::StealthStatus m_state;
};
#endif
diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp
index 6ad9994c..ccebaef3 100644
--- a/kopete/protocols/yahoo/libkyahoo/task.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/task.cpp
@@ -128,7 +128,7 @@ bool Task::take( Transfer * transfer)
if(p.isEmpty())
return false;
- // pass along the transfer to our tqchildren
+ // pass along the transfer to our children
TQObjectListIt it(p);
Task *t;
for(; it.current(); ++it)
@@ -252,7 +252,7 @@ void Task::clientDisconnected()
void Task::debug(const TQString &str)
{
- client()->debug(TQString("%1: ").tqarg(className()) + str);
+ client()->debug(TQString("%1: ").arg(className()) + str);
}
bool Task::forMe( const Transfer * transfer ) const
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
index 6d8d9e0d..efcd63cf 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp
@@ -30,7 +30,7 @@ ClientStreamTest::~ClientStreamTest()
void ClientStreamTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com");
+ TQString server = TQString::fromLatin1("scs.msg.yahoo.com");
// connect to server
kdDebug(14180) << k_funcinfo << " connecting to server" << endl;
myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
index ecf96906..5e9b04a5 100644
--- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp
@@ -46,7 +46,7 @@ LoginTest::~LoginTest()
void LoginTest::slotDoTest()
{
- TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com");
+ TQString server = TQString::fromLatin1("scs.msg.yahoo.com");
// connect to server
kdDebug(14180) << k_funcinfo << " connecting to server" << endl;
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
index 8c85705c..90245b29 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
@@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t )
info.sender = keyPending;
info.server = t->firstParam( 102 );
info.key = t->firstParam( 61 );
- info.status = InitialtqStatus;
+ info.status = InitialStatus;
info.dataLength = 0;
info.buffer = 0L;
info.headerRead = false;
@@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established()
if( socketMap[socket].direction == Incoming )
{
socket->writeBlock( TQCString("<RVWCFG>").data(), 8 );
- s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender);
+ s = TQString("g=%1\r\n").arg(socketMap[socket].sender);
}
else
{
@@ -172,7 +172,7 @@ void WebcamTask::slotConnectionStage2Established()
socket->writeBlock( TQCString("<RETQIMG>").data(), 8 );
// Send request information
s = TQString("a=2\r\nc=us\r\ne=21\r\nu=%1\r\nt=%2\r\ni=\r\ng=%3\r\no=w-2-5-1\r\np=1")
- .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender);
+ .arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender);
// Header: 08 00 01 00 00 00 00
stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length();
}
@@ -182,7 +182,7 @@ void WebcamTask::slotConnectionStage2Established()
socket->writeBlock( TQCString("<SNDIMG>").data(), 8 );
// Send request information
s = TQString("a=2\r\nc=us\r\nu=%1\r\nt=%2\r\ni=%3\r\no=w-2-5-1\r\np=2\r\nb=KopeteWebcam\r\nd=\r\n")
- .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName());
+ .arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName());
// Header: 08 00 05 00 00 00 00 01 00 00 00 01
stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)s.length()
<< (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01;
@@ -197,7 +197,7 @@ void WebcamTask::slotConnectionFailed( int error )
KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) );
kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl;
client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
- .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error );
+ .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error );
socketMap.remove( socket );
socket->deleteLater();
}
@@ -579,7 +579,7 @@ void WebcamTask::grantAccess( const TQString &userId )
}
TQByteArray ar;
TQDataStream stream( ar, IO_WriteOnly );
- TQString user = TQString("u=%1").tqarg(userId);
+ TQString user = TQString("u=%1").arg(userId);
stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)user.length()
<< (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x00 << (TQ_INT8)0x01;
diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
index 1aff0537..66dd92c8 100644
--- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h
+++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h
@@ -30,7 +30,7 @@ namespace KNetwork {
}
using namespace KNetwork;
-enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
+enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty };
enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft };
enum Direction { Incoming, Outgoing };
@@ -39,7 +39,7 @@ struct YahooWebcamInformation
TQString sender;
TQString server;
TQString key;
- ConnectiontqStatus status;
+ ConnectionStatus status;
PacketType type;
Direction direction;
uchar reason;
diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
index 65c48f54..9ca9af3d 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp
@@ -146,8 +146,8 @@ void YABEntry::fillTQDomElement( TQDomElement &e ) const
e.setAttribute( "hs", privateState );
e.setAttribute( "hz", privateZIP );
e.setAttribute( "hn", privateCountry );
- e.setAttribute( "bi", TQString("%1/%2/%3").tqarg( birthday.day() ).tqarg( birthday.month() ).tqarg( birthday.year() ) );
- e.setAttribute( "an", TQString("%1/%2/%3").tqarg( anniversary.day() ).tqarg( anniversary.month() ).tqarg( anniversary.year() ) );
+ e.setAttribute( "bi", TQString("%1/%2/%3").arg( birthday.day() ).arg( birthday.month() ).arg( birthday.year() ) );
+ e.setAttribute( "an", TQString("%1/%2/%3").arg( anniversary.day() ).arg( anniversary.month() ).arg( anniversary.year() ) );
e.setAttribute( "c1", additional1 );
e.setAttribute( "c2", additional2 );
e.setAttribute( "c3", additional3 );
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 278dcd31..951f88d8 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -94,13 +94,13 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision )
{
kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl;
m_data = TQString();
- TQString url = TQString::tqfromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
- .tqarg( lastMerge ).tqarg( lastRemoteRevision ).tqarg( YMSG_PROGRAM_VERSION_STRING );
+ TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
+ .arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING );
m_transferJob = KIO::get( url , false, false );
m_transferJob->addMetaData("cookies", "manual");
- m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;")
- .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()) );
+ m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;")
+ .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) );
connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
}
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index a317cb12..025386f0 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -81,7 +81,7 @@ void YahooBuddyIconLoader::slotComplete( KIO::Job *job )
{
kdDebug(YAHOO_RAW_DEBUG) << "An error occurred while downloading buddy icon." << endl;
if( m_client )
- m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
+ m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info );
}
else
{
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index ad70d3c6..1c9528ff 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -95,7 +95,7 @@ void YahooChatTask::getYahooChatCategories()
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
- transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) );
+ transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) );
@@ -107,11 +107,11 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category )
kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl;
KIO::TransferJob *transfer;
- transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( category.id )), false, false );
+ transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
- transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(client()->tCookie(), client()->yCookie()) );
+ transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) );
@@ -214,7 +214,7 @@ void YahooChatTask::login()
YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceChatOnline);
t->setId( client()->sessionID() );
t->setParam( 1, client()->userId().local8Bit() );
- t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
+ t->setParam( 135, TQString("ym%1").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() );
send( t );
}
diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h
index a5017609..376036b3 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahootypes.h
+++ b/kopete/protocols/yahoo/libkyahoo/yahootypes.h
@@ -93,8 +93,8 @@ namespace Yahoo
ServicePictureUpdate = 0xc1,
ServicePictureUpload = 0xc2,
ServiceVisibility = 0xc5, /* YMSG13, key 13: 2 = invisible, 1 = visible */
- ServicetqStatus = 0xc6, /* YMSG13 */
- ServicePicturetqStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
+ ServiceStatus = 0xc6, /* YMSG13 */
+ ServicePictureStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
ServiceContactDetails = 0xd3, /* YMSG13 */
ServiceChatSession = 0xd4,
ServiceAuthorization = 0xd6, /* YMSG13 */
@@ -102,11 +102,11 @@ namespace Yahoo
ServiceFileTransfer7Info = 0xdd, /* YMSG13 */
ServiceFileTransfer7Accept = 0xde, /* YMSG13 */
ServiceBuddyChangeGroup = 0xe7, /* YMSG13 */
- ServiceBuddytqStatus = 0xf0,
+ ServiceBuddyStatus = 0xf0,
ServiceBuddyList = 0xf1
};
- enum tqStatus
+ enum Status
{
StatusConnecting = -2,
StatusDisconnected = -1,
@@ -134,7 +134,7 @@ namespace Yahoo
StatusTypeAway
};
- enum LogintqStatus {
+ enum LoginStatus {
LoginOk = 0,
LoginUname = 3,
LoginPasswd = 13,
@@ -150,7 +150,7 @@ namespace Yahoo
StealthPermOffline
};
- enum StealthtqStatus {
+ enum StealthStatus {
StealthActive = 1,
StealthNotActive = 2,
StealthClear = 3
@@ -161,7 +161,7 @@ namespace Yahoo
ResponseDecline
};
- enum PicturetqStatus {
+ enum PictureStatus {
NoPicture = 0,
Avatar = 1,
Picture = 2
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
index 6cc99f24..b1e6e4e3 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp
@@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
int pos = 0;
int len = 0;
- Yahoo::tqStatus status = Yahoo::StatusAvailable;
+ Yahoo::Status status = Yahoo::StatusAvailable;
Yahoo::Service service = Yahoo::ServiceAuth;
int statusnum = 0;
int sessionid = 0;
@@ -149,9 +149,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceIddeAct " << servicenum << endl;
service = Yahoo::ServiceIddeAct;
break;
- case (Yahoo::ServicetqStatus) :
+ case (Yahoo::ServiceStatus) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl;
- service = Yahoo::ServicetqStatus;
+ service = Yahoo::ServiceStatus;
break;
case (Yahoo::ServiceMessage) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceMessage " << servicenum << endl;
@@ -177,9 +177,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureChecksum " << servicenum << endl;
service = Yahoo::ServicePictureChecksum;
break;
- case (Yahoo::ServicePicturetqStatus) :
+ case (Yahoo::ServicePictureStatus) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl;
- service = Yahoo::ServicePicturetqStatus;
+ service = Yahoo::ServicePictureStatus;
break;
case (Yahoo::ServicePicture) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicture " << servicenum << endl;
@@ -297,9 +297,9 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceComment " << servicenum << endl;
service = Yahoo::ServiceComment;
break;
- case (Yahoo::ServiceBuddytqStatus) :
+ case (Yahoo::ServiceBuddyStatus) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl;
- service = Yahoo::ServiceBuddytqStatus;
+ service = Yahoo::ServiceBuddyStatus;
break;
case (Yahoo::ServiceBuddyList) :
kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyList " << servicenum << endl;
@@ -329,7 +329,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
ServiceGroupRename = 0x89, // > 1, 65(new), 66(0), 67(old)
ServicePictureUpdate = 0xc1,
ServiceVisibility = 0xc5, // YMSG13, key 13: 2 = invisible, 1 = visible
- ServicetqStatus = 0xc6, // YMSG13
+ ServiceStatus = 0xc6, // YMSG13
*/
default:
@@ -378,7 +378,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes )
YMSGTransfer *t = new YMSGTransfer();
t->setService(service);
t->setId(sessionid);
- t->settqStatus(status);
+ t->setStatus(status);
t->setPacketLength(len);
TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos );
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
index 3ed2192a..b1f77863 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp
@@ -39,7 +39,7 @@ public:
int version;
int packetLength;
Yahoo::Service service;
- Yahoo::tqStatus status;
+ Yahoo::Status status;
unsigned int id;
ParamList data;
bool valid;
@@ -62,7 +62,7 @@ YMSGTransfer::YMSGTransfer(Yahoo::Service service)
d->status = Yahoo::StatusAvailable;
}
-YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status)
+YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::Status status)
{
d = new YMSGTransferPrivate;
d->valid = true;
@@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service)
d->service = service;
}
-Yahoo::tqStatus YMSGTransfer::status() const
+Yahoo::Status YMSGTransfer::status() const
{
return d->status;
}
-void YMSGTransfer::settqStatus(Yahoo::tqStatus status)
+void YMSGTransfer::setStatus(Yahoo::Status status)
{
d->status = status;
}
diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
index 953d3993..09ba7a27 100644
--- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
+++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h
@@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer
{
public:
YMSGTransfer(Yahoo::Service service);
- YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status);
+ YMSGTransfer(Yahoo::Service service, Yahoo::Status status);
YMSGTransfer();
~YMSGTransfer();
@@ -51,8 +51,8 @@ public:
bool isValid() const;
Yahoo::Service service() const;
void setService(Yahoo::Service service);
- Yahoo::tqStatus status() const;
- void settqStatus(Yahoo::tqStatus status);
+ Yahoo::Status status() const;
+ void setStatus(Yahoo::Status status);
unsigned int id() const;
void setId(unsigned int id);
int packetLength() const;
diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui
index f497da37..723f9904 100644
--- a/kopete/protocols/yahoo/ui/yahooadd.ui
+++ b/kopete/protocols/yahoo/ui/yahooadd.ui
@@ -27,7 +27,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout53</cstring>
+ <cstring>layout53</cstring>
</property>
<hbox>
<property name="name">
@@ -70,7 +70,7 @@
<property name="text">
<string>&lt;i&gt;(for example: joe8752)&lt;/i&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
index 144a0f33..cc13584e 100644
--- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui
@@ -29,7 +29,7 @@
<property name="name">
<cstring>tabWidget11</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>460</width>
<height>0</height>
@@ -59,7 +59,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout81</cstring>
+ <cstring>layout81</cstring>
</property>
<hbox>
<property name="name">
@@ -147,7 +147,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -156,7 +156,7 @@
<property name="text">
<string>To connect to the Yahoo network, you will need a Yahoo account.&lt;br&gt;&lt;br&gt;If you do not currently have a Yahoo account, please click the button to create one.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>81</height>
@@ -219,7 +219,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>110</height>
@@ -250,7 +250,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout58</cstring>
+ <cstring>layout58</cstring>
</property>
<hbox>
<property name="name">
@@ -371,13 +371,13 @@
<property name="name">
<cstring>m_Picture</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
@@ -416,7 +416,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
index 16af6016..8089a9d3 100644
--- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui
@@ -218,7 +218,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -516,7 +516,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>78</height>
diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
index c1d88464..63d7973e 100644
--- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<vbox>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -63,7 +63,7 @@
<property name="name">
<cstring>listFriends</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
@@ -74,7 +74,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="2">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -97,7 +97,7 @@
<property name="name">
<cstring>listInvited</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
@@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -131,7 +131,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -180,7 +180,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -193,7 +193,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -233,7 +233,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -265,7 +265,7 @@
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>350</width>
<height>31</height>
diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
index 197de528..2193118e 100644
--- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
index d0254985..92246ba1 100644
--- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
+++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui
@@ -12,7 +12,7 @@
<height>114</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>195</width>
<height>75</height>
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index a19ebfff..7eaf320e 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -19,13 +19,13 @@
#include "yahoouserinfodialog.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqcombobox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqobject.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kdatewidget.h>
#include <kdebug.h>
@@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co
showButton( User2, false );
TQFrame* genInfo = addPage( i18n( "General Info" ),
i18n( "General Yahoo Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" );
genLayout->addWidget( m_genInfoWidget );
TQFrame* workInfo = addPage( i18n( "Work Info" ),
i18n( "Work Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" );
workLayout->addWidget( m_workInfoWidget );
TQFrame* otherInfo = addPage( i18n( "Other Info" ),
i18n( "Other Yahoo Information" ),
- KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+ KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" );
otherLayout->addWidget( m_otherInfoWidget );
@@ -219,9 +219,9 @@ void YahooUserInfoDialog::setData( const YABEntry &yab )
m_genInfoWidget->titleEdit->setText( yab.title );
if( yab.birthday.isValid() )
- m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() ));
+ m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() ));
if( yab.anniversary.isValid() )
- m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() ));
+ m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() ));
m_genInfoWidget->addressEdit->setText( yab.privateAdress );
m_genInfoWidget->cityEdit->setText( yab.privateCity );
diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
index 5a18d662..bfaa80fb 100644
--- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
+++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui
@@ -12,7 +12,7 @@
<height>200</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>450</width>
<height>200</height>
@@ -32,7 +32,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout0</cstring>
+ <cstring>layout0</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -89,7 +89,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>72</width>
<height>20</height>
@@ -116,7 +116,7 @@
<property name="name">
<cstring>mPicture</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>240</width>
<height>75</height>
@@ -139,7 +139,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>72</width>
<height>20</height>
diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
index 640164f1..08e4331e 100644
--- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp
@@ -20,7 +20,7 @@
#include <tqobject.h>
#include <tqwidget.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqvbox.h>
#include <kdebug.h>
#include <klocale.h>
@@ -28,7 +28,7 @@
#include <webcamwidget.h>
YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name )
-: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ),
+: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ),
KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ )
{
setInitialSize( TQSize(320,290), false );
@@ -44,11 +44,11 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare
m_imageContainer = new Kopete::WebcamWidget( page );
m_imageContainer->setText( i18n( "No webcam image received" ) );
m_imageContainer->setMinimumSize(320,240);
- m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_imageContainer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
topLayout->add( m_imageContainer );
m_Viewer = new TQLabel( page );
- m_Viewer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
m_Viewer->hide();
topLayout->add( m_Viewer );
@@ -67,7 +67,7 @@ void YahooWebcamDialog::newImage( const TQPixmap &image )
void YahooWebcamDialog::webcamPaused()
{
- m_imageContainer->setText( TQString::tqfromLatin1("*** Webcam paused ***") );
+ m_imageContainer->setText( TQString::fromLatin1("*** Webcam paused ***") );
}
void YahooWebcamDialog::webcamClosed( int reason )
@@ -77,15 +77,15 @@ void YahooWebcamDialog::webcamClosed( int reason )
switch ( reason )
{
case 1:
- closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break;
+ closeReason = i18n( "%1 has stopped broadcasting" ).arg( contactName ); break;
case 2:
- closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break;
+ closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break;
case 3:
- closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break;
+ closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break;
case 4:
- closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break;
+ closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break;
default:
- closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( contactName);
+ closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName);
}
m_imageContainer->clear();
@@ -94,7 +94,7 @@ void YahooWebcamDialog::webcamClosed( int reason )
void YahooWebcamDialog::setViewer( const TQStringList &viewer )
{
- TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() );
+ TQString s = i18n( "%1 viewer(s)" ).arg( viewer.size() );
if( viewer.size() )
{
s += ": ";
diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
index c501d6b5..a70bc620 100644
--- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
+++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -210,7 +210,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index eabf6fdd..7cc330f2 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -109,7 +109,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con
// initConnectionSignals( MakeConnections );
- TQString displayName = configGroup()->readEntry(TQString::tqfromLatin1("displayName"), TQString());
+ TQString displayName = configGroup()->readEntry(TQString::fromLatin1("displayName"), TQString());
if(!displayName.isEmpty())
_myself->setNickName(displayName);
@@ -130,15 +130,15 @@ YahooAccount::~YahooAccount()
void YahooAccount::setServer( const TQString &server )
{
- configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server );
+ configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server );
}
void YahooAccount::setPort( int port )
{
- configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port );
+ configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port );
}
-void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage)
+void YahooAccount::slotGoStatus( int status, const TQString &awayMessage)
{
kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl;
if( !isConnected() )
@@ -148,7 +148,7 @@ void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage)
}
else
{
- m_session->changetqStatus( Yahoo::tqStatus( status ), awayMessage,
+ m_session->changeStatus( Yahoo::Status( status ), awayMessage,
(status == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
//sets the awayMessage property for the owner of the account. shows up in the statusbar icon's tooltip. the property is unset when awayMessage is null
@@ -265,8 +265,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)),
this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int)));
- TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)),
- this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) );
+ TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)),
+ this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) );
TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)),
this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int)));
@@ -407,8 +407,8 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct )
TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)),
this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int)));
- TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthtqStatus)),
- this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthtqStatus)) );
+ TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)),
+ this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) );
TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)),
this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int)));
@@ -526,7 +526,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd )
}
if ( isConnected() ||
- myself()->onlinetqStatus() == m_protocol->Connecting )
+ myself()->onlineStatus() == m_protocol->Connecting )
{
kdDebug(YAHOO_GEN_DEBUG) << "Yahoo plugin: Ignoring connect request (already connected)." << endl;
return;
@@ -549,7 +549,7 @@ void YahooAccount::connectWithPassword( const TQString &passwd )
kdDebug(YAHOO_GEN_DEBUG) << "Attempting to connect to Yahoo on <" << server << ":"
<< port << ">. user <" << accountId() << ">" << endl;
static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Connecting );
- m_session->setStatusOnConnect( Yahoo::tqStatus( initialtqStatus().internalStatus() ) );
+ m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) );
m_session->connect( server, port, accountId().lower(), passwd );
}
@@ -607,9 +607,9 @@ void YahooAccount::setAway(bool status, const TQString &awayMessage)
kdDebug(YAHOO_GEN_DEBUG) ;
if( awayMessage.isEmpty() )
- slotGotqStatus( status ? 2 : 0 );
+ slotGoStatus( status ? 2 : 0 );
else
- slotGotqStatus( status ? 99 : 0, awayMessage );
+ slotGoStatus( status ? 99 : 0, awayMessage );
}
void YahooAccount::slotConnected()
@@ -623,7 +623,7 @@ void YahooAccount::slotGoOnline()
if( !isConnected() )
connect( m_protocol->Online );
else
- slotGotqStatus(0);
+ slotGoStatus(0);
}
void YahooAccount::slotGoOffline()
@@ -722,9 +722,9 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url )
setupActions( succ == Yahoo::LoginOk );
if ( succ == Yahoo::LoginOk || (succ == Yahoo::LoginDupl && m_lastDisconnectCode == 2) )
{
- if ( initialtqStatus().internalStatus() )
+ if ( initialStatus().internalStatus() )
{
- static_cast<YahooContact *>( myself() )->setOnlineStatus( initialtqStatus() );
+ static_cast<YahooContact *>( myself() )->setOnlineStatus( initialStatus() );
}
else
{
@@ -750,7 +750,7 @@ void YahooAccount::slotLoginResponse( int succ , const TQString &url )
else if(succ == Yahoo::LoginLock)
{
initConnectionSignals( DeleteConnections );
- errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").tqarg(url);
+ errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").arg(url);
KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg);
static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
disconnected( BadUserName ); // FIXME: add a more appropriate disconnect reason
@@ -801,8 +801,8 @@ void YahooAccount::slotDisconnected()
TQString message;
message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" )
- .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() );
- KNotification::event( "connection_lost", message, myself()->onlinetqStatus().protocolIcon() );
+ .arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() );
+ KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() );
}
void YahooAccount::slotLoginFailed()
@@ -814,8 +814,8 @@ void YahooAccount::slotLoginFailed()
TQString message;
message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError message:\n%2 - %3" )
- .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() );
- KNotification::event( "cannot_connect", message, myself()->onlinetqStatus().protocolIcon() );
+ .arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() );
+ KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() );
}
void YahooAccount::slotError( int level )
@@ -825,11 +825,11 @@ void YahooAccount::slotError( int level )
return;
else if( level <= Client::Warning )
KMessageBox::information( Kopete::UI::Global::mainWidget(),
- i18n( "%1\n\nReason: %2").tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ),
+ i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ),
i18n( "Yahoo Plugin" ) );
else
KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" )
- .tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) );
+ .arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) );
}
void YahooAccount::slotGotBuddy( const TQString &userid, const TQString &alias, const TQString &group )
@@ -888,8 +888,8 @@ void YahooAccount::slotAuthorizationAccepted( const TQString &who )
{
kdDebug(YAHOO_GEN_DEBUG) ;
TQString message;
- message = i18n( "User %1 has granted your authorization request." ).tqarg( who );
- KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message );
+ message = i18n( "User %1 has granted your authorization request." ).arg( who );
+ KNotification::event( TQString::fromLatin1("kopete_authorization"), message );
if( contact( who ) )
contact( who )->setOnlineStatus( m_protocol->Online );
@@ -900,8 +900,8 @@ void YahooAccount::slotAuthorizationRejected( const TQString &who, const TQStrin
kdDebug(YAHOO_GEN_DEBUG) ;
TQString message;
message = i18n( "User %1 has rejected your authorization request.\n%2" )
- .tqarg( who ).tqarg( msg );
- KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message );
+ .arg( who ).arg( msg );
+ KNotification::event( TQString::fromLatin1("kopete_authorization"), message );
}
void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQString &msg, const TQString &name )
@@ -995,24 +995,24 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr
if ( kc )
{
- Kopete::OnlineStatus newtqStatus = m_protocol->statusFromYahoo( stat );
- Kopete::OnlineStatus oldtqStatus = kc->onlinetqStatus();
+ Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat );
+ Kopete::OnlineStatus oldStatus = kc->onlineStatus();
- if( newtqStatus == m_protocol->Custom ) {
+ if( newStatus == m_protocol->Custom ) {
if( away == 0 )
- newtqStatus =m_protocol->Online;
+ newStatus =m_protocol->Online;
kc->setProperty( m_protocol->awayMessage, msg);
}
else
kc->removeProperty( m_protocol->awayMessage );
// from original file
- if( newtqStatus != m_protocol->Offline && oldtqStatus == m_protocol->Offline && contact(who) != myself() )
+ if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() )
{
//m_session->requestBuddyIcon( who ); // Try to get Buddy Icon
if ( !myself()->property( Kopete::Global::Properties::self()->photo() ).isNull() &&
- myself()->onlinetqStatus() != m_protocol->Invisible &&
+ myself()->onlineStatus() != m_protocol->Invisible &&
!kc->stealthed() )
{
kc->sendBuddyIconUpdate( m_session->pictureFlag() );
@@ -1020,19 +1020,19 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr
}
}
- //if( newtqStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) {
- if( newtqStatus == m_protocol->Idle )
+ //if( newStatus == static_cast<YahooProtocol*>( m_protocol )->Idle ) {
+ if( newStatus == m_protocol->Idle )
kc->setIdleTime( idle ? idle : 1 );
else
kc->setIdleTime( 0 );
- kc->setOnlineStatus( newtqStatus );
+ kc->setOnlineStatus( newStatus );
slotGotBuddyIconChecksum( who, pictureChecksum );
}
}
-void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state )
+void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthStatus state )
{
//kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state;
@@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl;
- newMsgText.replace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&amp;" ) );
+ newMsgText.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&amp;" ) );
// Replace Font tags
regExp.setMinimal( true );
@@ -1063,7 +1063,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
pos = regExp.search( newMsgText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsgText.replace( regExp, TQString::tqfromLatin1("<font\\1style=\"font-size:\\2pt\">" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("<font\\1style=\"font-size:\\2pt\">" ) );
}
}
@@ -1095,7 +1095,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
pos = regExp.search( newMsgText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsgText.replace( regExp, TQString::tqfromLatin1("&lt;" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("&lt;" ) );
}
}
regExp.setPattern( "([^\"bui])>" );
@@ -1104,22 +1104,22 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText )
pos = regExp.search( newMsgText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsgText.replace( regExp, TQString::tqfromLatin1("\\1&gt;" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("\\1&gt;" ) );
}
}
// add closing tags when needed
regExp.setMinimal( false );
regExp.setPattern( "(<b>.*)(?!</b>)" );
- newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</b>" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("\\1</b>" ) );
regExp.setPattern( "(<i>.*)(?!</i>)" );
- newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</i>" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("\\1</i>" ) );
regExp.setPattern( "(<u>.*)(?!</u>)" );
- newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</u>" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("\\1</u>" ) );
regExp.setPattern( "(<font.*)(?!</font>)" );
- newMsgText.replace( regExp, TQString::tqfromLatin1("\\1</font>" ) );
+ newMsgText.replace( regExp, TQString::fromLatin1("\\1</font>" ) );
- newMsgText.replace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "<br/>" ) );
+ newMsgText.replace( TQString::fromLatin1( "\r" ), TQString::fromLatin1( "<br/>" ) );
return newMsgText;
}
@@ -1143,7 +1143,7 @@ void YahooAccount::slotGotIm( const TQString &who, const TQString &msg, long tm,
// FIXME to check
if (tm == 0)
- //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime );
+ //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime );
msgDT.setTime_t(time(0L));
else
//msgDT = TQDateTime::fromTime_t(tm);
@@ -1181,7 +1181,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm )
// FIXME: to check
if (tm == 0)
- //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime );
+ //msgDT = TQDateTime( TQDate::currentDate(), TQTime::currentTime(), TQt::LocalTime );
msgDT.setTime_t(time(0L));
else
//msgDT = TQDateTime::fromTime_t(tm);
@@ -1222,13 +1222,13 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo
{
if( *it != m_session->userId() )
{
- m.append( TQString(", %1").tqarg( *it ) );
+ m.append( TQString(", %1").arg( *it ) );
myMembers.push_back( *it );
}
}
if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
i18n("%1 has invited you to join a conference with %2.\n\nHis/her message: %3\n\nAccept?")
- .tqarg(who).tqarg(m).tqarg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) )
+ .arg(who).arg(m).arg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) )
{
m_session->joinConference( room, myMembers );
if( !m_conferences[room] )
@@ -1267,7 +1267,7 @@ void YahooAccount::prepareConference( const TQString &who )
char c = rand()%52;
room += (c > 25) ? c + 71 : c + 65;
}
- room = TQString("%1-%2--").tqarg(accountId()).tqarg(room);
+ room = TQString("%1-%2--").arg(accountId()).arg(room);
kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl;
TQStringList buddies;
@@ -1329,7 +1329,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo
YahooConferenceChatSession *session = m_conferences[room];
- TQString body = i18n( "%1 has declined to join the conference: \"%2\"").tqarg( who ).tqarg( msg );
+ TQString body = i18n( "%1 has declined to join the conference: \"%2\"").arg( who ).arg( msg );
Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText );
session->appendMessage( message );
@@ -1642,7 +1642,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec
if ( cnt > 0 && from.isEmpty() )
{
- TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.",
+ TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.",
"You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ),
TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
@@ -1651,7 +1651,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec
else if ( cnt > 0 )
{ kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl;
- TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").tqarg( from ).tqarg( subject ),
+ TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").arg( from ).arg( subject ),
TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) );
m_currentMailCount = cnt;
@@ -1681,7 +1681,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who )
m_pendingWebcamInvites.append( who );
- if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").tqarg( who ),
+ if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ),
TQString(), i18n("Accept"), i18n("Ignore") ) )
{
m_pendingWebcamInvites.remove( who );
@@ -1690,7 +1690,7 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who )
}
void YahooAccount::slotWebcamNotAvailable( const TQString &who )
{
- KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").tqarg(who), i18n( "Yahoo Plugin" ) );
+ KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").arg(who), i18n( "Yahoo Plugin" ) );
}
void YahooAccount::slotGotWebcamImage( const TQString& who, const TQPixmap& image )
@@ -1777,7 +1777,7 @@ void YahooAccount::setBuddyIcon( const KURL &url )
myself()->removeProperty( YahooProtocol::protocol()->iconExpire );
if ( m_session )
- m_session->setPicturetqStatus( Yahoo::NoPicture );
+ m_session->setPictureStatus( Yahoo::NoPicture );
}
else
{
@@ -1827,7 +1827,7 @@ void YahooAccount::setBuddyIcon( const KURL &url )
configGroup()->writeEntry( "iconLocalUrl", newlocation );
if ( checksum != static_cast<uint>(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) ||
- TQDateTime::tqcurrentDateTime().toTime_t() > expire )
+ TQDateTime::currentDateTime().toTime_t() > expire )
{
myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, checksum );
configGroup()->writeEntry( "iconCheckSum", checksum );
@@ -1848,7 +1848,7 @@ void YahooAccount::slotBuddyIconChanged( const TQString &url, int expires )
myself()->setProperty( YahooProtocol::protocol()->iconExpire , expires );
configGroup()->writeEntry( "iconRemoteUrl", url );
configGroup()->writeEntry( "iconExpire", expires );
- m_session->setPicturetqStatus( Yahoo::Picture );
+ m_session->setPictureStatus( Yahoo::Picture );
m_session->sendPictureChecksum( TQString(), checksum );
}
}
@@ -1893,7 +1893,7 @@ void YahooAccount::slotWebcamViewerJoined( const TQString &viewer )
void YahooAccount::slotWebcamViewerRequest( const TQString &viewer )
{
if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. Grant access?")
- .tqarg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) )
+ .arg(viewer), TQString(), i18n("Accept"), i18n("Ignore") ) )
m_session->grantWebcamAccess( viewer );
}
@@ -1928,52 +1928,52 @@ void YahooAccount::slotWebcamPaused( const TQString &who )
void YahooAccount::setOnlineStatus( const Kopete::OnlineStatus &status, const TQString &reason)
{
kdDebug(YAHOO_GEN_DEBUG) ;
- if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline &&
+ if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline &&
status.status() != Kopete::OnlineStatus::Offline )
{
if( !reason.isEmpty() )
m_session->setStatusMessageOnConnect( reason );
connect( status );
}
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
status.status() == Kopete::OnlineStatus::Offline )
{
disconnect();
}
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
status.internalStatus() == 2 && !reason.isEmpty())
{
- slotGotqStatus( 99, reason );
+ slotGoStatus( 99, reason );
}
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline &&
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline &&
status.internalStatus() == 99 && reason.isEmpty())
{
- slotGotqStatus( 2, reason );
+ slotGoStatus( 2, reason );
}
- else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline )
+ else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline )
{
- slotGotqStatus( status.internalStatus(), reason );
+ slotGoStatus( status.internalStatus(), reason );
}
}
/* FIXME: not ported yet
void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage)
{
- int currenttqStatus = myself()->onlinetqStatus().internalStatus();
- m_session->changetqStatus( Yahoo::tqStatus( currenttqStatus ), statusMessage.message(),
- (currenttqStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
+ int currentStatus = myself()->onlineStatus().internalStatus();
+ m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(),
+ (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway );
myself()->setStatusMessage( statusMessage );
}
*/
void YahooAccount::slotOpenInbox()
{
- KRun::runURL( KURL( TQString::tqfromLatin1("http://mail.yahoo.com/") ) , "text/html" );
+ KRun::runURL( KURL( TQString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" );
}
void YahooAccount::slotOpenYAB()
{
- KRun::runURL( KURL( TQString::tqfromLatin1("http://address.yahoo.com/") ) , "text/html" );
+ KRun::runURL( KURL( TQString::fromLatin1("http://address.yahoo.com/") ) , "text/html" );
}
void YahooAccount::slotEditOwnYABEntry()
diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h
index 7cfc6f84..de647bbe 100644
--- a/kopete/protocols/yahoo/yahooaccount.h
+++ b/kopete/protocols/yahoo/yahooaccount.h
@@ -176,7 +176,7 @@ protected slots:
void slotJoinChatRoom();
void slotChatCategorySelected( const Yahoo::ChatCategory &category );
- void slotGotqStatus(int status, const TQString &awayMessage = TQString());
+ void slotGoStatus(int status, const TQString &awayMessage = TQString());
void slotLoginResponse(int succ, const TQString &url);
void slotDisconnected();
void slotLoginFailed();
@@ -192,7 +192,7 @@ protected slots:
void slotGotIgnore(const TQStringList &);
void slotGotIdentities(const TQStringList &);
void slotStatusChanged(const TQString &who, int stat, const TQString &msg, int away, int idle, int pictureChecksum);
- void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus state);
+ void slotStealthStatusChanged(const TQString &who, Yahoo::StealthStatus state);
void slotGotIm(const TQString &who, const TQString &msg, long tm, int stat);
void slotGotBuzz(const TQString &who, long tm);
void slotGotConfInvite(const TQString &who, const TQString &room, const TQString &msg, const TQStringList &members);
diff --git a/kopete/protocols/yahoo/yahooaddcontact.cpp b/kopete/protocols/yahoo/yahooaddcontact.cpp
index af3e1bc5..64e0e461 100644
--- a/kopete/protocols/yahoo/yahooaddcontact.cpp
+++ b/kopete/protocols/yahoo/yahooaddcontact.cpp
@@ -17,7 +17,7 @@
*/
// QT Includes
-#include <tqlayout.h>
+#include <layout.h>
// KDE Includes
#include <kdebug.h>
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index ef0bf09e..5402919c 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -127,7 +127,7 @@ void YahooChatSession::slotDisplayPictureChanged()
int sz=22;
// get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know
- KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L;
+ KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
if(w)
{
//We connected that in the constructor. we don't need to keep this slot active.
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 06559f8f..3bd55b85 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -114,7 +114,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status)
protocol() ,
status.internalStatus()+1000 ,
status.overlayIcons() + TQStringList("yahoo_stealthed") ,
- i18n("%1|Stealthed").tqarg( status.description() ) ) );
+ i18n("%1|Stealthed").arg( status.description() ) ) );
}
else if( !m_stealthed && status.internalStatus() > 999 )// Stealthed -> Not Stealthed
Contact::setOnlineStatus( static_cast< YahooProtocol *>( protocol() )->statusFromYahoo( status.internalStatus() - 1000 ) );
@@ -128,7 +128,7 @@ void YahooContact::setOnlineStatus(const Kopete::OnlineStatus &status)
void YahooContact::setStealthed( bool stealthed )
{
m_stealthed = stealthed;
- setOnlineStatus( onlinetqStatus() );
+ setOnlineStatus( onlineStatus() );
}
bool YahooContact::stealthed()
@@ -187,7 +187,7 @@ void YahooContact::sync(unsigned int flags)
bool YahooContact::isOnline() const
{
//kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown;
+ return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown;
}
bool YahooContact::isReachable()
@@ -232,7 +232,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-weight:600\\2>\033[1m\\3\033[x1m</span>" ) );
}
}
@@ -243,7 +243,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1text-decoration:underline\\2>\033[4m\\3\033[x4m</span>" ) );
}
}
@@ -254,7 +254,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1font-style:italic\\2>\033[2m\\3\033[x2m</span>" ) );
}
}
@@ -265,7 +265,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3>\033[#\\2m\\4\033[#000000m</span>" ) );
}
}
@@ -276,7 +276,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font face=\"\\2\">\\4</span>" ) );
}
}
@@ -287,7 +287,7 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) );
+ newMsg.replace( regExp, TQString::fromLatin1("<span\\1\\3><font size=\"\\2\">\\4</span>" ) );
}
}
@@ -298,18 +298,18 @@ TQString YahooContact::prepareMessage( const TQString &messageText )
pos = regExp.search( messageText, pos );
if ( pos >= 0 ) {
pos += regExp.matchedLength();
- newMsg.replace( regExp, TQString::tqfromLatin1("\\2") );
+ newMsg.replace( regExp, TQString::fromLatin1("\\2") );
}
}
// convert escaped chars
- newMsg.replace( TQString::tqfromLatin1( "&gt;" ), TQString::tqfromLatin1( ">" ) );
- newMsg.replace( TQString::tqfromLatin1( "&lt;" ), TQString::tqfromLatin1( "<" ) );
- newMsg.replace( TQString::tqfromLatin1( "&quot;" ), TQString::tqfromLatin1( "\"" ) );
- newMsg.replace( TQString::tqfromLatin1( "&nbsp;" ), TQString::tqfromLatin1( " " ) );
- newMsg.replace( TQString::tqfromLatin1( "&amp;" ), TQString::tqfromLatin1( "&" ) );
- newMsg.replace( TQString::tqfromLatin1( "<br />" ), TQString::tqfromLatin1( "\r" ) );
- newMsg.replace( TQString::tqfromLatin1( "<br/>" ), TQString::tqfromLatin1( "\r" ) );
+ newMsg.replace( TQString::fromLatin1( "&gt;" ), TQString::fromLatin1( ">" ) );
+ newMsg.replace( TQString::fromLatin1( "&lt;" ), TQString::fromLatin1( "<" ) );
+ newMsg.replace( TQString::fromLatin1( "&quot;" ), TQString::fromLatin1( "\"" ) );
+ newMsg.replace( TQString::fromLatin1( "&nbsp;" ), TQString::fromLatin1( " " ) );
+ newMsg.replace( TQString::fromLatin1( "&amp;" ), TQString::fromLatin1( "&" ) );
+ newMsg.replace( TQString::fromLatin1( "<br />" ), TQString::fromLatin1( "\r" ) );
+ newMsg.replace( TQString::fromLatin1( "<br/>" ), TQString::fromLatin1( "\r" ) );
return newMsg;
}
@@ -447,7 +447,7 @@ void YahooContact::slotUserProfile()
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
- TQString profileSiteString = TQString::tqfromLatin1("http://profiles.yahoo.com/") + userId();
+ TQString profileSiteString = TQString::fromLatin1("http://profiles.yahoo.com/") + userId();
KRun::runURL( KURL( profileSiteString ) , "text/html" );
}
@@ -467,7 +467,7 @@ void YahooContact::stealthContact()
stealthSettingDialog->setMainWidget( stealthWidget );
// Prepare dialog
- if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible )
+ if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible )
{
stealthWidget->radioOffline->setEnabled( true );
stealthWidget->radioOffline->setChecked( true );
@@ -490,7 +490,7 @@ void YahooContact::stealthContact()
m_account->yahooSession()->stealthContact( m_userId, Yahoo::StealthPermOffline, Yahoo::StealthActive );
// Apply temporary setting
- if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible )
+ if( m_account->myself()->onlineStatus() == YahooProtocol::protocol()->Invisible )
{
if( stealthWidget->radioOnline->isChecked() )
{
@@ -607,7 +607,7 @@ void YahooContact::inviteWebcam()
{
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error,
i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images."
- "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") );
+ "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") );
return;
}
m_account->yahooSession()->sendWebcamInvite( m_userId );
@@ -662,7 +662,7 @@ void YahooContact::requestWebcam()
{
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error,
i18n("I cannot find the jasper image convert program.\njasper is required to render the yahoo webcam images."
- "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") );
+ "\nPlease see %1 for further information.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") );
return;
}
diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h
index e9f8b517..acd69e0d 100644
--- a/kopete/protocols/yahoo/yahoocontact.h
+++ b/kopete/protocols/yahoo/yahoocontact.h
@@ -54,7 +54,7 @@ public:
virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData );
void setOnlineStatus(const Kopete::OnlineStatus &status);
- void setYahootqStatus( const Kopete::OnlineStatus& );
+ void setYahooStatus( const Kopete::OnlineStatus& );
void setStealthed( bool );
bool stealthed();
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index e047e849..5248d19c 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -21,7 +21,7 @@
#include <tqgroupbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 7d50e900..632c7d05 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -14,7 +14,7 @@
*/
// QT Includes
-#include <tqlayout.h>
+#include <layout.h>
#include <tqfile.h>
#include <tqlabel.h>