From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/KABC_INTEG_NOTES | 4 +- kopete/kopete.api | 4 +- .../kopete/addaccountwizard/addaccountwizard.cpp | 6 +- kopete/kopete/addaccountwizard/addaccountwizard.h | 3 +- .../addaccountwizard/addaccountwizardpage1.ui | 20 +- .../addaccountwizard/addaccountwizardpage2.ui | 22 +- .../addaccountwizard/addaccountwizardpage3.ui | 22 +- .../kopete/addcontactwizard/addcontactwizard.cpp | 14 +- kopete/kopete/addcontactwizard/addcontactwizard.h | 3 +- .../addcontactwizard/addcontactwizard_base.ui | 66 ++--- .../addcontactwizard/fastaddcontactwizard.cpp | 8 +- .../kopete/addcontactwizard/fastaddcontactwizard.h | 3 +- .../addcontactwizard/fastaddcontactwizard_base.ui | 38 +-- kopete/kopete/chatwindow/chatmemberslistwidget.cpp | 40 +-- kopete/kopete/chatwindow/chatmemberslistwidget.h | 6 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 154 +++++----- kopete/kopete/chatwindow/chatmessagepart.h | 7 +- kopete/kopete/chatwindow/chattexteditpart.cpp | 36 +-- kopete/kopete/chatwindow/chattexteditpart.h | 3 +- kopete/kopete/chatwindow/chatview.cpp | 142 ++++----- kopete/kopete/chatwindow/chatview.h | 17 +- kopete/kopete/chatwindow/emoticonselector.cpp | 20 +- kopete/kopete/chatwindow/emoticonselector.h | 10 +- kopete/kopete/chatwindow/kopetechatwindow.cpp | 168 +++++------ kopete/kopete/chatwindow/kopetechatwindow.h | 5 +- kopete/kopete/chatwindow/kopetechatwindowstyle.cpp | 10 +- kopete/kopete/chatwindow/kopetechatwindowstyle.h | 2 +- .../chatwindow/kopetechatwindowstylemanager.cpp | 26 +- .../chatwindow/kopetechatwindowstylemanager.h | 11 +- kopete/kopete/chatwindow/kopeteemailwindow.cpp | 76 ++--- kopete/kopete/chatwindow/kopeteemailwindow.h | 5 +- kopete/kopete/chatwindow/kopeteemoticonaction.cpp | 12 +- kopete/kopete/chatwindow/kopeteemoticonaction.h | 9 +- kopete/kopete/chatwindow/krichtexteditpart.cpp | 50 ++-- kopete/kopete/chatwindow/krichtexteditpart.h | 7 +- .../chatwindow/tests/chatwindowstyle_test.cpp | 4 +- .../tests/chatwindowstylerendering_test.cpp | 36 +-- .../kopete/config/accounts/kopeteaccountconfig.cpp | 10 +- .../kopete/config/accounts/kopeteaccountconfig.h | 3 +- .../config/accounts/kopeteaccountconfigbase.ui | 28 +- .../kopete/config/appearance/appearanceconfig.cpp | 66 ++--- kopete/kopete/config/appearance/appearanceconfig.h | 3 +- .../appearance/appearanceconfig_chatwindow.ui | 22 +- .../config/appearance/appearanceconfig_colors.ui | 68 ++--- .../appearance/appearanceconfig_contactlist.ui | 70 ++--- .../appearance/appearanceconfig_emoticons.ui | 30 +- .../config/appearance/emoticonseditdialog.cpp | 20 +- .../kopete/config/appearance/emoticonseditdialog.h | 8 +- .../config/appearance/emoticonseditwidget.ui | 10 +- .../kopete/config/appearance/tooltipeditdialog.cpp | 16 +- .../kopete/config/appearance/tooltipeditdialog.h | 3 +- .../kopete/config/appearance/tooltipeditwidget.ui | 34 +-- kopete/kopete/config/avdevice/avdeviceconfig.cpp | 6 +- kopete/kopete/config/avdevice/avdeviceconfig.h | 3 +- .../config/avdevice/avdeviceconfig_videoconfig.ui | 88 +++--- kopete/kopete/config/behavior/behaviorconfig.cpp | 4 +- kopete/kopete/config/behavior/behaviorconfig.h | 3 +- .../kopete/config/behavior/behaviorconfig_chat.ui | 46 +-- .../config/behavior/behaviorconfig_events.ui | 54 ++-- .../config/behavior/behaviorconfig_general.ui | 26 +- .../kopete/config/behavior/kopeteawayconfigbase.ui | 46 +-- .../config/identity/globalidentitiesmanager.cpp | 6 +- .../config/identity/globalidentitiesmanager.h | 7 +- .../config/identity/kopeteidentityconfig.cpp | 22 +- .../kopete/config/identity/kopeteidentityconfig.h | 3 +- .../config/identity/kopeteidentityconfigbase.ui | 88 +++--- .../kopete/config/plugins/kopetepluginconfig.cpp | 4 +- kopete/kopete/config/plugins/kopetepluginconfig.h | 3 +- .../kopete/contactlist/customnotificationprops.cpp | 12 +- .../kopete/contactlist/customnotificationprops.h | 5 +- kopete/kopete/contactlist/customnotifications.ui | 34 +-- kopete/kopete/contactlist/kabcexport.cpp | 10 +- kopete/kopete/contactlist/kabcexport.h | 3 +- kopete/kopete/contactlist/kabcexport_base.ui | 30 +- kopete/kopete/contactlist/kopeteaddrbookexport.cpp | 8 +- kopete/kopete/contactlist/kopeteaddrbookexport.h | 6 +- .../kopete/contactlist/kopeteaddrbookexportui.ui | 24 +- .../kopete/contactlist/kopetecontactlistview.cpp | 134 ++++----- kopete/kopete/contactlist/kopetecontactlistview.h | 9 +- .../kopete/contactlist/kopetegrouplistaction.cpp | 6 +- kopete/kopete/contactlist/kopetegrouplistaction.h | 1 + kopete/kopete/contactlist/kopetegroupviewitem.cpp | 12 +- kopete/kopete/contactlist/kopetegroupviewitem.h | 5 +- kopete/kopete/contactlist/kopetegvipropswidget.ui | 26 +- kopete/kopete/contactlist/kopetelviprops.cpp | 28 +- kopete/kopete/contactlist/kopetelviprops.h | 6 +- kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 132 ++++----- kopete/kopete/contactlist/kopetemetacontactlvi.h | 17 +- .../kopete/contactlist/kopetemetalvipropswidget.ui | 94 +++--- .../contactlist/kopetestatusgroupviewitem.cpp | 4 +- .../kopete/contactlist/kopetestatusgroupviewitem.h | 4 +- kopete/kopete/eventsrc | 16 +- kopete/kopete/groupkabcselectorwidget.ui | 14 +- .../kconf_update/kopete-account-kconf_update.cpp | 14 +- kopete/kopete/kconf_update/kopete-nameTracking.cpp | 36 +-- kopete/kopete/kimiface.h | 10 +- kopete/kopete/kimifaceimpl.cpp | 18 +- kopete/kopete/kimifaceimpl.h | 5 +- kopete/kopete/kopeteaccountstatusbaricon.cpp | 14 +- kopete/kopete/kopeteaccountstatusbaricon.h | 5 +- kopete/kopete/kopeteapplication.cpp | 12 +- kopete/kopete/kopeteapplication.h | 7 +- kopete/kopete/kopeteballoon.cpp | 22 +- kopete/kopete/kopeteballoon.h | 8 +- kopete/kopete/kopeteeditglobalidentitywidget.cpp | 26 +- kopete/kopete/kopeteeditglobalidentitywidget.h | 14 +- kopete/kopete/kopeteiface.cpp | 10 +- kopete/kopete/kopeteiface.h | 14 +- kopete/kopete/kopetewindow.cpp | 100 +++---- kopete/kopete/kopetewindow.h | 10 +- kopete/kopete/systemtray.cpp | 42 +-- kopete/kopete/systemtray.h | 5 +- kopete/libkopete/API-TODO | 2 +- kopete/libkopete/avdevice/kxv.cpp | 2 +- kopete/libkopete/avdevice/qvideo.cpp | 4 +- kopete/libkopete/avdevice/qvideo.h | 6 +- kopete/libkopete/avdevice/qvideostream.cpp | 24 +- kopete/libkopete/avdevice/qvideostream.h | 5 +- kopete/libkopete/avdevice/videodevice.cpp | 8 +- kopete/libkopete/avdevice/videodevicepool.cpp | 18 +- kopete/libkopete/clientiface.h | 6 +- .../compat/kpixmapregionselectordialog.cpp | 20 +- .../libkopete/compat/kpixmapregionselectordialog.h | 10 +- .../compat/kpixmapregionselectorwidget.cpp | 26 +- .../libkopete/compat/kpixmapregionselectorwidget.h | 5 +- kopete/libkopete/connectionmanager.cpp | 58 ++-- kopete/libkopete/connectionmanager.h | 11 +- kopete/libkopete/kabcpersistence.cpp | 42 +-- kopete/libkopete/kabcpersistence.h | 5 +- kopete/libkopete/kautoconfig.cpp | 116 ++++---- kopete/libkopete/kautoconfig.h | 31 +- kopete/libkopete/kcautoconfigmodule.cpp | 24 +- kopete/libkopete/kcautoconfigmodule.h | 27 +- kopete/libkopete/knotification.cpp | 38 +-- kopete/libkopete/knotification.h | 15 +- kopete/libkopete/kopeteaccount.cpp | 90 +++--- kopete/libkopete/kopeteaccount.h | 59 ++-- kopete/libkopete/kopeteaccountmanager.cpp | 36 +-- kopete/libkopete/kopeteaccountmanager.h | 19 +- kopete/libkopete/kopeteaway.cpp | 48 ++-- kopete/libkopete/kopeteaway.h | 3 +- kopete/libkopete/kopeteawayaction.cpp | 14 +- kopete/libkopete/kopeteawayaction.h | 9 +- kopete/libkopete/kopeteawaydialog.cpp | 4 +- kopete/libkopete/kopeteawaydialog.h | 5 +- kopete/libkopete/kopeteblacklister.cpp | 10 +- kopete/libkopete/kopeteblacklister.h | 7 +- kopete/libkopete/kopetechatsession.cpp | 48 ++-- kopete/libkopete/kopetechatsession.h | 17 +- kopete/libkopete/kopetechatsessionmanager.cpp | 10 +- kopete/libkopete/kopetechatsessionmanager.h | 7 +- kopete/libkopete/kopetecommandhandler.cpp | 76 ++--- kopete/libkopete/kopetecommandhandler.h | 29 +- kopete/libkopete/kopetecontact.cpp | 136 ++++----- kopete/libkopete/kopetecontact.h | 45 +-- kopete/libkopete/kopetecontactlist.cpp | 276 +++++++++--------- kopete/libkopete/kopetecontactlist.h | 11 +- kopete/libkopete/kopetecontactlistelement.cpp | 78 ++--- kopete/libkopete/kopetecontactlistelement.h | 5 +- kopete/libkopete/kopetecontactproperty.h | 4 +- kopete/libkopete/kopeteeventpresentation.cpp | 8 +- kopete/libkopete/kopeteeventpresentation.h | 2 +- kopete/libkopete/kopeteglobal.cpp | 84 +++--- kopete/libkopete/kopeteglobal.h | 2 +- kopete/libkopete/kopetegroup.cpp | 38 +-- kopete/libkopete/kopetegroup.h | 7 +- kopete/libkopete/kopetemessage.cpp | 128 ++++----- kopete/libkopete/kopetemessage.h | 10 +- kopete/libkopete/kopetemessageevent.cpp | 4 +- kopete/libkopete/kopetemessageevent.h | 5 +- kopete/libkopete/kopetemessagehandler.h | 3 +- kopete/libkopete/kopetemessagehandlerchain.h | 2 + kopete/libkopete/kopetemetacontact.cpp | 74 ++--- kopete/libkopete/kopetemetacontact.h | 27 +- kopete/libkopete/kopetemimesourcefactory.cpp | 18 +- kopete/libkopete/kopetemimesourcefactory.h | 2 +- kopete/libkopete/kopetemimetypehandler.cpp | 8 +- kopete/libkopete/kopetenotifydataobject.cpp | 60 ++-- kopete/libkopete/kopetenotifyevent.cpp | 24 +- kopete/libkopete/kopeteonlinestatus.cpp | 14 +- kopete/libkopete/kopeteonlinestatus.h | 16 +- kopete/libkopete/kopeteonlinestatusmanager.cpp | 70 ++--- kopete/libkopete/kopeteonlinestatusmanager.h | 20 +- kopete/libkopete/kopetepassword.cpp | 22 +- kopete/libkopete/kopetepassword.h | 16 +- kopete/libkopete/kopetepasswordedaccount.cpp | 24 +- kopete/libkopete/kopetepasswordedaccount.h | 21 +- kopete/libkopete/kopetepicture.cpp | 12 +- kopete/libkopete/kopeteplugin.cpp | 10 +- kopete/libkopete/kopeteplugin.h | 7 +- kopete/libkopete/kopetepluginmanager.cpp | 52 ++-- kopete/libkopete/kopetepluginmanager.h | 7 +- kopete/libkopete/kopeteprefs.cpp | 48 ++-- kopete/libkopete/kopeteprefs.h | 11 +- kopete/libkopete/kopeteproperties.h | 12 +- kopete/libkopete/kopeteprotocol.cpp | 44 +-- kopete/libkopete/kopeteprotocol.h | 17 +- kopete/libkopete/kopetesimplemessagehandler.h | 1 + kopete/libkopete/kopetetask.h | 5 +- kopete/libkopete/kopetetransfermanager.cpp | 8 +- kopete/libkopete/kopetetransfermanager.h | 10 +- kopete/libkopete/kopeteuiglobal.h | 2 +- kopete/libkopete/kopeteutils.cpp | 8 +- kopete/libkopete/kopeteutils.h | 28 +- kopete/libkopete/kopetewalletmanager.cpp | 12 +- kopete/libkopete/kopetewalletmanager.h | 8 +- kopete/libkopete/managedconnectionaccount.cpp | 30 +- kopete/libkopete/managedconnectionaccount.h | 11 +- kopete/libkopete/networkstatuscommon.cpp | 12 +- kopete/libkopete/networkstatuscommon.h | 16 +- kopete/libkopete/private/kopetecommand.cpp | 26 +- kopete/libkopete/private/kopetecommand.h | 9 +- kopete/libkopete/private/kopeteemoticons.cpp | 52 ++-- kopete/libkopete/private/kopeteemoticons.h | 15 +- kopete/libkopete/private/kopeteutils_private.h | 3 +- kopete/libkopete/private/kopeteviewmanager.cpp | 24 +- kopete/libkopete/private/kopeteviewmanager.h | 5 +- kopete/libkopete/tests/create_test.rb | 2 +- kopete/libkopete/tests/kopetecontactlist_test.cpp | 2 +- kopete/libkopete/tests/kopeteemoticontest.cpp | 18 +- kopete/libkopete/tests/kopetemessage_test.cpp | 40 +-- .../libkopete/tests/kopetepasswordtest_program.cpp | 6 +- .../libkopete/tests/kopetepasswordtest_program.h | 3 +- kopete/libkopete/tests/kopetepropertiestest.cpp | 4 +- .../libkopete/tests/kopetewallettest_program.cpp | 14 +- kopete/libkopete/tests/kopetewallettest_program.h | 3 +- kopete/libkopete/tests/mock/kopeteaccount_mock.cpp | 12 +- kopete/libkopete/tests/mock/kopeteaccount_mock.h | 14 +- kopete/libkopete/tests/mock/kopetecontact_mock.cpp | 6 +- kopete/libkopete/tests/mock/kopetecontact_mock.h | 8 +- kopete/libkopete/tests/mock/kopetemessage_mock.cpp | 4 +- kopete/libkopete/tests/mock/kopetemessage_mock.h | 6 +- .../tests/mock/kopetemetacontact_mock.cpp | 2 +- .../libkopete/tests/mock/kopetemetacontact_mock.h | 4 +- .../libkopete/tests/mock/kopeteprotocol_mock.cpp | 12 +- kopete/libkopete/tests/mock/kopeteprotocol_mock.h | 12 +- kopete/libkopete/ui/accountselector.cpp | 14 +- kopete/libkopete/ui/accountselector.h | 11 +- kopete/libkopete/ui/addcontactpage.cpp | 2 +- kopete/libkopete/ui/addcontactpage.h | 5 +- kopete/libkopete/ui/addressbooklinkwidget.cpp | 12 +- kopete/libkopete/ui/addressbooklinkwidget.h | 3 +- kopete/libkopete/ui/addressbooklinkwidget_base.ui | 10 +- kopete/libkopete/ui/addressbookselectordialog.cpp | 6 +- kopete/libkopete/ui/addressbookselectordialog.h | 5 +- kopete/libkopete/ui/addressbookselectorwidget.cpp | 10 +- kopete/libkopete/ui/addressbookselectorwidget.h | 3 +- .../libkopete/ui/addressbookselectorwidget_base.ui | 16 +- kopete/libkopete/ui/addresseeitem.cpp | 6 +- kopete/libkopete/ui/addresseeitem.h | 4 +- kopete/libkopete/ui/contactaddednotifydialog.cpp | 6 +- kopete/libkopete/ui/contactaddednotifydialog.h | 9 +- kopete/libkopete/ui/contactaddednotifywidget.ui | 42 +-- kopete/libkopete/ui/fileconfirmbase.ui | 22 +- kopete/libkopete/ui/kopete.widgets | 4 +- kopete/libkopete/ui/kopeteawaydialogbase.ui | 12 +- kopete/libkopete/ui/kopetecontactaction.cpp | 6 +- kopete/libkopete/ui/kopetecontactaction.h | 3 +- kopete/libkopete/ui/kopetefileconfirmdialog.cpp | 14 +- kopete/libkopete/ui/kopetefileconfirmdialog.h | 3 +- kopete/libkopete/ui/kopetelistview.cpp | 36 +-- kopete/libkopete/ui/kopetelistview.h | 3 +- kopete/libkopete/ui/kopetelistviewitem.cpp | 264 ++++++++--------- kopete/libkopete/ui/kopetelistviewitem.h | 85 +++--- kopete/libkopete/ui/kopetelistviewsearchline.cpp | 10 +- kopete/libkopete/ui/kopetelistviewsearchline.h | 5 +- kopete/libkopete/ui/kopetepassworddialog.ui | 20 +- kopete/libkopete/ui/kopetepasswordwidget.cpp | 6 +- kopete/libkopete/ui/kopetepasswordwidget.h | 7 +- kopete/libkopete/ui/kopetepasswordwidgetbase.ui | 10 +- kopete/libkopete/ui/kopetestdaction.cpp | 54 ++-- kopete/libkopete/ui/kopetestdaction.h | 27 +- kopete/libkopete/ui/kopeteview.h | 4 +- kopete/libkopete/ui/kopeteviewplugin.cpp | 4 +- kopete/libkopete/ui/kopeteviewplugin.h | 2 +- kopete/libkopete/ui/kopetewidgets.cpp | 58 ++-- kopete/libkopete/ui/metacontactselectorwidget.cpp | 14 +- kopete/libkopete/ui/metacontactselectorwidget.h | 8 +- .../libkopete/ui/metacontactselectorwidget_base.ui | 14 +- kopete/libkopete/ui/userinfodialog.cpp | 10 +- kopete/libkopete/ui/userinfodialog.h | 3 +- kopete/libkopete/webcamwidget.cpp | 18 +- kopete/libkopete/webcamwidget.h | 12 +- kopete/plugins/addbookmarks/addbookmarksplugin.cpp | 10 +- kopete/plugins/addbookmarks/addbookmarksplugin.h | 3 +- .../addbookmarks/addbookmarkspreferences.cpp | 6 +- .../plugins/addbookmarks/addbookmarkspreferences.h | 3 +- .../addbookmarks/addbookmarksprefssettings.cpp | 8 +- .../addbookmarks/addbookmarksprefssettings.h | 5 +- kopete/plugins/addbookmarks/addbookmarksprefsui.ui | 18 +- kopete/plugins/alias/aliasdialog.ui | 12 +- kopete/plugins/alias/aliasdialogbase.ui | 4 +- kopete/plugins/alias/aliasplugin.cpp | 4 +- kopete/plugins/alias/aliasplugin.h | 3 +- kopete/plugins/alias/aliaspreferences.cpp | 62 ++-- kopete/plugins/alias/aliaspreferences.h | 5 +- kopete/plugins/alias/editaliasdialog.cpp | 6 +- kopete/plugins/alias/editaliasdialog.h | 5 +- kopete/plugins/autoreplace/autoreplaceconfig.cpp | 2 +- kopete/plugins/autoreplace/autoreplaceplugin.cpp | 16 +- kopete/plugins/autoreplace/autoreplaceplugin.h | 3 +- .../plugins/autoreplace/autoreplacepreferences.cpp | 12 +- .../plugins/autoreplace/autoreplacepreferences.h | 3 +- kopete/plugins/autoreplace/autoreplaceprefs.ui | 44 +-- .../connectionstatus/connectionstatusplugin.cpp | 18 +- .../connectionstatus/connectionstatusplugin.h | 7 +- kopete/plugins/contactnotes/contactnotesedit.cpp | 2 +- kopete/plugins/contactnotes/contactnotesedit.h | 1 + kopete/plugins/contactnotes/contactnotesplugin.cpp | 4 +- kopete/plugins/contactnotes/contactnotesplugin.h | 3 +- .../plugins/cryptography/cryptographyguiclient.cpp | 14 +- .../plugins/cryptography/cryptographyguiclient.h | 3 +- kopete/plugins/cryptography/cryptographyplugin.cpp | 32 +-- kopete/plugins/cryptography/cryptographyplugin.h | 3 +- .../cryptography/cryptographypreferences.cpp | 4 +- .../plugins/cryptography/cryptographypreferences.h | 3 +- .../plugins/cryptography/cryptographyprefsbase.ui | 30 +- .../cryptography/cryptographyselectuserkey.cpp | 2 +- .../cryptography/cryptographyselectuserkey.h | 1 + .../plugins/cryptography/cryptographyuserkey_ui.ui | 14 +- kopete/plugins/cryptography/kgpginterface.cpp | 28 +- kopete/plugins/cryptography/kgpginterface.h | 1 + kopete/plugins/cryptography/kgpgselkey.cpp | 16 +- kopete/plugins/cryptography/kgpgselkey.h | 3 +- kopete/plugins/cryptography/popuppublic.cpp | 48 ++-- kopete/plugins/cryptography/popuppublic.h | 5 +- kopete/plugins/highlight/highlightconfig.cpp | 72 ++--- kopete/plugins/highlight/highlightplugin.cpp | 10 +- kopete/plugins/highlight/highlightplugin.h | 3 +- kopete/plugins/highlight/highlightpreferences.cpp | 4 +- kopete/plugins/highlight/highlightpreferences.h | 3 +- kopete/plugins/highlight/highlightprefsbase.ui | 68 ++--- kopete/plugins/history/converter.cpp | 62 ++-- kopete/plugins/history/historydialog.cpp | 96 +++---- kopete/plugins/history/historydialog.h | 3 +- kopete/plugins/history/historyguiclient.cpp | 8 +- kopete/plugins/history/historyguiclient.h | 3 +- kopete/plugins/history/historylogger.cpp | 112 ++++---- kopete/plugins/history/historylogger.h | 7 +- kopete/plugins/history/historyplugin.cpp | 14 +- kopete/plugins/history/historyplugin.h | 3 +- kopete/plugins/history/historypreferences.cpp | 4 +- kopete/plugins/history/historypreferences.h | 3 +- kopete/plugins/history/historyprefsui.ui | 16 +- kopete/plugins/history/historyviewer.ui | 58 ++-- kopete/plugins/latex/latexguiclient.cpp | 10 +- kopete/plugins/latex/latexguiclient.h | 3 +- kopete/plugins/latex/latexplugin.cpp | 24 +- kopete/plugins/latex/latexplugin.h | 3 +- kopete/plugins/latex/latexpreferences.cpp | 4 +- kopete/plugins/latex/latexpreferences.h | 3 +- kopete/plugins/latex/latexprefsbase.ui | 28 +- kopete/plugins/motionautoaway/COPYING.motion | 4 +- kopete/plugins/motionautoaway/motionawayplugin.cpp | 8 +- kopete/plugins/motionautoaway/motionawayplugin.h | 3 +- .../motionautoaway/motionawaypreferences.cpp | 4 +- .../plugins/motionautoaway/motionawaypreferences.h | 3 +- kopete/plugins/motionautoaway/motionawayprefs.ui | 48 ++-- kopete/plugins/netmeeting/netmeetingguiclient.cpp | 6 +- kopete/plugins/netmeeting/netmeetingguiclient.h | 3 +- kopete/plugins/netmeeting/netmeetinginvitation.cpp | 12 +- kopete/plugins/netmeeting/netmeetinginvitation.h | 3 +- kopete/plugins/netmeeting/netmeetingplugin.cpp | 6 +- kopete/plugins/netmeeting/netmeetingplugin.h | 3 +- .../plugins/netmeeting/netmeetingpreferences.cpp | 4 +- kopete/plugins/netmeeting/netmeetingpreferences.h | 3 +- kopete/plugins/netmeeting/netmeetingprefs_ui.ui | 20 +- kopete/plugins/nowlistening/nlamarok.cpp | 6 +- kopete/plugins/nowlistening/nljuk.cpp | 12 +- kopete/plugins/nowlistening/nlkaffeine.cpp | 2 +- kopete/plugins/nowlistening/nlkscd.cpp | 6 +- kopete/plugins/nowlistening/nlnoatun.cpp | 8 +- kopete/plugins/nowlistening/nlnoatun.h | 2 +- .../plugins/nowlistening/nowlisteningguiclient.cpp | 6 +- .../plugins/nowlistening/nowlisteningguiclient.h | 3 +- kopete/plugins/nowlistening/nowlisteningplugin.cpp | 44 +-- kopete/plugins/nowlistening/nowlisteningplugin.h | 3 +- .../nowlistening/nowlisteningpreferences.cpp | 6 +- .../plugins/nowlistening/nowlisteningpreferences.h | 3 +- kopete/plugins/nowlistening/nowlisteningprefs.ui | 74 ++--- kopete/plugins/smpppdcs/Changelog.smpppdcs | 2 +- kopete/plugins/smpppdcs/detector.h | 2 +- kopete/plugins/smpppdcs/detectornetstat.cpp | 12 +- kopete/plugins/smpppdcs/detectornetstat.h | 3 +- kopete/plugins/smpppdcs/detectornetworkstatus.cpp | 44 +-- kopete/plugins/smpppdcs/detectornetworkstatus.h | 15 +- kopete/plugins/smpppdcs/detectorsmpppd.cpp | 12 +- kopete/plugins/smpppdcs/detectorsmpppd.h | 2 +- kopete/plugins/smpppdcs/iconnector.h | 4 +- .../smpppdcs/libsmpppdclient/smpppdclient.cpp | 2 +- .../smpppdcs/libsmpppdclient/smpppdready.cpp | 4 +- .../smpppdcs/libsmpppdclient/smpppdunsettled.cpp | 8 +- kopete/plugins/smpppdcs/onlineinquiry.cpp | 6 +- kopete/plugins/smpppdcs/onlineinquiry.h | 6 +- kopete/plugins/smpppdcs/smpppdcsplugin.cpp | 26 +- kopete/plugins/smpppdcs/smpppdcsplugin.h | 9 +- kopete/plugins/smpppdcs/smpppdcspreferences.cpp | 8 +- kopete/plugins/smpppdcs/smpppdcspreferences.h | 5 +- kopete/plugins/smpppdcs/smpppdcsprefs.ui | 34 +-- kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp | 6 +- kopete/plugins/smpppdcs/smpppdcsprefsimpl.h | 3 +- kopete/plugins/smpppdcs/smpppdlocationui.ui | 18 +- kopete/plugins/smpppdcs/smpppdlocationwidget.cpp | 4 +- kopete/plugins/smpppdcs/smpppdlocationwidget.h | 3 +- kopete/plugins/smpppdcs/smpppdsearcher.cpp | 12 +- kopete/plugins/smpppdcs/smpppdsearcher.h | 7 +- kopete/plugins/smpppdcs/unittest/clienttest.cpp | 8 +- kopete/plugins/smpppdcs/unittest/clienttest.h | 1 + kopete/plugins/statistics/statisticscontact.cpp | 80 +++--- kopete/plugins/statistics/statisticscontact.h | 10 +- kopete/plugins/statistics/statisticsdb.cpp | 8 +- kopete/plugins/statistics/statisticsdcopiface.h | 6 +- kopete/plugins/statistics/statisticsdialog.cpp | 70 ++--- kopete/plugins/statistics/statisticsdialog.h | 5 +- kopete/plugins/statistics/statisticsplugin.cpp | 52 ++-- kopete/plugins/statistics/statisticsplugin.h | 15 +- kopete/plugins/statistics/statisticswidget.ui | 48 ++-- kopete/plugins/texteffect/texteffectplugin.cpp | 4 +- kopete/plugins/texteffect/texteffectplugin.h | 3 +- .../plugins/texteffect/texteffectpreferences.cpp | 10 +- kopete/plugins/texteffect/texteffectpreferences.h | 5 +- kopete/plugins/texteffect/texteffectprefs.ui | 36 +-- kopete/plugins/translator/translatordialog.cpp | 2 +- kopete/plugins/translator/translatordialog.h | 3 +- kopete/plugins/translator/translatorguiclient.cpp | 6 +- kopete/plugins/translator/translatorguiclient.h | 3 +- kopete/plugins/translator/translatorplugin.cpp | 22 +- kopete/plugins/translator/translatorplugin.h | 3 +- kopete/plugins/translator/translatorprefs.cpp | 2 +- kopete/plugins/translator/translatorprefsbase.ui | 32 +-- kopete/plugins/webpresence/DESIGN | 2 +- kopete/plugins/webpresence/webpresence_html.xsl | 2 +- kopete/plugins/webpresence/webpresence_xhtml.xsl | 2 +- kopete/plugins/webpresence/webpresenceplugin.cpp | 28 +- kopete/plugins/webpresence/webpresenceplugin.h | 5 +- .../plugins/webpresence/webpresencepreferences.cpp | 6 +- .../plugins/webpresence/webpresencepreferences.h | 3 +- kopete/plugins/webpresence/webpresenceprefs.ui | 46 +-- kopete/protocols/gadu/gaduaccount.cpp | 106 +++---- kopete/protocols/gadu/gaduaccount.h | 11 +- kopete/protocols/gadu/gaduaddcontactpage.cpp | 6 +- kopete/protocols/gadu/gaduaddcontactpage.h | 3 +- kopete/protocols/gadu/gaduaway.cpp | 12 +- kopete/protocols/gadu/gaduaway.h | 3 +- kopete/protocols/gadu/gaducommands.cpp | 30 +- kopete/protocols/gadu/gaducommands.h | 34 ++- kopete/protocols/gadu/gaducontact.cpp | 26 +- kopete/protocols/gadu/gaducontact.h | 9 +- kopete/protocols/gadu/gaducontactlist.cpp | 4 +- kopete/protocols/gadu/gadudcc.cpp | 10 +- kopete/protocols/gadu/gadudcc.h | 3 +- kopete/protocols/gadu/gadudccserver.h | 1 + kopete/protocols/gadu/gadudcctransaction.cpp | 10 +- kopete/protocols/gadu/gadudcctransaction.h | 1 + kopete/protocols/gadu/gadueditaccount.cpp | 4 +- kopete/protocols/gadu/gadueditaccount.h | 3 +- kopete/protocols/gadu/gadueditcontact.cpp | 8 +- kopete/protocols/gadu/gadueditcontact.h | 5 +- kopete/protocols/gadu/gaduprotocol.cpp | 16 +- kopete/protocols/gadu/gaduprotocol.h | 9 +- kopete/protocols/gadu/gadupubdir.cpp | 24 +- kopete/protocols/gadu/gadupubdir.h | 15 +- kopete/protocols/gadu/gaduregisteraccount.cpp | 32 +-- kopete/protocols/gadu/gaduregisteraccount.h | 5 +- kopete/protocols/gadu/gadurichtextformat.cpp | 46 +-- kopete/protocols/gadu/gadurichtextformat.h | 4 +- kopete/protocols/gadu/gadusession.cpp | 30 +- kopete/protocols/gadu/gadusession.h | 13 +- kopete/protocols/gadu/ui/gaduadd.ui | 52 ++-- kopete/protocols/gadu/ui/gaduawayui.ui | 32 +-- kopete/protocols/gadu/ui/gadueditaccountui.ui | 144 +++++----- kopete/protocols/gadu/ui/gaduregisteraccountui.ui | 66 ++--- kopete/protocols/gadu/ui/gadusearch.ui | 100 +++---- kopete/protocols/groupwise/DESIGN | 2 +- kopete/protocols/groupwise/gwaccount.cpp | 124 ++++---- kopete/protocols/groupwise/gwaccount.h | 16 +- kopete/protocols/groupwise/gwaddui.ui | 18 +- kopete/protocols/groupwise/gwbytestream.cpp | 6 +- kopete/protocols/groupwise/gwbytestream.h | 3 +- kopete/protocols/groupwise/gwconnector.cpp | 6 +- kopete/protocols/groupwise/gwconnector.h | 7 +- kopete/protocols/groupwise/gwcontact.cpp | 32 +-- kopete/protocols/groupwise/gwcontact.h | 15 +- kopete/protocols/groupwise/gwcontactlist.cpp | 60 ++-- kopete/protocols/groupwise/gwcontactlist.h | 18 +- kopete/protocols/groupwise/gwmessagemanager.cpp | 36 +-- kopete/protocols/groupwise/gwmessagemanager.h | 1 + kopete/protocols/groupwise/gwprotocol.cpp | 42 +-- kopete/protocols/groupwise/gwprotocol.h | 7 +- .../protocols/groupwise/libgroupwise/Makefile.am | 4 +- .../groupwise/libgroupwise/bytestream.cpp | 6 +- .../protocols/groupwise/libgroupwise/bytestream.h | 5 +- .../groupwise/libgroupwise/chatroommanager.cpp | 12 +- .../groupwise/libgroupwise/chatroommanager.h | 5 +- kopete/protocols/groupwise/libgroupwise/client.cpp | 42 +-- kopete/protocols/groupwise/libgroupwise/client.h | 17 +- .../protocols/groupwise/libgroupwise/connector.cpp | 8 +- .../protocols/groupwise/libgroupwise/connector.h | 11 +- .../groupwise/libgroupwise/coreprotocol.cpp | 34 +-- .../groupwise/libgroupwise/coreprotocol.h | 9 +- .../groupwise/libgroupwise/eventprotocol.cpp | 34 +-- .../groupwise/libgroupwise/eventprotocol.h | 13 +- .../groupwise/libgroupwise/eventtransfer.cpp | 18 +- .../groupwise/libgroupwise/eventtransfer.h | 26 +- .../protocols/groupwise/libgroupwise/gwchatrooms.h | 4 +- .../groupwise/libgroupwise/gwclientstream.cpp | 18 +- .../groupwise/libgroupwise/gwclientstream.h | 7 +- .../protocols/groupwise/libgroupwise/gwerror.cpp | 4 +- kopete/protocols/groupwise/libgroupwise/gwerror.h | 16 +- .../protocols/groupwise/libgroupwise/gwfield.cpp | 30 +- kopete/protocols/groupwise/libgroupwise/gwfield.h | 36 +-- .../groupwise/libgroupwise/inputprotocolbase.cpp | 12 +- .../groupwise/libgroupwise/inputprotocolbase.h | 7 +- .../groupwise/libgroupwise/privacymanager.cpp | 14 +- .../groupwise/libgroupwise/privacymanager.h | 3 +- .../groupwise/libgroupwise/qca/src/Makefile.am | 2 +- .../groupwise/libgroupwise/qca/src/qca.cpp | 18 +- .../protocols/groupwise/libgroupwise/qca/src/qca.h | 16 +- .../groupwise/libgroupwise/qca/src/qcaprovider.h | 2 +- .../groupwise/libgroupwise/qcatlshandler.cpp | 6 +- .../groupwise/libgroupwise/qcatlshandler.h | 3 +- .../groupwise/libgroupwise/responseprotocol.cpp | 56 ++-- .../groupwise/libgroupwise/responseprotocol.h | 3 +- kopete/protocols/groupwise/libgroupwise/rtf.cc | 34 +-- kopete/protocols/groupwise/libgroupwise/rtf.ll | 18 +- .../groupwise/libgroupwise/safedelete.cpp | 6 - .../protocols/groupwise/libgroupwise/safedelete.h | 3 +- .../groupwise/libgroupwise/securestream.h | 4 +- kopete/protocols/groupwise/libgroupwise/stream.cpp | 4 +- kopete/protocols/groupwise/libgroupwise/stream.h | 5 +- kopete/protocols/groupwise/libgroupwise/task.cpp | 26 +- kopete/protocols/groupwise/libgroupwise/task.h | 7 +- .../libgroupwise/tasks/chatcountstask.cpp | 6 +- .../groupwise/libgroupwise/tasks/chatcountstask.h | 3 +- .../libgroupwise/tasks/chatpropertiestask.cpp | 4 +- .../libgroupwise/tasks/chatpropertiestask.h | 3 +- .../libgroupwise/tasks/conferencetask.cpp | 28 +- .../groupwise/libgroupwise/tasks/conferencetask.h | 5 +- .../libgroupwise/tasks/connectiontask.cpp | 2 +- .../groupwise/libgroupwise/tasks/connectiontask.h | 3 +- .../libgroupwise/tasks/createconferencetask.cpp | 2 +- .../libgroupwise/tasks/createconferencetask.h | 3 +- .../tasks/createcontactinstancetask.cpp | 14 +- .../libgroupwise/tasks/createcontactinstancetask.h | 11 +- .../libgroupwise/tasks/createcontacttask.cpp | 10 +- .../libgroupwise/tasks/createcontacttask.h | 5 +- .../libgroupwise/tasks/createfoldertask.cpp | 6 +- .../libgroupwise/tasks/createfoldertask.h | 5 +- .../libgroupwise/tasks/deleteitemtask.cpp | 6 +- .../groupwise/libgroupwise/tasks/deleteitemtask.h | 5 +- .../groupwise/libgroupwise/tasks/eventtask.cpp | 6 +- .../groupwise/libgroupwise/tasks/eventtask.h | 3 +- .../tasks/getchatsearchresultstask.cpp | 20 +- .../libgroupwise/tasks/getchatsearchresultstask.h | 7 +- .../libgroupwise/tasks/getdetailstask.cpp | 8 +- .../groupwise/libgroupwise/tasks/getdetailstask.h | 3 +- .../groupwise/libgroupwise/tasks/getstatustask.cpp | 8 +- .../groupwise/libgroupwise/tasks/getstatustask.h | 5 +- .../groupwise/libgroupwise/tasks/joinchattask.cpp | 10 +- .../groupwise/libgroupwise/tasks/joinchattask.h | 3 +- .../libgroupwise/tasks/joinconferencetask.cpp | 16 +- .../libgroupwise/tasks/joinconferencetask.h | 3 +- .../groupwise/libgroupwise/tasks/keepalivetask.cpp | 2 +- .../groupwise/libgroupwise/tasks/keepalivetask.h | 3 +- .../libgroupwise/tasks/leaveconferencetask.cpp | 2 +- .../libgroupwise/tasks/leaveconferencetask.h | 3 +- .../groupwise/libgroupwise/tasks/logintask.cpp | 46 +-- .../groupwise/libgroupwise/tasks/logintask.h | 5 +- .../libgroupwise/tasks/modifycontactlisttask.cpp | 8 +- .../libgroupwise/tasks/modifycontactlisttask.h | 5 +- .../libgroupwise/tasks/movecontacttask.cpp | 4 +- .../groupwise/libgroupwise/tasks/movecontacttask.h | 3 +- .../libgroupwise/tasks/needfoldertask.cpp | 4 +- .../groupwise/libgroupwise/tasks/needfoldertask.h | 3 +- .../libgroupwise/tasks/pollsearchresultstask.cpp | 22 +- .../libgroupwise/tasks/pollsearchresultstask.h | 7 +- .../libgroupwise/tasks/privacyitemtask.cpp | 2 +- .../groupwise/libgroupwise/tasks/privacyitemtask.h | 3 +- .../libgroupwise/tasks/rejectinvitetask.cpp | 2 +- .../libgroupwise/tasks/rejectinvitetask.h | 3 +- .../groupwise/libgroupwise/tasks/requesttask.cpp | 6 +- .../groupwise/libgroupwise/tasks/requesttask.h | 3 +- .../libgroupwise/tasks/searchchattask.cpp | 6 +- .../groupwise/libgroupwise/tasks/searchchattask.h | 3 +- .../libgroupwise/tasks/searchusertask.cpp | 8 +- .../groupwise/libgroupwise/tasks/searchusertask.h | 3 +- .../libgroupwise/tasks/sendinvitetask.cpp | 2 +- .../groupwise/libgroupwise/tasks/sendinvitetask.h | 2 +- .../libgroupwise/tasks/sendmessagetask.cpp | 2 +- .../groupwise/libgroupwise/tasks/sendmessagetask.h | 2 +- .../groupwise/libgroupwise/tasks/setstatustask.cpp | 14 +- .../groupwise/libgroupwise/tasks/setstatustask.h | 9 +- .../groupwise/libgroupwise/tasks/statustask.cpp | 6 +- .../groupwise/libgroupwise/tasks/statustask.h | 5 +- .../groupwise/libgroupwise/tasks/typingtask.cpp | 2 +- .../groupwise/libgroupwise/tasks/typingtask.h | 3 +- .../libgroupwise/tasks/updatecontacttask.cpp | 6 +- .../libgroupwise/tasks/updatecontacttask.h | 3 +- .../libgroupwise/tasks/updatefoldertask.cpp | 4 +- .../libgroupwise/tasks/updatefoldertask.h | 3 +- .../libgroupwise/tasks/updateitemtask.cpp | 2 +- .../groupwise/libgroupwise/tasks/updateitemtask.h | 3 +- .../libgroupwise/tests/clientstream_test.h | 7 +- .../groupwise/libgroupwise/tests/field_test.cpp | 16 +- .../groupwise/libgroupwise/tlshandler.cpp | 4 +- .../protocols/groupwise/libgroupwise/tlshandler.h | 5 +- .../groupwise/libgroupwise/userdetailsmanager.cpp | 14 +- .../groupwise/libgroupwise/userdetailsmanager.h | 5 +- .../protocols/groupwise/ui/gwaccountpreferences.ui | 42 +-- kopete/protocols/groupwise/ui/gwaddcontactpage.cpp | 8 +- kopete/protocols/groupwise/ui/gwaddcontactpage.h | 3 +- kopete/protocols/groupwise/ui/gwaddui.ui | 20 +- .../protocols/groupwise/ui/gwchatpropsdialog.cpp | 8 +- kopete/protocols/groupwise/ui/gwchatpropsdialog.h | 5 +- kopete/protocols/groupwise/ui/gwchatpropswidget.ui | 58 ++-- .../protocols/groupwise/ui/gwchatsearchdialog.cpp | 4 +- kopete/protocols/groupwise/ui/gwchatsearchdialog.h | 3 +- .../protocols/groupwise/ui/gwchatsearchwidget.ui | 12 +- .../protocols/groupwise/ui/gwcontactproperties.cpp | 14 +- .../protocols/groupwise/ui/gwcontactproperties.h | 7 +- .../protocols/groupwise/ui/gwcontactpropswidget.ui | 30 +- kopete/protocols/groupwise/ui/gwcontactsearch.ui | 72 ++--- .../protocols/groupwise/ui/gwcustomstatusedit.ui | 24 +- .../protocols/groupwise/ui/gwcustomstatuswidget.ui | 16 +- .../protocols/groupwise/ui/gweditaccountwidget.cpp | 4 +- .../protocols/groupwise/ui/gweditaccountwidget.h | 3 +- kopete/protocols/groupwise/ui/gwprivacy.ui | 46 +-- kopete/protocols/groupwise/ui/gwprivacydialog.cpp | 8 +- kopete/protocols/groupwise/ui/gwprivacydialog.h | 3 +- .../groupwise/ui/gwreceiveinvitationdialog.cpp | 6 +- .../groupwise/ui/gwreceiveinvitationdialog.h | 3 +- kopete/protocols/groupwise/ui/gwsearch.cpp | 10 +- kopete/protocols/groupwise/ui/gwsearch.h | 5 +- kopete/protocols/groupwise/ui/gwshowinvitation.ui | 30 +- kopete/protocols/irc/ircaccount.cpp | 96 +++---- kopete/protocols/irc/ircaccount.h | 15 +- kopete/protocols/irc/ircaddcontactpage.cpp | 2 +- kopete/protocols/irc/ircaddcontactpage.h | 3 +- kopete/protocols/irc/ircchannelcontact.cpp | 72 ++--- kopete/protocols/irc/ircchannelcontact.h | 9 +- kopete/protocols/irc/irccontact.cpp | 38 +-- kopete/protocols/irc/irccontact.h | 7 +- kopete/protocols/irc/irccontactmanager.cpp | 4 +- kopete/protocols/irc/irccontactmanager.h | 3 +- kopete/protocols/irc/ircguiclient.cpp | 8 +- kopete/protocols/irc/ircguiclient.h | 3 +- kopete/protocols/irc/ircprotocol.cpp | 202 ++++++------- kopete/protocols/irc/ircprotocol.h | 15 +- kopete/protocols/irc/ircservercontact.cpp | 18 +- kopete/protocols/irc/ircservercontact.h | 3 +- kopete/protocols/irc/ircsignalhandler.h | 35 ++- kopete/protocols/irc/irctransferhandler.cpp | 2 +- kopete/protocols/irc/irctransferhandler.h | 3 +- kopete/protocols/irc/ircusercontact.cpp | 134 ++++----- kopete/protocols/irc/ircusercontact.h | 3 +- kopete/protocols/irc/kcodecaction.cpp | 4 +- kopete/protocols/irc/kcodecaction.h | 3 +- kopete/protocols/irc/ksparser.cpp | 64 ++--- kopete/protocols/irc/ksparser.h | 2 +- kopete/protocols/irc/libkirc/kircengine.cpp | 52 ++-- kopete/protocols/irc/libkirc/kircengine.h | 71 ++--- .../protocols/irc/libkirc/kircengine_commands.cpp | 26 +- kopete/protocols/irc/libkirc/kircengine_ctcp.cpp | 66 ++--- .../irc/libkirc/kircengine_numericreplies.cpp | 2 +- kopete/protocols/irc/libkirc/kircentity.cpp | 8 +- kopete/protocols/irc/libkirc/kircentity.h | 3 +- kopete/protocols/irc/libkirc/kircmessage.cpp | 48 ++-- kopete/protocols/irc/libkirc/kircmessage.h | 4 +- .../irc/libkirc/kircmessageredirector.cpp | 6 +- .../protocols/irc/libkirc/kircmessageredirector.h | 5 +- kopete/protocols/irc/libkirc/kirctransfer.cpp | 34 +-- kopete/protocols/irc/libkirc/kirctransfer.h | 63 ++-- .../protocols/irc/libkirc/kirctransferhandler.cpp | 8 +- kopete/protocols/irc/libkirc/kirctransferhandler.h | 11 +- .../protocols/irc/libkirc/kirctransferserver.cpp | 16 +- kopete/protocols/irc/libkirc/kirctransferserver.h | 21 +- kopete/protocols/irc/libkirc/ksslsocket.cpp | 22 +- kopete/protocols/irc/libkirc/ksslsocket.h | 9 +- kopete/protocols/irc/ui/channellist.cpp | 58 ++-- kopete/protocols/irc/ui/channellist.h | 13 +- kopete/protocols/irc/ui/channellistdialog.h | 1 + kopete/protocols/irc/ui/ircadd.ui | 30 +- kopete/protocols/irc/ui/irceditaccount.ui | 150 +++++----- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 18 +- kopete/protocols/irc/ui/irceditaccountwidget.h | 3 +- kopete/protocols/irc/ui/networkconfig.ui | 60 ++-- kopete/protocols/irc/ui/networkconfig.ui.h | 2 +- kopete/protocols/jabber/jabberaccount.cpp | 94 +++--- kopete/protocols/jabber/jabberaccount.h | 19 +- kopete/protocols/jabber/jabberbasecontact.cpp | 24 +- kopete/protocols/jabber/jabberbasecontact.h | 3 +- kopete/protocols/jabber/jabberbookmarks.cpp | 8 +- kopete/protocols/jabber/jabberbookmarks.h | 7 +- kopete/protocols/jabber/jabberbytestream.cpp | 4 +- kopete/protocols/jabber/jabberbytestream.h | 3 +- .../protocols/jabber/jabbercapabilitiesmanager.cpp | 50 ++-- .../protocols/jabber/jabbercapabilitiesmanager.h | 13 +- kopete/protocols/jabber/jabberchatsession.cpp | 18 +- kopete/protocols/jabber/jabberchatsession.h | 1 + kopete/protocols/jabber/jabberclient.cpp | 40 +-- kopete/protocols/jabber/jabberclient.h | 15 +- kopete/protocols/jabber/jabberconnector.cpp | 6 +- kopete/protocols/jabber/jabberconnector.h | 7 +- kopete/protocols/jabber/jabbercontact.cpp | 76 ++--- kopete/protocols/jabber/jabbercontact.h | 5 +- kopete/protocols/jabber/jabbercontactpool.cpp | 4 +- kopete/protocols/jabber/jabbercontactpool.h | 6 +- kopete/protocols/jabber/jabberfiletransfer.cpp | 4 +- kopete/protocols/jabber/jabberfiletransfer.h | 7 +- kopete/protocols/jabber/jabberformlineedit.cpp | 6 +- kopete/protocols/jabber/jabberformlineedit.h | 16 +- kopete/protocols/jabber/jabberformtranslator.cpp | 8 +- kopete/protocols/jabber/jabberformtranslator.h | 5 +- kopete/protocols/jabber/jabbergroupchatmanager.cpp | 6 +- kopete/protocols/jabber/jabbergroupchatmanager.h | 1 + kopete/protocols/jabber/jabbergroupcontact.cpp | 10 +- kopete/protocols/jabber/jabbergroupcontact.h | 3 +- .../protocols/jabber/jabbergroupmembercontact.cpp | 2 +- kopete/protocols/jabber/jabbergroupmembercontact.h | 3 +- kopete/protocols/jabber/jabberprotocol.cpp | 90 +++--- kopete/protocols/jabber/jabberprotocol.h | 19 +- kopete/protocols/jabber/jabberresource.cpp | 2 +- kopete/protocols/jabber/jabberresource.h | 3 +- kopete/protocols/jabber/jabberresourcepool.cpp | 4 +- kopete/protocols/jabber/jabberresourcepool.h | 3 +- kopete/protocols/jabber/jabbertransport.cpp | 42 +-- kopete/protocols/jabber/jabbertransport.h | 25 +- kopete/protocols/jabber/jingle/DESIGN | 10 +- kopete/protocols/jabber/jingle/jinglesession.h | 3 +- .../jabber/jingle/jinglesessionmanager.cpp | 6 +- .../protocols/jabber/jingle/jinglesessionmanager.h | 3 +- .../protocols/jabber/jingle/jinglevoicecaller.cpp | 42 +-- kopete/protocols/jabber/jingle/jinglevoicecaller.h | 1 + .../protocols/jabber/jingle/jinglevoicesession.cpp | 38 +-- .../protocols/jabber/jingle/jinglevoicesession.h | 3 +- .../jabber/jingle/jinglevoicesessiondialog.cpp | 26 +- .../jabber/jingle/jinglevoicesessiondialog.h | 3 +- .../jabber/jingle/jinglevoicesessiondialogbase.ui | 62 ++-- .../jabber/jingle/jinglewatchsessiontask.cpp | 4 +- .../jabber/jingle/jinglewatchsessiontask.h | 5 +- .../jabber/jingle/libjingle/libjingle.pro | 6 +- .../jabber/jingle/libjingle/talk/base/base64.cc | 2 +- .../jabber/jingle/libjingle/talk/base/common.h | 4 +- .../jingle/libjingle/talk/base/messagequeue.cc | 2 +- .../jingle/libjingle/talk/base/messagequeue.h | 6 +- .../jabber/jingle/libjingle/talk/base/network.cc | 8 +- .../jabber/jingle/libjingle/talk/base/network.h | 6 +- .../jabber/jingle/libjingle/talk/base/sigslot.h | 2 +- .../jabber/jingle/libjingle/talk/base/socket.h | 2 +- .../jingle/libjingle/talk/base/socketadapters.cc | 30 +- .../jabber/jingle/libjingle/talk/base/task.cc | 22 +- .../jabber/jingle/libjingle/talk/base/task.h | 26 +- .../jingle/libjingle/talk/base/taskrunner.cc | 2 +- .../libjingle/talk/examples/call/callclient.cc | 24 +- .../libjingle/talk/examples/call/callclient.h | 6 +- .../talk/examples/call/presenceouttask.cc | 52 ++-- .../libjingle/talk/examples/call/presenceouttask.h | 10 +- .../talk/examples/call/presencepushtask.cc | 38 +-- .../talk/examples/call/presencepushtask.h | 4 +- .../jingle/libjingle/talk/examples/call/status.h | 32 +-- .../libjingle/talk/examples/login/xmppauth.cc | 6 +- .../libjingle/talk/examples/login/xmpppump.cc | 2 +- .../libjingle/talk/examples/login/xmpppump.h | 2 +- .../jingle/libjingle/talk/p2p/base/p2psocket.cc | 8 +- .../jabber/jingle/libjingle/talk/p2p/base/port.cc | 4 +- .../jingle/libjingle/talk/p2p/base/relayserver.cc | 22 +- .../libjingle/talk/p2p/base/sessionmanager.cc | 4 +- .../libjingle/talk/p2p/base/socketmanager.cc | 2 +- .../jingle/libjingle/talk/p2p/base/stunrequest.cc | 8 +- .../talk/p2p/client/basicportallocator.cc | 4 +- .../libjingle/talk/p2p/client/sessionclient.cc | 196 ++++++------- .../jingle/libjingle/talk/session/phone/call.cc | 26 +- .../libjingle/talk/session/phone/channelmanager.cc | 2 +- .../talk/session/phone/linphonemediaengine.cc | 4 +- .../talk/session/phone/linphonemediaengine.h | 2 +- .../libjingle/talk/session/phone/mediachannel.h | 2 +- .../libjingle/talk/session/phone/mediaengine.h | 2 +- .../talk/session/phone/phonesessionclient.cc | 34 +-- .../talk/session/phone/portaudiomediaengine.cc | 12 +- .../talk/session/phone/portaudiomediaengine.h | 2 +- .../libjingle/talk/session/phone/voicechannel.cc | 6 +- .../jingle/libjingle/talk/session/receiver.h | 4 +- .../libjingle/talk/session/sessionsendtask.h | 14 +- .../talk/third_party/mediastreamer/alsacard.c | 8 +- .../talk/third_party/mediastreamer/alsacard.h | 2 +- .../talk/third_party/mediastreamer/g711common.h | 16 +- .../talk/third_party/mediastreamer/hpuxsndcard.c | 4 +- .../talk/third_party/mediastreamer/jackcard.h | 2 +- .../libjingle/talk/third_party/mediastreamer/ms.c | 2 +- .../talk/third_party/mediastreamer/msAlawdec.h | 2 +- .../talk/third_party/mediastreamer/msAlawenc.h | 2 +- .../talk/third_party/mediastreamer/msGSMdecoder.h | 2 +- .../talk/third_party/mediastreamer/msGSMencoder.h | 2 +- .../third_party/mediastreamer/msLPC10decoder.h | 2 +- .../third_party/mediastreamer/msLPC10encoder.h | 2 +- .../talk/third_party/mediastreamer/msMUlawdec.h | 2 +- .../talk/third_party/mediastreamer/msMUlawenc.h | 2 +- .../talk/third_party/mediastreamer/msavdecoder.h | 2 +- .../talk/third_party/mediastreamer/msavencoder.h | 2 +- .../talk/third_party/mediastreamer/mscopy.h | 2 +- .../talk/third_party/mediastreamer/msfdispatcher.c | 18 +- .../talk/third_party/mediastreamer/msfdispatcher.h | 2 +- .../talk/third_party/mediastreamer/msfilter.c | 14 +- .../talk/third_party/mediastreamer/msfilter.h | 4 +- .../talk/third_party/mediastreamer/msilbcdec.h | 2 +- .../talk/third_party/mediastreamer/msilbcenc.h | 2 +- .../talk/third_party/mediastreamer/msnosync.h | 2 +- .../talk/third_party/mediastreamer/msossread.h | 2 +- .../talk/third_party/mediastreamer/msosswrite.h | 2 +- .../talk/third_party/mediastreamer/msqdispatcher.c | 20 +- .../talk/third_party/mediastreamer/msqdispatcher.h | 18 +- .../talk/third_party/mediastreamer/msqueue.h | 4 +- .../talk/third_party/mediastreamer/msread.h | 2 +- .../talk/third_party/mediastreamer/msringplayer.h | 2 +- .../talk/third_party/mediastreamer/msrtprecv.h | 2 +- .../talk/third_party/mediastreamer/msrtpsend.h | 2 +- .../talk/third_party/mediastreamer/mssdlout.h | 4 +- .../talk/third_party/mediastreamer/mssoundread.h | 2 +- .../talk/third_party/mediastreamer/mssoundwrite.h | 2 +- .../talk/third_party/mediastreamer/msspeexdec.h | 4 +- .../talk/third_party/mediastreamer/msspeexenc.h | 4 +- .../talk/third_party/mediastreamer/mstimer.h | 2 +- .../mediastreamer/mstruespeechdecoder.h | 2 +- .../mediastreamer/mstruespeechencoder.h | 2 +- .../talk/third_party/mediastreamer/msutils.h | 4 +- .../talk/third_party/mediastreamer/msv4l.h | 4 +- .../talk/third_party/mediastreamer/msvideosource.h | 2 +- .../talk/third_party/mediastreamer/mswrite.h | 2 +- .../talk/third_party/mediastreamer/osscard.h | 2 +- .../talk/third_party/mediastreamer/portaudiocard.h | 2 +- .../jingle/libjingle/talk/third_party/ortp/ortp.c | 2 +- .../jingle/libjingle/talk/third_party/ortp/rtp.h | 2 +- .../libjingle/talk/third_party/ortp/rtpsession.c | 2 +- .../libjingle/talk/third_party/ortp/rtpsession.h | 2 +- .../libjingle/talk/third_party/ortp/scheduler.c | 8 +- .../libjingle/talk/third_party/ortp/scheduler.h | 12 +- .../libjingle/talk/third_party/ortp/sessionset.c | 28 +- .../libjingle/talk/third_party/ortp/sessionset.h | 16 +- .../jabber/jingle/libjingle/talk/xmllite/qname.cc | 48 ++-- .../jabber/jingle/libjingle/talk/xmllite/qname.h | 26 +- .../jingle/libjingle/talk/xmllite/xmlbuilder.cc | 10 +- .../jingle/libjingle/talk/xmllite/xmlelement.cc | 38 +-- .../jingle/libjingle/talk/xmllite/xmlelement.h | 46 +-- .../jingle/libjingle/talk/xmllite/xmlnsstack.cc | 4 +- .../jingle/libjingle/talk/xmllite/xmlnsstack.h | 4 +- .../jingle/libjingle/talk/xmllite/xmlparser.cc | 14 +- .../jingle/libjingle/talk/xmllite/xmlparser.h | 4 +- .../jingle/libjingle/talk/xmllite/xmlprinter.cc | 10 +- .../jabber/jingle/libjingle/talk/xmpp/constants.cc | 318 ++++++++++---------- .../jabber/jingle/libjingle/talk/xmpp/constants.h | 320 ++++++++++----------- .../jabber/jingle/libjingle/talk/xmpp/jid.cc | 10 +- .../jingle/libjingle/talk/xmpp/plainsaslhandler.h | 2 +- .../libjingle/talk/xmpp/saslcookiemechanism.h | 4 +- .../jingle/libjingle/talk/xmpp/saslmechanism.cc | 4 +- .../libjingle/talk/xmpp/saslplainmechanism.h | 4 +- .../jingle/libjingle/talk/xmpp/xmppclient.cc | 12 +- .../jabber/jingle/libjingle/talk/xmpp/xmppclient.h | 16 +- .../jabber/jingle/libjingle/talk/xmpp/xmppengine.h | 48 ++-- .../jingle/libjingle/talk/xmpp/xmppengineimpl.cc | 38 +-- .../jingle/libjingle/talk/xmpp/xmppengineimpl.h | 36 +-- .../libjingle/talk/xmpp/xmppengineimpl_iq.cc | 100 +++---- .../jingle/libjingle/talk/xmpp/xmpplogintask.cc | 68 ++--- .../jingle/libjingle/talk/xmpp/xmpplogintask.h | 2 +- .../jabber/jingle/libjingle/talk/xmpp/xmpptask.cc | 40 +-- .../jabber/jingle/libjingle/talk/xmpp/xmpptask.h | 12 +- kopete/protocols/jabber/jingle/voicecaller.h | 3 +- kopete/protocols/jabber/kioslave/jabberdisco.cpp | 6 +- kopete/protocols/jabber/kioslave/jabberdisco.h | 1 + .../jabber/libiris/001_last_activity.patch | 6 +- kopete/protocols/jabber/libiris/004_xhtml_im.patch | 6 +- .../libiris/005_join_muc_with_password.patch | 26 +- .../jabber/libiris/006_private_storage.patch | 6 +- .../jabber/libiris/cutestuff/network/bsocket.cpp | 14 +- .../jabber/libiris/cutestuff/network/bsocket.h | 9 +- .../libiris/cutestuff/network/httpconnect.cpp | 8 +- .../jabber/libiris/cutestuff/network/httpconnect.h | 3 +- .../jabber/libiris/cutestuff/network/httppoll.cpp | 20 +- .../jabber/libiris/cutestuff/network/httppoll.h | 8 +- .../jabber/libiris/cutestuff/network/ndns.cpp | 26 +- .../jabber/libiris/cutestuff/network/ndns.h | 8 +- .../jabber/libiris/cutestuff/network/servsock.cpp | 8 +- .../jabber/libiris/cutestuff/network/servsock.h | 12 +- .../jabber/libiris/cutestuff/network/socks.cpp | 60 ++-- .../jabber/libiris/cutestuff/network/socks.h | 19 +- .../libiris/cutestuff/network/srvresolver.cpp | 12 +- .../jabber/libiris/cutestuff/network/srvresolver.h | 7 +- .../jabber/libiris/cutestuff/util/base64.cpp | 4 +- .../jabber/libiris/cutestuff/util/bytestream.cpp | 6 +- .../jabber/libiris/cutestuff/util/bytestream.h | 5 +- .../jabber/libiris/cutestuff/util/cipher.cpp | 4 +- .../jabber/libiris/cutestuff/util/qrandom.h | 4 +- .../jabber/libiris/cutestuff/util/safedelete.cpp | 6 - .../jabber/libiris/cutestuff/util/safedelete.h | 3 +- .../jabber/libiris/cutestuff/util/sha1.cpp | 12 +- .../protocols/jabber/libiris/cutestuff/util/sha1.h | 12 +- .../jabber/libiris/cutestuff/util/showtextdlg.cpp | 4 +- .../jabber/libiris/cutestuff/util/showtextdlg.h | 5 +- kopete/protocols/jabber/libiris/iris/include/im.h | 62 ++-- .../protocols/jabber/libiris/iris/include/xmpp.h | 46 +-- .../jabber/libiris/iris/jabber/all_mocs.cpp | 2 +- .../jabber/libiris/iris/jabber/filetransfer.cpp | 68 ++--- .../jabber/libiris/iris/jabber/filetransfer.h | 40 +-- .../protocols/jabber/libiris/iris/jabber/s5b.cpp | 35 +-- kopete/protocols/jabber/libiris/iris/jabber/s5b.h | 16 +- .../jabber/libiris/iris/jabber/xmpp_ibb.cpp | 10 +- .../jabber/libiris/iris/jabber/xmpp_ibb.h | 5 +- .../jabber/libiris/iris/jabber/xmpp_jidlink.h | 6 +- .../jabber/libiris/iris/xmpp-core/connector.cpp | 24 +- .../jabber/libiris/iris/xmpp-core/hash.cpp | 22 +- .../jabber/libiris/iris/xmpp-core/jid.cpp | 10 +- .../jabber/libiris/iris/xmpp-core/parser.cpp | 26 +- .../jabber/libiris/iris/xmpp-core/parser.h | 2 +- .../jabber/libiris/iris/xmpp-core/protocol.cpp | 12 +- .../jabber/libiris/iris/xmpp-core/qcaprovider.h | 2 +- .../jabber/libiris/iris/xmpp-core/securestream.cpp | 3 +- .../jabber/libiris/iris/xmpp-core/securestream.h | 1 + .../jabber/libiris/iris/xmpp-core/simplesasl.cpp | 6 +- .../jabber/libiris/iris/xmpp-core/stream.cpp | 24 +- .../jabber/libiris/iris/xmpp-core/tlshandler.cpp | 10 +- .../jabber/libiris/iris/xmpp-core/xmlprotocol.cpp | 32 +-- .../jabber/libiris/iris/xmpp-im/client.cpp | 142 ++++----- .../jabber/libiris/iris/xmpp-im/types.cpp | 111 +++---- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp | 128 ++++----- .../jabber/libiris/iris/xmpp-im/xmpp_tasks.h | 62 ++-- .../jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp | 4 +- .../jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp | 2 +- kopete/protocols/jabber/libiris/jingle_iris.patch | 20 +- kopete/protocols/jabber/libiris/qca/src/qca.cpp | 18 +- kopete/protocols/jabber/libiris/qca/src/qca.h | 16 +- .../protocols/jabber/libiris/qca/src/qcaprovider.h | 2 +- kopete/protocols/jabber/ui/dlgaddcontact.ui | 18 +- kopete/protocols/jabber/ui/dlgbrowse.ui | 18 +- kopete/protocols/jabber/ui/dlgchangepassword.ui | 16 +- kopete/protocols/jabber/ui/dlgchatjoin.ui | 28 +- kopete/protocols/jabber/ui/dlgchatroomslist.ui | 28 +- kopete/protocols/jabber/ui/dlgjabberbrowse.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabberbrowse.h | 3 +- .../jabber/ui/dlgjabberchangepassword.cpp | 8 +- .../protocols/jabber/ui/dlgjabberchangepassword.h | 3 +- kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabberchatjoin.h | 3 +- .../protocols/jabber/ui/dlgjabberchatroomslist.cpp | 4 +- .../protocols/jabber/ui/dlgjabberchatroomslist.h | 3 +- .../protocols/jabber/ui/dlgjabberchooseserver.ui | 12 +- .../jabber/ui/dlgjabbereditaccountwidget.ui | 148 +++++----- kopete/protocols/jabber/ui/dlgjabberregister.cpp | 6 +- kopete/protocols/jabber/ui/dlgjabberregister.h | 3 +- .../jabber/ui/dlgjabberregisteraccount.ui | 66 ++--- kopete/protocols/jabber/ui/dlgjabbersendraw.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabbersendraw.h | 7 +- kopete/protocols/jabber/ui/dlgjabberservices.cpp | 4 +- kopete/protocols/jabber/ui/dlgjabberservices.h | 8 +- kopete/protocols/jabber/ui/dlgjabbervcard.cpp | 36 +-- kopete/protocols/jabber/ui/dlgjabbervcard.h | 3 +- kopete/protocols/jabber/ui/dlgregister.ui | 18 +- kopete/protocols/jabber/ui/dlgsendraw.ui | 30 +- kopete/protocols/jabber/ui/dlgservices.ui | 28 +- kopete/protocols/jabber/ui/dlgvcard.ui | 224 +++++++-------- .../protocols/jabber/ui/jabberaddcontactpage.cpp | 20 +- kopete/protocols/jabber/ui/jabberaddcontactpage.h | 8 +- kopete/protocols/jabber/ui/jabberchooseserver.cpp | 14 +- kopete/protocols/jabber/ui/jabberchooseserver.h | 3 +- .../jabber/ui/jabbereditaccountwidget.cpp | 14 +- .../protocols/jabber/ui/jabbereditaccountwidget.h | 3 +- .../protocols/jabber/ui/jabberregisteraccount.cpp | 32 +-- kopete/protocols/jabber/ui/jabberregisteraccount.h | 3 +- kopete/protocols/meanwhile/meanwhileaccount.cpp | 26 +- kopete/protocols/meanwhile/meanwhileaccount.h | 7 +- .../meanwhile/meanwhileaddcontactpage.cpp | 8 +- .../protocols/meanwhile/meanwhileaddcontactpage.h | 3 +- kopete/protocols/meanwhile/meanwhilecontact.cpp | 4 +- kopete/protocols/meanwhile/meanwhilecontact.h | 3 +- .../meanwhile/meanwhileeditaccountwidget.cpp | 10 +- .../meanwhile/meanwhileeditaccountwidget.h | 3 +- kopete/protocols/meanwhile/meanwhileplugin.cpp | 2 +- kopete/protocols/meanwhile/meanwhileplugin.h | 2 +- kopete/protocols/meanwhile/meanwhileprotocol.cpp | 28 +- kopete/protocols/meanwhile/meanwhileprotocol.h | 11 +- kopete/protocols/meanwhile/meanwhilesession.cpp | 10 +- kopete/protocols/meanwhile/meanwhilesession.h | 7 +- .../meanwhile/ui/meanwhileaddcontactbase.ui | 20 +- .../meanwhile/ui/meanwhileeditaccountbase.ui | 74 ++--- kopete/protocols/msn/config/msnpreferences.cpp | 2 +- kopete/protocols/msn/config/msnprefs.ui | 32 +-- kopete/protocols/msn/dispatcher.cpp | 78 ++--- kopete/protocols/msn/dispatcher.h | 17 +- kopete/protocols/msn/incomingtransfer.cpp | 20 +- kopete/protocols/msn/incomingtransfer.h | 3 +- kopete/protocols/msn/messageformatter.cpp | 10 +- kopete/protocols/msn/messageformatter.h | 5 +- kopete/protocols/msn/msnaccount.cpp | 140 ++++----- kopete/protocols/msn/msnaccount.h | 11 +- kopete/protocols/msn/msnaddcontactpage.cpp | 4 +- kopete/protocols/msn/msnaddcontactpage.h | 3 +- kopete/protocols/msn/msnchallengehandler.cpp | 24 +- kopete/protocols/msn/msnchallengehandler.h | 5 +- kopete/protocols/msn/msnchatsession.cpp | 36 +-- kopete/protocols/msn/msnchatsession.h | 3 +- kopete/protocols/msn/msncontact.cpp | 62 ++-- kopete/protocols/msn/msncontact.h | 9 +- kopete/protocols/msn/msndebugrawcmddlg.cpp | 4 +- kopete/protocols/msn/msndebugrawcmddlg.h | 3 +- kopete/protocols/msn/msnfiletransfersocket.cpp | 14 +- kopete/protocols/msn/msnfiletransfersocket.h | 3 +- kopete/protocols/msn/msnnotifysocket.cpp | 98 +++---- kopete/protocols/msn/msnnotifysocket.h | 11 +- kopete/protocols/msn/msnprotocol.cpp | 30 +- kopete/protocols/msn/msnprotocol.h | 7 +- kopete/protocols/msn/msnsecureloginhandler.cpp | 8 +- kopete/protocols/msn/msnsecureloginhandler.h | 3 +- kopete/protocols/msn/msnsocket.cpp | 66 ++--- kopete/protocols/msn/msnsocket.h | 15 +- kopete/protocols/msn/msnswitchboardsocket.cpp | 120 ++++---- kopete/protocols/msn/msnswitchboardsocket.h | 9 +- kopete/protocols/msn/outgoingtransfer.cpp | 26 +- kopete/protocols/msn/outgoingtransfer.h | 3 +- kopete/protocols/msn/p2p.cpp | 10 +- kopete/protocols/msn/p2p.h | 45 +-- kopete/protocols/msn/sha1.cpp | 12 +- kopete/protocols/msn/sha1.h | 12 +- kopete/protocols/msn/transport.cpp | 32 +-- kopete/protocols/msn/transport.h | 29 +- kopete/protocols/msn/ui/msnadd.ui | 20 +- kopete/protocols/msn/ui/msndebugrawcommand_base.ui | 18 +- kopete/protocols/msn/ui/msneditaccountui.ui | 230 +++++++-------- kopete/protocols/msn/ui/msneditaccountwidget.cpp | 16 +- kopete/protocols/msn/ui/msneditaccountwidget.h | 3 +- kopete/protocols/msn/ui/msninfo.ui | 42 +-- kopete/protocols/msn/webcam.cpp | 76 ++--- kopete/protocols/msn/webcam.h | 9 +- .../protocols/msn/webcam/libmimic/mimic-private.h | 6 +- kopete/protocols/msn/webcam/libmimic/mimic.c | 6 +- kopete/protocols/msn/webcam/mimicwrapper.cpp | 2 +- kopete/protocols/msn/webcam/msnwebcamdialog.cpp | 12 +- kopete/protocols/msn/webcam/msnwebcamdialog.h | 3 +- kopete/protocols/oscar/aim/aimaccount.cpp | 110 +++---- kopete/protocols/oscar/aim/aimaccount.h | 12 +- kopete/protocols/oscar/aim/aimchatsession.h | 3 +- kopete/protocols/oscar/aim/aimcontact.cpp | 106 +++---- kopete/protocols/oscar/aim/aimcontact.h | 5 +- kopete/protocols/oscar/aim/aimjoinchat.cpp | 4 +- kopete/protocols/oscar/aim/aimjoinchat.h | 3 +- kopete/protocols/oscar/aim/aimprotocol.cpp | 60 ++-- kopete/protocols/oscar/aim/aimprotocol.h | 7 +- kopete/protocols/oscar/aim/aimuserinfo.cpp | 16 +- kopete/protocols/oscar/aim/aimuserinfo.h | 3 +- .../protocols/oscar/aim/ui/aimaddcontactpage.cpp | 4 +- kopete/protocols/oscar/aim/ui/aimaddcontactpage.h | 3 +- kopete/protocols/oscar/aim/ui/aimaddcontactui.ui | 14 +- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 88 +++--- .../oscar/aim/ui/aimeditaccountwidget.cpp | 4 +- .../protocols/oscar/aim/ui/aimeditaccountwidget.h | 3 +- kopete/protocols/oscar/aim/ui/aiminfobase.ui | 50 ++-- kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui | 20 +- kopete/protocols/oscar/icq/icqaccount.cpp | 46 +-- kopete/protocols/oscar/icq/icqaccount.h | 12 +- kopete/protocols/oscar/icq/icqcontact.cpp | 54 ++-- kopete/protocols/oscar/icq/icqcontact.h | 7 +- kopete/protocols/oscar/icq/icqpresence.cpp | 30 +- kopete/protocols/oscar/icq/icqpresence.h | 14 +- kopete/protocols/oscar/icq/icqprotocol.cpp | 46 +-- kopete/protocols/oscar/icq/icqprotocol.h | 7 +- kopete/protocols/oscar/icq/icqreadaway.cpp | 10 +- kopete/protocols/oscar/icq/icqreadaway.h | 3 +- kopete/protocols/oscar/icq/ui/icqadd.ui | 22 +- .../protocols/oscar/icq/ui/icqaddcontactpage.cpp | 12 +- kopete/protocols/oscar/icq/ui/icqaddcontactpage.h | 7 +- .../protocols/oscar/icq/ui/icqauthreplydialog.cpp | 10 +- kopete/protocols/oscar/icq/ui/icqauthreplydialog.h | 3 +- kopete/protocols/oscar/icq/ui/icqauthreplyui.ui | 36 +-- kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 74 ++--- .../oscar/icq/ui/icqeditaccountwidget.cpp | 6 +- .../protocols/oscar/icq/ui/icqeditaccountwidget.h | 5 +- kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui | 102 +++---- .../oscar/icq/ui/icqinterestinfowidget.ui | 24 +- .../protocols/oscar/icq/ui/icqotherinfowidget.ui | 14 +- kopete/protocols/oscar/icq/ui/icqsearchbase.ui | 56 ++-- kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp | 22 +- kopete/protocols/oscar/icq/ui/icqsearchdialog.h | 5 +- .../protocols/oscar/icq/ui/icquserinfowidget.cpp | 14 +- kopete/protocols/oscar/icq/ui/icquserinfowidget.h | 5 +- kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui | 54 ++-- kopete/protocols/oscar/liboscar/HACKING | 14 +- kopete/protocols/oscar/liboscar/aimlogintask.cpp | 14 +- kopete/protocols/oscar/liboscar/aimlogintask.h | 3 +- kopete/protocols/oscar/liboscar/blmlimitstask.cpp | 6 +- kopete/protocols/oscar/liboscar/blmlimitstask.h | 2 +- kopete/protocols/oscar/liboscar/buddyicontask.cpp | 8 +- kopete/protocols/oscar/liboscar/buddyicontask.h | 3 +- kopete/protocols/oscar/liboscar/buffer.cpp | 12 +- kopete/protocols/oscar/liboscar/buffer.h | 2 +- kopete/protocols/oscar/liboscar/bytestream.cpp | 6 +- kopete/protocols/oscar/liboscar/bytestream.h | 5 +- .../oscar/liboscar/changevisibilitytask.cpp | 12 +- .../oscar/liboscar/changevisibilitytask.h | 4 +- .../oscar/liboscar/chatnavservicetask.cpp | 6 +- .../protocols/oscar/liboscar/chatnavservicetask.h | 3 +- .../protocols/oscar/liboscar/chatservicetask.cpp | 10 +- kopete/protocols/oscar/liboscar/chatservicetask.h | 3 +- kopete/protocols/oscar/liboscar/client.cpp | 52 ++-- kopete/protocols/oscar/liboscar/client.h | 23 +- .../protocols/oscar/liboscar/clientreadytask.cpp | 4 +- kopete/protocols/oscar/liboscar/clientreadytask.h | 2 +- .../oscar/liboscar/closeconnectiontask.cpp | 6 +- .../protocols/oscar/liboscar/closeconnectiontask.h | 4 +- kopete/protocols/oscar/liboscar/connection.cpp | 6 +- kopete/protocols/oscar/liboscar/connection.h | 9 +- .../protocols/oscar/liboscar/connectionhandler.cpp | 14 +- .../protocols/oscar/liboscar/connectionhandler.h | 4 +- kopete/protocols/oscar/liboscar/connector.cpp | 8 +- kopete/protocols/oscar/liboscar/connector.h | 11 +- kopete/protocols/oscar/liboscar/coreprotocol.cpp | 8 +- kopete/protocols/oscar/liboscar/coreprotocol.h | 3 +- kopete/protocols/oscar/liboscar/errortask.cpp | 4 +- kopete/protocols/oscar/liboscar/errortask.h | 2 +- kopete/protocols/oscar/liboscar/flapprotocol.cpp | 6 +- kopete/protocols/oscar/liboscar/flapprotocol.h | 3 +- kopete/protocols/oscar/liboscar/icbmparamstask.cpp | 6 +- kopete/protocols/oscar/liboscar/icbmparamstask.h | 2 +- kopete/protocols/oscar/liboscar/icqlogintask.cpp | 6 +- kopete/protocols/oscar/liboscar/icqlogintask.h | 3 +- kopete/protocols/oscar/liboscar/icqtask.cpp | 6 +- kopete/protocols/oscar/liboscar/icqtask.h | 3 +- kopete/protocols/oscar/liboscar/icquserinfo.cpp | 2 +- kopete/protocols/oscar/liboscar/icquserinfo.h | 6 +- .../protocols/oscar/liboscar/icquserinfotask.cpp | 4 +- kopete/protocols/oscar/liboscar/icquserinfotask.h | 5 +- .../protocols/oscar/liboscar/inputprotocolbase.cpp | 10 +- .../protocols/oscar/liboscar/inputprotocolbase.h | 7 +- .../oscar/liboscar/locationrightstask.cpp | 6 +- .../protocols/oscar/liboscar/locationrightstask.h | 2 +- kopete/protocols/oscar/liboscar/logintask.cpp | 12 +- kopete/protocols/oscar/liboscar/logintask.h | 6 +- kopete/protocols/oscar/liboscar/md5.c | 2 +- .../oscar/liboscar/messagereceivertask.cpp | 10 +- .../protocols/oscar/liboscar/messagereceivertask.h | 3 +- .../oscar/liboscar/offlinemessagestask.cpp | 4 +- .../protocols/oscar/liboscar/offlinemessagestask.h | 3 +- .../oscar/liboscar/onlinenotifiertask.cpp | 2 +- .../protocols/oscar/liboscar/onlinenotifiertask.h | 3 +- .../protocols/oscar/liboscar/oscarbytestream.cpp | 8 +- kopete/protocols/oscar/liboscar/oscarbytestream.h | 5 +- .../protocols/oscar/liboscar/oscarclientstream.cpp | 16 +- .../protocols/oscar/liboscar/oscarclientstream.h | 7 +- kopete/protocols/oscar/liboscar/oscarconnector.cpp | 8 +- kopete/protocols/oscar/liboscar/oscarconnector.h | 9 +- kopete/protocols/oscar/liboscar/oscarmessage.cpp | 2 +- .../protocols/oscar/liboscar/oscartypeclasses.cpp | 18 +- kopete/protocols/oscar/liboscar/oscartypeclasses.h | 18 +- kopete/protocols/oscar/liboscar/oscartypes.h | 6 +- kopete/protocols/oscar/liboscar/oscarutils.cpp | 2 +- kopete/protocols/oscar/liboscar/oscarutils.h | 2 +- .../protocols/oscar/liboscar/ownuserinfotask.cpp | 6 +- kopete/protocols/oscar/liboscar/ownuserinfotask.h | 3 +- kopete/protocols/oscar/liboscar/prmparamstask.cpp | 6 +- kopete/protocols/oscar/liboscar/prmparamstask.h | 2 +- kopete/protocols/oscar/liboscar/profiletask.cpp | 6 +- kopete/protocols/oscar/liboscar/profiletask.h | 2 +- kopete/protocols/oscar/liboscar/rateclass.cpp | 4 +- kopete/protocols/oscar/liboscar/rateclass.h | 5 +- .../protocols/oscar/liboscar/rateclassmanager.cpp | 6 +- kopete/protocols/oscar/liboscar/rateclassmanager.h | 5 +- kopete/protocols/oscar/liboscar/rateinfotask.cpp | 6 +- kopete/protocols/oscar/liboscar/rateinfotask.h | 3 +- kopete/protocols/oscar/liboscar/rtf.cc | 20 +- kopete/protocols/oscar/liboscar/rtf.ll | 18 +- kopete/protocols/oscar/liboscar/safedelete.cpp | 6 - kopete/protocols/oscar/liboscar/safedelete.h | 3 +- kopete/protocols/oscar/liboscar/senddcinfotask.cpp | 6 +- kopete/protocols/oscar/liboscar/senddcinfotask.h | 4 +- .../protocols/oscar/liboscar/sendidletimetask.cpp | 4 +- kopete/protocols/oscar/liboscar/sendidletimetask.h | 2 +- .../protocols/oscar/liboscar/sendmessagetask.cpp | 8 +- kopete/protocols/oscar/liboscar/sendmessagetask.h | 2 +- .../oscar/liboscar/serverredirecttask.cpp | 6 +- .../protocols/oscar/liboscar/serverredirecttask.h | 3 +- .../oscar/liboscar/serverversionstask.cpp | 8 +- .../protocols/oscar/liboscar/serverversionstask.h | 3 +- .../protocols/oscar/liboscar/servicesetuptask.cpp | 22 +- kopete/protocols/oscar/liboscar/servicesetuptask.h | 3 +- kopete/protocols/oscar/liboscar/snacprotocol.cpp | 6 +- kopete/protocols/oscar/liboscar/snacprotocol.h | 3 +- .../protocols/oscar/liboscar/ssiactivatetask.cpp | 4 +- kopete/protocols/oscar/liboscar/ssiactivatetask.h | 2 +- kopete/protocols/oscar/liboscar/ssiauthtask.cpp | 6 +- kopete/protocols/oscar/liboscar/ssiauthtask.h | 3 +- kopete/protocols/oscar/liboscar/ssilisttask.cpp | 6 +- kopete/protocols/oscar/liboscar/ssilisttask.h | 3 +- kopete/protocols/oscar/liboscar/ssimanager.cpp | 28 +- kopete/protocols/oscar/liboscar/ssimanager.h | 5 +- kopete/protocols/oscar/liboscar/ssimodifytask.cpp | 24 +- kopete/protocols/oscar/liboscar/ssimodifytask.h | 2 +- kopete/protocols/oscar/liboscar/ssiparamstask.cpp | 6 +- kopete/protocols/oscar/liboscar/ssiparamstask.h | 2 +- kopete/protocols/oscar/liboscar/stream.cpp | 4 +- kopete/protocols/oscar/liboscar/stream.h | 5 +- kopete/protocols/oscar/liboscar/task.cpp | 28 +- kopete/protocols/oscar/liboscar/task.h | 9 +- .../oscar/liboscar/tests/clientstream_test.cpp | 2 +- .../oscar/liboscar/tests/clientstream_test.h | 5 +- kopete/protocols/oscar/liboscar/tests/ipaddrtest.h | 4 +- .../protocols/oscar/liboscar/tests/kunittest.cpp | 6 +- kopete/protocols/oscar/liboscar/tests/kunittest.h | 9 +- .../protocols/oscar/liboscar/tests/logintest.cpp | 2 +- kopete/protocols/oscar/liboscar/tests/logintest.h | 5 +- .../protocols/oscar/liboscar/tests/redirecttest.h | 4 +- .../oscar/liboscar/tests/ssigrouptest.cpp | 6 +- .../protocols/oscar/liboscar/tests/ssigrouptest.h | 5 +- kopete/protocols/oscar/liboscar/tests/ssitest.cpp | 12 +- kopete/protocols/oscar/liboscar/tests/ssitest.h | 5 +- .../oscar/liboscar/tests/userinfotest.cpp | 4 +- .../protocols/oscar/liboscar/tests/userinfotest.h | 5 +- kopete/protocols/oscar/liboscar/transfer.cpp | 6 +- .../protocols/oscar/liboscar/typingnotifytask.cpp | 12 +- kopete/protocols/oscar/liboscar/typingnotifytask.h | 5 +- kopete/protocols/oscar/liboscar/userdetails.cpp | 52 ++-- kopete/protocols/oscar/liboscar/userdetails.h | 4 +- kopete/protocols/oscar/liboscar/userinfotask.cpp | 12 +- kopete/protocols/oscar/liboscar/userinfotask.h | 17 +- kopete/protocols/oscar/liboscar/usersearchtask.cpp | 10 +- kopete/protocols/oscar/liboscar/usersearchtask.h | 5 +- kopete/protocols/oscar/liboscar/warningtask.cpp | 8 +- kopete/protocols/oscar/liboscar/warningtask.h | 7 +- kopete/protocols/oscar/oscaraccount.cpp | 76 ++--- kopete/protocols/oscar/oscaraccount.h | 11 +- kopete/protocols/oscar/oscarcontact.cpp | 8 +- kopete/protocols/oscar/oscarcontact.h | 3 +- .../protocols/oscar/oscarencodingselectionbase.ui | 10 +- .../oscar/oscarencodingselectiondialog.cpp | 8 +- .../protocols/oscar/oscarencodingselectiondialog.h | 3 +- kopete/protocols/oscar/oscarlistcontactsbase.ui | 10 +- .../protocols/oscar/oscarlistnonservercontacts.cpp | 4 +- .../protocols/oscar/oscarlistnonservercontacts.h | 3 +- kopete/protocols/oscar/oscarmyselfcontact.h | 1 + kopete/protocols/oscar/oscarversionupdater.cpp | 6 +- kopete/protocols/oscar/oscarversionupdater.h | 3 +- kopete/protocols/oscar/oscarvisibilitybase.ui | 32 +-- kopete/protocols/oscar/oscarvisibilitydialog.cpp | 8 +- kopete/protocols/oscar/oscarvisibilitydialog.h | 3 +- kopete/protocols/sms/serviceloader.cpp | 2 +- kopete/protocols/sms/services/gsmlib.cpp | 28 +- kopete/protocols/sms/services/gsmlib.h | 9 +- kopete/protocols/sms/services/gsmlibprefs.ui | 14 +- .../protocols/sms/services/kopete_unix_serial.cpp | 10 +- kopete/protocols/sms/services/kopete_unix_serial.h | 2 +- kopete/protocols/sms/services/smsclient.cpp | 38 +-- kopete/protocols/sms/services/smsclient.h | 5 +- kopete/protocols/sms/services/smsclientprefs.ui | 20 +- kopete/protocols/sms/services/smssend.cpp | 32 +-- kopete/protocols/sms/services/smssend.h | 3 +- kopete/protocols/sms/services/smssendprefs.ui | 22 +- kopete/protocols/sms/services/smssendprovider.cpp | 36 +-- kopete/protocols/sms/services/smssendprovider.h | 5 +- kopete/protocols/sms/smsaccount.cpp | 26 +- kopete/protocols/sms/smsaccount.h | 7 +- kopete/protocols/sms/smsaddcontactpage.cpp | 4 +- kopete/protocols/sms/smsaddcontactpage.h | 3 +- kopete/protocols/sms/smscontact.cpp | 4 +- kopete/protocols/sms/smscontact.h | 3 +- kopete/protocols/sms/smseditaccountwidget.cpp | 8 +- kopete/protocols/sms/smseditaccountwidget.h | 3 +- kopete/protocols/sms/smsprotocol.cpp | 18 +- kopete/protocols/sms/smsprotocol.h | 7 +- kopete/protocols/sms/smsservice.h | 9 +- kopete/protocols/sms/smsuserpreferences.h | 1 + kopete/protocols/sms/ui/smsactprefs.ui | 60 ++-- kopete/protocols/sms/ui/smsadd.ui | 26 +- kopete/protocols/sms/ui/smsuserprefs.ui | 14 +- kopete/protocols/testbed/testbedaccount.cpp | 26 +- kopete/protocols/testbed/testbedaccount.h | 11 +- .../protocols/testbed/testbedaccountpreferences.ui | 30 +- kopete/protocols/testbed/testbedaddcontactpage.cpp | 6 +- kopete/protocols/testbed/testbedaddcontactpage.h | 3 +- kopete/protocols/testbed/testbedaddui.ui | 18 +- kopete/protocols/testbed/testbedcontact.cpp | 4 +- kopete/protocols/testbed/testbedcontact.h | 3 +- .../protocols/testbed/testbededitaccountwidget.cpp | 4 +- .../protocols/testbed/testbededitaccountwidget.h | 3 +- kopete/protocols/testbed/testbedfakeserver.cpp | 4 +- kopete/protocols/testbed/testbedfakeserver.h | 3 +- kopete/protocols/testbed/testbedincomingmessage.h | 3 +- kopete/protocols/testbed/testbedprotocol.cpp | 20 +- kopete/protocols/testbed/testbedprotocol.h | 7 +- .../protocols/testbed/ui/testbedwebcamdialog.cpp | 6 +- kopete/protocols/testbed/ui/testbedwebcamdialog.h | 3 +- .../protocols/winpopup/libwinpopup/libwinpopup.cpp | 26 +- .../protocols/winpopup/libwinpopup/libwinpopup.h | 7 +- kopete/protocols/winpopup/ui/wpaddcontactbase.ui | 28 +- kopete/protocols/winpopup/ui/wpeditaccountbase.ui | 64 ++--- kopete/protocols/winpopup/ui/wpuserinfowidget.ui | 26 +- kopete/protocols/winpopup/wpaccount.cpp | 24 +- kopete/protocols/winpopup/wpaccount.h | 13 +- kopete/protocols/winpopup/wpaddcontact.cpp | 8 +- kopete/protocols/winpopup/wpaddcontact.h | 5 +- kopete/protocols/winpopup/wpcontact.cpp | 26 +- kopete/protocols/winpopup/wpcontact.h | 9 +- kopete/protocols/winpopup/wpeditaccount.cpp | 12 +- kopete/protocols/winpopup/wpeditaccount.h | 5 +- kopete/protocols/winpopup/wpprotocol.cpp | 24 +- kopete/protocols/winpopup/wpprotocol.h | 9 +- kopete/protocols/winpopup/wpuserinfo.cpp | 10 +- kopete/protocols/winpopup/wpuserinfo.h | 5 +- kopete/protocols/yahoo/libkyahoo/bytestream.cpp | 6 +- kopete/protocols/yahoo/libkyahoo/bytestream.h | 5 +- .../protocols/yahoo/libkyahoo/changestatustask.cpp | 10 +- .../protocols/yahoo/libkyahoo/changestatustask.h | 8 +- .../protocols/yahoo/libkyahoo/chatsessiontask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/chatsessiontask.h | 2 +- kopete/protocols/yahoo/libkyahoo/client.cpp | 52 ++-- kopete/protocols/yahoo/libkyahoo/client.h | 21 +- .../protocols/yahoo/libkyahoo/conferencetask.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/conferencetask.h | 3 +- kopete/protocols/yahoo/libkyahoo/connector.cpp | 8 +- kopete/protocols/yahoo/libkyahoo/connector.h | 11 +- kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/coreprotocol.h | 3 +- kopete/protocols/yahoo/libkyahoo/crypt.c | 2 +- .../yahoo/libkyahoo/filetransfernotifiertask.cpp | 6 +- .../yahoo/libkyahoo/filetransfernotifiertask.h | 3 +- .../yahoo/libkyahoo/inputprotocolbase.cpp | 8 +- .../protocols/yahoo/libkyahoo/inputprotocolbase.h | 5 +- kopete/protocols/yahoo/libkyahoo/libyahoo.c | 4 +- kopete/protocols/yahoo/libkyahoo/listtask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/listtask.h | 5 +- kopete/protocols/yahoo/libkyahoo/logintask.cpp | 22 +- kopete/protocols/yahoo/libkyahoo/logintask.h | 7 +- kopete/protocols/yahoo/libkyahoo/logofftask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/logofftask.h | 2 +- .../protocols/yahoo/libkyahoo/mailnotifiertask.cpp | 4 +- .../protocols/yahoo/libkyahoo/mailnotifiertask.h | 3 +- kopete/protocols/yahoo/libkyahoo/md5.c | 2 +- .../yahoo/libkyahoo/messagereceivertask.cpp | 2 +- .../yahoo/libkyahoo/messagereceivertask.h | 3 +- .../protocols/yahoo/libkyahoo/modifybuddytask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/modifybuddytask.h | 3 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp | 26 +- kopete/protocols/yahoo/libkyahoo/modifyyabtask.h | 3 +- .../yahoo/libkyahoo/picturenotifiertask.cpp | 16 +- .../yahoo/libkyahoo/picturenotifiertask.h | 5 +- kopete/protocols/yahoo/libkyahoo/pingtask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/pingtask.h | 2 +- .../protocols/yahoo/libkyahoo/receivefiletask.cpp | 18 +- kopete/protocols/yahoo/libkyahoo/receivefiletask.h | 3 +- .../yahoo/libkyahoo/requestpicturetask.cpp | 2 +- .../protocols/yahoo/libkyahoo/requestpicturetask.h | 3 +- kopete/protocols/yahoo/libkyahoo/safedelete.cpp | 6 - kopete/protocols/yahoo/libkyahoo/safedelete.h | 3 +- .../protocols/yahoo/libkyahoo/sendauthresptask.cpp | 2 +- .../protocols/yahoo/libkyahoo/sendauthresptask.h | 3 +- kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp | 8 +- kopete/protocols/yahoo/libkyahoo/sendfiletask.h | 3 +- .../protocols/yahoo/libkyahoo/sendmessagetask.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/sendmessagetask.h | 2 +- .../protocols/yahoo/libkyahoo/sendnotifytask.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/sendnotifytask.h | 3 +- .../protocols/yahoo/libkyahoo/sendpicturetask.cpp | 28 +- kopete/protocols/yahoo/libkyahoo/sendpicturetask.h | 9 +- .../yahoo/libkyahoo/statusnotifiertask.cpp | 18 +- .../protocols/yahoo/libkyahoo/statusnotifiertask.h | 9 +- kopete/protocols/yahoo/libkyahoo/stealthtask.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/stealthtask.h | 6 +- kopete/protocols/yahoo/libkyahoo/stream.cpp | 4 +- kopete/protocols/yahoo/libkyahoo/stream.h | 5 +- kopete/protocols/yahoo/libkyahoo/task.cpp | 24 +- kopete/protocols/yahoo/libkyahoo/task.h | 7 +- .../yahoo/libkyahoo/tests/clientstream_test.cpp | 2 +- .../yahoo/libkyahoo/tests/clientstream_test.h | 5 +- .../protocols/yahoo/libkyahoo/tests/logintest.cpp | 2 +- kopete/protocols/yahoo/libkyahoo/tests/logintest.h | 5 +- kopete/protocols/yahoo/libkyahoo/webcamtask.cpp | 54 ++-- kopete/protocols/yahoo/libkyahoo/webcamtask.h | 17 +- kopete/protocols/yahoo/libkyahoo/yabentry.cpp | 32 +-- kopete/protocols/yahoo/libkyahoo/yabentry.h | 90 +++--- kopete/protocols/yahoo/libkyahoo/yabtask.cpp | 16 +- kopete/protocols/yahoo/libkyahoo/yabtask.h | 3 +- .../yahoo/libkyahoo/yahoobuddyiconloader.cpp | 6 +- .../yahoo/libkyahoo/yahoobuddyiconloader.h | 3 +- .../protocols/yahoo/libkyahoo/yahoobytestream.cpp | 8 +- kopete/protocols/yahoo/libkyahoo/yahoobytestream.h | 5 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp | 10 +- kopete/protocols/yahoo/libkyahoo/yahoochattask.h | 3 +- .../yahoo/libkyahoo/yahooclientstream.cpp | 16 +- .../protocols/yahoo/libkyahoo/yahooclientstream.h | 7 +- .../protocols/yahoo/libkyahoo/yahooconnector.cpp | 8 +- kopete/protocols/yahoo/libkyahoo/yahooconnector.h | 9 +- kopete/protocols/yahoo/libkyahoo/yahootypes.h | 20 +- kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp | 28 +- kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h | 3 +- kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp | 30 +- kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h | 8 +- kopete/protocols/yahoo/ui/yahooadd.ui | 18 +- kopete/protocols/yahoo/ui/yahooeditaccountbase.ui | 86 +++--- .../protocols/yahoo/ui/yahoogeneralinfowidget.ui | 102 +++---- kopete/protocols/yahoo/ui/yahooinvitelistbase.ui | 74 ++--- kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp | 10 +- kopete/protocols/yahoo/ui/yahooinvitelistimpl.h | 3 +- kopete/protocols/yahoo/ui/yahoootherinfowidget.ui | 26 +- kopete/protocols/yahoo/ui/yahoostealthsetting.ui | 14 +- kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp | 16 +- kopete/protocols/yahoo/ui/yahoouserinfodialog.h | 5 +- .../protocols/yahoo/ui/yahooverifyaccountbase.ui | 32 +-- kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp | 24 +- kopete/protocols/yahoo/ui/yahoowebcamdialog.h | 3 +- kopete/protocols/yahoo/ui/yahooworkinfowidget.ui | 44 +-- kopete/protocols/yahoo/yahooaccount.cpp | 260 ++++++++--------- kopete/protocols/yahoo/yahooaccount.h | 17 +- kopete/protocols/yahoo/yahooaddcontact.cpp | 4 +- kopete/protocols/yahoo/yahooaddcontact.h | 3 +- kopete/protocols/yahoo/yahoochatsession.cpp | 2 +- kopete/protocols/yahoo/yahoochatsession.h | 1 + .../yahoo/yahooconferencemessagemanager.cpp | 2 +- .../yahoo/yahooconferencemessagemanager.h | 1 + kopete/protocols/yahoo/yahoocontact.cpp | 58 ++-- kopete/protocols/yahoo/yahoocontact.h | 5 +- kopete/protocols/yahoo/yahooeditaccount.cpp | 6 +- kopete/protocols/yahoo/yahooeditaccount.h | 3 +- kopete/protocols/yahoo/yahooprotocol.cpp | 92 +++--- kopete/protocols/yahoo/yahooprotocol.h | 7 +- kopete/protocols/yahoo/yahooverifyaccount.cpp | 4 +- kopete/protocols/yahoo/yahooverifyaccount.h | 3 +- kopete/protocols/yahoo/yahoowebcam.h | 3 +- kopete/styles/Hacker/gpl.txt | 4 +- 1422 files changed, 12866 insertions(+), 12335 deletions(-) (limited to 'kopete') diff --git a/kopete/KABC_INTEG_NOTES b/kopete/KABC_INTEG_NOTES index f249f22c..02bc5bbe 100644 --- a/kopete/KABC_INTEG_NOTES +++ b/kopete/KABC_INTEG_NOTES @@ -33,7 +33,7 @@ Goals (-ve): *) don't store information that's not worth sharing in the address book gregj's goals -kopete should not replace server side data with kabc derived data nor upload information that wasn't present on the server before. +kopete should not tqreplace server side data with kabc derived data nor upload information that wasn't present on the server before. E.g. we know someones telephone nr. but we don't want to put this information back on server if it was not present there before. Update IMO is ok. brunes goals @@ -414,7 +414,7 @@ A "reply-by-IM" action in KMail such as things could be done. but how? The application could know if this user is registered to an IM by looking at messaging fields -But how to use such as information available only at runtime, like the Status. +But how to use such as information available only at runtime, like the tqStatus. 1) Saving the status to KABC --the problem is that the status can not be reseted to offline if kopete crashed diff --git a/kopete/kopete.api b/kopete/kopete.api index 95a196aa..04084b8e 100644 --- a/kopete/kopete.api +++ b/kopete/kopete.api @@ -59,8 +59,8 @@ WARN_LOGFILE = INPUT = libkopete libkopete/ui FILE_PATTERNS = *.h RECURSIVE = NO -EXCLUDE_PATTERNS = *.moc.* \ - moc* \ +EXCLUDE_PATTERNS = *.tqmoc.* \ + tqmoc* \ *.all_cpp.* \ *unload.* \ */test/* \ diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp index 1c42acf2..3a422759 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp +++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp @@ -37,9 +37,9 @@ #include "kopeteprotocol.h" #include "kopetepluginmanager.h" -AddAccountWizard::AddAccountWizard( TQWidget *parent, const char *name, bool modal, bool firstRun ) +AddAccountWizard::AddAccountWizard( TQWidget *tqparent, const char *name, bool modal, bool firstRun ) : - KWizard(parent, name, modal, WDestructiveClose), + KWizard(tqparent, name, modal, WDestructiveClose), m_accountPage(0), m_proto(0) { @@ -128,7 +128,7 @@ void AddAccountWizard::next() if (!m_proto) { KMessageBox::queuedMessageBox(this, KMessageBox::Error, - i18n("Cannot load the %1 protocol plugin.").arg(m_protocolItems[lvi]->name()), + i18n("Cannot load the %1 protocol plugin.").tqarg(m_protocolItems[lvi]->name()), i18n("Error While Adding Account")); return; } diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.h b/kopete/kopete/addaccountwizard/addaccountwizard.h index 7458d8b1..0b9bda29 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.h +++ b/kopete/kopete/addaccountwizard/addaccountwizard.h @@ -42,9 +42,10 @@ class KopeteEditAccountWidget; class AddAccountWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - AddAccountWizard( TQWidget *parent = 0, const char *name = 0 , bool modal = false, bool firstRun = false ); + AddAccountWizard( TQWidget *tqparent = 0, const char *name = 0 , bool modal = false, bool firstRun = false ); private slots: void slotProtocolListClicked( TQListViewItem *item ); diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index 0e4dae7d..f296f214 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -1,6 +1,6 @@ AddAccountWizardPage1 - + AddAccountWizardPage1 @@ -12,7 +12,7 @@ 464 - + 0 0 @@ -28,15 +28,15 @@ 0 - + - layout8 + tqlayout8 unnamed - + PixmapLabel1 @@ -57,7 +57,7 @@ Expanding - + 21 70 @@ -92,7 +92,7 @@ protocolListView - + 400 300 @@ -105,7 +105,7 @@ true - + m_header @@ -121,7 +121,7 @@ <h2>Welcome to the Add Account Wizard</h2> <p>Select the messaging service from the list below.</p> - + WordBreak|AlignTop|AlignLeft @@ -137,7 +137,7 @@ protocolListView - + klistview.h diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui index a5711037..63e542a6 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui @@ -1,6 +1,6 @@ AddAccountWizardPage2 - + AddAccountWizardPage2 @@ -22,7 +22,7 @@ 0 - + m_header @@ -38,19 +38,19 @@ <h2>Congratulations</h2> <p>You have finished configuring the account. Please click the "Finish" button.</p> - + WordBreak|AlignTop - + - layout3 + tqlayout3 unnamed - + mUseColor @@ -86,7 +86,7 @@ for account: Expanding - + 101 21 @@ -95,7 +95,7 @@ for account: - + PixmapLabel1_2_2_2 @@ -116,14 +116,14 @@ for account: Expanding - + 20 58 - + mConnectNow @@ -149,7 +149,7 @@ for account: 789ce57d5973ea3ad7e6fdfb2b4e1dddbdd5e58f84904075f50564820009848c74f5856cc90364200364f8aaff7b2f692d19039e0067effd9e2e4a47fb3922c65e7af4ac257959feaf7fff75d7ebfef5effffad7db3b7f0f9cbf1c9fbffef56f317d7cfcfadfffe77ffdf7bffeded9dbfd6bb756faeba05cfe6bf7effff1afbfadc7bf9cbfd86e696fafc2357ed0b8b65722cc08537bffdde07dfc7b4eb84ad825ec10b6152eef84ed4e88f1f892b0f9be0831b67b882b25c2cf061f94351e11ae50fbd8606c77f5f997e1fc2afaf8fc21c4fafb421076103b55c415ba7eb663309ddf5388f1f77c83e97c3e099bf3090cc676764bb846ed1383e9ef5f426c6b7c4c5850fb7b8875bb4dc7dfdf411cbc2abcb7b357dadbd1d7ff4598ae5f5e1176c81e2cc4fa7c383718af5758888d3d9ca1c1d81edc13ae507bd960b2d75188d1de2383e97ae8fc8c3dd8bbc1d4fe1a62b4c72561638fb710633b9d1fd803db4b21d6edecc6e0aa6eb77dc215b2e7bdc1d82e0cae21f6f1787c6f6f4f9faf7742b88a583c198cf6f5f7083bd8ce760d26fb7f8658b7bb75c4606fb4ff6788f1f83d83d1be927edfd85fdc194cfd771062dd2e25e11af5cf34c4badd367f4ff6e7e6ef05f1b56230b63b7e88917fa788f777a83f1f0dc6efcbd710637f74081b3edc8758b73b2d83d1fed63e61c3976b83f1efc5b3c1d47f5f21d6c79374bdfb02b14fd773b08338e006d7f63476095710fb9a6f95dd72a954d2e7778038e403b59bfef566884d7fbaa721c6f1726d30f687f74db842df9f8518bfff6630f5e70b61eacf910831f6d70761eabfd1a3c164af3162d35fd689c1d41f03c246bfba21c6fe730893fd837188d1befb06637fb007c2f4fb2337c4687fcf60fc7ef014626ca7bf37fde5ef1a4cfd43fd61fa2b102176341e11ae51bb1f626c7f272c10fb5aff2adcf4b7b747780fb1ff45b84af831c4556d5fb467a8170e1d2fd45bfabee187d33498f830214cfdef39846ba4176d83f1fbee116181ed72cf606ce7e310633bf24d8d57d4f3bb10ebf6e0c660ea2ffafd7da3e7cc60eaff9310a31eef10267eb0af10637f3e1a8cfdcd2f09131ffca1c1d44ed77760fc5dc5606c1ff11063bbf97e05f188aef780f420f83298f8108418f9b04f5850fb7388b1fdcd608eed0dc4d51d6a9f194ced17842b887d7d7efbbb217fdc106bfef867841dc20c31d04f63e7de60f4f7de98f01e62e18518fbeb9630f92bd6430c7c42fe9409135fc42b62c30ff725c4c83ffabd7de36ff6438c7a32234cfdef5c8458dbdff3091b7fde0931eacb14b1e96ffe6630e9c34788916f5784e9f759c960f2dfe510231fde0dc6feb5ee08937e066d83a9ffc95e211f5a21c6fea6f30ffbffd060eaff2661eaffe03cc4fafb239b708dda6f438ced166141f8cd605b7f7ff489b8b683d8a969cccb4eb9a631fe1e377cf19f0813df3cfafe9eb383fcfa3298fc19da07f46857f3959f1a8c7c728788437da813267bba5706537c4ee7b36ff4283098f8d0451c8ef74fc2c6ff3c194c7c9810367ae28718bf7f48988eefdf1b4c7ad0475c257f327a0831f667c960ea1fba9e2af997119d8fe9bf911762fcfb03c2d47f41d960ecaf80ec67fa6f340db1d0ed7b842bf4fddd10ebf6d18c700db1a37fffa06cf4c07f475c29eda0de5c8418fbff9e7005dbbdb2c1d4dfb6c1783c59456cfa4b4c111f90bfb00d367c681b4cf1e06e88b5fddd5bc2a40fce8dc1143f1c11267fc0bc1063ffd51157491ff87188b1dd3198c6ef35611affa391c1d47f92b0f10774bda1bdc784c9dea30f839d8ac6743e3541ed5f0663bb83d76f97ab656d4fe788308d571bed6187fa5e415c11d85fac6930b6db6788f74dbce011a6f1e53e2036f616a784c9de828e7740facb3f0c267b8b10a3ded2df1b7b3b7b21c6f1563598ec4de75725fd0d060693fe5e1336f391a1c114df55438ce38d1126ff2b74ff56cbe53de4ab731562d4bf57c2646ffe85b852417bfb1ee2fd1db2ef04f1c10ef947df60b2678930e9993498ec252e111bfb04738cf3911bc2a45f6c1662b4cfb1c178fdd2266cf4ecce606ce7747d55ea6f7b6430b6b3d3106bfbf10ee21a5d8f13184cf6f50d26fbe2f9d865d20be7ce60b2f73e6163ffcf10239f6b84ab88bd27c49512f98f6fc4fb3bc85fff8ab0c0fef2e9f70f76f0efc5036133ff7b435c257fe13d1336f3f9ab1023dffb84c99ed6aec1682f41e75325be3b3d83c99e74fc1af1db7b08b1b61fb3099bf590db10637cd13598e61b3b06937f217bd5c89f08dd3fb5bdd0fe8706a3bded2ae13d6a7f3198fac30d31f6c70de12ab6bb32c4badd3d21ec507fbd22de2b617f786784f710bb1f8449bf3cd760d2af4fc4a6bf5999708d8ed73798f8503198e28f63c4861fee2e62d3ffde25e22af90bef2bc4d8df25c2d47fa28bd8f41f3b0fb1ee0fd1206cf4e93bc4e80fa60663ff5864cf1acdc7b817629cef550dc6bfb7fa06e3dfb337c2147f073b06131f6488912f35c47c07b1a3f5b4e698feb6f70957910ff681c1d82ead10a33e4e089bf84f1a4cdf7f0bb1febe6c198cfd278e10ef113fa56730f183ce2fe4cb28c478bc2fc255e24f8fb0f93d3aff4a09dbdd5783915ffc89708df88be3c5d9df217e71c2a48f1ef6bf63f4dca7f6ea0e5eaf4fbf5fa578c7ad194cf3893661817cf5070693fedc1a8cfc73a93f42bdb00913bfc44b88b17f9b848d1e55438cfa6d194cfc1913a6ebf35f0da6bf1f8418f9776e30febdc3428cfa45f6e634ffe3f706e3f7ed5988917f6784cd7ce6d5609a8f687de07b864f7605b1e18b7d6d30b50f081b3d7b3698f48a1b4cf15383b0e1fb95c1f87db14798f4490e0da6fe75101b3ec90961d3ff3dc2a44fbc4958903fda451cea139d8f89c7fc6fc4b51d8a37ce0d463eb99f84cd7a638b30f1c7ab1a4cfd593698fac343cc8dffec1a4cfa766c30e9c97788757f499730e919932146be1c10e6c807bb6430cd676c8369fe42f6e392fa5ff3853ba6ffec3e61d35f970693bf12848d1e3d194c7f8ffde984f39716619aafc863c2a6bf1cc282da0706a37f61743efb145f48c760ba7f42e7bf4feb6fb24998e26f7e1e626cbf3718edc5d0dece418dfa7f8ab866f46948b842f1ce09613a3f798a98937f72ef0dc6fef276091b7d9221c6f5b40f83893f1d83c99f3408738a972606633b7f3718fb9399df97a4171706633b1f21b67769beca428cf3533d3fb2f7c2febc406cfad3ee194ceddf842bd45e3798da1b846bd82e1e119bfe7477080b1aff6d83e97eca3ee203b3de7519621ccf7b88abe4dffd67c49cfacfef10e6148fdc184ce3fbd160b2974f58d2787d3098faefd0608aff8606937d6b888d7d6537c4dabebc4f789faeaf61307edf3a0cb1febe45d76773c4b6d6175b84f63d274cf6751c83a9fd8930cd4fedaec1d8cef0f8c2ccaff8b7c1f4f75f84a97fbd23c2e6f88784496ff98dc1687fd6426ce607f2c8608a37a684c93fcb3162335f9075c2343f967d83e97ee13b62be43e3fbd060d2eb6bc2d4fffe29627b97d623ba0663ff8b196163ff2661b23f1f1a8ceb05e28cb0a4f61383b13db0103bbbb4bea07f1fe4d0d8ff12b1b1bffd6830e9e13361b23f170663bb27099bfeef1a4c7a6d8718fbc71c8f7edfb6438cfe32c4a47f1f880f0c1f3a0663bbbc234cfa289f428cf39923c2f4fbf2d260f2df17884d3c26de119bf9af7b6330cdcf1961d24f796d30cdc7cddf537ce6d2f9193e78fb8425e9fd0b627b9fe2c303c29cd6333961d203f66930f6276b207676e9fed1bec1a4479f06139fda06d37a5410626c2f13dea7e30f43acdb5decbf707cc90ae2038a5f789d30f1c3b93418db99f9bee1c7a3c1e42f2f08131f1cf37db39ef510628cd7a7884d7cce5b21467def188cdfb7e9fcab153afe89c1e84fed63c234ffb4770da6fbf3738cc733bf47fec3ed1b4ceb6d4dc4c69fbb2d83295e32ed86bf658369bd86ceaf66e6c31706137fcf101bff2f0d36fca4ef1b7fecfb88ed5de21ff597cd697e30232c49affa0653bc80e31ff484be7f6b30e9cf8030f1c51911e688472f060be4974b58623bab198cedb68558ec22167a3c8a8ae92f5e266cc6f7a7c1942f7118621ccf55c2c42fdb3198e6ab2e62d33fce2d61b35e5d236cd6233f0da6f5ed53c2c407716130dddfb80e31e69770c4263e730c36f1c15388b13f7dc2d49f9c8e67ef92deb821c67850188cdf77df0893bf1715c2e43f5c0bb1e94fff9230c577eea1c1d85ffe1d618a47f8d460ec2f3e436cfacfaa13de47ecb4432c353f9e0973c41ced2f0dffb9446ce22b7b4298f445f60c26fbbd13267bda8230e9af1c194cfa4dbf67ec297608efa33d9d6fc21cafd73d3618ed257cc2640fb78bd8e82d7b21bc4ff7ff1f0ca6fef10cc6ef7bf4fb0e8d4fd6262c299f686230e9fd38c4c857e48734f6652784c9becebbc1725ff7cf056149ed2583b19de9f10d07377a3f214cf6f41862a32fde21e17dd2f706614efef9c560d2f7b6c1b4ded63298e69f6784cdef750cc6bf77760cc6efcb1a6287e2617b4c98f8eff40913bf050f31f2db264cc7171f06d37809dbb1bf64d88ee343760c46be7b25c46297d6131e0dc6bf779b06933e8e08ef93deb5438cfee5da60ca0fb93298f4e2dc603a1f61308dc72a614efeefc3606c970f21d67c90645fc30f1e188cfcf0881f7297da4b0613bf7a84f711072f21c6efebf98094862fde3b61b2bf87f680f144b84e98becff609139fdc03c482f4cfde3118edcde718fdd53161b2971f10e6b49ee7184cf9575383d15e3e9d9fa0f129a4c1680f7762305ebf7f83589af8bc6330d99b1b8cdfb71961b21ffb08b1febef74298ce875f194cf66f85587fdf6a1096647fade7eebeb11fab8718fd9d242c69fda48218f88ced6f8449dfd81561f3f7aec1c4b757c2743c16184ceb2fd42ee9f8bc6730b55b84e9f7bc73c2a4175e3bc4baffbd538371bc7b8d10ebfef6ccf1687ee50521467d0f8f4ff6168469bc7b8f06937f1b1b4cf63e33d8d5fdc1d11eaeb10f7f216cec8bdf77c3eb3f3498ae9f11a6ebb76a06637bffdd6271c5e2f05f6e6a28764c6dc337928a43b58022a98e2f3614178a5c2a22520bcbcb55e61f3fa63625c82c2328636daf07b8cec7242bcdad654ad46a11eb71b21627ab2cd7a6c8258bc55bce8d2972a1466bc8dcd68afb284b8dc822e3382badf267e9ea633993c21b27526773862f5df53267e4dabc79da8a3386379a3baad6fcc9c99b04cee0ff4be78ce14d3a67e2782397ea2867d2b893fc79a63aca9958eeccf9a35953acdea473a658bd89e3ccd346bc19476a558264fe6cac3771bc594f6f56392372712699378633997ab330c246649f4ccefc32bd59df4f6de7a3bc25cea83a30dc09fdd7cfe84d3667d6d59bcdfc94b15c3a6762b813f2278e333c436bb6e3cca67a93eca30ad29b857a62f4e71feda3d6d29b65aba1fe6ce0a39cb57cd4b67a931d136fc69915bd519c8916c39f141fc56338537c4c2cac6d63e2f57c541c6f5647dc24d49f5f1d136fab37ebf9a974ce048b9c59e6cf1fa537c5f9a88df486ea891969c89f1c7af30f8a89d3f4264d7ffed131714ebd897267ae3f5be94d968f5a7f0efec331719adee8f212d693507ffe61eb366b702658e64cb40ef9f3bbd76d7e0d6732f54671467f5eb0d0fcf43fd547e5e74d8a8f4aac0d7ff2fba83f2dae491a316bf928d29bc9327722fcc9e3a336e14c3e1f953d8f5a7bdd268133b13e6a65e4cd3f2fda3edbfba8fcbc89e3ccfa7a933d8fcae7a3623993c19f227c543ebdc9f651f9f4664b1f15c39bd072da3eff241f954f6f523963bd52fd16f2e71fb76eb3e0a3d6d09be53ac29f7ff43c2aafde28ce58eff33ac29fcde7517fe0bacda67ab364ad77e2cf7faede64f126afde443813ad893f7f928f8ae74e1667b262e26cce442df86e0af1a7889838596f36bb07bead8fda486f748de525963fff1fc4c4697ab35c883f7f4cbecd567a1359b7595b6f229c89d4ef217ffef3d66d8af251b1bc31968bf0e78fc8b749e0ccf67a93e2a39639132dda3e7f50becdc63e6a6acdac0feb730dbd49e44cb426fe6cefa3a2dcd92c26cebc9799c0992fb0ccb755b71ad6a175b4898fa2fa78993b217ffe43ef2dc0e7c43ab59a56cb3a03eb9c596dab43ff3f8e33510ba57246d7c750bf93fefce7c5c4ca325debdcba20cb60e9597d1861ab7af3665d5a03ebcabab66eac5bebcebab78656295e6f12f5e74f5c278e5bb799c0b5ee58bb5679c132a6ec59951885deb70eacaa5563161466d5ac2ae3cc660e58e96d853bef9191769cc99f641ff5ebe7e0ea0a064c3009e369d532ba3097a95f5abce24be6b3802c538bd42336660fc0a564fe94427dfebdeb36d97a73c91ed9137b06156ec55b864a0bacf7b5a8ce6cc25ee6dc59a85fc1466f60a3e3b9de2cab74027ffe989898bd5b15366533abc93e522d43857db2afd067a9f2c1be597d853b919a35d8a11e690bbc81f216f2e78f8c89991a195fec881d6bdf9d69191a6127ec14349afc127b674dd6626731dc89d66deb9a75623d7c69893fd9317151f936297a0357f5ceba309ecec163276a4da2852ed82372078ed2637d76c906ec2a9e3b218794165d136f42eeb09b707ef1c7c4c4ec169466caeed83df8ee352d43236cc84a70a44fb6c3765999ed817d2a6c9fbda673087cda81e6507484cdf9f367f8a80a8ca7aa75ce6a192a9c5e7adce28c73283677b860975c3d99ee267167ce21ee59f78a33863b0bfeeb77c6c49f30121eb90ffea9c9832d2c43858ff8983ff047fe04dc51fcd9e3cf7cc25f12f527d421fe0a3629adf0e737c6c4ca3ff13776c7dff9747bcb60e133fec13ff917ff56dca152e70d7e98c921ce8f903b544a217fb27d54be98789d75e22ff6c58fad737e02bebb10cb5069b1637eca9bc89d90432db0d0593a87789b7762f8b3998fca5eb749d41b5061f04f569f8fd849a1963123accbcfc12222c21f552e6094a5ea10eff1bed6a09229a17db6d59bbcebc49f309e2ed929937cb0950aa759e78a5ff39b2877223a74cbef527d59438db018fdf90531b18e6aaafc9e0f79e9672c43fab3c37757b813165e563be3257188efb3871cfc293abfef931ff0375ee535dbfa49cba862339bdbf62a77e6853fdb8eda9d8a9f2d73c8766dcff69542db81f264ec46dbe7677d14a8b03de2ef9bc4c29b147b6c3f2471078bfd683f71613fdb13fbc596f6abe18efd66bfdbd3397796f85374be0dc4b0d609f7ed9975082afc435ab3629d0ffbd3fe4ae68e2af6137cbeedbaddb00fed23fbd83eb14feda6dd62dff699f2ea863b7690c99f4d7d945661f04f3556cb37ef2e4a99edb6dd49e30e943dbb6b9f83752eec9eddb72fed01942bfbdabeb16fedbb2877ecfb903f9baddbc4c53523ebcb1ad843bb04e3e9e2d75986b467c7de4de70e58e7097853b6f7c03eca3a15b0ccbe7d6057ed9a632167a2232c813f1bcda3742cec3b8c9ff0d9afd19a25eb30873b7606771eed73c781d1d57384e6ceb5231d69571dd7f11c1f3983056c35e7cff67a032aec04d6a13302dffd8bb466b13863e7c1794ce78ed69e73b0ce85239c277be03c3b136d9d17e7d5795be68eb2d2127f36f1514a858fd9051b3aefbfc732589ca9fd09d14d86df02ed51ca7c01d6e93b33bbe27ca8d1e57c3a5fabdc5175447fd69f477d5a53ab032aacc653eff7594615185bdf10f5e4f15bdff69e53771ace73689d43e788bd2f2b3316e2cfda7a035a73c2eeac433e2d6245a280d175ec9c64f8ad4be7546b8ff15ba0ccce04acf302cadc8c7246d54e4bd509fcc99a474dd99373c66ace2f8af87258a76373a79ba93d0dd09e8b88324f94df02ed39c77827ca9b25fee4d59b23e7c2e9f181d32e784562cbe2f49dcbec9859fbad7a44993f803d03e7cab98e7287dd18ee382db24f1ebdf1f8817363edf1198ca7dfa8c271c5fe706e73faadfa82dfda07ebdc39f78ebadb1cc31d65a5087f92f26d3ead236b669df399f39b3c77867598b3e374d3b547fb2d1d333bf5302a3c50dae3ec72e694adcb2867d447d5217f92f5e6d3fa70f6ac323bf9d915896d0a287365d398d9d9770e9ca1530506c47027a23fab3e0a223eab0b51cd1f6c1955d46a46e67c6b296686d125292aac394361818586ca16cbdc59e10f7187ed08e6f4584d47c2bfdd02a9dc19434098bad69316330b877f0ae10c61840dadaf450f6ffb682b6d9fb9dea8f174c387ce1f6f192c420a37db6f25c4cc87c243ee280e5947a83dcb25e48f076370c73ad719127fa00ac7159b093f07774cccfc043173681d116865d6a38b46d89be2cef247d9478cc498cdacf27f0667a8b4acb278108f5931b3f25b919879606266185d4f863bba2e5b5fcbdc11cf649f0928cdefbfe27c45b1fb42bc8857f126deb3fc564acc5c9b73070bfab0b94263adc7d7efbfea9c9c817e6c8a297c66a03d1f196b3da931b3f88c70c77cfc396fc4d79c3f7fc095e7b00c9f8a6f51170de4bad31187ebc6cce2086366712c4e16b983c53a5ae48eb2d01fcf1fb00c3b1113712a9a913b8a2dd14ae74e749d7929663e748ee6aa1cfd5853ab14e58eaaff60fe34b465ce80356dd1598c529da9ddd93c6656ca1cc71fb0d02572475be7f90fe64f8f9d305774445374996b2d65d7897371b145cc7c2e7a4bcc299b621de951f5352f7f1c7f5a3ce03350e1beb8e4b578bfeaf4950532b4e7dcc4cc641db3ce7c0531730c77421ff636e7ce9fc61ff60196698b81b882729d14a5425478933b66de8bc6cce0b75ec4ad8977568bb883115631dc11aa3cff21fc6959753e10435102b5394b5dcb6e899d3563e667a33d30a3d8e59f49dc218dd63e6caed07f007f2e9c118ca7328ca8093bc9fabe52e6cc98f9313e66167bea1d24ab9c59a80fac4bc31d55ff56fef420a63903dffd2daa3967372d51cba13db131b3b424935cdae26e993391ba4c23cc78f9dfc59f16f8a74f311355d14d52e1b8628f378f99c17d0995fd2b652277ee8c0f43eefc1efd016bb4c54cbaa221caa0c76bfcad90cec9a631b3f4a46f33d5333288e14e19b9837538c27e397f603ccdd83d78a72afb5c3bafa32547e9f7475362e61739960f64e5b2e2493c77a23e4c73e897f10794b7c9eed931ccbc73a8705c918ff2493e6f1633cb0928f3391deb42be44f566ce9db094e5eb2fe44fcf1981e79e88013b8619d4a6a3f2cab975ba9be566c837f92e79e4581fc9dcd1057dd8b39c927d7eca322d71cd6bc09763b0cc1a2a1c5784bfce3af362cc2c67f26321da6c8acf44eee8624d6dff67f9c34bca73c378ea8889ce06daea78ce54e6cecd50ca3c5f490565fe22659e1faf25bf13b983458db02fe0cf4fe84f0bc693b68c74ad762177875afaeefa9a3133adc2bfc83af8f5e5637eabbb82f1b30c9aa96a1f26a7c5f2879d404c53569c010e5f17c343d99087f268d398591e8bcaea71f94c9eac72262c07609fa9755fa8fef4ac3270a62c5d5e734685642fb43828baa8ca53d9e4dfb9e6eb4bd601656e2d2af3bcc82069961af161cf85f0075418bc535569308ca742b217808743754431649ff24cad85e58a997b2b31735b76e27f4376395be10d71076b1861cfdbf247af9757e133b49ac5e490e9e85a1d114628734149cfedddbcf9cc601db110337fc98b25658efc8e8e82523448adb66ec19f169f42ff76d575e89ccced4728f010661d5d760cb61e5034d0923ddbde2c66b66f64dfc4cc71455c6affbec099c55af9b00df803ac81a8a60fcad08078af5ec45d45a5c260eb861aa1e27a3ef3b0c7f2326bbe9e18330f44c51927ffa633925749dc51d651770c37593f84c8660231cd80cf8a51618806aae21b78d8e6b3451e4a0e3173f67c3d3e666ec96b185b29bfcd3ec47e3277d087c9d74cfeb4d4cc493f5b125e91552f2887ec424ce48da82aa5d1cfc92db5cb5b79b771cc7c2fb37aaf659dab3bf08b9c41eb989a3da6f1077a53c5320d5112ddd5b3dfaa80ef8611da8719ab9b3442e5b938dc2c66b60fe450fad93dc84ee4c90a77168a95a43f2de682875596b9541f7903d751906580355559125535429373edf995ad9f15d824660665aecb9d1ce7d293bb7afe558ee38eae0f56f9a3c69318805a5e01f72fc3cfa408eb881958e652c5025923d41e3b95ac9839299f593a7131736c2f9ca879463c77b044f9037e4945ac5d79b3601962d076f36f3e030d86880054fd243b4e723ab29cf31ed76accec4996d7a7f240ee257247d7c41fd05c184f2fa00957cb960947d8e786d6e981bf9b8a2b155be78d9340992b1bc7ccfb6a9d39f7b9a9383a813bd694eca362e044cb849feafa3e0b54f8126cd3d1599eb9e324f9982b37233e663e9017eb9c27ab89cf78eee0a853f6c9b40c7eae60469edf3201a830589d4fd7cdf2e457b29795cf9c12338f613eba4e0f063288e38d29da3e79aca346d87dae5f6d011f4fc51462e18b4d7219654d5e6e9a9b211d77cde7a3d907afb92c9e3baace6f1ff894b2ee39800a77455dbcacb3a3d162713ace6dceb59e9598d9e572833527a72df75679230e84253ed9ee3af691375639f657302770084a83bb116e64196d9db1bcdd629df91ee6a36bff26441aa7216f4ca4d893576c575ef1cff5ec2356ef3fb4f4fd893ed8a60cbfb4b165b0b8362873465e5852ccec3a6e7ebfb5d0bb70fe56c89b3bc51b79a5b8a3eab5c6d725d821ca60608d74455b5c16b397867a8a4bd9609398d995721cb3d6a3f216b39faaa95bb3b965f8a7e18eaad7b30f302872471866f243765fccda0f28db85ebf29bcd6366d75b3a660f7ce8199c7533eb2e365cc137444196e14cb45e933f9730532d368b5c6b179f4ad7f5dd20cb6f25c5ccee48ceb9a3f619bd80313370c7ee835428f5f77909e69a65b63be70cd658d6b64fdf1915671de8e16b8806be45d37d749fdce7cd7233a425efdd89b95a98dbd54413bc6835736fa1160fd4bd28b5fee4be28be2c726703fd519f4e015aa3c6e6b5551665b892173e73c6e2c3de5d3766c66700417b5edd37e527606ef709b3c72acc80db199188e698d5d6592455280d71aa78b3c89d8df80351d0967eaac54ea0d7666afdc744034ec77d5f2f3743f92d8c99e59b3b05ce0cc44496c08b4e3277b500ad13d760c90158e6252c7d775688fe5ceaabdad03abc04a353dd9fb864c791fd0d5b10333f65694f52ccec7eb8c01ab04c29c7c8575a37930db00df2665ebe45ddfd5ae4ce86fcb914e50deee4b4b08f813525880616da9ce9e631b36cb9dfb2241b39d6c2416d980bda545de0cdbc5cbaf542f4e7527cf3e93a5a03f14519faec05a283989db56c2676d2f77b4a8e99417b1aee61f639b00f76a27ba7bac29b79e9bb4785e8cfa55a37ce671d359e2006e908b59e3a8bff0ec4ccf9f3992f96d799dde3ec73003fd6d6b689e78d295d8806567cd846f6b9841968960af67416bc5ac3eeeabd8913bee774642fa7df5a8d994f643fd5976a6f2fced45dfc14decccba57b3ae70e5a6843fbf4ad768a0a072a0333cca54bbd027b2c9f368e99076e8aa7e081ce763ccee4cdbc94c43e2f427fd45ad0716c1cade6aa2a37752006a0c2d9ebcc53b7953f665eca67f6dcb324ee2ab501251ee4e4cdbc348d75b6e4cfa5682ce98952e1a6ce8b1ac01c2dd7ce5ae25c2bf3a631f37eecfd5195d3a79e5428e7e4cc426133b75d88fe008364233a7280371d38a789cab9c8ebd7e4a3dbc9e9b7966266959be176978f07beb1aef3f1ab31dce80ab512decde04fd73d573eac00fe5c8941f48e0f9fb2cff5ee00296596cf39d67a626266fbc65d5c858798583dab00233b8e177dd19655f75c2a2b657108a220e40f968deda366f2f1efa0c8574099377f06d0ed45720a1b6ab62e1be15c6a810fe214ac5277cfd51d266d9d2c0deacf67aa5bf147ad050d379fa90ae9f633e75bc9f9cc46df202686592e7aa9451ea868742aea609d29cccb4ab935e845b4c527ff44fe6c181faad1d565f730dfd9346ba1256f73ecf794f00ca07ba9e329506298a7df83ea2d72e005e652a7a2ae59730a566aace9c32ed54c7563fe5cc168eee83be85bac1bca4727c7fdd1f933803a66bec67c6677a0b2bdc535c47df74b737054616d19f74129c0263ecce9b957ca32c8a135ed53d5d9a927dbad21daccbdde34661681ab72499a5a8997e64f62ea8ec1360f42adb8adc79905feb9b74bfce9e7b04c49e58c59f5ed73c678c9bdcbcc294c8c99dd57f71e2289c5981854d81d826da630aefa397c5456b9927b3caa3fd50c1dd6195e05e48cb5f840deb825772747ccdc885d6796eeee625fc3f1cedd32a8f0299ceb375cdbe6bc89c64ad3287f20124fb24e570cf578da3a739707a0a36df09e8feeeabef0396366d09e8abb1f9d6fbb47ee50dd5f02d6bc6cc999c5d2746773fd81d964699535e033cfacba8ef9b61b512d09f31ab88a32a8fa1446d7815b4d7f8e2b69af39f7c4ad191f235edd32447c256077564cbc49f916afea3979bcffce4ec01651ebbcf01a9fe9ec826db566a62276b0fe0c62018a593ccb7ef318bfc8173347f7cdf0b867abe3798e3b26cb14c9996851198077d6d4c2fcf016ccb93163ac2f5d3e60ea7d145b6a0d2f81f705bd942e44d90b19989e608c1fb27dae12bdd688993dd7f3dc23cf81a32aa5c9130b6f54d8b1546f18a979bebae3aced73a673904185f5782a4085617c5645496534affa3b8fdee5c6aebc112fe78d991dd71b83d65c16e29f92e7efc710716a76f092f7a018a4ed83ebb3257da771ab11c54e2062ab8b36af25fb3bef317c67c0abfdc627bc9e2766f69ebce782fcd38b38f5262a965bf8ffea898fb2b601f532bbb03eace29effd259511083549d110fd2eece792f0bef9b5023ed16f3c562f2992966f65edd1a68cff61cb97287de1bf4e0e582bf2b8ba17eba66416f9d9173b398bfba616968153e52b93f9a85191c04fe2cbfb3e4ca7bf7a6f2393966f6f8d67af32da6de0cd4eb546bd79c8755fd245f5c9e5b8b57a5dc8e3ffa4995ba7805ff779d3712f062de25c9cfec377be27dc43f03e87d7a5f5bf1e6d273bc199c675f5b26fcff4a6dd2f416ae8d6dcc9f16073fe27deb5daf7aebe4197a56c2bb930ebdba7d0cbe2b2e66de5477be45dd7bf31cbdc2b1700c760c114796de5eb0bb4df8036a7e0c31c891bedbb7b6a27b8de4f76fd9afdea177b418337bc79198397fd12a0c5a33d5aabed836d4194139ce951dafc51f95c5d486717c22fa10d36c382abdd3d477b8a9e8b1e9b54c3eb37716c6ccb9fd13ccc986708eaf5a85a36d2f62201bd61af9d1ec33277f5a2a02102f6a146f9e9d40fc69a7bfc34d7dbc8e3c525133684f17d8939f33dfee83f70ddebbbd145b57d588d22be46baa48267f74e69b00bb80d6548bd867d33bcf7c0f20fab40bafe7f5bde53825bee09346afde0c228cfe4a7b5574acb656c9b5cf37953f3af34da8fe38d5bbc86d6919656d6fe05db1abf93b93e26bdef3aebd1befd6bbcdc199ae5a1903ad512abc1c5b574599ddf3e9e6ef004ae00f58c6aa4b57f96e882b8b78b785da1bb4ce6b30bbbcf3eebda15762af89dc09bc1d6f379333ca326aa51958a39e6488f94e59cda4b69b65aff24765be89337105962925e55cac57a0f7d4ee6bdf6e5965027b656f0f3e156f9f5dad72871ff2b677e065e65a0898bfcb2a8cf9573d53586e1fa835f222deaab5c01ff5ac695994d5ea76ae8ca3ecd212d70c021875a7450c350f7b5ecdb7bc3ddff299cf7d5b8fb4703ee63bbef065066fd4cac629447c93d8fba1557517b7b8774745f9c33ee0e8d31c799ff98ad22e95655817dd793460339f29eb680bb9bee7fb7e80dcf147fed87f809e4fe64d573f6954f7263093efc7cfbf798d0ff27b1195ff92be5bd3227f22f3d72d0a66ddc0954e656939f7c71bf88f681d2a4ffe337be53d7fe2bff8af29fe49dd4398ba653d838afb4e55edfcc1a7b9cfbf057da6b2a69a2261078a55fe1450d4086db37b350220de88e1a1dcf1dfe6d681ffbefb53efda9ff91f89bcf906d69c026b1c1d0bc7acf5a91d63f4fe16b99faa54f75cd58c552b6cea77ffde7efe3ee79eca326ca87b2c89b93f0dffd3b742ee7c7915ffdbaffb495aa3c6d3a9acba476a3d35610e3660f7e22cb712f7f45e9403600d3e6994f93785f007e6aa308e8ef51818a62ba37f48da730423ebd83ff14ffd660c271a3aa7fe0174e67525160e79a3f677819ec8a7c40dabce3e613c9588d939af6d4bfee03e8f1d7d5fb79a23f7a7e1b7b475ce80396dbfe3c7dd7b5091f0a98ebceac93917d2950dbd2f4a9ef3bcd0f7e9d59a7b69ddb78c6ece1f959baab303fa6245859347a17f0ef6b9f07b7edfbf649fc0f126a86a0d8e33d4b967df2a075e65a4c4c4c273bd9928b5c91513f7f8148eae987da59f345afb3a37e28fcaf5aee9dd6dfa6a656c8d28ace10ffc2bffdabf991f4b2b97ea617d15ea6eaddec5e5cc6aca06c4bf35b5031e7c3aa2a3f6c163f760d53c7bc600b32927a84fccde8805ebf247ed4ba733534ba2c107ebcf6bfc5bff6e71d719b52392ce3650eb34670b4f23b500f5208e0a20a2bf863e99eabb68d9fb6a7c807f9a687def02d3b67a3e6d0dfeb4748ea1cac9ea027b36da0373b1e89c38ba0ea8d7e161e23942e435247d9f14f196d17cfc6127c0723d57068617b25389de1109679965bd9fdbd6c7d44f0b0e74945db60a7bbf5d267f7aa0050dcd1a75ff30fd59bc9c7d0cec1f90cfce99099c517accd56ad855da55ecbb9ed3f8c367e657751e7c01bfa6df64f1ad2d3329666d8007e0fbf01c3b108515fe66a524fe0057d5ea4a55ef295bc4fa4f4fbfc9a2a4229782d8df82c8eb05cf117cda0fbdeb39893f2aea83f154c8af72b54f785f74554c57d0da401d987da5720974a6c9f6c76b6966c7ec7194c49f62de1da7b338ae74943401df5c04fb7b3ad7a40f0a36b4ca45f0108ed1d46b4a03a1fe4f4efe6c5d940aeb5987de99ae9077ecf2a93e62033cf8d9f67b356816ccf45c55451767f1fbc526f167aba2d8df84b982bbceaa43aa6502b552037ddca115e5edcfb10711cba97a0e56ccc0fb25f2b060fef4d8a7ceb41aa88cb1625418e28b3e5c89ce2c2ee65d9a6abf10f7017838d3f7df53bf5b187f54e48a6b3f35f5bed442fab80e766eeba739db3abadefa3c211a3856f99c6acd285fbc5e047fd43e1c6ac549dd85835f2d648556ccf411cbecb3a87d3af55e1c53a5c26bacc26ebdfea3b97a0ebebba1df74befd2e926ae745b5f2d95723b4987d3a81d92f6a2d8972ffd73ac72df873c18e5586adbe3fb9e5130758f4ceae53508609e58816c043506138a28a72371ba11bf147cdc94edda168d0130705ccbb211ab874c730fffdcc9f69955a80d9e029eaa05e9f69fb74e6e18f93f22cf2728138b32b5ed5eab6be8e62f60a2f83ad4fa1a78bb18cda934edd199faa3c9f6dcf51d987e7dbb1a6a572e9dc23b5076631f7c9e018ea6d9dafe0bba74564a35b180d9cc211bb96daedab8073d4fc61d93b50892bef4ddd3de7997bd8e5e6e1b7bad707ec0f8ad971098ea8ee043dc846319699f3c7bf4f7bdadf6a7b8e5bd6efd8dd3a3f1afb18a28f57cf5177590ad12ee4a1ba7f58b5eacb59ba45f0c71fb2b4797a3d3d9f799dc267b2e497203e730b7a0bb67a8ef0ca9b8976e68e48f94b5ddf97bc9ef3c769f93b3fb57e8257a177f93af6dedc3244d7055946ed7beb1e79dfcbef46ddf8787a5f7d770c3c1ccc67bf9a3fbb7e990f7fc83a2d1d0d4c41bdbe8b9973ab8c3ff0dd257f0f22be42d620e1d3e35379a3f2e4f433c791366d9f8abfcf64e16f37c7dd53badec43d5fd8bf7e2bcea868c0fb76c7b26115a185fa1dbd100dbc92c2ae7c47dbe7404efd6a613ba837f4eada8518ca2afc6ab990b51f9d250ab1e314fab85bd0dbd87b6a9f195982119a922747fcd9f587d66141bee402c6d3b77b242ef58ae1d657a2328b614ea69ef06817c343f6a1ded1aba20159cde221f207ecb3efd7b6bc7ba3f7f7121db56381e6eaf67dac76bd55eff669c3cca32015d6637ee63e00b373652b137f0efc0af78335f74e5efc55aba9e73bdf85acefe9bd58d4ce912a9fb9181eea1dadca383bcabf5f6cc89f037f3fc88ea3578aca4dd5ef4c6eeb8ca342661d6a7723b5efadfbc0b7e534f150efb808dec93d8f57e174fe04dc3f08b89c3ac13a3ba8ab5fe5039d4b3715e5cd9fc758e061e08c60967705472c669db901aaeeca8628a9a784d7d89b68993ff829f39c5907309ea6faedb76dbd1359212aac72d0847ece9f7d16c343da9bed34e7fe88a9fc5123ccba0fec2cf6e97790374547e7784d0a89f85a94f9d657996f85bc958fb244715d7fbbbc9005feec060eaba5f5b1d506f677556ed75a3b4426f330d07b85bda87b5039df509d51d43b4e34b3718fbdad79f837ce2f0e34870e200adab392e201f53e1f75efa690f7c499cc37f5ae16765f0c0f693f3f9525bae13b7a178bf23d863f8150ff15cf814c99a9b60a51e1867ec3cf44cf92abebbda13af14a304b54ed19552d261a50b1b5cae954f609dc70841db0d2f20cadc8a29f3f9ce86c857e51d180f6dcea6d59a0c24544a56af60b637e204aea5e9eb68f40fee8e205b9dfeeb35ed1996f65fdb45621ecc7b717eb0ca5925af32d86873a8ffb4565546034f077549f0fd44c959d16338a22e542e7acab5c9d9762545867139575565ba30815c62c51bdcb9b3ac7e69c87217f7c2a813f64c5ad05b59c91fed5aede13a69079b79ae3d1d371c3627868d5294bf44567892eb4cff9830aad46983d2be24ac4b5d237f5abd22d26e7426789ea5c48fdf4faf63c6ce92cd117fd1459c27eb19a3f41c81d5d336fbb7539f601ecc7bd2acbc5bca11aa2d201f5703977ae7e4601152eeb2342bc94cc43e48f1e612333ca8231df34ffa2a53349750626cc2d0b7937aa7e0e563d6d3028e24de9c8431dad63de69c69c4cf327c21d5d3f780f1b446c1752bfe95254d5ce9185f4b1ba6fa3b244076ad7a6225458c71725fd1459275f9628f1c75f2cfc0de619f97f59c5200dfddcb97a4ead889c0bfdd658b5f7a57adbf0ba3917f145e7d25da92c5175273befdffdbdac3f4130825aad05e5ea2fe06a077ef55be5a6e67ca626ab8fd5bbbbe18898f956d09caca6dfb67aac76e35b8f87f1fc0106c53e1db96019a5c27d985956d533b1fa6d16db5e49cf2a03f7750666face33f979a8560cf5b387f84cf3dae788fc519c015d8ed68f696fdbd0796aa76a4f4db55f57019669a83df4e03a546cfd59c8932aa8c24db55bac38db3c4b34863fca3a7ef064f59d44cfac18cb3ed3f23ed7283dd9d0ab4965bd4b6711abf03dabad9e1056cf77e89cce2dd77f96b8438595524658ab98184467bea9a7886bf3fd11b72be25a54dd07954ba7335c0ad93f218c7b46c41d5dfbfbbc90acb904cb84fb2316b3eb2da9f0a968ab5db3741e47113c6cfebda83ff3f20c71f45df208dba298ccb72ebdf17dfb6336988a20ebea39d8edf6a58e587ba6de94256fb47d46cbdc212b8d0b7a9a24d2c7eaad6e6a7f449ded5a446eaacae9ac8bb67abaa9a82c51cdeca97455b6ebdf73fd21de44ca837356d47378fa89a9a9ba6b09aa5e486eaadea7b3a972e9d475143627d3fbd680ef39411e127f903bfe92a71f05d96f1bcb53602ca99deed43e074565608a867b24d47af3493159a22a5b192ca39e87bd8e3ebb14f2e739ae58f7dbadcbe9b7f78ed5fe884559064a984b579065544e671b8ed88d7b5774c89f450f4f16521a1dbc6cf6cba0994d60cd2545204558a62efade89385dd827753bcb5c507e52539f638cb5b57d56b913989a5faeef0f742e9de38e41858bca4dfd60f79ee339d22d883350202a7df5661095a6be455bdb07b9133bc2c4f31a79412dfd14c8147e15b3380a613f68e6a9ce2d2ee6b92f9567389337c12be5d2651c33863fc89d37f8ef73f00ef524cfbbfdf4f34d2fde4456b77b4375f4986ab764e0e1b0a03b923ae34f4c140f61de98f36f883fb1dcc1c2baa9abe02ddce942bd45a0b09db97afaf9a6a9d2cc62eec7eb3d3edac043f5ecea5ab35fe28fe14c409c79d61f55bfc1cc23e5b972f0b42acb708d8ca3f42bd16f2c7c71cb30873a2be68903bd1f5f55ede6af57aed7fcfb4cfebc07cffc327984e9f7f9169281a933df8610430ec520f26ed4ad2ca3ee78602edda6ab30c49ff788de3c2f177f9f0d0bb0406251efb3554f99aafde58b7a0a5cef54d850fb726d979f94c89ff7b0bc810679c5efdc807dac32dfd4fe88b21af76ed4f58bca03d677e4db52ed68b7755e88b6cf82dec49459302e28e7385a22fb2316b3070266898a6fb5dbe8e63b22a5f027ca9977b218d60f4c1668999ed91f917691dbda323aabadadd77c4ff57decc2ce35e44f3c6fc2c29e8af14f2af34dbfef67aa23d702ae80dee5d9573b7f16f43cc6327fde23dc795ee0ce5b588fb7cd2051fb2302fb1bee83bcd1591c5b9fbd8a05f42e4bea2d71c54403f9f8338b29cfec6ee35fd1fb23820a5f415453880aeb4c36958376259a45a870267f96f5e62de2e9c942fc6d932bd3996f2a97ee54bc14b5231268d7503464497c17140de4e14f1c67b0bc51fd60e57893f8bc28f6832e94d56e3405cdc95aea88948159d03a734efe247066b1b0a39c4735fb237e8b2bbd97671179f07581bb7d5d8a41f12a1c5f548ca9ed93cd9d99ae3fb2cf4cb3bfa332f836db1f318e87105b777007aa9f52e195d26335d9b0fa817ebf43843bc99652e5cb3a4f39aada3903f3d44a7a17b902f640d0fb23aabdee4a996f4a2faaa808a4197c07756bc7fab00631fc8972a6111cd2bfb09e24f79fdea7aa2b3a05e55c04e0b9310373f0f32a4cbfa972342f9c9ed515636b600d5897ec93c59b676d29551f89a477aeebfcfa62f28fadb2569a86dec1e8279fab9e9716abf19af5eddc08669db04765192cc49fb7087796398335161505fde499d6c173eb772cb1fb6276e6ca2e103d35f97d700ce3e9046c0356094ed03aaacee44f231c69ba4ecd5ad8e62c4ba0eb3a9f59baebbe297de3d26243f8b56736152c389d73265a883ff19c59e4ce2c684269153a53d567a9f7e92ce19b117f910aeb1ddfacbe73e35c581f518b18eeb02ff8f738853fb355eea09777f60abb8296de99ab0f9fb27e1b7861bb8aa49696b5679d0767560754f8248e332bfc49e38ce18d2987419b0f0a39cbb27ab31bee8ff88b54f88cb94c3a3df6a454389933ec8b754dbdc09f460267162dd709ba5b9d6543ef58705ae4fe88d9c55131d933cc007616fd532efec471a79950cec192cec6731fb5a7ec25cc2cf5fe88853c9b9ce73787a2ca66309e18faa765bd41aeac7227d49f65ceac72e782ac73a1718f8fd63f53710dfe692abed5eef2bf4a85c53593ec8e4dad9d79c4b75ef9dbe84f92de206716ebc3f5d682d88718ba0fb83fa2cea5fb059651d13c3b776eac8eb2cb2a6792f426567f92f5a619e1cebc3c07fddcbb9994c595da1f91de20ff0b2ca33247ac73501a6599b5b466c98a635542fe6471e61cec644a33e8d8d9abadb43f22bd41fe575806a24cd90d2e61fec496b5261a13a7e98daa559ba9ff8eea4fbcdec4a9f4733048f53b6dbd974343bdbbbba03dc6b24acb1939bde05359863d6ea63551de2cf0278d3b51decccb2cb882282bf96cdb949bfa8b6261760c4ab303fd7d1267993c9c89e34e447fd2f566d97217dacba7ed10504cee4f7669f113eb14bc135b55e1ed78b3c29f34bdc1d25ca80f83eb9fbc6f905d40d3be3d3fb889b7cc3a3e6a9933f33ae44f1a679a21672ec25a8fb0c267aab9b586d7824feb438fa69588af18de2cf0275b6f9a2bf56df0ec3dfc7aeb886beb34b8e307a957bca68f4ae24ef0181c117f92f526ca99c5a218f453bb02c670063ee7ee55706f4653713e6ab5b0afc00b5ac08121e94f5ece44cb79500a767e8d65c419ff10776abd3c8d3345e88db64c1bae6f089f5db24f928f4ae68e2a30c2d8e98fdea5534f51d5d979702725c6c13fe3a342ce8c83a3a01394c1327b689d608ff427993368893967a2f579a09eb3fa21cb381079079ff225596b368d896338330e2ac17e704056a986f5de127fb23883d63205e61981b24fd19cb9604369f3b19418ef6dc79974de04637f08ac698eac3967a275843fd97a33af4d698c5881777b5b4ec96907df3240cb64f9a8edf4465966c4218e3b58e28caaf7147754aded7391536fcc488bd61d8882b6b78c7a32ecda3a74f6e48b359dcf9f7e466f3467bca037b2b50aef2d73265a883f51ee247126ca9df9a7e3ef6cf9ec558f9db021b746ce4858959fe7cca27f5ad69b903b5876893fe97ab3cc19532b4bcd4632e59e6a96e7be7046ec42c5c230a27e94339a371e28cdb356e1610c6756b8a3ac15ea4f3667167913619073b6c9be9bacc64fd89d6010d764de65d9d6478d5c509aaf9117cb9905bd897227f45fe93e6a9533643518bfca3e87237fad7baa2d3e1b05fcdeea089827e0fce9e76262edb9d13f0de993ce19e28d29da3ee93e2a8937e16734caf986089d6b6a1d320191f0347b66b99dde90653a6a96b0648114bd59ae97f813cf9965eb2d7f9ef5dec8192aacde9c6d7d8f1c81b3cb939fd31badc295a0472a9ce9a36278135a2ec29fbc7a839cf1e85f07eaaf462c6d5740a7cd4ff83baa705ece6ca637649936cd12e239335ce24c1c777647632cc49f75f426ce5a0f811d67199571c46bc119a970b85ef31331b19e59827f1a7911adc9f6514b7ab3a4d4467f726b8de10e9cc32df491a95b815cba47d102461d5adf5657cad163be55accdd789f51c617ff444b1f09a3e2a5a1bde2cf0278533b17a13f7b9e2a10f1b3df393d124188831c5c285f9a855de0463e5b96196701b72269fdea470666ebdd138c29f4ccee8cf9c33a83d652a1d18612dab377a09582083aba00de73dcec799cd7c94f14f344b58b640b28f4ad59b58fe24f8a864bdd1add64299f9557b367a1d49f01bcffa1bcd605c14679679a3c7530b7ee16081353963e214ceeca2d5c83a7b217fd23f07099c090bb496c12aed603f3857ffd6f8363882be2e3eaea980653ae15acd0f70665e46667d3e878f4ae0cdb252df8ede420b3de719616b688d074af3acfb6853cec473678933510b25f127c64725f026a5dc065e313e0ae64fef416bf434b246d31c71cd9a3e2a863733c51d552bfb14c0190bad35e70e95aff811b6b67f6ac6f8a7ade29aa88f5ae64c127fa23171b6dea496375d0f83437fb8a9de68ff049e3bc13fad398fcaab3751ee8c3eb2f4398e37c97a13530e5647583eff04acd1fe69f4b9665c93eda3163993c21d65a9d03e0705e88de60c7067a8b953d6ff6ea93192ce9da5b8a6429ebb1c6b8135e751ebea8de24ca44ee04fb6dee4b0148eb0a61a61f9783372613c7516e64f05eb4d3667426bcd22fc498a89f372a66c38b3c41d5d431494a937face5c0bf4ef202316fe111fb5c49db1aea92cf26785376f397c54fc289b974e304ee54d25c63f153e8fcae24e9433cbfc89d79bbc3e2a8e332177cabaad12af3778672e585ddffbe198384d6f42ee7c6141fe6ce5a3e279131d71df268e8ec435153db33cd0568ce7cd363e2ab7de24f1465b2ca23f9be94d126716af1a74651c896b3ced9fca7094698205d6f351ebeb4d126722bc89e74f5c4cbc266f96b9a3cb88d3bd04b55e7ea0db16e39a9fd39bf5798316c3fa6bce9fa2f426f6d3d2eb11079199e5fa7a53584cbcc29918deacf2672b1f15c319b2da10b9b215673658b7599b3773cea8baaead3333fcc9b4c45a7ab3fcd13ab37c67ae807b0b5beb4d026756f953808fb2563913ad1378b3ddba4d413e6a9933510bfdfd7fffe7bffe1f92e4fedb - + kcolorbutton.h diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui index 8d2edc1e..d8941dfa 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui @@ -1,6 +1,6 @@ AddAccountWizardPage3 - + AddAccountWizardPage3 @@ -22,7 +22,7 @@ 0 - + TextLabel9 @@ -40,19 +40,19 @@ - + WordBreak|AlignTop - + - layout3 + tqlayout3 unnamed - + mUseColor @@ -88,7 +88,7 @@ for account: Expanding - + 101 21 @@ -97,7 +97,7 @@ for account: - + PixmapLabel1_2_2_2 @@ -118,14 +118,14 @@ for account: Expanding - + 20 58 - + mConnectNow @@ -149,5 +149,5 @@ for account: 789ce57d5973ea3ad7e6fdfb2b4e1dddbdd5e58f84904075f50564820009848c74f5856cc90364200364f8aaff7b2f692d19039e0067effd9e2e4a47fb3922c65e7af4ac257959feaf7fff75d7ebfef5effffad7db3b7f0f9cbf1c9fbffef56f317d7cfcfadfffe77ffdf7bffeded9dbfd6bb756faeba05cfe6bf7effff1afbfadc7bf9cbfd86e696fafc2357ed0b8b65722cc08537bffdde07dfc7b4eb84ad825ec10b6152eef84ed4e88f1f892b0f9be0831b67b882b25c2cf061f94351e11ae50fbd8606c77f5f997e1fc2afaf8fc21c4fafb421076103b55c415ba7eb663309ddf5388f1f77c83e97c3e099bf3090cc676764bb846ed1383e9ef5f426c6b7c4c5850fb7b8875bb4dc7dfdf411cbc2abcb7b357dadbd1d7ff4598ae5f5e1176c81e2cc4fa7c383718af5758888d3d9ca1c1d81edc13ae507bd960b2d75188d1de2383e97ae8fc8c3dd8bbc1d4fe1a62b4c72561638fb710633b9d1fd803db4b21d6edecc6e0aa6eb77dc215b2e7bdc1d82e0cae21f6f1787c6f6f4f9faf7742b88a583c198cf6f5f7083bd8ce760d26fb7f8658b7bb75c4606fb4ff6788f1f83d83d1be927edfd85fdc194cfd771062dd2e25e11af5cf34c4badd367f4ff6e7e6ef05f1b56230b63b7e88917fa788f777a83f1f0dc6efcbd710637f74081b3edc8758b73b2d83d1fed63e61c3976b83f1efc5b3c1d47f5f21d6c79374bdfb02b14fd773b08338e006d7f63476095710fb9a6f95dd72a954d2e7778038e403b59bfef566884d7fbaa721c6f1726d30f687f74db842df9f8518bfff6630f5e70b61eacf910831f6d70761eabfd1a3c164af3162d35fd689c1d41f03c246bfba21c6fe730893fd837188d1befb06637fb007c2f4fb2337c4687fcf60fc7ef014626ca7bf37fde5ef1a4cfd43fd61fa2b102176341e11ae51bb1f626c7f272c10fb5aff2adcf4b7b747780fb1ff45b84af831c4556d5fb467a8170e1d2fd45bfabee187d33498f830214cfdef39846ba4176d83f1fbee116181ed72cf606ce7e310633bf24d8d57d4f3bb10ebf6e0c660ea2ffafd7da3e7cc60eaff9310a31eef10267eb0af10637f3e1a8cfdcd2f09131ffca1c1d44ed77760fc5dc5606c1ff11063bbf97e05f188aef780f420f83298f8108418f9b04f5850fb7388b1fdcd608eed0dc4d51d6a9f194ced17842b887d7d7efbbb217fdc106bfef867841dc20c31d04f63e7de60f4f7de98f01e62e18518fbeb9630f92bd6430c7c42fe9409135fc42b62c30ff725c4c83ffabd7de36ff6438c7a32234cfdef5c8458dbdff3091b7fde0931eacb14b1e96ffe6630e9c34788916f5784e9f759c960f2dfe510231fde0dc6feb5ee08937e066d83a9ffc95e211f5a21c6fea6f30ffbffd060eaff2661eaffe03cc4fafb239b708dda6f438ced166141f8cd605b7f7ff489b8b683d8a969cccb4eb9a631fe1e377cf19f0813df3cfafe9eb383fcfa3298fc19da07f46857f3959f1a8c7c728788437da813267bba5706537c4ee7b36ff4283098f8d0451c8ef74fc2c6ff3c194c7c9810367ae28718bf7f48988eefdf1b4c7ad0475c257f327a0831f667c960ea1fba9e2af997119d8fe9bf911762fcfb03c2d47f41d960ecaf80ec67fa6f340db1d0ed7b842bf4fddd10ebf6d18c700db1a37fffa06cf4c07f475c29eda0de5c8418fbff9e7005dbbdb2c1d4dfb6c1783c59456cfa4b4c111f90bfb00d367c681b4cf1e06e88b5fddd5bc2a40fce8dc1143f1c11267fc0bc1063ffd51157491ff87188b1dd3198c6ef35611affa391c1d47f92b0f10774bda1bdc784c9dea30f839d8ac6743e3541ed5f0663bb83d76f97ab656d4fe788308d571bed6187fa5e415c11d85fac6930b6db6788f74dbce011a6f1e53e2036f616a784c9de828e7740facb3f0c267b8b10a3ded2df1b7b3b7b21c6f1563598ec4de75725fd0d060693fe5e1336f391a1c114df55438ce38d1126ff2b74ff56cbe53de4ab731562d4bf57c2646ffe85b852417bfb1ee2fd1db2ef04f1c10ef947df60b2678930e9993498ec252e111bfb04738cf3911bc2a45f6c1662b4cfb1c178fdd2266cf4ecce606ce7747d55ea6f7b6430b6b3d3106bfbf10ee21a5d8f13184cf6f50d26fbe2f9d865d20be7ce60b2f73e6163ffcf10239f6b84ab88bd27c49512f98f6fc4fb3bc85fff8ab0c0fef2e9f70f76f0efc5036133ff7b435c257fe13d1336f3f9ab1023dffb84c99ed6aec1682f41e75325be3b3d83c99e74fc1af1db7b08b1b61fb3099bf590db10637cd13598e61b3b06937f217bd5c89f08dd3fb5bdd0fe8706a3bded2ae13d6a7f3198fac30d31f6c70de12ab6bb32c4badd3d21ec507fbd22de2b617f786784f710bb1f8449bf3cd760d2af4fc4a6bf5999708d8ed73798f8503198e28f63c4861fee2e62d3ffde25e22af90bef2bc4d8df25c2d47fa28bd8f41f3b0fb1ee0fd1206cf4e93bc4e80fa60663ff5864cf1acdc7b817629cef550dc6bfb7fa06e3dfb337c2147f073b06131f6488912f35c47c07b1a3f5b4e698feb6f70957910ff681c1d82ead10a33e4e089bf84f1a4cdf7f0bb1febe6c198cfd278e10ef113fa56730f183ce2fe4cb28c478bc2fc255e24f8fb0f93d3aff4a09dbdd5783915ffc89708df88be3c5d9df217e71c2a48f1ef6bf63f4dca7f6ea0e5eaf4fbf5fa578c7ad194cf3893661817cf5070693fedc1a8cfc73a93f42bdb00913bfc44b88b17f9b848d1e55438cfa6d194cfc1913a6ebf35f0da6bf1f8418f9776e30febdc3428cfa45f6e634ffe3f706e3f7ed5988917f6784cd7ce6d5609a8f687de07b864f7605b1e18b7d6d30b50f081b3d7b3698f48a1b4cf15383b0e1fb95c1f87db14798f4490e0da6fe75101b3ec90961d3ff3dc2a44fbc4958903fda451cea139d8f89c7fc6fc4b51d8a37ce0d463eb99f84cd7a638b30f1c7ab1a4cfd593698fac343cc8dffec1a4cfa766c30e9c97788757f499730e919932146be1c10e6c807bb6430cd676c8369fe42f6e392fa5ff3853ba6ffec3e61d35f970693bf12848d1e3d194c7f8ffde984f39716619aafc863c2a6bf1cc282da0706a37f61743efb145f48c760ba7f42e7bf4feb6fb24998e26f7e1e626cbf3718edc5d0dece418dfa7f8ab866f46948b842f1ce09613a3f798a98937f72ef0dc6fef276091b7d9221c6f5b40f83893f1d83c99f3408738a972606633b7f3718fb9399df97a4171706633b1f21b67769beca428cf3533d3fb2f7c2febc406cfad3ee194ceddf842bd45e3798da1b846bd82e1e119bfe7477080b1aff6d83e97eca3ee203b3de7519621ccf7b88abe4dffd67c49cfacfef10e6148fdc184ce3fbd160b2974f58d2787d3098faefd0608aff8606937d6b888d7d6537c4dabebc4f789faeaf61307edf3a0cb1febe45d76773c4b6d6175b84f63d274cf6751c83a9fd8930cd4fedaec1d8cef0f8c2ccaff8b7c1f4f75f84a97fbd23c2e6f88784496ff98dc1687fd6426ce607f2c8608a37a684c93fcb3162335f9075c2343f967d83e97ee13b62be43e3fbd060d2eb6bc2d4fffe29627b97d623ba0663ff8b196163ff2661b23f1f1a8ceb05e28cb0a4f61383b13db0103bbbb4bea07f1fe4d0d8ff12b1b1bffd6830e9e13361b23f170663bb27099bfeef1a4c7a6d8718fbc71c8f7edfb6438cfe32c4a47f1f880f0c1f3a0663bbbc234cfa289f428cf39923c2f4fbf2d260f2df17884d3c26de119bf9af7b6330cdcf1961d24f796d30cdc7cddf537ce6d2f9193e78fb8425e9fd0b627b9fe2c303c29cd6333961d203f66930f6276b207676e9fed1bec1a4479f06139fda06d37a5410626c2f13dea7e30f43acdb5decbf707cc90ae2038a5f789d30f1c3b93418db99f9bee1c7a3c1e42f2f08131f1cf37db39ef510628cd7a7884d7cce5b21467def188cdfb7e9fcab153afe89c1e84fed63c234ffb4770da6fbf3738cc733bf47fec3ed1b4ceb6d4dc4c69fbb2d83295e32ed86bf658369bd86ceaf66e6c31706137fcf101bff2f0d36fca4ef1b7fecfb88ed5de21ff597cd697e30232c49affa0653bc80e31ff484be7f6b30e9cf8030f1c51911e688472f060be4974b58623bab198cedb68558ec22167a3c8a8ae92f5e266cc6f7a7c1942f7118621ccf55c2c42fdb3198e6ab2e62d33fce2d61b35e5d236cd6233f0da6f5ed53c2c407716130dddfb80e31e69770c4263e730c36f1c15388b13f7dc2d49f9c8e67ef92deb821c67850188cdf77df0893bf1715c2e43f5c0bb1e94fff9230c577eea1c1d85ffe1d618a47f8d460ec2f3e436cfacfaa13de47ecb4432c353f9e0973c41ced2f0dffb9446ce22b7b4298f445f60c26fbbd13267bda8230e9af1c194cfa4dbf67ec297608efa33d9d6fc21cafd73d3618ed257cc2640fb78bd8e82d7b21bc4ff7ff1f0ca6fef10cc6ef7bf4fb0e8d4fd6262c299f686230e9fd38c4c857e48734f6652784c9becebbc1725ff7cf056149ed2583b19de9f10d07377a3f214cf6f41862a32fde21e17dd2f706614efef9c560d2f7b6c1b4ded63298e69f6784cdef750cc6bf77760cc6efcb1a6287e2617b4c98f8eff40913bf050f31f2db264cc7171f06d37809dbb1bf64d88ee343760c46be7b25c46297d6131e0dc6bf779b06933e8e08ef93deb5438cfee5da60ca0fb93298f4e2dc603a1f61308dc72a614efeefc3606c970f21d67c90645fc30f1e188cfcf0881f7297da4b0613bf7a84f711072f21c6efebf98094862fde3b61b2bf87f680f144b84e98becff609139fdc03c482f4cfde3118edcde718fdd53161b2971f10e6b49ee7184cf9575383d15e3e9d9fa0f129a4c1680f7762305ebf7f83589af8bc6330d99b1b8cdfb71961b21ffb08b1febef74298ce875f194cf66f85587fdf6a1096647fade7eebeb11fab8718fd9d242c69fda48218f88ced6f8449dfd81561f3f7aec1c4b757c2743c16184ceb2fd42ee9f8bc6730b55b84e9f7bc73c2a4175e3bc4baffbd538371bc7b8d10ebfef6ccf1687ee50521467d0f8f4ff6168469bc7b8f06937f1b1b4cf63e33d8d5fdc1d11eaeb10f7f216cec8bdf77c3eb3f3498ae9f11a6ebb76a06637bffdd6271c5e2f05f6e6a28764c6dc337928a43b58022a98e2f3614178a5c2a22520bcbcb55e61f3fa63625c82c2328636daf07b8cec7242bcdad654ad46a11eb71b21627ab2cd7a6c8258bc55bce8d2972a1466bc8dcd68afb284b8dc822e3382badf267e9ea633993c21b27526773862f5df53267e4dabc79da8a3386379a3baad6fcc9c99b04cee0ff4be78ce14d3a67e2782397ea2867d2b893fc79a63aca9958eeccf9a35953acdea473a658bd89e3ccd346bc19476a558264fe6cac3771bc594f6f56392372712699378633997ab330c246649f4ccefc32bd59df4f6de7a3bc25cea83a30dc09fdd7cfe84d3667d6d59bcdfc94b15c3a6762b813f2278e333c436bb6e3cca67a93eca30ad29b857a62f4e71feda3d6d29b65aba1fe6ce0a39cb57cd4b67a931d136fc69915bd519c8916c39f141fc56338537c4c2cac6d63e2f57c541c6f5647dc24d49f5f1d136fab37ebf9a974ce048b9c59e6cf1fa537c5f9a88df486ea891969c89f1c7af30f8a89d3f4264d7ffed131714ebd897267ae3f5be94d968f5a7f0efec331719adee8f212d693507ffe61eb366b702658e64cb40ef9f3bbd76d7e0d6732f54671467f5eb0d0fcf43fd547e5e74d8a8f4aac0d7ff2fba83f2dae491a316bf928d29bc9327722fcc9e3a336e14c3e1f953d8f5a7bdd268133b13e6a65e4cd3f2fda3edbfba8fcbc89e3ccfa7a933d8fcae7a3623993c19f227c543ebdc9f651f9f4664b1f15c39bd072da3eff241f954f6f523963bd52fd16f2e71fb76eb3e0a3d6d09be53ac29f7ff43c2aafde28ce58eff33ac29fcde7517fe0bacda67ab364ad77e2cf7faede64f126afde443813ad893f7f928f8ae74e1667b262e26cce442df86e0af1a7889838596f36bb07bead8fda486f748de525963fff1fc4c4697ab35c883f7f4cbecd567a1359b7595b6f229c89d4ef217ffef3d66d8af251b1bc31968bf0e78fc8b749e0ccf67a93e2a39639132dda3e7f50becdc63e6a6acdac0feb730dbd49e44cb426fe6cefa3a2dcd92c26cebc9799c0992fb0ccb755b71ad6a175b4898fa2fa78993b217ffe43ef2dc0e7c43ab59a56cb3a03eb9c596dab43ff3f8e33510ba57246d7c750bf93fefce7c5c4ca325debdcba20cb60e9597d1861ab7af3665d5a03ebcabab66eac5bebcebab78656295e6f12f5e74f5c278e5bb799c0b5ee58bb5679c132a6ec59951885deb70eacaa5563161466d5ac2ae3cc660e58e96d853bef9191769cc99f641ff5ebe7e0ea0a064c3009e369d532ba3097a95f5abce24be6b3802c538bd42336660fc0a564fe94427dfebdeb36d97a73c91ed9137b06156ec55b864a0bacf7b5a8ce6cc25ee6dc59a85fc1466f60a3e3b9de2cab74027ffe989898bd5b15366533abc93e522d43857db2afd067a9f2c1be597d853b919a35d8a11e690bbc81f216f2e78f8c89991a195fec881d6bdf9d69191a6127ec14349afc127b674dd6626731dc89d66deb9a75623d7c69893fd9317151f936297a0357f5ceba309ecec163276a4da2852ed82372078ed2637d76c906ec2a9e3b218794165d136f42eeb09b707ef1c7c4c4ec169466caeed83df8ee352d43236cc84a70a44fb6c3765999ed817d2a6c9fbda673087cda81e6507484cdf9f367f8a80a8ca7aa75ce6a192a9c5e7adce28c73283677b860975c3d99ee267167ce21ee59f78a33863b0bfeeb77c6c49f30121eb90ffea9c9832d2c43858ff8983ff047fe04dc51fcd9e3cf7cc25f12f527d421fe0a3629adf0e737c6c4ca3ff13776c7dff9747bcb60e133fec13ff917ff56dca152e70d7e98c921ce8f903b544a217fb27d54be98789d75e22ff6c58fad737e02bebb10cb5069b1637eca9bc89d90432db0d0593a87789b7762f8b3998fca5eb749d41b5061f04f569f8fd849a1963123accbcfc12222c21f552e6094a5ea10eff1bed6a09229a17db6d59bbcebc49f309e2ed929937cb0950aa759e78a5ff39b2877223a74cbef527d59438db018fdf90531b18e6aaafc9e0f79e9672c43fab3c37757b813165e563be3257188efb3871cfc293abfef931ff0375ee535dbfa49cba862339bdbf62a77e6853fdb8eda9d8a9f2d73c8766dcff69542db81f264ec46dbe7677d14a8b03de2ef9bc4c29b147b6c3f2471078bfd683f71613fdb13fbc596f6abe18efd66bfdbd3397796f85374be0dc4b0d609f7ed9975082afc435ab3629d0ffbd3fe4ae68e2af6137cbeedbaddb00fed23fbd83eb14feda6dd62dff699f2ea863b7690c99f4d7d945661f04f3556cb37ef2e4a99edb6dd49e30e943dbb6b9f83752eec9eddb72fed01942bfbdabeb16fedbb2877ecfb903f9baddbc4c53523ebcb1ad843bb04e3e9e2d75986b467c7de4de70e58e7097853b6f7c03eca3a15b0ccbe7d6057ed9a632167a2232c813f1bcda3742cec3b8c9ff0d9afd19a25eb30873b7606771eed73c781d1d57384e6ceb5231d69571dd7f11c1f3983056c35e7cff67a032aec04d6a13302dffd8bb466b13863e7c1794ce78ed69e73b0ce85239c277be03c3b136d9d17e7d5795be68eb2d2127f36f1514a858fd9051b3aefbfc732589ca9fd09d14d86df02ed51ca7c01d6e93b33bbe27ca8d1e57c3a5fabdc5175447fd69f477d5a53ab032aacc653eff7594615185bdf10f5e4f15bdff69e53771ace73689d43e788bd2f2b3316e2cfda7a035a73c2eeac433e2d6245a280d175ec9c64f8ad4be7546b8ff15ba0ccce04acf302cadc8c7246d54e4bd509fcc99a474dd99373c66ace2f8af87258a76373a79ba93d0dd09e8b88324f94df02ed39c77827ca9b25fee4d59b23e7c2e9f181d32e784562cbe2f49dcbec9859fbad7a44993f803d03e7cab98e7287dd18ee382db24f1ebdf1f8817363edf1198ca7dfa8c271c5fe706e73faadfa82dfda07ebdc39f78ebadb1cc31d65a5087f92f26d3ead236b669df399f39b3c77867598b3e374d3b547fb2d1d333bf5302a3c50dae3ec72e694adcb2867d447d5217f92f5e6d3fa70f6ac323bf9d915896d0a287365d398d9d9770e9ca1530506c47027a23fab3e0a223eab0b51cd1f6c1955d46a46e67c6b296686d125292aac394361818586ca16cbdc59e10f7187ed08e6f4584d47c2bfdd02a9dc19434098bad69316330b877f0ae10c61840dadaf450f6ffb682b6d9fb9dea8f174c387ce1f6f192c420a37db6f25c4cc87c243ee280e5947a83dcb25e48f076370c73ad719127fa00ac7159b093f07774cccfc043173681d116865d6a38b46d89be2cef247d9478cc498cdacf27f0667a8b4acb278108f5931b3f25b919879606266185d4f863bba2e5b5fcbdc11cf649f0928cdefbfe27c45b1fb42bc8857f126deb3fc564acc5c9b73070bfab0b94263adc7d7efbfea9c9c817e6c8a297c66a03d1f196b3da931b3f88c70c77cfc396fc4d79c3f7fc095e7b00c9f8a6f51170de4bad31187ebc6cce2086366712c4e16b983c53a5ae48eb2d01fcf1fb00c3b1113712a9a913b8a2dd14ae74e749d7929663e748ee6aa1cfd5853ab14e58eaaff60fe34b465ce80356dd1598c529da9ddd93c6656ca1cc71fb0d02572475be7f90fe64f8f9d305774445374996b2d65d7897371b145cc7c2e7a4bcc299b621de951f5352f7f1c7f5a3ce03350e1beb8e4b578bfeaf4950532b4e7dcc4cc641db3ce7c0531730c77421ff636e7ce9fc61ff60196698b81b882729d14a5425478933b66de8bc6cce0b75ec4ad8977568bb883115631dc11aa3cff21fc6959753e10435102b5394b5dcb6e899d3563e667a33d30a3d8e59f49dc218dd63e6caed07f007f2e9c118ca7328ca8093bc9fabe52e6cc98f9313e66167bea1d24ab9c59a80fac4bc31d55ff56fef420a63903dffd2daa3967372d51cba13db131b3b424935cdae26e993391ba4c23cc78f9dfc59f16f8a74f311355d14d52e1b8628f378f99c17d0995fd2b652277ee8c0f43eefc1efd016bb4c54cbaa221caa0c76bfcad90cec9a631b3f4a46f33d5333288e14e19b9837538c27e397f603ccdd83d78a72afb5c3bafa32547e9f7475362e61739960f64e5b2e2493c77a23e4c73e897f10794b7c9eed931ccbc73a8705c918ff2493e6f1633cb0928f3391deb42be44f566ce9db094e5eb2fe44fcf1981e79e88013b8619d4a6a3f2cab975ba9be566c837f92e79e4581fc9dcd1057dd8b39c927d7eca322d71cd6bc09763b0cc1a2a1c5784bfce3af362cc2c67f26321da6c8acf44eee8624d6dff67f9c34bca73c378ea8889ce06daea78ce54e6cecd50ca3c5f490565fe22659e1faf25bf13b983458db02fe0cf4fe84f0bc693b68c74ad762177875afaeefa9a3133adc2bfc83af8f5e5637eabbb82f1b30c9aa96a1f26a7c5f2879d404c53569c010e5f17c343d99087f268d398591e8bcaea71f94c9eac72262c07609fa9755fa8fef4ac3270a62c5d5e734685642fb43828baa8ca53d9e4dfb9e6eb4bd601656e2d2af3bcc82069961af161cf85f0075418bc535569308ca742b217808743754431649ff24cad85e58a997b2b31735b76e27f4376395be10d71076b1861cfdbf247af9757e133b49ac5e490e9e85a1d114628734149cfedddbcf9cc601db110337fc98b25658efc8e8e82523448adb66ec19f169f42ff76d575e89ccced4728f010661d5d760cb61e5034d0923ddbde2c66b66f64dfc4cc71455c6affbec099c55af9b00df803ac81a8a60fcad08078af5ec45d45a5c260eb861aa1e27a3ef3b0c7f2326bbe9e18330f44c51927ffa633925749dc51d651770c37593f84c8660231cd80cf8a51618806aae21b78d8e6b3451e4a0e3173f67c3d3e666ec96b185b29bfcd3ec47e3277d087c9d74cfeb4d4cc493f5b125e91552f2887ec424ce48da82aa5d1cfc92db5cb5b79b771cc7c2fb37aaf659dab3bf08b9c41eb989a3da6f1077a53c5320d5112ddd5b3dfaa80ef8611da8719ab9b3442e5b938dc2c66b60fe450fad93dc84ee4c90a77168a95a43f2de682875596b9541f7903d751906580355559125535429373edf995ad9f15d824660665aecb9d1ce7d293bb7afe558ee38eae0f56f9a3c69318805a5e01f72fc3cfa408eb881958e652c5025923d41e3b95ac9839299f593a7131736c2f9ca879463c77b044f9037e4945ac5d79b3601962d076f36f3e030d86880054fd243b4e723ab29cf31ed76accec4996d7a7f240ee257247d7c41fd05c184f2fa00957cb960947d8e786d6e981bf9b8a2b155be78d9340992b1bc7ccfb6a9d39f7b9a9383a813bd694eca362e044cb849feafa3e0b54f8126cd3d1599eb9e324f9982b37233e663e9017eb9c27ab89cf78eee0a853f6c9b40c7eae60469edf3201a830589d4fd7cdf2e457b29795cf9c12338f613eba4e0f063288e38d29da3e79aca346d87dae5f6d011f4fc51462e18b4d7219654d5e6e9a9b211d77cde7a3d907afb92c9e3baace6f1ff894b2ee39800a77455dbcacb3a3d162713ace6dceb59e9598d9e572833527a72df75679230e84253ed9ee3af691375639f657302770084a83bb116e64196d9db1bcdd629df91ee6a36bff26441aa7216f4ca4d893576c575ef1cff5ec2356ef3fb4f4fd893ed8a60cbfb4b165b0b8362873465e5852ccec3a6e7ebfb5d0bb70fe56c89b3bc51b79a5b8a3eab5c6d725d821ca60608d74455b5c16b397867a8a4bd9609398d995721cb3d6a3f216b39faaa95bb3b965f8a7e18eaad7b30f302872471866f243765fccda0f28db85ebf29bcd6366d75b3a660f7ce8199c7533eb2e365cc137444196e14cb45e933f9730532d368b5c6b179f4ad7f5dd20cb6f25c5ccee48ceb9a3f619bd80313370c7ee835428f5f77909e69a65b63be70cd658d6b64fdf1915671de8e16b8806be45d37d749fdce7cd7233a425efdd89b95a98dbd54413bc6835736fa1160fd4bd28b5fee4be28be2c726703fd519f4e015aa3c6e6b5551665b892173e73c6e2c3de5d3766c66700417b5edd37e527606ef709b3c72acc80db199188e698d5d6592455280d71aa78b3c89d8df80351d0967eaac54ea0d7666afdc744034ec77d5f2f3743f92d8c99e59b3b05ce0cc44496c08b4e3277b500ad13d760c90158e6252c7d775688fe5ceaabdad03abc04a353dd9fb864c791fd0d5b10333f65694f52ccec7eb8c01ab04c29c7c8575a37930db00df2665ebe45ddfd5ae4ce86fcb914e50deee4b4b08f813525880616da9ce9e631b36cb9dfb2241b39d6c2416d980bda545de0cdbc5cbaf542f4e7527cf3e93a5a03f14519faec05a283989db56c2676d2f77b4a8e99417b1aee61f639b00f76a27ba7bac29b79e9bb4785e8cfa55a37ce671d359e2006e908b59e3a8bff0ec4ccf9f3992f96d799dde3ec73003fd6d6b689e78d295d8806567cd846f6b9841968960af67416bc5ac3eeeabd8913bee774642fa7df5a8d994f643fd5976a6f2fced45dfc14decccba57b3ae70e5a6843fbf4ad768a0a072a0333cca54bbd027b2c9f368e99076e8aa7e081ce763ccee4cdbc94c43e2f427fd45ad0716c1cade6aa2a37752006a0c2d9ebcc53b7953f665eca67f6dcb324ee2ab501251ee4e4cdbc348d75b6e4cfa5682ce98952e1a6ce8b1ac01c2dd7ce5ae25c2bf3a631f37eecfd5195d3a79e5428e7e4cc426133b75d88fe008364233a7280371d38a789cab9c8ebd7e4a3dbc9e9b7966266959be176978f07beb1aef3f1ab31dce80ab512decde04fd73d573eac00fe5c8941f48e0f9fb2cff5ee00296596cf39d67a626266fbc65d5c858798583dab00233b8e177dd19655f75c2a2b657108a220e40f968deda366f2f1efa0c8574099377f06d0ed45720a1b6ab62e1be15c6a810fe214ac5277cfd51d266d9d2c0deacf67aa5bf147ad050d379fa90ae9f633e75bc9f9cc46df202686592e7aa9451ea868742aea609d29cccb4ab935e845b4c527ff44fe6c181faad1d565f730dfd9346ba1256f73ecf794f00ca07ba9e329506298a7df83ea2d72e005e652a7a2ae59730a566aace9c32ed54c7563fe5cc168eee83be85bac1bca4727c7fdd1f933803a66bec67c6677a0b2bdc535c47df74b737054616d19f74129c0263ecce9b957ca32c8a135ed53d5d9a927dbad21daccbdde34661681ab72499a5a8997e64f62ea8ec1360f42adb8adc79905feb9b74bfce9e7b04c49e58c59f5ed73c678c9bdcbcc294c8c99dd57f71e2289c5981854d81d826da630aefa397c5456b9927b3caa3fd50c1dd6195e05e48cb5f840deb825772747ccdc885d6796eeee625fc3f1cedd32a8f0299ceb375cdbe6bc89c64ad3287f20124fb24e570cf578da3a739707a0a36df09e8feeeabef0396366d09e8abb1f9d6fbb47ee50dd5f02d6bc6cc999c5d2746773fd81d964699535e033cfacba8ef9b61b512d09f31ab88a32a8fa1446d7815b4d7f8e2b69af39f7c4ad191f235edd32447c256077564cbc49f916afea3979bcffce4ec01651ebbcf01a9fe9ec826db566a62276b0fe0c62018a593ccb7ef318bfc8173347f7cdf0b867abe3798e3b26cb14c9996851198077d6d4c2fcf016ccb93163ac2f5d3e60ea7d145b6a0d2f81f705bd942e44d90b19989e608c1fb27dae12bdd688993dd7f3dc23cf81a32aa5c9130b6f54d8b1546f18a979bebae3aced73a673904185f5782a4085617c5645496534affa3b8fdee5c6aebc112fe78d991dd71b83d65c16e29f92e7efc710716a76f092f7a018a4ed83ebb3257da771ab11c54e2062ab8b36af25fb3bef317c67c0abfdc627bc9e2766f69ebce782fcd38b38f5262a965bf8ffea898fb2b601f532bbb03eace29effd259511083549d110fd2eece792f0bef9b5023ed16f3c562f2992966f65edd1a68cff61cb97287de1bf4e0e582bf2b8ba17eba66416f9d9173b398bfba616968153e52b93f9a85191c04fe2cbfb3e4ca7bf7a6f2393966f6f8d67af32da6de0cd4eb546bd79c8755fd245f5c9e5b8b57a5dc8e3ffa4995ba7805ff779d3712f062de25c9cfec377be27dc43f03e87d7a5f5bf1e6d273bc199c675f5b26fcff4a6dd2f416ae8d6dcc9f16073fe27deb5daf7aebe4197a56c2bb930ebdba7d0cbe2b2e66de5477be45dd7bf31cbdc2b1700c760c114796de5eb0bb4df8036a7e0c31c891bedbb7b6a27b8de4f76fd9afdea177b418337bc79198397fd12a0c5a33d5aabed836d4194139ce951dafc51f95c5d486717c22fa10d36c382abdd3d477b8a9e8b1e9b54c3eb37716c6ccb9fd13ccc986708eaf5a85a36d2f62201bd61af9d1ec33277f5a2a02102f6a146f9e9d40fc69a7bfc34d7dbc8e3c525133684f17d8939f33dfee83f70ddebbbd145b57d588d22be46baa48267f74e69b00bb80d6548bd867d33bcf7c0f20fab40bafe7f5bde53825bee09346afde0c228cfe4a7b5574acb656c9b5cf37953f3af34da8fe38d5bbc86d6919656d6fe05db1abf93b93e26bdef3aebd1befd6bbcdc199ae5a1903ad512abc1c5b574599ddf3e9e6ef004ae00f58c6aa4b57f96e882b8b78b785da1bb4ce6b30bbbcf3eebda15762af89dc09bc1d6f379333ca326aa51958a39e6488f94e59cda4b69b65aff24765be89337105962925e55cac57a0f7d4ee6bdf6e5965027b656f0f3e156f9f5dad72871ff2b677e065e65a0898bfcb2a8cf9573d53586e1fa835f222deaab5c01ff5ac695994d5ea76ae8ca3ecd212d70c021875a7450c350f7b5ecdb7bc3ddff299cf7d5b8fb4703ee63bbef065066fd4cac629447c93d8fba1557517b7b8774745f9c33ee0e8d31c799ff98ad22e95655817dd793460339f29eb680bb9bee7fb7e80dcf147fed87f809e4fe64d573f6954f7263093efc7cfbf798d0ff27b1195ff92be5bd3227f22f3d72d0a66ddc0954e656939f7c71bf88f681d2a4ffe337be53d7fe2bff8af29fe49dd4398ba653d838afb4e55edfcc1a7b9cfbf057da6b2a69a2261078a55fe1450d4086db37b350220de88e1a1dcf1dfe6d681ffbefb53efda9ff91f89bcf906d69c026b1c1d0bc7acf5a91d63f4fe16b99faa54f75cd58c552b6cea77ffde7efe3ee79eca326ca87b2c89b93f0dffd3b742ee7c7915ffdbaffb495aa3c6d3a9acba476a3d35610e3660f7e22cb712f7f45e9403600d3e6994f93785f007e6aa308e8ef51818a62ba37f48da730423ebd83ff14ffd660c271a3aa7fe0174e67525160e79a3f677819ec8a7c40dabce3e613c9588d939af6d4bfee03e8f1d7d5fb79a23f7a7e1b7b475ce80396dbfe3c7dd7b5091f0a98ebceac93917d2950dbd2f4a9ef3bcd0f7e9d59a7b69ddb78c6ece1f959baab303fa6245859347a17f0ef6b9f07b7edfbf649fc0f126a86a0d8e33d4b967df2a075e65a4c4c4c273bd9928b5c91513f7f8148eae987da59f345afb3a37e28fcaf5aee9dd6dfa6a656c8d28ace10ffc2bffdabf991f4b2b97ea617d15ea6eaddec5e5cc6aca06c4bf35b5031e7c3aa2a3f6c163f760d53c7bc600b32927a84fccde8805ebf247ed4ba733534ba2c107ebcf6bfc5bff6e71d719b52392ce3650eb34670b4f23b500f5208e0a20a2bf863e99eabb68d9fb6a7c807f9a687def02d3b67a3e6d0dfeb4748ea1cac9ea027b36da0373b1e89c38ba0ea8d7e161e23942e435247d9f14f196d17cfc6127c0723d57068617b25389de1109679965bd9fdbd6c7d44f0b0e74945db60a7bbf5d267f7aa0050dcd1a75ff30fd59bc9c7d0cec1f90cfce99099c517accd56ad855da55ecbb9ed3f8c367e657751e7c01bfa6df64f1ad2d3329666d8007e0fbf01c3b108515fe66a524fe0057d5ea4a55ef295bc4fa4f4fbfc9a2a4229782d8df82c8eb05cf117cda0fbdeb39893f2aea83f154c8af72b54f785f74554c57d0da401d987da5720974a6c9f6c76b6966c7ec7194c49f62de1da7b338ae74943401df5c04fb7b3ad7a40f0a36b4ca45f0108ed1d46b4a03a1fe4f4efe6c5d940aeb5987de99ae9077ecf2a93e62033cf8d9f67b356816ccf45c55451767f1fbc526f167aba2d8df84b982bbceaa43aa6502b552037ddca115e5edcfb10711cba97a0e56ccc0fb25f2b060fef4d8a7ceb41aa88cb1625418e28b3e5c89ce2c2ee65d9a6abf10f7017838d3f7df53bf5b187f54e48a6b3f35f5bed442fab80e766eeba739db3abadefa3c211a3856f99c6acd285fbc5e047fd43e1c6ac549dd85835f2d648556ccf411cbecb3a87d3af55e1c53a5c26bacc26ebdfea3b97a0ebebba1df74befd2e926ae745b5f2d95723b4987d3a81d92f6a2d8972ffd73ac72df873c18e5586adbe3fb9e5130758f4ceae53508609e58816c043506138a28a72371ba11bf147cdc94edda168d0130705ccbb211ab874c730fffdcc9f69955a80d9e029eaa05e9f69fb74e6e18f93f22cf2728138b32b5ed5eab6be8e62f60a2f83ad4fa1a78bb18cda934edd199faa3c9f6dcf51d987e7dbb1a6a572e9dc23b5076631f7c9e018ea6d9dafe0bba74564a35b180d9cc211bb96daedab8073d4fc61d93b50892bef4ddd3de7997bd8e5e6e1b7bad707ec0f8ad971098ea8ee043dc846319699f3c7bf4f7bdadf6a7b8e5bd6efd8dd3a3f1afb18a28f57cf5177590ad12ee4a1ba7f58b5eacb59ba45f0c71fb2b4797a3d3d9f799dc267b2e497203e730b7a0bb67a8ef0ca9b8976e68e48f94b5ddf97bc9ef3c769f93b3fb57e8257a177f93af6dedc3244d7055946ed7beb1e79dfcbef46ddf8787a5f7d770c3c1ccc67bf9a3fbb7e990f7fc83a2d1d0d4c41bdbe8b9973ab8c3ff0dd257f0f22be42d620e1d3e35379a3f2e4f433c791366d9f8abfcf64e16f37c7dd53badec43d5fd8bf7e2bcea868c0fb76c7b26115a185fa1dbd100dbc92c2ae7c47dbe7404efd6a613ba837f4eada8518ca2afc6ab990b51f9d250ab1e314fab85bd0dbd87b6a9f195982119a922747fcd9f587d66141bee402c6d3b77b242ef58ae1d657a2328b614ea69ef06817c343f6a1ded1aba20159cde221f207ecb3efd7b6bc7ba3f7f7121db56381e6eaf67dac76bd55eff669c3cca32015d6637ee63e00b373652b137f0efc0af78335f74e5efc55aba9e73bdf85acefe9bd58d4ce912a9fb9181eea1dadca383bcabf5f6cc89f037f3fc88ea3578aca4dd5ef4c6eeb8ca342661d6a7723b5efadfbc0b7e534f150efb808dec93d8f57e174fe04dc3f08b89c3ac13a3ba8ab5fe5039d4b3715e5cd9fc758e061e08c60967705472c669db901aaeeca8628a9a784d7d89b68993ff829f39c5907309ea6faedb76dbd1359212aac72d0847ece9f7d16c343da9bed34e7fe88a9fc5123ccba0fec2cf6e97790374547e7784d0a89f85a94f9d657996f85bc958fb244715d7fbbbc9005feec060eaba5f5b1d506f677556ed75a3b4426f330d07b85bda87b5039df509d51d43b4e34b3718fbdad79f837ce2f0e34870e200adab392e201f53e1f75efa690f7c499cc37f5ae16765f0c0f693f3f9525bae13b7a178bf23d863f8150ff15cf814c99a9b60a51e1867ec3cf44cf92abebbda13af14a304b54ed19552d261a50b1b5cae954f609dc70841db0d2f20cadc8a29f3f9ce86c857e51d180f6dcea6d59a0c24544a56af60b637e204aea5e9eb68f40fee8e205b9dfeeb35ed1996f65fdb45621ecc7b717eb0ca5925af32d86873a8ffb4565546034f077549f0fd44c959d16338a22e542e7acab5c9d9762545867139575565ba30815c62c51bdcb9b3ac7e69c87217f7c2a813f64c5ad05b59c91fed5aede13a69079b79ae3d1d371c3627868d5294bf44567892eb4cff9830aad46983d2be24ac4b5d237f5abd22d26e7426789ea5c48fdf4faf63c6ce92cd117fd1459c27eb19a3f41c81d5d336fbb7539f601ecc7bd2acbc5bca11aa2d201f5703977ae7e4601152eeb2342bc94cc43e48f1e612333ca8231df34ffa2a53349750626cc2d0b7937aa7e0e563d6d3028e24de9c8431dad63de69c69c4cf327c21d5d3f780f1b446c1752bfe95254d5ce9185f4b1ba6fa3b244076ad7a6225458c71725fd1459275f9628f1c75f2cfc0de619f97f59c5200dfddcb97a4ead889c0bfdd658b5f7a57adbf0ba3917f145e7d25da92c5175273befdffdbdac3f4130825aad05e5ea2fe06a077ef55be5a6e67ca626ab8fd5bbbbe18898f956d09caca6dfb67aac76e35b8f87f1fc0106c53e1db96019a5c27d985956d533b1fa6d16db5e49cf2a03f7750666face33f979a8560cf5b387f84cf3dae788fc519c015d8ed68f696fdbd0796aa76a4f4db55f57019669a83df4e03a546cfd59c8932aa8c24db55bac38db3c4b34863fca3a7ef064f59d44cfac18cb3ed3f23ed7283dd9d0ab4965bd4b6711abf03dabad9e1056cf77e89cce2dd77f96b8438595524658ab98184467bea9a7886bf3fd11b72be25a54dd07954ba7335c0ad93f218c7b46c41d5dfbfbbc90acb904cb84fb2316b3eb2da9f0a968ab5db3741e47113c6cfebda83ff3f20c71f45df208dba298ccb72ebdf17dfb6336988a20ebea39d8edf6a58e587ba6de94256fb47d46cbdc212b8d0b7a9a24d2c7eaad6e6a7f449ded5a446eaacae9ac8bb67abaa9a82c51cdeca97455b6ebdf73fd21de44ca837356d47378fa89a9a9ba6b09aa5e486eaadea7b3a972e9d475143627d3fbd680ef39411e127f903bfe92a71f05d96f1bcb53602ca99deed43e074565608a867b24d47af3493159a22a5b192ca39e87bd8e3ebb14f2e739ae58f7dbadcbe9b7f78ed5fe884559064a984b579065544e671b8ed88d7b5774c89f450f4f16521a1dbc6cf6cba0994d60cd2545204558a62efade89385dd827753bcb5c507e52539f638cb5b57d56b913989a5faeef0f742e9de38e41858bca4dfd60f79ee339d22d883350202a7df5661095a6be455bdb07b9133bc2c4f31a79412dfd14c8147e15b3380a613f68e6a9ce2d2ee6b92f9567389337c12be5d2651c33863fc89d37f8ef73f00ef524cfbbfdf4f34d2fde4456b77b4375f4986ab764e0e1b0a03b923ae34f4c140f61de98f36f883fb1dcc1c2baa9abe02ddce942bd45a0b09db97afaf9a6a9d2cc62eec7eb3d3edac043f5ecea5ab35fe28fe14c409c79d61f55bfc1cc23e5b972f0b42acb708d8ca3f42bd16f2c7c71cb30873a2be68903bd1f5f55ede6af57aed7fcfb4cfebc07cffc327984e9f7f9169281a933df8610430ec520f26ed4ad2ca3ee78602edda6ab30c49ff788de3c2f177f9f0d0bb0406251efb3554f99aafde58b7a0a5cef54d850fb726d979f94c89ff7b0bc810679c5efdc807dac32dfd4fe88b21af76ed4f58bca03d677e4db52ed68b7755e88b6cf82dec49459302e28e7385a22fb2316b3070266898a6fb5dbe8e63b22a5f027ca9977b218d60f4c1668999ed91f917691dbda323aabadadd77c4ff57decc2ce35e44f3c6fc2c29e8af14f2af34dbfef67aa23d702ae80dee5d9573b7f16f43cc6327fde23dc795ee0ce5b588fb7cd2051fb2302fb1bee83bcd1591c5b9fbd8a05f42e4bea2d71c54403f9f8338b29cfec6ee35fd1fb23820a5f415453880aeb4c36958376259a45a870267f96f5e62de2e9c942fc6d932bd3996f2a97ee54bc14b5231268d7503464497c17140de4e14f1c67b0bc51fd60e57893f8bc28f6832e94d56e3405cdc95aea88948159d03a734efe247066b1b0a39c4735fb237e8b2bbd97671179f07581bb7d5d8a41f12a1c5f548ca9ed93cd9d99ae3fb2cf4cb3bfa332f836db1f318e87105b777007aa9f52e195d26335d9b0fa817ebf43843bc99652e5cb3a4f39aada3903f3d44a7a17b902f640d0fb23aabdee4a996f4a2faaa808a4197c07756bc7fab00631fc8972a6111cd2bfb09e24f79fdea7aa2b3a05e55c04e0b9310373f0f32a4cbfa972342f9c9ed515636b600d5897ec93c59b676d29551f89a477aeebfcfa62f28fadb2569a86dec1e8279fab9e9716abf19af5eddc08669db04765192cc49fb7087796398335161505fde499d6c173eb772cb1fb6276e6ca2e103d35f97d700ce3e9046c0356094ed03aaacee44f231c69ba4ecd5ad8e62c4ba0eb3a9f59baebbe297de3d26243f8b56736152c389d73265a883ff19c59e4ce2c684269153a53d567a9f7e92ce19b117f910aeb1ddfacbe73e35c581f518b18eeb02ff8f738853fb355eea09777f60abb8296de99ab0f9fb27e1b7861bb8aa49696b5679d0767560754f8248e332bfc49e38ce18d2987419b0f0a39cbb27ab31bee8ff88b54f88cb94c3a3df6a454389933ec8b754dbdc09f460267162dd709ba5b9d6543ef58705ae4fe88d9c55131d933cc007616fd532efec471a79950cec192cec6731fb5a7ec25cc2cf5fe88853c9b9ce73787a2ca66309e18faa765bd41aeac7227d49f65ceac72e782ac73a1718f8fd63f53710dfe692abed5eef2bf4a85c53593ec8e4dad9d79c4b75ef9dbe84f92de206716ebc3f5d682d88718ba0fb83fa2cea5fb059651d13c3b776eac8eb2cb2a6792f426567f92f5a619e1cebc3c07fddcbb9994c595da1f91de20ff0b2ca33247ac73501a6599b5b466c98a635542fe6471e61cec644a33e8d8d9abadb43f22bd41fe575806a24cd90d2e61fec496b5261a13a7e98daa559ba9ff8eea4fbcdec4a9f4733048f53b6dbd974343bdbbbba03dc6b24acb1939bde05359863d6ea63551de2cf0278d3b51decccb2cb882282bf96cdb949bfa8b6261760c4ab303fd7d1267993c9c89e34e447fd2f566d97217dacba7ed10504cee4f7669f113eb14bc135b55e1ed78b3c29f34bdc1d25ca80f83eb9fbc6f905d40d3be3d3fb889b7cc3a3e6a9933f33ae44f1a679a21672ec25a8fb0c267aab9b586d7824feb438fa69588af18de2cf0275b6f9a2bf56df0ec3dfc7aeb886beb34b8e307a957bca68f4ae24ef0181c117f92f526ca99c5a218f453bb02c670063ee7ee55706f4653713e6ab5b0afc00b5ac08121e94f5ece44cb79500a767e8d65c419ff10776abd3c8d3345e88db64c1bae6f089f5db24f928f4ae68e2a30c2d8e98fdea5534f51d5d979702725c6c13fe3a342ce8c83a3a01394c1327b689d608ff427993368893967a2f579a09eb3fa21cb381079079ff225596b368d896338330e2ac17e704056a986f5de127fb23883d63205e61981b24fd19cb9604369f3b19418ef6dc79974de04637f08ac698eac3967a275843fd97a33af4d698c5881777b5b4ec96907df3240cb64f9a8edf4465966c4218e3b58e28caaf7147754aded7391536fcc488bd61d8882b6b78c7a32ecda3a74f6e48b359dcf9f7e466f3467bca037b2b50aef2d73265a883f51ee247126ca9df9a7e3ef6cf9ec558f9db021b746ce4858959fe7cca27f5ad69b903b5876893fe97ab3cc19532b4bcd4632e59e6a96e7be7046ec42c5c230a27e94339a371e28cdb356e1610c6756b8a3ac15ea4f3667167913619073b6c9be9bacc64fd89d6010d764de65d9d6478d5c509aaf9117cb9905bd897227f45fe93e6a9533643518bfca3e87237fad7baa2d3e1b05fcdeea089827e0fce9e76262edb9d13f0de993ce19e28d29da3ee93e2a8937e16734caf986089d6b6a1d320191f0347b66b99dde90653a6a96b0648114bd59ae97f813cf9965eb2d7f9ef5dec8192aacde9c6d7d8f1c81b3cb939fd31badc295a0472a9ce9a36278135a2ec29fbc7a839cf1e85f07eaaf462c6d5740a7cd4ff83baa705ece6ca637649936cd12e239335ce24c1c777647632cc49f75f426ce5a0f811d67199571c46bc119a970b85ef31331b19e59827f1a7911adc9f6514b7ab3a4d4467f726b8de10e9cc32df491a95b815cba47d102461d5adf5657cad163be55accdd789f51c617ff444b1f09a3e2a5a1bde2cf0278533b17a13f7b9e2a10f1b3df393d124188831c5c285f9a855de0463e5b96196701b72269fdea470666ebdd138c29f4ccee8cf9c33a83d652a1d18612dab377a09582083aba00de73dcec799cd7c94f14f344b58b640b28f4ad59b58fe24f8a864bdd1add64299f9557b367a1d49f01bcffa1bcd605c14679679a3c7530b7ee16081353963e214ceeca2d5c83a7b217fd23f07099c090bb496c12aed603f3857ffd6f8363882be2e3eaea980653ae15acd0f70665e46667d3e878f4ae0cdb252df8ede420b3de719616b688d074af3acfb6853cec473678933510b25f127c64725f026a5dc065e313e0ae64fef416bf434b246d31c71cd9a3e2a863733c51d552bfb14c0190bad35e70e95aff811b6b67f6ac6f8a7ade29aa88f5ae64c127fa23171b6dea496375d0f83437fb8a9de68ff049e3bc13fad398fcaab3751ee8c3eb2f4398e37c97a13530e5647583eff04acd1fe69f4b9665c93eda3163993c21d65a9d03e0705e88de60c7067a8b953d6ff6ea93192ce9da5b8a6429ebb1c6b8135e751ebea8de24ca44ee04fb6dee4b0148eb0a61a61f9783372613c7516e64f05eb4d3667426bcd22fc498a89f372a66c38b3c41d5d431494a937face5c0bf4ef202316fe111fb5c49db1aea92cf26785376f397c54fc289b974e304ee54d25c63f153e8fcae24e9433cbfc89d79bbc3e2a8e332177cabaad12af3778672e585ddffbe198384d6f42ee7c6141fe6ce5a3e279131d71df268e8ec435153db33cd0568ce7cd363e2ab7de24f1465b2ca23f9be94d126716af1a74651c896b3ced9fca7094698205d6f351ebeb4d126722bc89e74f5c4cbc266f96b9a3cb88d3bd04b55e7ea0db16e39a9fd39bf5798316c3fa6bce9fa2f426f6d3d2eb11079199e5fa7a53584cbcc29918deacf2672b1f15c319b2da10b9b215673658b7599b3773cea8baaead3333fcc9b4c45a7ab3fcd13ab37c67ae807b0b5beb4d026756f953808fb2563913ad1378b3ddba4d413e6a9933510bfdfd7fffe7bffe1f92e4fedb - + diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 7198d53c..82da868a 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -71,8 +71,8 @@ #include "kopeteaccount.h" #include "kopetegroup.h" -AddContactWizard::AddContactWizard( TQWidget *parent, const char *name ) -: AddContactWizard_Base( parent, name ) +AddContactWizard::AddContactWizard( TQWidget *tqparent, const char *name ) +: AddContactWizard_Base( tqparent, name ) { //TQVBox *kabcPageVbox = new TQVBox(this->page(1)); m_addressbookSelectorWidget = new Kopete::UI::AddressBookSelectorWidget(this->page(1)); @@ -96,7 +96,7 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name ) for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { accountLVI= new TQCheckListItem( protocolListView, i->accountLabel(), TQCheckListItem::CheckBox); - accountLVI->setText(1,i->protocol()->displayName() + TQString::fromLatin1(" ") ); + accountLVI->setText(1,i->protocol()->displayName() + TQString::tqfromLatin1(" ") ); //FIXME - I'm not sure the column 1 is a right place for the colored icon -Olivier accountLVI->setPixmap( 1, i->accountIcon() ); m_accountItems.insert(accountLVI,i); @@ -202,7 +202,7 @@ void AddContactWizard::accept() TQCheckListItem *check = dynamic_cast( it.current() ); if ( check && check->isOn() ) { - if(m_groupItems.contains(check)) + if(m_groupItems.tqcontains(check)) metaContact->addToGroup(m_groupItems[check]); else //it's a new group metaContact->addToGroup( Kopete::ContactList::self()->findGroup( check->text() ) ); @@ -271,7 +271,7 @@ void AddContactWizard::next() usedAccounts.append( i->protocol()->pluginId() + i->accountId() ); - if(protocolPages.contains(i)) + if(protocolPages.tqcontains(i)) continue; AddContactPage *addPage = i->protocol()->createAddContactWidget(this, i ); @@ -283,7 +283,7 @@ void AddContactWizard::next() addPage->show(); insertPage( addPage, i18n( "The user has to select the contact to add to the given account name", - "Choose New Contact For %1 Account %2" ).arg( i->protocol()->displayName() ).arg( item->text(0) ), indexOf( finis ) ); + "Choose New Contact For %1 Account %2" ).tqarg( i->protocol()->displayName() ).tqarg( item->text(0) ), indexOf( finis ) ); protocolPages.insert( i , addPage ); } } @@ -293,7 +293,7 @@ void AddContactWizard::next() for ( it = protocolPages.begin(); it != protocolPages.end(); ++it ) { Kopete::Account *i=it.key(); - if( !i || !usedAccounts.contains( i->protocol()->pluginId() + i->accountId() ) ) + if( !i || !usedAccounts.tqcontains( i->protocol()->pluginId() + i->accountId() ) ) { delete it.data(); protocolPages.remove(it); diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.h b/kopete/kopete/addcontactwizard/addcontactwizard.h index 0c0d5af6..f28334e5 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.h +++ b/kopete/kopete/addcontactwizard/addcontactwizard.h @@ -50,9 +50,10 @@ class AddressBookSelectorWidget; class AddContactWizard : public AddContactWizard_Base { Q_OBJECT + TQ_OBJECT public: - AddContactWizard( TQWidget *parent = 0, const char *name = 0 ); + AddContactWizard( TQWidget *tqparent = 0, const char *name = 0 ); ~AddContactWizard(); virtual void showPage( TQWidget *page ); diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui index d5c31826..432255d8 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui @@ -1,6 +1,6 @@ AddContactWizard_Base - + AddContactWizard_Base @@ -15,7 +15,7 @@ Contact Addition Wizard - + intro @@ -26,7 +26,7 @@ unnamed - + TextLabel1 @@ -43,11 +43,11 @@ <p>This wizard will guide you through the process of adding a new contact to Kopete.</p> - + WordBreak|AlignTop|AlignLeft - + textLabel2_2 @@ -56,7 +56,7 @@ <p>If you prefer not to store instant messaging information in the KDE Addressbook, uncheck the box below.</p> - + textLabel1_3 @@ -64,7 +64,7 @@ <p>Press the "Next" button to begin.</p> - + PixmapLabel1 @@ -91,7 +91,7 @@ Expanding - + 20 50 @@ -108,14 +108,14 @@ Expanding - + 425 20 - + chkAddressee @@ -139,7 +139,7 @@ Expanding - + 20 91 @@ -148,7 +148,7 @@ - + selectAddressee @@ -161,7 +161,7 @@ - + selectGroup @@ -172,7 +172,7 @@ unnamed - + textLabel2 @@ -182,11 +182,11 @@ AutoText - + WordBreak|AlignVCenter - + textLabel1_4 @@ -197,7 +197,7 @@ mDisplayName - + mDisplayName @@ -215,7 +215,7 @@ Expanding - + 20 65 @@ -236,14 +236,14 @@ Horizontal - + TextLabel1_3 Select the contact list &group(s) that this contact should belong to : - + WordBreak|AlignVCenter @@ -293,7 +293,7 @@ Expanding - + 407 16 @@ -302,7 +302,7 @@ - + selectService @@ -313,18 +313,18 @@ unnamed - + TextLabel5 <p><h2>Select Instant Messaging Accounts</h2></p> - + WordBreak|AlignVCenter - + textLabel2_3 @@ -335,7 +335,7 @@ protocolListView - + textLabel3 @@ -389,7 +389,7 @@ Expanding - + 20 80 @@ -399,7 +399,7 @@ How do you want to message the contact? If they use more than one Instant Messaging system, select them all here - + textLabel1_2 @@ -412,7 +412,7 @@ - + finis @@ -423,7 +423,7 @@ unnamed - + TextLabel9 @@ -442,7 +442,7 @@ <p><i>Note</i>: If adding this contact requires authorization from one or more of the messaging services, Kopete may prompt you for further information after this screen.</p> - + WordBreak|AlignVCenter @@ -456,7 +456,7 @@ Expanding - + 16 205 @@ -478,7 +478,7 @@ addGroupButton protocolListView - + klistview.h kpushbutton.h diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp index 48e1b159..16dd8a51 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp @@ -30,8 +30,8 @@ #include "fastaddcontactwizard.h" -FastAddContactWizard::FastAddContactWizard( TQWidget *parent, const char *name ) -: FastAddContactWizard_Base( parent, name ) +FastAddContactWizard::FastAddContactWizard( TQWidget *tqparent, const char *name ) +: FastAddContactWizard_Base( tqparent, name ) { m_accountItems.clear(); @@ -41,7 +41,7 @@ FastAddContactWizard::FastAddContactWizard( TQWidget *parent, const char *name ) for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { accountLVI= new TQListViewItem( protocolListView, i->accountLabel() ); - accountLVI->setText(1,i->protocol()->displayName() + TQString::fromLatin1(" ") ); + accountLVI->setText(1,i->protocol()->displayName() + TQString::tqfromLatin1(" ") ); accountLVI->setPixmap( 1, SmallIcon( i->protocol()->pluginIcon() ) ); m_accountItems.insert(accountLVI,i); } @@ -87,7 +87,7 @@ void FastAddContactWizard::next() { TQString title = i18n( "The account name is prepended here", "%1 contact information" ) - .arg( item->text(0) ); + .tqarg( item->text(0) ); addPage->show(); insertPage( addPage, title, indexOf( finis ) ); protocolPages.insert( m_accountItems[item] , addPage ); diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h index 981052b4..aafeba4a 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.h +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.h @@ -48,8 +48,9 @@ class Account; class FastAddContactWizard : public FastAddContactWizard_Base { Q_OBJECT + TQ_OBJECT public: - FastAddContactWizard( TQWidget *parent = 0, const char *name = 0 ); + FastAddContactWizard( TQWidget *tqparent = 0, const char *name = 0 ); ~FastAddContactWizard(); private: TQMap protocolPages; diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index f53f487d..6456863d 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -1,6 +1,6 @@ FastAddContactWizard_Base - + FastAddContactWizard_Base @@ -15,7 +15,7 @@ Fast Contact Addition Wizard - + selectService @@ -26,15 +26,15 @@ unnamed - + - layout21 + tqlayout21 unnamed - + textLabel4 @@ -55,7 +55,7 @@ Expanding - + 20 41 @@ -64,15 +64,15 @@ - + - layout19 + tqlayout19 unnamed - + textLabel3 @@ -117,7 +117,7 @@ - + finis @@ -128,15 +128,15 @@ unnamed - + - layout21_2 + tqlayout21_2 unnamed - + textLabel4_2 @@ -157,7 +157,7 @@ Expanding - + 20 41 @@ -166,15 +166,15 @@ - + - layout25 + tqlayout25 unnamed - + textLabel5 @@ -193,7 +193,7 @@ Expanding - + 211 61 @@ -212,7 +212,7 @@ 789cedbd596f233997ae7bdfbfa2d0ba6b1ca8352b021be74292e7799e0ece45ccf3282914a18dfddf3783ef222dd9966c67655665ba5d0b1ff03da918c897e45a1cc3fffd5f7f3d5c9cfef55ffffd1fd39936f38cbf0c57cbfffa2f731e45d5fff7ffffbffffb3ffeb3dd6bfdd5517b7fb55545fdabf39fffcf7ffca7e1ff65fcd568f1ff6a9e0e24b7f9ef23e236d8b425f3fb47b8bf2deeaf0cc9fc7a3b22a6fb67f792f9fd7648dc69756b5e1e72eec8f45c117770bd277eefb67a3507d792fb354767c43df068c1b92b9e373b21a6e7a5f7c45dbc3fb920eeb506356731711f5c159c7be279d13931ddef2c897b48dfac4d3c680d797af0febecc5f97b88ff4ce9e889596c67f879e83da6a2e7ac44a4bad59ef12ab2d9d97d7856483a71f7a0cc5fd79977888f72596649e3e734cacb54c9e5fa45711e975c7c4cc6ab64a62bd65f1f2bc2336c0d989649bdf3f12dc46fe0f894d7081f4a9e2f9339758457efd8098ae0fe7c4561bf50b7a69e2fa45446ce2f7e98cd86af3f29fa5c436382e25f3f21c3738ebb2bc8e8835944f1e12ebd03f154cf767a76056e1797d30a09fc16a3ce7794c2cee8f880d94df0c7a9982239dd844f9cc89db9d362fdfe444322fcf0af5c512e99f3f11ebb8df3b22b6505ec52e675bf0bc416ca3fce65370bbd786befbc4fd36d76336271e800d8f78d8e6e91ff1f6d37ef637636213f5d3be27a6f7a5376071bfd193ccd367d2f56d053ced736ed70e8697cf1d711be59f259c3bb5f1fc78c46a9bbfcfba21d63afc7ea792ccef9ff3fad8eed6c6df7749ac77f8f35c85d8e8c09fe1f9d25fc4785e4fdcef2bc46687d7874823b63abc7dfa2ae73efb17f893063133aeff0db189f7cdc692f9eff390989e377388ed0eaf1f53e467209ee70c8807a84fb329315d9f9860e63e713f2f6f561a74fd628f7888fa9742ff21931bed197a29e2f7ac4fcc8ca717e5a3b0eb79fd9af1f6c14a877ecf6fc19d6e87d787e494b8d7e1f57989f46842ef04efd3d813f8f3529487d6e977787d59407f9d31bf7fb6473cc0ef21eaabd1d6dbbc7d4eaf890dd4c7b90dee285dc4cb25b1da4579203fa6b8deb4c01dbdcbf5b60cc95c3f17e56db13b787af231b185fa6d04e04e07e99d3f10eb5d5e3fa6bcfdb7ed968afa9d77c0e2fe29da8bdd31ba5c7f3b2036bb5cdf8afb5f167e299e2d8660f604de3e66c4b5f1fad227b6ba5cdf25f7279de7fe800e16f7a70f6071ffb447dc46fb2a63621bcf9b9d4ae6fec43b90cccb23b802b3e684f2e0f963ea88e7df10d3f317d7c41db4d788c74b569b04e37d5df63cc42f9fb8035e70ffc86a1b5d3f3589bb687fc939b8dbedf1f797787e5ffcee87c43db4f72c0277fb3df4af78fbec0cda3af5575a6071fdcc23ee53fb1e80bb3dbc6fde241ef478fa2e67e05ea7cff56c3624733d9b1a71175cf0fad2198ae73b23e24107fd8f1de221da7f13e53b14f7370dc9bc7c9a26710f3c47fe1479bf0516bf376dc9bc3c9b747daf0f5e223faaa85f05d2af8ae72536b142fe06f543edaa3d9efef49a58efa1ffd421367a789f0b16ef6b7a92797b6bfac403e24032af1f4bee9f3ad2ff4c8fc1323d3ab10aff565e82bb5a8fa7df3827367b783eea8b269edf8c8887c4b164b44fd4075d3c3fb821d63ae8af44c4cc787d43f9ea5dbbc7ef6f26e09e82e73553c1039e9f6646ac822d94afc13c0e671be9313a149f674b627aff5c23a6f7cf8e890df8f329fc8bc1d2c3d95a807b2c40f1f7e7c4f4fee654327e9f116bc473c918afa07d9bb27ce08f4c999e1931a527837f3259771e7a14c4f4bce682581fc0dfc33f58e27e77426cc25f4f47c416e24b81fa60b1e7c33f77883bc8af7d2b19fe4523ee829b2531bdbfb994ccfd45b32236c029cac716e9c9ef89293d33f82b9b3d1ff91b11d3fdcdb164ee1f9a136293784732c61bbc7fc8865b26957f442cde1710db1daeeff4115c1bd76f0966ed0fcfdf25a6e737f7882de27dc9f02f07c43678ccdb73f7393ecdc1223e460658a467a681457aa605711bf17ef60066e9e3faf83ef1a08ff71f12d3fb9b4792b93f681e83d9f092f308f997e3df2c05cbf73bc4f47ebd0766ed9fb7f77046ac903f3e018be7374f25231e9c11b789cf25a33f8ffc74c5fbbc636216d0b87e2698bd9feb1f2f8855f2e71760f1bce6257187f84a32bf7ec9fb3f5dd95fcedb60f1be7849dca5fe15dedf63efc3f3aec1e279cd1be22ef1ad64f81b3caf2f9e974f887bd49fb289fbe8afa5a8affd9e41fef70e2c9ed7bc27ee0de0bf9f24e3fa07e23e7889f40d447e4be83f10fec3c6f503999e0531a52717bf0fd07fcc90be016b1ff08fa84f03f1be664b32fc599b78009ea3fe0ca57f447b1976a9ff113489e9fdc91531bdbf407b1c327d90ff0e583cbfd9153c44fa7ac443708af42ae279f91ef110fdd5661f2cae6f0e24c3df0f8915624532af3f19ae57c5f3a625b182feef0ce955597d853f5589e9fe469358256e48c67c01da8b8cff21ca4b13cf7786c42afab7860b66e5c1eb6f4323a6e73574628dd890cccba36112ebe008ed4b17cf4fae8935f49f67d04f67f591e77f1649e6d7376c627a5ec392cccbbbe1101bc4ae645e5e11d263b03762bc84f41be2f9d327e23efcd1ac920c3dbac443b4a786474ccf6ff8c4e690a7df437998e27df908dc57707f722c99d747f38e58457b6804c4f4bc462899a7af11115be005ea8f25cad38f880d8c3f1a31585cdf482443df94d826ce24f3f209511f6df1bca0416c7679fa2d94a7cdca1fe32fba9e950fea634e4ccf6b4cc18316f14c32d7ab31276e83475c8f9e9c9fc913304b0fcf8fbb436c613ce48c89ed2e6fdf451fccf4457f674a4ce94d7d624aefac496ca0bd360ab0484f632119fa96c41df088c7af9e8ce7d11558a4677a0b66ef437f62486c52fdaec0e2798da5649efec688b84b3c91ccf33fc1fd325e3b0ab89e00e6fefb91b88df19d8ff77798fea8cf63627a5e6387b847bc2b99e767c4db4f4fce674716583cdf99107730fe9b213d5d56ff30be6d80999ea89f7bc4f4fcc63e719ff840b0c2df37e2edb127e373b52016f389787e4fbcbf710816f7378e8807c4c79279fa7770bf9c1f4f91dfbe785e5811b380c8f3ab12b3ff787e3330d317f1c920ee527d3a211e2a48dfa964f8d73362053ce1f1b227e3b38bf21888f735cec1e2fac68564fc7e49ac8227dcbff7647c4dd1be86e279ce0e71bf87f93ae83564e5c1eb677a2b99ebad9f112bd0af71454cef6b5c4b86bfbe21d6c019d2af88f7b94de201c6cb81463cc4f834d1c14c2fbcef965853509fef8875e27bc9fcfe09ef6ff4e4f87d81fcaae27dde0931bdcfdd23567af0bf317830801e46452cf2fb404cef6b3c121bc44f92319f88e769e2f9be6015f303a90b66f9e3cf374d629df46c119b785ea32d19febd436c8177a0af5c4fc8507ff55e0ff1da6d10d3fbe7a8bf3acb1fc6db3ab1785f97d852e0df7bc436715f32afff63949721df0f7f6488f779a7c45a8fdf9f65c47a0fed670016cfd3517f8c618bde37948cf938e4cf14eb7f2efc8b299e3783bf37999e582f3926b6903fdb970c3de1cf4cf1fc862a99b707ad49dc064fd01ee4fa479e82bb3ae6077db43f4ba427a3ebeb1c733d34c9fc7d0ef4b5d8f3396b0dc9dc5f6b74fdb043ac4be6fe34447cb1c5f3bc33629aef710f882dcc0778d0cb66f7237f067117cfd34cc12acf8f6611f7c0152fcfbe8ce7ae0666efe3efcf1f89e97dda3d58a67f4732de6713d3f33547322f5fcd25ee83f5b664ccbff0f2edcb781ddc82657e75629a8f0a47e07a8194b7ff0330d39bd7375d2316f9f788e97d9a4f3c200e24a3bfcefb437d19bf03bcbf23dee79d13d3fcd31ccfeb30fd79794427c494dfe48c78004eaf24e3fda164fe7e2d221e12c792110f78bc61c35113fd2df7102cd2a36560e68fb93fd212b0b85f1b132bc4a964f8ff9058c5ef13bc4fc6771fd7b3f134e6833c8398e69f74a49ff5eee1efb53b6213e5339b80993efc79fa0931bd5f13bfab2abf5f6f4ae6fe5a6f106be010f9e98bf70706710ff32f85091ef6507f931d620def8b9a92f1be5032de574ae6fe47af8875b0c7e37b7f20dea7a960a63f673d2056116ff427b0683fb6414ce5e1d0f384feeeb5649ede704aac53fa4e25237d2dc9183f39c406788cf621fb1b25ca6b28d6a30294d750e4c7cf8869be4ddb2556d15fd546c416fa5316d23364f9c17e0eba9ea59f978f51121b2ad683cf884de2b664febc05da8b22e6af2df807a54bf3cb19daabc24a803fdf3325a33c97c43afab7c12598bd9fb3d121a6f79906b1455c49e6fa8c79ffa32ffb2b15f454c5fab19683fb6d8c27039398d2138f8887980f34505e6cf489f8e10fc02c7dfc77df233691ded9a364f40752620b6c5e49c6fae235b10db69a92317ea4fb951678cec77f7d395f91a3fcb5ae82f53f0ffa6922fd7e4eacf479fab20b6215f38f560166f511fdd77d624aaf45cf17efb74e2473fdac21719b5891ccdb4fc5fb337dd97fd250de7add83e0e54fbfb3f2e0d747d7c4943e0fe5a90b7ddd01b105fddd4a32bfde86ffd0c5fb1d87b843ec0ad6103fa0271b2d53ff3624a6f99810fece10e9c9778835cc5f9a682f061b40607d78406c23de04c8af21d217f7886db42707f1ca10e971e9fd4a57e3f16284dfe5fa8789f231457af39c58457f4d83ff31d98808eb9da7c403cc8f690f92e1ff746205f3f1da2db181f91d0ff5d514f90dee8975cc17e72d6203eb6f26fcabc9f4e0cff7ba60965fcc6f414f93d51fac0f27c494df592919f12b25ee81fd13c9e80fa0bdc8fe62754c4cfb7d52f43facae067df405b86761bec9b3c0758de3cf9f12537ea6e27713f3a301ea9b25deef9f12f7c1a12999e73f7c201e80c7a8efb648af8dfcdaacfcb0ff614eac5379e27d76af85f96b83eeaf47f49cf17e9bf540509f2d624a6f720466f59fe7277c24a6f44423c9bcfec60ef110bce4ed6520fba3de35982982fd16f7e0611bfd85f0092cde373b23267d92a564fefe989e2fde173f48c6fea811b1423c96ccdbbfc6fdc3a0dd1d52fc9b112bf0e7d913b105ff9876c17589f3f2a3eb9962dc3f98485f9bf90f8c2775627a5f7a42ac129f4ae6fe69c2fde140f64fb512dca5f5b9620216e39770072cde9fd960169ff9f373a4a7a3b4e11fe23e710ffe367789499ffc4a32e6cb15624a6fe648463cd827d6880f24637f08ef3f0fe4fc957e0cae572478fd457eba6cc48af5ea5db0c84f80fc74eb0d913cfd63e236d67be37be20ee6272ca4bfcbea0f7f5e42cf53fa945f8f98d29753fa149d38908cf45c131b1ad77bc2fdf340f697b539b85e71e6ed6901ae571078fe2a6293fa33487fafd7a6fdabc85f6fd081bf4d35e23efcdf14fad6fd63febc694aaca17e4dcf884dc4571bf5ada774a9fd5c131b949f1bc998afcf24c35fe5c4267882fa21e7e734dcdfef68983fd014621a5fea3eb18df19d9580bb16f93fb4977ac0c1cb2b34884df853f708dc3768fe14faf6853e31da5f5f19201ea7743f6befd84f44ef63e947fe0e24237fe792315f7d416c81c7285f39ffa7a13c5983c27c9589f7d71580a7c78c88a93c33f89301eb01717d32e83310e90f7789bb88a731eae380a51feb6f77c4949e694b32f60bb4896d625532fc0fca7f28f47750bf86f50a13d7bf24a6f89bc0df0c7bb4bf7a8afa57f7ff797d4b91ff61ddc2f8fd8e64a47f42dc437f20cb89fbd81fb00cc1a27d2d4f8929fd334b32d6df29bd6a8b3814ac737d2668ef727fb256803b2dccff07f0ff8a787f8af6a1307f85f563f84b453c6f9613b7891792d19f3827ee80753e5e67837d0dfd3bfd112cde6fd8c41ddadf7549dca3f9eb33629a6f8ae9fa2ef58f32d42fb547fece47fe54961fc43f4732fcc70df100fdafa40166f9c57a00eabf2ad23f3b948cdfe97eb54b7c2b19fd3df81fadddc77ab40fffad89f69e237f9a68df09da8fd6a3fde7e603b141eba3681f9a486fe0120fb13e1939c40ad60b2bb44f8df52f305f48d7b3fac4d353c2df6b32fd779251de5de21e714f32bf7f097de5f8c285ffd7dbb4fe9622bfbac8ef14e9d7bb347e9e26c4b41f628ef8aa8bfe5f8efe832ef263a3bdeb8a06ff3543fbd5457ae6a664ecf7b388fb601dfece68d9d84f3347fa0db1dfd93a26a6f574af434cf9c9a1afd111f3ef287f83f528b03e9112537a83476215fdf98aee67fd715e7f6da4d760f114fd67f8174394c73c20a6f4cf33c9d02b271e103f4ac6fc07fa6f668bf66b698fc4b49f29417c35dbb43e9b138bf6664ec1bd21ce17c41ab18afa19a1be9b227f8147aca13f12ef10eb186f5a48af29f26b35887570a8121b545f0f894df4afaaa164cccfdf1393bf9fd3ef22ff738578082e0cc9e82fa2bce5f845bb26a6f914f78a98f63745e80f5a6ddaff12a13d59227fc113b181786ca27e58227f7187d8427fbb807fb05405e9290692715e202156c13aeaabdda2fd2546484cfb4f33c42fbb67e2fc43ae11d3f98d12f5c716f3a74bd4379b8d07f8ef637a3ef37fd89f0efd6df1fec591645ebe8b5b628d58958cf9059e9f7a3a0deb07da9098f617eb1e31ed0fce2c62ca4fde030f68fe3f710543df709fd8c4fa7972436c617e29ccc12c3ee27c530516fa964d624a6f9912ebc4d79231bfc5dbe350cec71b4f82b15f5b3b108cfc2e26c4e2bc481b2cf6e7678fe09e0dff13ef8245fa238fd8c6fcccf21e2ce63fc70698f5d7f9f5a30e58f8ebca22a6f45736b1415c49c67900de5e8672fca41f11b791bfa20116fb9bad2eb847e3fb1cf9673f63bf509a1153fa8316b83e40c5d31f81597bc7fc91466ca1fd4f4692d19f46f97484bfdb3188a9fd4c048bfc9e1353fe2aca9f6a12ab92b1bf8cfb83a11c6f1913e21ece17987b60168fe1cfcfc0fd3ee2ef2804b30885f91fe8db95f9457ded2a2df8ffc9297117f12cb800b30e12c6d7683ff5060e9c5fe913d3f933ed4a30ca638ef4f7c47eb3f91d58ac9fc53ab8dfc6fd11fd2ed2171e10b7b1bf643c148cf5c4b443dcc1fe88c903711feb072394af1cef2cd15efa62bfa7d92336e83c24f2db67e18ce77f82fa5eef47c0fa8a42dcc37e9cc51db185f593f888d8c67c48e48345fad29cb88bfd6013d4d7bee84fdbf0177da637fc273d4fed61bc37c6ef723ca35f10d37eede509b83b407f752e98f6cb8da1f7a047e305ab476cd1f9d09cd8867f98ccc07deabf86d7c41d94970d7fc30658787f02bd06227fd994b807fd4697c40afcbd8ffa537798797bd9417b7b5eef3823a6f39ec609b18af78de7e0ae8ef5ffc91e31ed3f9fa2bd0cfb3aea6b047f3514e9090f89fbd86f3281be4351ff1de4675877e8b95eaa645ede23bcff79fc72486ca27f33823f579803c278f48e98cefb4cae892df477e6687f8ad89f36bf25a6f9e700f5491958585f8d915f45a43fbb241e60bdc7477c52d43eea4f85f27c5e0f1910d3fe1f3d2136e05f76505f54713e7154122bf87d227ed7113f271d621beddf44fb55597dc1f9c87de201cef765c8bf3aeca03d066de23eea4f1410537ed229f110fbfd6ce8c5a20fea8f7f46dc072fa1b75c1f29c6c4b49f61722219fddb1e319dff5d2e24737dc721319d079e2c89a93f3a6a13d3f9567321197a415f8dbd9ee76f4ebf8bfdeb73a45f13fb3de737c4b43f728178a3b106cd7f1f45c4e47f22f83f4de8e3217e6bea00e53f87bf795e7f41fbd5db5df427e7884fbad8bf38bf26a6f14682fceb431a2f8547c4f4bee49658c17cc3645f30da7bda2656319f52e279723fcb1cf5cb10e7cd62dc6f88eb23ba9ee590e7c785ff30d421f2171d13ab88cf23a44fae97cce12f4db1ffb140fd34fb038c0f52b40f533c3ff18975ac973a282f5355f0be05da9becaf1b280fd6bbc5faec7497b84be75fe9fa1ed59f10e56bf535d49fbc416ca3bf96c37f58f50c1cbf1ef9b386b43f337a24a6f4b9d08ff5cf311e092d628df4803f90eb0d73a4c716fb1d97a83f763de3ccf38ff6638be7c707c426f6afd9482feb7f430ffb4432ea2b6fbfcaf379e118ccc239ce935d81c5fec7c91cccea33fc750416ef4be9779663c43b5e3f15d9ff35f1fc765fc379db7c0a1e74e19f12a4a72dee8f9e886dec978cdb60d63f4379f2f187d261fe0ee38721b14a3c27d631fed12ec19d16da6bd4010f69bd3db927a6f715bc3fa9c8fe9dbf0feed379eaf8102cae5ff2fe9bd2eb2b18df4d7c302b2fac0fe8c43db49f087af4ea03ba9cc760d546fe96d047f68f4c05dc3670fe3b6a81950efa8fa9e02ef67b8db9bf54647fc4b0c0cc9f613ef908dc1962ff67f20016f73b5db04af38573e825e3bf3d00f76dfabec32398b558e407e5356439e4fadbbcffa2287d8bbe0f81f263ff80fa54e1f932fe8d915fb53fc47cc198b75745c68b39f4d6c479f46513dc33d1bf8b911e8d3968ccf7f078a0e862fec6bc05b3df319e6a11d3fc507a494cf32913eecf94677f88fa6188fd0a09f2630c34c40ffb18acd1fc5885f27cf677286f53dc9f36c01d1aefe926b185f3390efd3ea0f9631bf935351abfcd797f4ab1c4f9f7f90e319d6f9f1f1153bc0befc01d15e7c5c707e01ecda7d948af35e8a17cc30cac0da0c798fb2be5d95fa17c6c71de3dbf0077a8bf52417f5b9cbf7334f06048f9d903b3e7a3bf714e3cc4f86dc2d3ab4a7f35df038bf3f125ef6fa8d2dfccf7c1e2f718f7b73b1638db25b6e12fb40b7057c7fe972801b3168dfde797604d81deee8d64a4ff4832be2fd02356c1f14032fa8f5c6fb523ceeb5b1a98ddcfcbdb9a4ae6ef1bf1f6a94a7f343f048bf981890aeed1fa83e582eb1516ce6760f67ed4cf67e6e90b4692d13fe9116bd03fd9938cf9bd27c9fc7d13e45faed78d63b0387fe9ed80c5f3c296643ccf27d6f1bcd4918cf86f121bf83df324f3faba407aa5bf2c513efdee10fbbf5dfa9d3d0fe59149863fe4ed55adcf6be3fb2b13f080f66b9821b185781514c436f62f6473b062603fcf88f757d4e7fde82598fd8ef42cc02cfd585f4f894de8919e135b288f11f7c7aa22ceb34f1e892dac6f2cb83f51a5ffb4513f54cdc4f8b5e4fe43d53a26c69b4b1e2f55d9dff451beacff88fc58282f83e50ff5117a1b2c43a86f285fe9cf26a84f66b74bfd371e6f54d9ff1a2dc11d0de3ab25eafff3fe8a3e7848dfeb59f0f2d0eae93e9e1eff1cac77687d98e74793ed3d2fc13d11effb6071fe293904eb7dc4b382fb4f4dce5f4dc6e0ce10e74175e2de80f6a3e1fd1d118f46787f577cafc31e82d90813f35d73b0dec67af292d7674db60f5303f754c4a331ef2f69b2fe1678de407c7f6592111b98ffb42a703d22e7f5a50766cd19e309debe3459ff623c9fc5633c2fb4c13aadefc609f110f349156fcf9a1c3f2fcfc0cc9f623d02fa283d8bc68b1d707f80f48db9ffd2647d9c707fa1c9fa3631c12c5e61fd097acaf8ba8c88e9fb43d31d705fc3f71eb413f080ceb36513b062e13ced88fb434dd6cf1cf935fb341e3671bd39a4f5325707b3888cfda407605dc17ef93025d6a9fef178a0c9fa3d7e20a6ef3399481feb2d438f92f76f3559df43bccfee2b74fd0cacd0f75122a4cfd675ec4f1bf1faabcbf8575d12d3f7acac18dc57f13c9daeef8befa33c81d90883b78f058f77ba6c3fe305318d7f2c3cbfad6bd86f1b9c11d37ec711afcfba6c3f954b4cfd93498f98c6e70beedf7519bfc626317d9f2c6c82eb1e0bd77f1fac1b180f24f4bb6e637da4e0fe4497eda9cc89c5fcc1ad64ac178cc0aa46dff3e0fd535db6b7ca23a6fbcb2931cd6f8dbbc4f4fd9691424cfe6abc434cebb1a30362fafe546680d501fc4bf6406c623f8b97818d16f6fb2ec003f1bee29098e63f165d62f1fe2b627aff62444cdffb1ae7c41ae6a39703624adf127a0fea2f44f1fa82fa311874b03ee4d3fb0c9adf9df0f6a90fc5febd49494cdfd32a5ac4f43dadc93931ad6f8c517f86a2ff3eba27a6ef098da07fbda080f512d4bf217350b89ffb1b5d11cf1fa3be2a22fd930931f5f7973631f54fc7e277ea1f8ee877b15ee1227f8a6e637ce6a460a38df299404f55f4af2787c4d41fab04d3f78dc6284f557c2f6704bd55f1fd81d802b3fe1acec3a0bda8468be6a3f1bb26fa8be30b620de3c1d1102cf6772faf88e97b1023a457ab4f10f3e7d3f3060acadf477968068dffe29898f6fb8fd15e74513ee347627aff644a4cf34315daab5e7f2188bf1fefd3bb36fa071aea072b408cbf4dc1169e37467d31c4f779c663625abf58223f8638cf3eb68987e0d11d31cd972dfbe01eed1f19ed11b7e10f7494af31a4f93613e565a81d3c2f5a100f29ffa8ef66fd4529ee2f505ea6f81ecd08fecd14f327a38c98ce5b2e7bc45d7080fa6c6a5dcc2f8fa19725eacb648798f6232ca08f557fe183ff7e414cf393e39498e62747bb6071be7379494cebf7a38164ac07d0fdf50950ae0f5d3f3029de209e586c44cbdb93790a565bc8bf8d7860193d9c27f426c4033a3f86fa618bef318cd1be6d919ff18858417fb56a13d3fce012e567f706385f39ba958cfa71414cfbc934a4cf56e83c6754805503f575c4db8bd112df679a3860f17d8ee52eb83eb1c9afdf918cf2368855b0f5085628de7a365835d1ff1af1f665b4457d19b7c0f5173878f97ac4627de89498f6434d0a626a4fcb0c2cce1b8e1262da3fb8b48875c49bd18d647cdf12e96d3387cbaf779a6036a2c3fbf8f8c7e888f6345e8245fda872622a8fc90131bd7fd427a6f72d5362da9fb5348969ffcfb22b19fb690ec11a7d9fc6a5df0d3a6fb444fabba23e151558d497c9022ccee3562d620bcfaf0e88693f9f4dd7b3fce37c06fdae52ff2aa3fb35fafe558cfc770d03fda325f4e909ff3e3e018bf6560a16f945fde9f5e97b48d513711bf30fcb4432ea23ef2f1b7d515f26015896c73eb84ff32da36bc9e88faac4b4df39467dea1b74be69c1fd913110d7578fc43dcc8f8c2692f1be3d625abfad3262da7fac3f8087d41f9922fd0385fa43156fefc650d6f763b0288f52018be7951e31ed07ab7625637cdb2156c0ba0b5687a82f25f717f5f10db4a731f450447d5ca0fc14717f3924a6fdc6e53131cdb7947c3c67a8a27d2c4e882daccf140a31b5d7c2960c7f87f25645792cdac4f4fcc519318def0a71bd81f5e2f408ac74315e1d833599be01315d5f1e49467a5d6293be07a713d37e439fae1f5a680f31fc87a629f09763b44f5dd497894d4ccfab52627a5e29aea7f5f8a204b30e2dd677f17e5d35e17f52ba5eb3108fd30bb06161bdc54904633daa407d35c4f3aa84b88df5f2b24fdcc1fe761fed9d6508f1369f81590f18f313683f8641df3389511f0c93ce538cf17c53d48f02cf33c5f38b0762dadf5bc5c43dec3735104f4ca58bfe7b521293ff9d46c4627f19fc9fa9f750bf4ade9f606ad0f3463a31ed672d0ac938cf794f3cc0fe561bf5dd627ae33c820f66fd3ff8878898cee354605bdcbf6c130fc1655732be5f342756b0ffa5e4f5cd6c092eee8855da8ffa40ac81cb8e64c4139e5fb32dce2b2c7788e9f762464ce71d162d6283d8918cf52205ac28e8cf580158a3f149c5f5323be2fa71454ce7e3ca03c9883f5362aa9fc63158d1e8fbd0485f47efa23e2f787b36bbe2fa854d6c83ab3bc9f0876d70bd838df3be64f467b83f357b033a2f56e4e0219ddf2b6e05633fcfa222a6f349654b32f6bb1e811503fd196b0facb5909fb041ac613cb5e4fed0acf7d3a0fe6792117f1ce21eb8b8918cf524e4a76f0eb0be58429f0173ef882f3bc40370914ae6e9314cb0e87f4548ffc05411df4648df7040f5793901d73b4ef8f3ae25633c312656c0e5a364cc8fd0ef2c05c81ff451ea1d11fc798964f8872b628dbe7f644986bf7e20d6c14b94872ab8dc958c7810131b184f1597c426d8c6fb556d80f2720a307b03da2f1f4f989ad07f6112d3fd8b5232daff84d802973b92515f6f896db081f4696a9fe69351ff353600427be1fec4d4d9f518df18e07a4599f34232d65b9f88db600be9d7cd3ef5df2c62fa9ea72d7ea7ef572d911eb97fa1447e0c367cc7fc5248dc21be908cefddeac45d1a4fa0fdb0f121f2e75e122be01cf931588f0bf10dedc130e9fc7709ffc2fc3ffc6d392626ff5b0492d17fb489fbf47d0fd46793f510b1be41d79b438c07538b58857fae50ff2c513e05f4b1143a0fb52888e97c68752319fe7d444cdf4730e66095f6776af0cf96d1a6fd953c9e98b6d0ab3822a6fc14e2f721f6cb1467c40a78a149e6ed693127a6ef0198a8dfb6de43ffcd41f9da269df708e977ab85f35a0bee0fad96c85fb9245631df5b85c41ab8f02423be9c12ebe0c5a3648c8fe97e8dea434c6caae89f876d620dfde992b707ab2dd2b36810d3f3966362035c5692d1de5d62135c5a9231fe8ec12aed27b4f6c19a46ebf70a988df0907feeffac8eb8bf3821a6f3f58b9964f8e79298ce532f479279fbab90feaee0c201ab2de263c9bc7d2c9ac46de2a960f4b7cc21b85ec1e1f17b424cdfc34dfa6083c6ff156f0f564fdc5f2e883bc4267117df1731e97a5dc1f8304079f7ac36dacb82fb67abcfae47fb54897be0b2908cef79d0ef1a9d073607c47d625732e2eb21f180fe5ec883647c8fe14a32f687df83cd0ee261c9fd8d3550fbd8ff5dde110fc08b7bc9989f3f251e82cbb964ec1744fd1eb0fa8cfa63112bc411b1582fed4bc67af38858437b704cc9383f722e98f64ff4c07a1ff34d3abd8f75d0d1dfe1fe9775f6e9fcad658335da2f6c39c426f18164ec6f3d94ccf36718c4349f6776c0fa00eb7be6ae60c4abcc2456b01ee5d0f516edffb3e04f148dce331b578231ff638d8869ff8cb92318e30f0bed45d15ba80fc69160cc875a77c4f4f72eac7bc958cf5f48c6f72c0ac1c88fb3473cc0efb642ac60fe399812dbb45f847e678ae3fb12a88faadea1fe725f32e6677cc9182fdd4ac6fdbbc434def122c9484f4a4c7f2fc6ce24a3bc3bc47ddaefdc928cf937f1fe3ee6e7cd8660cce7a5c8bf6ad8f0bf3e3dcfea207e5a789e269fd726a6f6663f33be3fa149e6f98b4dc1183fd81de221e5af2b19e7996782311eb005d3fa9e3d978cf9f233c198bf303dc9f8de85489f8af945f39098e627747abed9c5fe0a1bf543d7e9efdd388664ac471c48c6fec65230d6579c7d620dd7bb9e64ec47542563fdf95630dd7f484c7fefc639958cf9f863620be9378f24637e10fe4337c4f94ffc6e88fb9d6362fafb38ce0931fdfd1ad7908cfe9b4b4ce7a15c5332f6cb3625a37fbb2b98be6fd626b6e9efd30c04239e184dc9d8af86fa6918e2ef55401f83d5479ede688f7888fe880b7f688ae7bbb6647c6f10fecf345ac4c792e1cfe782313fe89e10b7b1be64a682319f63fa92b1ffe994b883f52ef74c32be9f6210ab88c70efc9f69b5b0ffdeeb130f307e75517e96b8dfbd20ee82bd5032d64b1dc9789e4bdc23f624a3ff732b19dfd3f489fbc481647cbf23211e60fec683bfb58d01d60bbc7be221f6037b0f92717d4b32be8ff248ac103f4986ff6f0ac678dd502563feb92456e93c9f2218f323c65032fcd109b181f9550df5d1362d13f35b681f36eb1162fe8bd75fbb259eef5792b19f6d4732ce2f2c8935e29164a4772c19fbff27c43a380824e3fc444e6c108792f13d9b4c32d6d3457a4cfadef3bd608c5f7d1b6cf5d11e031e5fecb661627d208825a37f974ac6f7a612625a3f0dba9279f9270bc1d037e811db882f415f32d6f70660d6fd407fe04e307d6ff35632fcc38d64d4c76b621aef06bcbced0e7b3ef64b2a60f67cb02a19f333a792b1ffee8ab88df9f6f04c322f9f28958cfa744edc21be908cf1d5a5647c6f6841dca3f330c7c4b4fe92207d5db30b7f1e6592115f72e21ee6cba3a964cc7fce88fb58bf8de692b1dfa32d19e3e12be201e243d4938cf5cd7bc1188fe416f110eb33c6a160b417e38098becf66ec4b46fc417deb5a7d3a1f3e265631ff18a17ef44c5a2f8b9bc4345e89069271fe6e2819e5a3102b585f8b54c9384f7d2919eb7b7b82d1ff8f4f88553aef772119dfc310e9d1305f1ca3fef44d8dcaf34c30e2537c2e19fbf9a792f1f7bc42c1b41f2f22d6b15e94e492513f62c9980fcf88697f6506ffd367e33194f70d31ed37773bc426e61712b4e701bb1fe72752c9484f8fd8c47c41f2446c61fd22e94ac6799b9664ec4f6a13db988f4e3a92515fa682b1bfcec825c37f237f03ab85fd9a462a19e39f03e20eed3f2e884dcc4fe5bc7f620fad16e6fbd34a32f6b32f89db882fe9ae649cbf1d49c6fed31dc9587f191377882792e18f1bc45dcc57e7489fc298eb93f625e3fb494de21e381d08c67c71aa4ac6fef821319d3f4b15c9f81e4a453cc07c6a7e2619e7e1af8987988f3274c9f0b79a64f8db06311b01f1e7233faa35c4f82e2b2523ff0b6205fe3b3f25a6ef0be773c9980f5425a37c6c62da9fa63b60e63130de447cd02c9aefcaee2423bf0ab18ef999fc84d8c0fc892eaeb74cbcbf4f6ce33cbf2e9e6f9b98afb8910cff88fac086ab26f6f7a33c74cb843fc98f25f3fa350d88e9fb7ff98098be9fa8a3beebcc63f2f4f9f03f8665d3f756503f0d9bce17ebfbc4030be723f6888716ca775732e211f4b32c9bfc29eeb7ec3ee6a7749bd8b0b1ffbb4b6cda48df9498fd0be75c32c627c89f6d69187f3b21b18efeb575416ca07f1ced0846ffd0b926a6bf4f683bc4d4bf7063c1e84fd8b664cc9fdc48463cef10dba83f6e2219cf47fcb3ed16e28d732b19e3e74bc9189f5e48863f3c908cf4dd11d3fe04df928cfe645b32e63bbb92f1fee7fb71de20978cf1c25c32bedfe01277e07f9d5c32c67733c1f0bfce5432f4be978c78a64ac6782b25eec2ff853dc9d87fde928cf3768a648c8f1f24e3bcc35432d227f4a0f5afd023a6f516e751324f8fd3928cf5a58964fcbd9327c9f81ee2a564c4ffb9649c37ec4be6e9f34d62fa7b04b1482ffd3d81e04432caf34932e6b36792118f32c988bf73c9f8fee7bd648ce746c403cc57bbb9648cd70692f1fdee9964f4c77724a33e8af40f309feb5f4946fa0dc9f02fa23ed3fca6fb2019f5712619e39747c9e86f1d4ac679d7b664a47f2919f31d223ff4fd31573c4fa1ef670e2543cf9664b49f5832e6f7762523fd4f9231feba968cef2bcf25a3bee892513f9edf8ff1d131b18af956af920c7f2df452715e31f42563fc5b48869e8a64a4a724a6efa9047b92a1df4232eaab2619e76d03c106eaeb11b16e40af4832c6aff79231de0925a33eaa92d1de1bc48681f1d6be608c9ffda6643cff4632beb7752819e521fc9d69a2fe1e48869ec21f5b16cea3913fafffabf972f66d6fd9b7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3c99a8d6f6d5e5b5363a637f56f6d9e4d6842667c6b53b79e754d9899ccacffc9da6cd084a9c2cc6efe8ffceef5564db82a4da7b6ff49dabcd044dfa40933b7e935bdff09da704db48f6bc2ccafed6b6bf3614d9c554db805cde06b6af3f7346986cda8b6afa5cda668fc8626ee664d98c5b57d0d6dde8bc69b3c8ad4245cd5845bd24cfe6c6d3e1a8d3fa709b3b4b63f539bcf46e3cf69c22d6be67f96363f1a8d4993571ee56d4d9a53d89fa2cdcf893c5b35c98426dc66cdf9efaecdbfa009538559d12c7e576dde8dc62f5bcf8f6892bfad09d9e277d3e6d744e3154dd2f735212b7f176d7e6d347e4393e9464d982adcaa7f5b9b7f261a7f4e1361ff9636ff6c345ed1e4cdd6c36df9ac4a73d41c37c7ffbc36ff4634fe9c26cd09ec9fd3e6df8cc6ef6a52ad6ac26da7b9fbebb5f91da2f1164d46af3569eec17e9d36bf28f2fc48345e7c4e1366fbb5fd7c6d7ec768fc394d9a07cc0e9b873f4f9b9f168d3f1b797e54939d4d9a303baaedef6bf32744e38d9aecbda549f398dbc9dfd1e68f8a3c3b1b5acfaa2650e5a4790afb116dfe284d367994d79a1c0b4d989dd5f6196d3e1d8d5f7a947f2d1a7f4e93e679f3a2b68f68f38f47e3f7bceccfd2e4e46d4d985d32bbdaa6cdd789c62fbdec764d84bda5cddf8c3cbf6134dea8c9f95b9a34af99dd346f57b5f903a3f1cb9af2239a5cbed44418b4f9a322cf0f446352e57c43eb79a109b3bbe67df3bed6e60fd1e427449e7735b9ad3511c6b5f9f2d1f8739a707b683e726dbe7c345ed1e4fa8526772f34796a3e0ae3dafc7ed1f8c723cf9bd1f8739a306b316b736dbe7c34deaac9c34b4d98756ae3da7cf968fc394d987599f5b8365f3e1a6fd4e4f12d4dc8fa5c9b2f1f8d45e4f99026bde680db906bf33b46e38f479e1fd1a4bd4d13615c9b9fe1657f4493837f2a1abff228eb9af4d735692a4db5a9369a5c9bdf33f26c8ec6ef7994ed9a745f683258d7a456851b3f23f4414d5eb69e3f281abff4b2af34515635a1ff34aecdaf8dc62f3dcaaf8dc65b23cfc73469e8dcf819a17f35f2fc23d178ab26cd979a08e3da7cf968fcd2cb6ed78499d9b01afcfcd46f138d5f469e9f168ddfd4a4b14913615c9b3f3d1abf6c3d3fa289bdaa4ac369b80d8fb4f9e2d178adf5bcab8930aecd978fc6af6aca564d98f9b5496dbe74345eb1d79ab82f356116d4c6b5f9f2d1f89526d60b4dbc554d98858da8c1cf4f7dfd68fc394dc8f8f9a9af1f8d377994b7356924ccd2063f23f4f5a3f1268ff2b626c2b836ff44e4f957a3f13b9ac4eb9a34b246de9836f819a12f178d37461e661fd04418d7e6cb47e37735c9563569cc98cd1bfc8cd0d78fc61b3cca064d84716dbe7c347e4393fc8526b3674d1a0b6efc8cd09788c61f8a3c2f3dcadb9a30ab982db9363f698df4378ac6ef78d917ade785266423aecdcf8ac6ef79947f2d1a7f4e13b23169f3c5a3f1e73411c6b5f9bd23cf4f88c66f6a52bdd0642255d961b6dbd85dd1e677d3e4274663a949f9114d98edd5c6b5f9b7a3f10f8c033f178ddf6c3d1b3569ec333b681cac68f385a3f1164d765e6b42c6cf08fdbd71e09f108d5f68f2b2a6bcd0a471d438ae4d6af3a5a3f196d6b3aac9213411c6b5f9f2d1f8739a303ba98d6bf3ef47e3e8d746e38d9a1cbda58930aecdef168d5f469ebf1d8dd73439784f93c669e38cd93969f3c5a3f1e73411c6b5f9f2d1f8739a342e1a97b591365f3c1a6fd0e4846b72f652136657ccaeb9365f3e1abf53535e68c2eca6b65a9b7f2c1aff78e4f9559a5cbcd08454e1c6cf4f7dfd68bc5593ab979a70bb6bdc716dfeac68fce35ef66253eb59d784db7de35e6af3a5a3f1e73461f6c08c9f11fa42d1f8e46768c2eda9f124b5f9d2d1788b26cfaa484dc85a5c9b2f1f8d5754f98026ccdab5496dbe74347eb3f56cd4848c9f2dfbfad1f85d4d5655e930ebd6c6b5f91991e7b78ec62b5ef6039a90f173771f8e3c7f6c347eaff5ac69d26df4990d1a03aecdc7a2f16723cf6f148d3fa1095705c6b5f9b5d1f8a547f917a2f13b9af4d635690c61a4cdef188d5f469ebf118d3fa709338599cab5f9f2d1f8a597ddae89d68491369b34f9f159d9df2a1a7f4e13327e26f18f8fc62f6bcae734515e6aa2d17fa4cd178fc61faa295213fe9faef1bfe9f6f5a3f13b9a34d6356166d4c6b5f9f2d1f8039a68cf9a703335936bf3e5a3f1e734e16669fc6fba7d22f2fca1d1789347795b13664e6d5c9baf168d37469e8f69c2cdd55caecdbf1d797e79347e57137b5513665e6d5c9b2f1f8d573431a426d6264db8f91a3faff90f44e3bb7f371a7f4e132de016726d5e7bd92f168d3fa8095409b9451a3faff92f47e31f8f3c1f8ec62fbdec764db41826b5f9d2d1786beb09a52aa4899670e36712bf7e34fea02650251546dafcfa68fcd2a3fcea689c69b936d566da5c2bb485566a95b6d4464c99cd9a8c9f55e1c6ffe6c96f3d0efc6c34ded176b53d6d5f3bd00eb523ed583bd14eb533ed5cbbd02eb52bed5abbd16eb5bbed9a08236dbe4634bed71eb447a6ca93d6d2da5ae79575b59ed6d706da50533475b326b5e94d1d735b5f201ab30b75ddd00e7453b774fb0d5da4e98eee6a03ddd37d3d785b1366616d5c9bb722cf1f158df5488f992e899eead99b7ae46b36d567fa9c5d5fe88b1555a426dc4a9dff6dae3f3d1aeb4b7dc4723ad627fa8ebebb667b6bb6bf6207faa17ec4ee3ad64f5e6ac2ed54e77fbbe24f8dc6fa997eae05ac2d79fa857ea95fe9d74c9bda6ed6ec76cdeea4ddeb0f7ac2d479d49fb826a5d08459ab36aecdaf8ac6c39f3f36163d14bdad77f4aeded3fbfa401fea8aae1acdd5ad79ccd6429aa1af1a5391996118a661690786cdb45951c570605c9b7f27f2fcd0d818bd36c3353cc3671618a11119b1ae326d122325cbd62c5fb3e98acdd85d73a360ea2c5053842a46591bd7e6f78bc61bc7c64c97ca581a23ae8c6f8c8d89b1532bc372b96becadd9fe8a1dacd921d911bfefd83861ea9c3e6bc2ecac36aecd6f158db78f038d73e38274815d421996c72be39ad9cd9addaed9dd9add1b0f74e7a3f1c4ea5f4b6862b4b9616fd26f148ddf1cf3d0d8d8e81abd355d6aeb0b6d581e07c6904c593175d5cca6b4c6f39da6a61d983aa9d2313aa6511bd7e6b789c69bc781a6695aa6fd4a19df745672e89a9ee9330bccd08cccd84ccc74c5323337a7e6cc9c732b9eefabbd8eb9d00766094d9855b5716d7e381a9bcb9f1779b68d8dcd91397ead0ba93359cda5b963ee9a7be63eb703f3d03c328fb99dd0bfed9ba7e69979be7a0fbfef82d59c4b68625e99d7b5716d7e301a9b37e6edafd5a41ef39877e6fd265db8360f6b797c349fa40afb66cb6c73eb985df96f3db36f0e5e69333415a68e5a6b62d19fab206d7e20f2588dda95b27cffad68fc7ab66d756c6ce996f1564b5a35cb14f9b32ccbb61ccb7dd6c6f22c9f5bb0a2d7be15b2aba297ea586cd46125a44b6a6556c6b5f9012f6be5d6d49a5973abf8f168bc591352666195db7521752a56ee03a6cbd21a59636bb2a2c28eb5cb6d6f4d9b7d76d5c83ab00ed7b4612308ebb8d6c43a8191365b34b14e5f7b14f3c63ab3cead0bebd2bafad168bc7d0ec5bab66e3ea20bd7e6d67ce4aadc59f7d683f5b8a2c293d5b2dacc3a966c53568f69d567d7ddb13bacb576c55a953520658696c2b5d91a792cd56eda0d9671dda676639bd6996dd9b6edd8aeedfd4834de3eaf64fb7660871f55c68eecd84e585efb766a674c85b69d43057b6acfecb95d309bdb0bbbe4ff56d94ba655cbead829d3e8c11e3d6b638fb5037b62299662efd4c6b5d91a8ded5d7bcfdeb70fec43fbc83eb64fec53fbcc3eb72fec4bfbcabeb66f7e74a67ad3cc927d6bdf7d5417a6ccbdfd603fda4f7666b7ecb6ddb1bb4c879eddb707f6d0566cf5d99ca6d36009d51d836935635792428ef4570e1b5b393674711c87aff9bed743713cc777022774222776122775322777a6cecc993b85b3f8d199eab766db9cd2a93eae8bb37446ced899383bceaeb3c7f25b38fbce0153e1d039728e999dbcb0fadf8e9c5376c581b32f15ea48bff3c0b439735c6ee70e3fe7fb5e0fc5b9702e9d2be7dab9716e9d3be7de79701e9d27a7e5b49d8ed3fd7834de3e03e9f49cfec75b125366e00c1dc551dda6dba827feb82ab52627aee1b26ea06bb9acc9bb8e349bfd0b0b62aecb553ab255d7e30a755d9fb461fec60d6a559c733774f9bcdffbe3404b7523377613e7ce4d9d969bb9b93b7567eedc2ddc855bbad5fbd178b32698537297eee8e3bab86377e2ee381377d7dd73f7dd03f7d0852a2e57c4718fdd13f7d43d73cf995d703b6774cafef584fd56ab640a856a7dd0aedc4ba6cd55ad0a8c6bf3ee38d0bd766fdc5bb7ae332df7de7d701fdd27b7e5b6993e1db7ebf6dcbe3bf8b42672b6cd1dbaca273c4ce4aa5ed351bc465d63ea292ecff04ccff2ea5a526b72e65e788ee77a9ee77bc18af95efd9fe3854ca75376a5c314aaeb10d3c7e3bd1d2f86365ec22cf5f8fad4477a2896ea655eee4dddcc9b7973aff0165ee955ded21b392d6fec4dbc1d6fd7db7b4f93d7b3b2debe77e01d7e5c19efc83b7677ec4777d73bf14ebd33efdcbbf02ebd2befdabb714fbd906972cb74b8f3eebd07efd17b5ab147afc5feed8e540a9986275e9beb736cabb5cf314cedc0ebd4aac0b8361f181b7b5dafe7f59d476fe00d3dc553fda6dfa8a7df58724d37655d4fdb77bc9eeffadec734c1acaceffbc1677caf1ffa9133f61ace8e1ffb89a7fba99ff9b93ff567fedc2ffc0557e5c17bf24bbff297fec81ffb136963c63bfe2e53a9c5940b98868ebfe7effb0775fbf299363eebfdf9c7b52afe09333e5ffc91b1b17fe69ffb17fea57fe55fb37fb8f16ffd3bffde7ff01ffd27bfe5b7fd8edff57b7edf1f6cf228a4899c95f587fe275a92e1fb6ad00c1af6a3a3061a6b4b67811e1881e95d055660074ee0b266e37b8f4c95a53f0e82200ca220669690a5ecff474116e44ca5915f31851e8269300be641c1daa11d2c58ab62fe262883ca3f85716ddeeda104cb60148c9d6930097682dd602fd80f0e82c3e02838761f8293e034380bce838be0f25d4d302bdbd2ece02ab8fe8cef0d6ebc66ed7d9d9ddafb06b7ee6170e7e7c17d5d638287e031780a5a413be8305532a64237e805fd60100c032550b90d19f5d9bf76994a5110b25ab413369932f3b0c1dad749a8e96aa86b072c50325542b336aecdbb3d94d00aedd061aedb73efbd65e8874118869157847198846998857938fd802634531dcec2f9677c6f58848bb07494b0aabd6fb80c47e13830c34960853be16eb81778e17e78101e8647e17178c2f23f08d4f0343c0bcfc38bf092ec82d15978159e3295fa4ca19865e19a2973c3da97ef39e12dd3e68e6973cf5479081f6be3dabc33360e9fc256d80e3b6137ec857d771a0ec261e87b15534609ce43356a7e4413cc54478d48fb4c4b8af4c8884c7727b29ee375ed7d837bef3ab28387c889dcc88bfc2888c2288ae228094fa334bc8cb2288fa6d12c9a4b9b31ce984ae7e115ab47fda8a86b4db4f04be6a182a88c2afd285ad69a442318d7e69db171348e26d18e73635f846eb41bed45fbd14174e8cdfcabe8283a7edbcbbed484eb72129d46679fd0e53cba882efd28baaae3b51f8b781d5dfbd370c79f4737d16db81fdd45f7d143f4183d45ada81d75a22e53651ef5a27e3488869112a9cc146683b8c9fe75ce15ba881bb116cc633d3658ebdaf55ab119b311436cd79ac4acfb1fb3ee1cd7666baf2df6629f39b5308ee2384ee234cee23c9ec633ff299ec74570f1be2698bb8f17f187661c84c555bc8cccdafbaec6eb7854c7eb781c4f0237de8977233fde8bf7e383f890e9d262fa3cc647f131d3448d4fe2d3f88cd939b7334617f165a4c4cdf82a9ac5d775ad896f58eb8a9877aee2db98b5a8f8bed6247e80716db6f6dae2c7f8296ec56ddf8d3b7137eec5fd78100f63c56fc56ad24c1a2b9a9cb0dbf5979ad4b3f78991989fd125b1123bba643d3c8ad7eefe7abc4e9ce031718356e2450f899f04bcc6c4ac4d85ac6df949c874384fa2244e9224254b922cc99329d3e824529359c294498af02c18260b76cb3829b583a44a96b526c9881bff9ee8b6b171384d26c9ceba974d7693bd64df6f2707c9617224ea49729c9cb05cadaef3f0158de42c394f2e3eae8b1d2597c955721d34c468693d5e87bb75bc4e6ec283782fb94dee92fbe481d97df4c87cf121f3c9fbecd747a6c653d24ada4987accda89bf4984251d24f064c9961a2242ad4499b69433b48356892ea30aecd07c73ccf5e36355233b55236c047db49ddd413794b7d5ae5e12b1a69907e62fcc8ee8ed2385c205ea7c9cb785d7bdf340d9ed22ccdd3693a4be7519c1651ccba2fb3749a782c8e3fb178fe902ed232add2653a4ac7e984d938dd4977d38a69d44af7d2fd609e1ea487cc23cda04eca7a7de9b1d084d90933f46f3eacc9b34749cfd2f3f422bd64ba5ca5d7abbdfef486d51bbeca93dea69f98896177dea70fe96372cdfabe4afa84d1521daf3d19afa31bc4ebe83e3c8a1e93fbb4953cc487c95dda8ef7d24ec27e6575ca617d412beda6bdb49f0ed261aa301ba66ad6cc1ae938d332bdf63499119f321fcdd4092f33d328322bb38526b08caf876fd564a397cdd8d02a6e1b65f62a8f59601a59984559fc1965b2244bc3451dafe17db3cc3b5b8dd759be1eafe17d5997d78f1eb269d0626de93171d8d861c67c52ee67d92c9b6745b6202bb32a5b66a36ccc9599b03617317594a897ed64bbda41b6f7ac09b3fdec203b78d6667d6cfc91c8931d6647c65976fcd29b6427f1223bfd942e67ce28b9aae375ed7db3738c96ea789d5dacc7eb6c5ac76b78dff890c5a7fdec92a9e5c53b2c6e4de2311b735eb1b1e7058b6967d955769ddd64b7d91dfbdf7df6903d725d9eb2166b5d2da6ce34bec8da598729d35dd54458adcd673591ebc6676655b79eecf54aec27cc8eb27ebccc06cff13a1bd6def775bc4e3b75bc4eee582b7a603586795fa6d33dbc6f7493294cc36974cd5ae098e9cac65c6e93e9ace6cdbc916bb52ab5e57a6e64cd749c9bcc3367b995dbda41eee4eeaa2ab99733f796f3bfb1f4794dd6d78da3e6e76ac9aae5611ed53546c4ebfc55bcae474b88d7b5f76535267e8ed7cc2367c153e4b0feb1ed5db3b67719dcb987acefbccfbcf8ae337177bc669ee4699e3155f27c9acff27956a64a5ea4bb49275fe42c72e755be94aa704d84716d5eed58929a38db3411ebc6e655fe8939bb674beff3713ec906abf13a5c067a3d5aca77d6e3753d5a7a8ed7c91de235bc6fb89bef325f3d6163ac31f3ddcbbac638aaa3048de43adfcb27f97e7e901fe647f9717e92dde5a7f959aaa693fc3cbf60ca5ce6572f3561769ddfe4fc1b763fac498575e37a2530bffd748db9cbeff387f5789d3fd6f1baf6be88d7f913e235ab21b37ab4f456bcaebd6fde6299bbf35316eff7f3d8a9c7eb63561387c955dece3b769477f35edecf07f9305772352ba7cd69c35c64d6547b4b13615c9bd7ade7c39a8835d2a9fe195da6c6d4cc27225e3fcf6e225e4fdf8cd7d15abc8e7785f70d2cd62734bd0be6a1ce98a73a7154fb316844663698da5367eaca777a537f1ae427d3701a4d63dd9b26d37445959b559b6653d6006b6ddef028a48954a55add61b0a249136ba4d3e974f60965e6d362ba98966fc5ebdafbaec6ebec32de7f8ed7b5f7cda6d3aa8ed7d18d3fafbdaf9f7ba69f321f95f87176ce7cd6988d4e59cf7aba9c8ea2b5129b8ea793e9ce7497e9b237dddfac09b383dab836eb9ab43769b2a6cacaba717a3bfdf08ceff428b1a7cbd7f19ae5ceacbd2fe275f018ee4fabf578cd14a278cd5473987ab688d74cd533a6ee89bbcb94de89cc69395d78c7d3e3c47ae3fd27d3d3e9d9cbd6c334c99e35999e73bbe0dabc6e3d9b35499f35c1bab1164d2f3fa8cbd5f49ad5725bc46b477d8ed7182dadc7ebb4bd1aaf59cb92f13adc0d7758cb9bacc76b47f1a3e43a7d64fe3d9dde4caf364480707abb4113a872c1ed6ecabf0bf956e4795f13ac1bb3f6b47577ccb3d9f7d387bc9d5c39c33a5ed7b39b75bc0e6e990765a325e64d5766379fe375ed7da38879628ad7cc3bb378edcf44bc66de9bc5eb3441bc0e17397bc7f431d95e5aa3e9d3364da62d6efc3b6d3fa289b069e74335a63bedb17033c9f7d6e3f5f3ec66befbd1785d8f96588467358645fbb5789d0df2c9d47127d3fed6b40ca6c3a9f24a938b674dc8f8f76fde8e3caf3419ae6a52afa53beeacf99131d3ac91c6ac3417225e3fcf6eaec66bd683a3784db39bedd578cd7a7f14af315aaabd2fe275ed7dbd66ed7de3e54c9be933635b5a82eb99c9dad2564d661637fe5d81579a64ef692256d367cebbbab8338fb5fee5a6785d7bdf4c798ed7dcfbca781defafc7ebdafbb291848cd7b5f715f17ac61adad47496db52a377596bdaa4495b6842c6d77c5f479ef734c15afa2c7a57997816b0825ed4def7edd548e17d45bc16b39b225e47776c84792be27576e1996c04fa46bc9e69693c4becad299aa5b36cc5a36cd4848cf76fb67b94754da00a6c36dd961267195dccb4d578fdd66a643dbbc9624fab8ed7627613f1ba9edd5c8dd7b5f77d1dafc3451daf5909cc7cf59d729acf8a4dad675d136e8bd9826bf3494deab5f45939dbba53260f67cb992f464bdb5623939bd5789dbe19af038ad7e108f13a7d5a8dd7f93df332ef8ce866e3d9e41d4d769e5581716d94375bcf2b4d6a5566a55849df363b3e75678188d7efad46aec7eb745e7b5fc4eb3415f1ba1e2db17b6fd7e3753d5a9a3ece76fd70bad5ff3265f666fb1fd76476c0ec70c6ff56cee734c15afaec688b32d775bcaebdefc756236bef2be275721befadc7eb7ab4c4ea1af3beafe335ab31c7796776f28e32a7b3b3373cca6b4dcea189b05a9bd75e769326b52a584b9f6d5c39982588d7db572383a7c85b8bd734bb29e2f5eaec26e2b5ff2a5ebb93e066f66e9f7c7635bbfe9c26b39bd9edec6ec6fbc56f6982dd39af358185e6f3bac24b65ea78fdd9d548cc6ec67b91ff3a5ed7b39b2cb6adc6eb451daf672c2cd9eff4c967f7b30716873eaec94dad89b05a9bcf68c2ed61f6387bdaa0cc627576f3e3ab91f5ece67abcae6737eb78ed697e5c8f96a2ab3a5ea78f88d779346bcddc779469cf3aeb91e7639accbab35e6dd00691e77d4db0bf207c9cbdd92bafd7dc7e7c35f2ad782d663759dba4789db7eb1a331bcc86db7b79866f9533e50d4d0e5e6872fb5a93990aabb559d7a4deb1b44913ec2f889d79f3755ae68df5d1d2e75723c33d11af576737c38af9f3f2395ecfb5c44e2eb7f7f2586af4b9f13af2bcf428d2d634999b73ab36a14dadc9ab9af24a13da61f0307f75fe22b1ec874df17ad36a24e2f5faece67abcae6737d7e375703377e6efb425a68cc71ef5694d982a96b460cee7d2df683d6b9ac85d170fc2e62fd671ed6816fc8cd5c8d5781d6898dd44bc664d329a1d4f8ffd70feeee8769e30d1b76bd2dda849ad4a36cf6babb5f9b826d86190eaf3e97c365ffdaf982fe6e5bc9a2fe7a3f9783e99efcc77e77bf3fdf9c1fc707e343f9e9fcc4fe767f3f3f9c5fc727ec5fe7731bf9edfcc6fe7772f5723c5ec26e2f5f368a98ed7acc6dcbfd7cb63ca3cb0decc764d5eb51ea909a9c28defdb7a6e3def69226cfe346fcddb1fb6cebcbbc17af3fecbd54811af6beffb1caf67ba330a8bf4dd79b4f9607ab039f27c48937c3e64a6ccf93998579ab8eb9a3cefbac05aba97ced54f28d32e9a1bb5e9168df578bd3ebb395d66691daf0b6de6cd1aefe962f885cee2d2dfd60456f0b3ac1fd544aca5176661b11cdb8553b88557f84550844554c44552a44556e4c5b49815f3a22816455954ecca6531daa8cdb898bcb51ab91aaf8b9da959ecbea78b7758ec7d5093e085268feb9a70db2ff66b6d3eaa095f4bdfcf0e8a0396dfc3e2a8382e4e8ad3e2ac382f2e983697c555715ddc14b75c9bbbe2be78281e8ba782b53ea6e5e69ad37e7b3552c4eba2933e14dd776b4cafe86f8ec69fd384dba0e0df92dfa0c9c94b4d841543965ba55017cde264d15868c5f9425f180b7361419b85bd7084360b77e1cddb0b7f116c566711be5e8d9c6988d76c8c7dfd5e2fcff017d122de168d3fa10957a5182c9245526bb3a289be4d13ac1b2f5296d76c91336d98a364dacc1705d366b128a1cda27aa1cd723162778cb7683359ecacae468a78ed8c16bb8bbdf77a794c99fdc5c1468ff2039a303b5c1c2d8e6a6dded0e4c54e94dc7b5e1d5d1cb39c9e2c4eeb7ac3b5d1b836c6466dce16e7ec8e8bc5e51675aed66737f368eecc5a8bebfc03fbbe1637fee0bd68fcd2cbbe6c3deb9a70bb5df0bfe9f67ac7d25b9a903277a8358bfbc5036f538f759b2a2e16467129dbd4d3a2b5a24d7bd15974d95dbd2ddaf41703ac468a783d3517c3fc033b0517caecece391e7b526a4cab3265c95855a364b7e3efc4d4ddedc7591df948d79bbd44abd344ab3704aab8e53a5fd1ca74a07beb874599c7a28ca5a9bd22b7d765750869bd52923785fc4ebe8828de8dfede5197e1997c94fd5e4b6d6848c9f11fa8826a44c56e6e5b49c95f39265bb2ccbaa5c96a3725c4eca9d72b7dcab6378b95f1e88185e1e9647e531d3e6a49c32754eb76873569ecf76eb785d5e4c6fb2fea615db35652ecbabcf459e154d0ed735414d8126ccae6b8336ef6922d68dcb1b96c35b566bee58ad39468b629d98fbda13970fe563f954b6ca76795076ca6ed92bfb4c9b41392c9552ad9af376d5d8accdbc5bf1781d5d54fafb6349c3af8ccafc559a541637be76b75913b9eb82af90564ee5565ee52fee0bb50aea5a53852b3dbfabd5085e45555c2555ca3cf1b2ca983679c5627935dda2cdac9a4f6ff24ef4819d3c55512daaf21391e7539a30e3ff496db66822d68dab25cbdd68715fb7a76acc7ccd69ed87eb5a534d588b7aac76d65b14bc4db55bed55fbd54175c8ee3eda5a738ec3c2ddf8bd9215654e2ad63aabb317aa6c89c69fd384ff775ef133d0ef6902ab2eaa4b566bae0ab55c144e75cddad3bcbaa97d4d75cbfd308fdfd55d755f3dacb528af7aac9eaa56c5c756d5e67167adcebbfd5fa64cafeaf36b07d5f0435ef62d4d565579a549a5546a6d429bf51d4b6fada52f99c75836160f759d61ca346a65d09eea9e4ded6b961a6a0d8b513c7e2f75dea2f64a75692ccda5b5b4d9139c6dda2cdff5344b6fe9cbab83cf469e5735e54d4d84d5da6cd46465dd78192ea3ca5bc68b6659b211e629297351f7f9eaf684e80d5fb3526b8eeb5ab34caa8365bacc96793dee5c6ef1392cbf5bf7c62de7cb62e5dac5b2fc159aac69237771bddc9df3bc46ba64e3e9e572392a4e96e3c25b684299dad314c97252dc94adeaae3c58ee705f237ac4dc0f2f8daac56acdee726fb9cf9e72b0559b62b9717fdcf26879fce2ea934f7ad9754dcedfd6644d9b2d9a603d7079ba3c63b93ae7bacc596c3aaffd4cdd9a6a656a4fc362f74a7baa2394f035b2d65c2c2f9757bce65c6f5567c3b75d96b7d5ecd5b577cbfb9fafc99a361b3511ab81cb07a6cc23745914758d593e3165cc65abdc439d29f73133b16ca33dd5116ad9215fd3a55ad35bf69703f6a4e1566d94ea8d35dca5faf6d5a3e66722cfa6d6b3459bb7355959231db191c2482b476ce4142cf4bac6549322ae3d30eb09af285376473ac56ed69e789f8f45a8653a32ea5a333247d688f9e3913372b7a9337ab1663af2475b663846e1cfd6645d9b4d9a60ed6b14b1fcc44550de1717b52ee54e112f5b755baa7b34ac13d6e67d1aa10c8f4f2bedc91c25cbdd513aca96fd513e9ad6917cf4aa75ace5763e2a5694592c6f47f32d5797a3eabd68fc63566bf37ac7d2fa7ae088f5f946a3e513f3bcb7757da97dcc685cd798a556dcd61e18ad4928533cd5ca8c26d53e62f76867b937da1ded8df6470798411e1d8eb6f60247c7529993d1e9e86c74bef5ea8b9fabc99a361b34c11ae9e8b2588eaeca9d4559abb2b0a04bf95464c56ddd96160e1b3db95554f6ead62494a9f646d7757c1add8c8cd12d6b4f77a3fbd5f9f5d1c3b6dc32af33470f78f4c894391b3d8d5a5bb4698f3a3f5393356d765e68b2b61e38eab29cf4ca875a15e65fea7674c35bd2fee249b4a5a2a862f2c0676bcaf46b4f331a8c8623657ded61b4c1b70a1b370d7fdc98cfb832ccc6dad6abf59fa9c99a365bd68dc7c6d81c5baca65cf3bac254295b757d812e65a79857116b4b2c6abf5606917b6c8f9db75666c65bfd31cbaf37f685325c9d2dfe781c8ea35fa6cd86dd39b3bb71cc7291d49ab0110157a5ba2ba6d57dad4be9d635a67828fb4559f76716ed3a36b1d1d33e9419a7e36c9c6f5ab51a4fdfd12658558669b3d57f8fe7bf489b8debc6e362bc189745cefa755c93f2605c1533d6f7bd2be6cb76dd926aef2b6a0c1b71674b63bc1c8fc6e3f164bcf3de9ade78f71d75f6d6d5591d2fbcb4623cdeff45da6c58371eb3b8323eac1561e3a4196f434c15565beeeb7654f6c747e3e3f1c9f8747c363e1f5f8c2fc7579f59ef1c5fbfa3cdcdc85bab39b7cbbb2d57dffd126d36ac918eefc70fe347aec71d1b0b304daaa82846faf869dc1ab7c79d71f7334abca9ce96f9759edffe8b7635d87af5f09768f3e61ae998c596b1cac647f7ccab1465af8ac74793e6b8f3771579b6c9d659d27a2e70a2ad6a33d15e8fa99e6da24f8c9faecd9b6ba45539312716f327ccca7e954cec89531cfe3c5d6adbb6524ef9755ff89cadd16de2fd746dde5c239df8ac5c83f2b03cacd22a9d8493e8e7ea423527deaecdf26e7cbba68e37bed9a24d32497fae366faf1b4fb249ce468ccc4a6532fd15bad4b67da59cab53acd79cf996b1155367f693b579638d743267655a2c3bd5ee6431297f95325c9d2d2be5b0d1f19acfa95ece70ad69b39c8c7eaa366fac1b4fc69309ebc53d4e76eab5935faacdc5f671e7eb5ee0646bbf68b2f793b579b1463ad967116a343998fc64dffbb64dded186a9a3bd50675bcd39999cfe446d5ead7d4dce26e7938b7a6fc83fa2cde5b69572deaa5a6c24beaacdd5d69a73fdf3b479b9ca33b999dcbe3d3efc65ea6ce9ef52cd69bea839f75bd579f869dabc580f9c3cfe93ba706d9eded366349fb4d6b4696fed05763e3a5ffeae366bebc693eea4f74f6bc3d4e9bfa7ce64f0a2e66c9d919ffc8459ae5a9bf5b5afc9a7f6c7fe34db32af075bdeedacb5ab9dc6ce96f9ae1d7de76f8f1ffef3fffcaffff8bf491de25c - + klistview.h diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index b215bb66..9cafeada 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -37,11 +37,11 @@ //BEGIN ChatMembersListWidget::ToolTip -class ChatMembersListWidget::ToolTip : public QToolTip +class ChatMembersListWidget::ToolTip : public TQToolTip { public: - ToolTip( KListView *parent ) - : TQToolTip( parent->viewport() ), m_listView ( parent ) + ToolTip( KListView *tqparent ) + : TQToolTip( tqparent->viewport() ), m_listView ( tqparent ) { } @@ -54,9 +54,9 @@ public: { if( TQListViewItem *item = m_listView->itemAt( pos ) ) { - TQRect itemRect = m_listView->itemRect( item ); - if( itemRect.contains( pos ) ) - tip( itemRect, static_cast( item )->contact()->toolTip() ); + TQRect tqitemRect = m_listView->tqitemRect( item ); + if( tqitemRect.tqcontains( pos ) ) + tip( tqitemRect, static_cast( item )->contact()->toolTip() ); } } @@ -69,8 +69,8 @@ private: //BEGIN ChatMembersListWidget::ContactItem -ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, Kopete::Contact *contact ) - : KListViewItem( parent ), m_contact( contact ) +ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *tqparent, Kopete::Contact *contact ) + : KListViewItem( tqparent ), m_contact( contact ) { TQString nick = m_contact->property(Kopete::Global::Properties::self()->nickName().key()).value().toString(); if ( nick.isEmpty() ) @@ -81,7 +81,7 @@ ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, connect( m_contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; - setStatus( parent->session()->contactOnlineStatus(m_contact) ); + settqStatus( tqparent->session()->contactOnlineStatus(m_contact) ); reposition(); } @@ -95,7 +95,7 @@ void ChatMembersListWidget::ContactItem::slotPropertyChanged( Kopete::Contact*, } } -void ChatMembersListWidget::ContactItem::setStatus( const Kopete::OnlineStatus &status ) +void ChatMembersListWidget::ContactItem::settqStatus( const Kopete::OnlineStatus &status ) { setPixmap( 0, status.iconFor( m_contact ) ); reposition(); @@ -103,7 +103,7 @@ void ChatMembersListWidget::ContactItem::setStatus( const Kopete::OnlineStatus & void ChatMembersListWidget::ContactItem::reposition() { - // Qt's listview sorting is pathetic - it's impossible to reposition a single item + // TQt's listview sorting is pathetic - it's impossible to reposition a single item // when its key changes, without re-sorting the whole list. Plus, the whole list gets // re-sorted whenever an item is added/removed. So, we do manual sorting. // In particular, this makes adding N items O(N^2) not O(N^2 log N). @@ -133,8 +133,8 @@ void ChatMembersListWidget::ContactItem::reposition() //BEGIN ChatMembersListWidget -ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name ) - : KListView( parent, name ), m_session( session ) +ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), m_session( session ) { // use our own custom tooltips setShowToolTips( false ); @@ -142,11 +142,11 @@ ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWi // set up display: no header setAllColumnsShowFocus( true ); - addColumn( TQString::null, -1 ); + addColumn( TQString(), -1 ); header()->setStretchEnabled( true, 0 ); header()->hide(); - // list is sorted by us, not by Qt + // list is sorted by us, not by TQt setSorting( -1 ); // add chat members @@ -183,14 +183,14 @@ void ChatMembersListWidget::slotContextMenu( KListView*, TQListViewItem *item, c void ChatMembersListWidget::slotContactAdded( const Kopete::Contact *contact ) { - if ( !m_members.contains( contact ) ) + if ( !m_members.tqcontains( contact ) ) m_members.insert( contact, new ContactItem( this, const_cast( contact ) ) ); } void ChatMembersListWidget::slotContactRemoved( const Kopete::Contact *contact ) { kdDebug(14000) << k_funcinfo << endl; - if ( m_members.contains( contact ) && contact != session()->myself() ) + if ( m_members.tqcontains( contact ) && contact != session()->myself() ) { delete m_members[ contact ]; m_members.remove( contact ); @@ -199,8 +199,8 @@ void ChatMembersListWidget::slotContactRemoved( const Kopete::Contact *contact ) void ChatMembersListWidget::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { - if ( m_members.contains( contact ) ) - m_members[contact]->setStatus( status ); + if ( m_members.tqcontains( contact ) ) + m_members[contact]->settqStatus( status ); } void ChatMembersListWidget::slotExecute( TQListViewItem *item ) @@ -249,7 +249,7 @@ TQDragObject *ChatMembersListWidget::dragObject() } } - drag->setPixmap( c->onlineStatus().iconFor(c, 12) ); + drag->setPixmap( c->onlinetqStatus().iconFor(c, 12) ); return drag; } diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.h b/kopete/kopete/chatwindow/chatmemberslistwidget.h index c8af44a4..b5ef43a7 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.h +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.h @@ -35,8 +35,9 @@ class OnlineStatus; class ChatMembersListWidget : public KListView { Q_OBJECT + TQ_OBJECT public: - ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 ); + ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *tqparent, const char *name = 0 ); virtual ~ChatMembersListWidget(); Kopete::ChatSession *session() { return m_session; } @@ -98,6 +99,7 @@ private: class ChatMembersListWidget::ContactItem : public TQObject, public KListViewItem { Q_OBJECT + TQ_OBJECT public: ContactItem( ChatMembersListWidget *list, Kopete::Contact *contact ); Kopete::Contact *contact() const { return m_contact; } @@ -109,7 +111,7 @@ private: friend class ChatMembersListWidget; void reposition(); - void setStatus( const Kopete::OnlineStatus &status ); + void settqStatus( const Kopete::OnlineStatus &status ); Kopete::Contact *m_contact; }; diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 379ead44..53e318bf 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -25,7 +25,7 @@ #include -// Qt includes +// TQt includes #include #include #include @@ -88,7 +88,7 @@ #if !(KDE_IS_VERSION(3,3,90)) //From kdelibs/khtml/misc/htmltags.h // used in ChatMessagePart::copy() -#define ID_BLOCKQUOTE 12 +#define ID_BLOCKTQUOTE 12 #define ID_BR 14 #define ID_DD 22 #define ID_DIV 26 @@ -158,7 +158,7 @@ public: TQValueList allMessages; }; -class ChatMessagePart::ToolTip : public QToolTip +class ChatMessagePart::ToolTip : public TQToolTip { public: ToolTip( ChatMessagePart *c ) : TQToolTip( c->view()->viewport() ) @@ -213,8 +213,8 @@ private: ChatMessagePart *m_chat; }; -ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, const char *name) - : KHTMLPart( parent, name ), d( new Private ) +ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *tqparent, const char *name) + : KHTMLPart( tqparent, name ), d( new Private ) { d->manager = mgr; @@ -231,7 +231,7 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co // Write the template to KHTMLPart writeTemplate(); - view()->setFocusPolicy( TQWidget::NoFocus ); + view()->setFocusPolicy( TQ_NoFocus ); d->tt=new ToolTip( this ); @@ -263,8 +263,8 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() ); d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() ); d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() ); - d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); - d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); + d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::tqfromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); + d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); // read formatting override flags readOverrides(); @@ -289,7 +289,7 @@ void ChatMessagePart::slotScrollingTo( int /*x*/, int y ) void ChatMessagePart::slotImportEmoticon() { TQString emoticonString = KInputDialog::getText( i18n("Import Emoticon"), - i18n("
Insert the string for the emoticon
separated by space if you want multiple strings").arg( d->activeElement.getAttribute("src").string() ) ); + i18n("
Insert the string for the emoticon
separated by space if you want multiple strings").tqarg( d->activeElement.getAttribute("src").string() ) ); if (emoticonString.isNull() ) return; @@ -335,7 +335,7 @@ void ChatMessagePart::slotImportEmoticon() void ChatMessagePart::save() { - KFileDialog dlg( TQString::null, TQString::fromLatin1( "text/html text/plain" ), view(), "fileSaveDialog", false ); + KFileDialog dlg( TQString(), TQString::tqfromLatin1( "text/html text/plain" ), view(), "fileSaveDialog", false ); dlg.setCaption( i18n( "Save Conversation" ) ); dlg.setOperationMode( KFileDialog::Saving ); @@ -350,7 +350,7 @@ void ChatMessagePart::save() TQTextStream stream ( file ); stream.setEncoding(TQTextStream::UnicodeUTF8); - if ( dlg.currentFilter() == TQString::fromLatin1( "text/plain" ) ) + if ( dlg.currentFilter() == TQString::tqfromLatin1( "text/plain" ) ) { TQValueList::ConstIterator it, itEnd = d->allMessages.constEnd(); for(it = d->allMessages.constBegin(); it != itEnd; ++it) @@ -374,7 +374,7 @@ void ChatMessagePart::save() if ( !KIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) ) { KMessageBox::queuedMessageBox( view(), KMessageBox::Error, - i18n("Could not open %1 for writing.").arg( saveURL.prettyURL() ), // Message + i18n("Could not open %1 for writing.").tqarg( saveURL.prettyURL() ), // Message i18n("Error While Saving") ); //Caption } } @@ -392,7 +392,7 @@ void ChatMessagePart::pageDown() void ChatMessagePart::slotOpenURLRequest(const KURL &url, const KParts::URLArgs &/*args*/) { kdDebug(14000) << k_funcinfo << "url=" << url.url() << endl; - if ( url.protocol() == TQString::fromLatin1("kopetemessage") ) + if ( url.protocol() == TQString::tqfromLatin1("kopetemessage") ) { Kopete::Contact *contact = d->manager->account()->contacts()[ url.host() ]; if ( contact ) @@ -437,7 +437,7 @@ void ChatMessagePart::setStyleVariant( const TQString &variantPath ) { DOM::HTMLElement variantNode = document().getElementById( TQString::fromUtf8("mainStyle") ); if( !variantNode.isNull() ) - variantNode.setInnerText( TQString("@import url(\"%1\");").arg(variantPath) ); + variantNode.setInnerText( TQString("@import url(\"%1\");").tqarg(variantPath) ); } void ChatMessagePart::slotAppearanceChanged() @@ -607,7 +607,7 @@ void ChatMessagePart::slotRefreshView() kopeteNode.setInnerText( styleHTML() ); DOM::HTMLBodyElement bodyElement = htmlDocument().body(); - bodyElement.setBgColor( KopetePrefs::prefs()->bgColor().name() ); + bodyElement.setBgColor( TQString(KopetePrefs::prefs()->bgColor().name()) ); } void ChatMessagePart::keepScrolledDown() @@ -626,15 +626,15 @@ const TQString ChatMessagePart::styleHTML() const if( p->fontFace().pointSize() != -1 ) { fontSize = p->fontFace().pointSize(); - fontSizeCss = TQString::fromUtf8("%1pt;").arg(fontSize); + fontSizeCss = TQString::fromUtf8("%1pt;").tqarg(fontSize); } else if( p->fontFace().pixelSize() != -1 ) { fontSize = p->fontFace().pixelSize(); - fontSizeCss = TQString::fromUtf8("%1px;").arg(fontSize); + fontSizeCss = TQString::fromUtf8("%1px;").tqarg(fontSize); } - TQString style = TQString::fromLatin1( + TQString style = TQString::tqfromLatin1( "body{background-color:%1;font-family:%2;font-size:%3;color:%4}" "td{font-family:%5;font-size:%6;color:%7}" "a{color:%8}a.visited{color:%9}" @@ -642,15 +642,15 @@ const TQString ChatMessagePart::styleHTML() const "a.KopeteDisplayName:hover{text-decoration:underline;color:inherit}" ".KopeteLink{cursor:pointer;}.KopeteLink:hover{text-decoration:underline}" ".KopeteMessageBody > p:first-child{margin:0;padding:0;display:inline;}" /* some html messages are encapsuled into a

*/ ) - .arg( p->bgColor().name() ) - .arg( p->fontFace().family() ) - .arg( fontSizeCss ) - .arg( p->textColor().name() ) - .arg( p->fontFace().family() ) - .arg( fontSizeCss ) - .arg( p->textColor().name() ) - .arg( p->linkColor().name() ) - .arg( p->linkColor().name() ); + .tqarg( p->bgColor().name() ) + .tqarg( p->fontFace().family() ) + .tqarg( fontSizeCss ) + .tqarg( p->textColor().name() ) + .tqarg( p->fontFace().family() ) + .tqarg( fontSizeCss ) + .tqarg( p->textColor().name() ) + .tqarg( p->linkColor().name() ) + .tqarg( p->linkColor().name() ); return style; } @@ -700,7 +700,7 @@ Kopete::Contact *ChatMessagePart::contactFromNode( const DOM::Node &n ) const void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) { - // look through parents until we find an Element + // look through tqparents until we find an Element DOM::Node activeNode = nodeUnderMouse(); while ( !activeNode.isNull() && activeNode.nodeType() != DOM::Node::ELEMENT_NODE ) activeNode = activeNode.parentNode(); @@ -727,7 +727,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) chatWindowPopup->setItemEnabled( 1, false ); chatWindowPopup->insertSeparator(); } - else if ( d->activeElement.tagName().lower() == TQString::fromLatin1( "a" ) ) + else if ( d->activeElement.tagName().lower() == TQString::tqfromLatin1( "a" ) ) { d->copyURLAction->plug( chatWindowPopup ); chatWindowPopup->insertSeparator(); @@ -755,7 +755,7 @@ TQString ChatMessagePart::textUnderMouse() { DOM::Node activeNode = nodeUnderMouse(); if( activeNode.nodeType() != DOM::Node::TEXT_NODE ) - return TQString::null; + return TQString(); DOM::Text textNode = activeNode; TQString data = textNode.data().string(); @@ -797,15 +797,15 @@ void ChatMessagePart::slotCopyURL() DOM::HTMLAnchorElement a = d->activeElement; if ( !a.isNull() ) { - TQApplication::clipboard()->setText( a.href().string(), QClipboard::Clipboard ); - TQApplication::clipboard()->setText( a.href().string(), QClipboard::Selection ); + TQApplication::tqclipboard()->setText( a.href().string(), TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( a.href().string(), TQClipboard::Selection ); } } void ChatMessagePart::slotScrollView() { // NB: view()->contentsHeight() is incorrect before the view has been shown in its window. - // Until this happens, the geometry has not been correctly calculated, so this scrollBy call + // Until this happens, the tqgeometry has not been correctly calculated, so this scrollBy call // will usually scroll to the top of the view. view()->scrollBy( 0, view()->contentsHeight() ); } @@ -872,7 +872,7 @@ void ChatMessagePart::copy(bool justselection /* default false */) case ID_TD: case ID_TH: case ID_HR: case ID_OL: case ID_UL: case ID_LI: case ID_DD: case ID_DL: case ID_DT: - case ID_PRE: case ID_BLOCKQUOTE: case ID_DIV: + case ID_PRE: case ID_BLOCKTQUOTE: case ID_DIV: if (!hasNewLine) text += "\n"; hasNewLine = true; @@ -902,7 +902,7 @@ void ChatMessagePart::copy(bool justselection /* default false */) case ID_TD: case ID_TH: case ID_HR: case ID_OL: case ID_UL: case ID_LI: case ID_DD: case ID_DL: case ID_DT: - case ID_PRE: case ID_BLOCKQUOTE: case ID_DIV: + case ID_PRE: case ID_BLOCKTQUOTE: case ID_DIV: if (!hasNewLine) text += "\n"; hasNewLine = true; @@ -943,25 +943,25 @@ void ChatMessagePart::copy(bool justselection /* default false */) disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD if(!justselection) { TQTextDrag *textdrag = new TQTextDrag(text, 0L); KMultipleDrag *drag = new KMultipleDrag( ); drag->addDragObject( textdrag ); if(!htmltext.isEmpty()) { - htmltext.replace( TQChar( 0xa0 ), ' ' ); + htmltext.tqreplace( TQChar( 0xa0 ), ' ' ); TQTextDrag *htmltextdrag = new TQTextDrag(htmltext, 0L); htmltextdrag->setSubtype("html"); drag->addDragObject( htmltextdrag ); } - TQApplication::clipboard()->setData( drag, QClipboard::Clipboard ); + TQApplication::tqclipboard()->setData( drag, TQClipboard::Clipboard ); } - TQApplication::clipboard()->setText( text, QClipboard::Selection ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); #else if(!justselection) - TQApplication::clipboard()->setText( text, QClipboard::Clipboard ); - TQApplication::clipboard()->setText( text, QClipboard::Selection ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); #endif connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); @@ -1024,10 +1024,10 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const protocolIcon = KGlobal::iconLoader()->iconPath( iconName, KIcon::Small ); - nickLink=TQString::fromLatin1("") - .arg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"""), - TQStyleSheet::escape(message.from()->protocol()->pluginId()).replace('"',"""), - TQStyleSheet::escape(message.from()->account()->accountId() ).replace('"',""")); + nickLink=TQString::tqfromLatin1("") + .tqarg( TQStyleSheet::escape(message.from()->contactId()).tqreplace('"',"""), + TQStyleSheet::escape(message.from()->protocol()->pluginId()).tqreplace('"',"""), + TQStyleSheet::escape(message.from()->account()->accountId() ).tqreplace('"',""")); } else { @@ -1036,15 +1036,15 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // Replace sender (contact nick) - resultHTML = resultHTML.replace( TQString::fromUtf8("%sender%"), nickLink+nick+"" ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%sender%"), nickLink+nick+"" ); // Replace time, by default display only time and display seconds(that was true means). - resultHTML = resultHTML.replace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%time%"), KGlobal::locale()->formatTime(message.timestamp().time(), true) ); // Replace %screenName% (contact ID) - resultHTML = resultHTML.replace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"" ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%senderScreenName%"), nickLink+TQStyleSheet::escape(contactId)+"" ); // Replace service name (protocol name) - resultHTML = resultHTML.replace( TQString::fromUtf8("%service%"), TQStyleSheet::escape(service) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%service%"), TQStyleSheet::escape(service) ); // Replace protocolIcon (sender statusIcon) - resultHTML = resultHTML.replace( TQString::fromUtf8("%senderStatusIcon%"), TQStyleSheet::escape(protocolIcon).replace('"',""") ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%senderStatusIcon%"), TQStyleSheet::escape(protocolIcon).tqreplace('"',""") ); // Look for %time{X}% TQRegExp timeRegExp("%time\\{([^}]*)\\}%"); @@ -1052,7 +1052,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const while( (pos=timeRegExp.search(resultHTML , pos) ) != -1 ) { TQString timeKeyword = formatTime( timeRegExp.cap(1), message.timestamp() ); - resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword ); + resultHTML = resultHTML.tqreplace( pos , timeRegExp.cap(0).length() , timeKeyword ); } // Look for %textbackgroundcolor{X}% @@ -1069,7 +1069,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const int textPos=0; while( (textPos=textBackgroundRegExp.search(resultHTML, textPos) ) != -1 ) { - resultHTML = resultHTML.replace( textPos , textBackgroundRegExp.cap(0).length() , bgColor ); + resultHTML = resultHTML.tqreplace( textPos , textBackgroundRegExp.cap(0).length() , bgColor ); } // Replace userIconPath @@ -1098,22 +1098,22 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const else if(message.direction() == Kopete::Message::Outbound) photoPath = TQString::fromUtf8("Outgoing/buddy_icon.png"); } - resultHTML = resultHTML.replace(TQString::fromUtf8("%userIconPath%"), photoPath); + resultHTML = resultHTML.tqreplace(TQString::fromUtf8("%userIconPath%"), photoPath); } // Replace messages. // Build the action message if the currentChatStyle do not have Action template. if( message.type() == Kopete::Message::TypeAction && !d->currentChatStyle->hasActionTemplate() ) { - kdDebug(14000) << k_funcinfo << "Map Action message to Status template. " << endl; + kdDebug(14000) << k_funcinfo << "Map Action message to tqStatus template. " << endl; - TQString boldNick = TQString::fromUtf8("%1%2 ").arg(nickLink,nick); + TQString boldNick = TQString::fromUtf8("%1%2 ").tqarg(nickLink,nick); TQString newBody = boldNick + message.parsedBody(); message.setBody(newBody, Kopete::Message::ParsedHTML ); } // Set message direction("rtl"(Right-To-Left) or "ltr"(Left-to-right)) - resultHTML = resultHTML.replace( TQString::fromUtf8("%messageDirection%"), message.isRightToLeft() ? "rtl" : "ltr" ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%messageDirection%"), message.isRightToLeft() ? "rtl" : "ltr" ); // These colors are used for coloring nicknames. I tried to use // colors both visible on light and dark background. @@ -1130,7 +1130,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const // hash contactId to deterministically pick a color for the contact int hash = 0; for( uint f = 0; f < contactId.length(); ++f ) - hash += contactId[f].unicode() * f; + hash += contactId[f].tqunicode() * f; const TQString colorName = nameColors[ hash % nameColorsLen ]; TQString lightColorName; // Do not initialize, TQColor::name() is expensive! kdDebug(14000) << k_funcinfo << "Hash " << hash << " has color " << colorName << endl; @@ -1149,12 +1149,12 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const if ( doLight && lightColorName.isNull() ) lightColorName = TQColor( colorName ).light( light ).name(); - resultHTML = resultHTML.replace( textPos , senderColorRegExp.cap(0).length(), + resultHTML = resultHTML.tqreplace( textPos , senderColorRegExp.cap(0).length(), doLight ? lightColorName : colorName ); } // Replace message at the end, maybe someone could put a Adium keyword in his message :P - resultHTML = resultHTML.replace( TQString::fromUtf8("%message%"), formatMessageBody(message) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%message%"), formatMessageBody(message) ); // TODO: %status // resultHTML = addNickLinks( resultHTML ); @@ -1180,21 +1180,21 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) destinationName = remoteContact->nickName(); // Replace %chatName%, create a internal span to update it by DOM when asked. - resultHTML = resultHTML.replace( TQString::fromUtf8("%chatName%"), TQString("%1").arg( formatName(d->manager->displayName()) ) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%chatName%"), TQString("%1").tqarg( formatName(d->manager->displayName()) ) ); // Replace %sourceName% - resultHTML = resultHTML.replace( TQString::fromUtf8("%sourceName%"), formatName(sourceName) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%sourceName%"), formatName(sourceName) ); // Replace %destinationName% - resultHTML = resultHTML.replace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%destinationName%"), formatName(destinationName) ); // For %timeOpened%, display the date and time (also the seconds). - resultHTML = resultHTML.replace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%timeOpened%"), KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ); // Look for %timeOpened{X}% TQRegExp timeRegExp("%timeOpened\\{([^}]*)\\}%"); int pos=0; while( (pos=timeRegExp.search(resultHTML, pos) ) != -1 ) { - TQString timeKeyword = formatTime( timeRegExp.cap(1), TQDateTime::currentDateTime() ); - resultHTML = resultHTML.replace( pos , timeRegExp.cap(0).length() , timeKeyword ); + TQString timeKeyword = formatTime( timeRegExp.cap(1), TQDateTime::tqcurrentDateTime() ); + resultHTML = resultHTML.tqreplace( pos , timeRegExp.cap(0).length() , timeKeyword ); } // Get contact image paths #if 0 @@ -1207,13 +1207,13 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) if( photoOutgoingPath.isEmpty() ) photoOutgoingPath = TQString::fromUtf8("Outgoing/buddy_icon.png"); - resultHTML = resultHTML.replace( TQString::fromUtf8("%incomingIconPath%"), photoIncomingPath); - resultHTML = resultHTML.replace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoingPath); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%incomingIconPath%"), photoIncomingPath); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoingPath); #endif TQString photoIncoming, photoOutgoing; if( remoteContact->metaContact() && !remoteContact->metaContact()->picture().isNull() ) { - photoIncoming = TQString("data:image/png;base64,%1").arg( remoteContact->metaContact()->picture().base64() ); + photoIncoming = TQString("data:image/png;base64,%1").tqarg( remoteContact->metaContact()->picture().base64() ); } else { @@ -1222,7 +1222,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) if( d->manager->myself()->metaContact() && !d->manager->myself()->metaContact()->picture().isNull() ) { - photoOutgoing = TQString("data:image/png;base64,%1").arg( d->manager->myself()->metaContact()->picture().base64() ); + photoOutgoing = TQString("data:image/png;base64,%1").tqarg( d->manager->myself()->metaContact()->picture().base64() ); } else { @@ -1230,8 +1230,8 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML ) } - resultHTML = resultHTML.replace( TQString::fromUtf8("%incomingIconPath%"), photoIncoming); - resultHTML = resultHTML.replace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoing ); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%incomingIconPath%"), photoIncoming); + resultHTML = resultHTML.tqreplace( TQString::fromUtf8("%outgoingIconPath%"), photoOutgoing ); } return resultHTML; @@ -1274,7 +1274,7 @@ TQString ChatMessagePart::formatMessageBody(const Kopete::Message &message) formattedBody += message.getHtmlStyleAttribute(); // Affect the parsed body. - formattedBody += TQString::fromUtf8("class=\"KopeteMessageBody\">%1").arg(message.parsedBody()); + formattedBody += TQString::fromUtf8("class=\"KopeteMessageBody\">%1").tqarg(message.parsedBody()); return formattedBody; } @@ -1363,11 +1363,11 @@ void ChatMessagePart::writeTemplate() "%3\n" "" "" - ).arg( d->currentChatStyle->getStyleBaseHref() ) - .arg( formatStyleKeywords(d->currentChatStyle->getHeaderHtml()) ) - .arg( formatStyleKeywords(d->currentChatStyle->getFooterHtml()) ) - .arg( KopetePrefs::prefs()->styleVariant() ) - .arg( styleHTML() ); + ).tqarg( d->currentChatStyle->getStyleBaseHref() ) + .tqarg( formatStyleKeywords(d->currentChatStyle->getHeaderHtml()) ) + .tqarg( formatStyleKeywords(d->currentChatStyle->getFooterHtml()) ) + .tqarg( KopetePrefs::prefs()->styleVariant() ) + .tqarg( styleHTML() ); write(xhtmlBase); end(); #ifdef STYLE_TIMETEST diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h index 5314d776..97a3c3a3 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.h +++ b/kopete/kopete/chatwindow/chatmessagepart.h @@ -39,11 +39,12 @@ class ChatWindowStyle; class ChatMessagePart : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: /** * Create a new ChatMessage Part. */ - ChatMessagePart( Kopete::ChatSession *manager, TQWidget *parent, const char *name = 0); + ChatMessagePart( Kopete::ChatSession *manager, TQWidget *tqparent, const char *name = 0); ~ChatMessagePart(); /** @@ -185,7 +186,7 @@ private: TQString textUnderMouse(); /** - * Format(replace) style keywords for messages (incoming, outgoing, internal) + * Format(tqreplace) style keywords for messages (incoming, outgoing, internal) * Use formatStyleKeywords(const TQString &sourceHTML) for header and footer. * * @param sourceHTML the source html which contains the keywords @@ -195,7 +196,7 @@ private: */ TQString formatStyleKeywords( const TQString &sourceHTML, const Kopete::Message &message ); /** - * Format(replace) style keywords for header and footers. + * Format(tqreplace) style keywords for header and footers. * For messages, use formatStyleKeywords(const TQString &sourceHTML, Kopete::Message &message) instead. * * @param sourceHTML HTML source needed to be replaced. diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp index e284903d..d3d3afc4 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.cpp +++ b/kopete/kopete/chatwindow/chattexteditpart.cpp @@ -31,8 +31,8 @@ #include #include -ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *parent, const char *name ) - : KopeteRichTextEditPart( parent, name, session->protocol()->capabilities() ), m_session(session) +ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *tqparent, const char *name ) + : KopeteRichTextEditPart( tqparent, name, session->protocol()->capabilities() ), m_session(session) { historyPos = -1; @@ -107,7 +107,7 @@ KDictSpellingHighlighter* ChatTextEditPart::spellHighlighter() } // NAUGHTY, BAD AND WRONG! (but needed to fix nick complete bugs) -#include +#include class EvilTextEdit : public KTextEdit { public: @@ -130,8 +130,8 @@ void ChatTextEditPart::complete() if ( parIdx > 0 ) { - int firstSpace = txt.findRev( TQRegExp( TQString::fromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; - int lastSpace = txt.find( TQRegExp( TQString::fromLatin1("[\\s\\:]") ), firstSpace ); + int firstSpace = txt.tqfindRev( TQRegExp( TQString::tqfromLatin1("\\s\\S+") ), parIdx - 1 ) + 1; + int lastSpace = txt.tqfind( TQRegExp( TQString::tqfromLatin1("[\\s\\:]") ), firstSpace ); if( lastSpace == -1 ) lastSpace = txt.length(); @@ -143,7 +143,7 @@ void ChatTextEditPart::complete() if ( word != m_lastMatch ) { match = mComplete->makeCompletion( word ); - m_lastMatch = TQString::null; + m_lastMatch = TQString(); parIdx -= word.length(); } else @@ -158,13 +158,13 @@ void ChatTextEditPart::complete() if ( para == 0 && firstSpace == 0 && rightText[0] != TQChar(':') ) { - rightText = match + TQString::fromLatin1(": ") + rightText; + rightText = match + TQString::tqfromLatin1(": ") + rightText; parIdx += 2; } else rightText = match + rightText; - // insert *before* remove. this is becase Qt adds an extra blank line + // insert *before* remove. this is becase TQt adds an extra blank line // if the rich text control becomes empty (if you remove the only para). // disable updates while we change the contents to eliminate flicker. edit()->setUpdatesEnabled( false ); @@ -245,11 +245,11 @@ bool ChatTextEditPart::canSend() return true; } -void ChatTextEditPart::slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) +void ChatTextEditPart::slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) { //FIXME: should use signal contact->isReachableChanged, but it doesn't exist ;( - if ( ( oldStatus.status() == Kopete::OnlineStatus::Offline ) - != ( newStatus.status() == Kopete::OnlineStatus::Offline ) ) + if ( ( oldtqStatus.status() == Kopete::OnlineStatus::Offline ) + != ( newtqStatus.status() == Kopete::OnlineStatus::Offline ) ) { emit canSendChanged( canSend() ); } @@ -257,19 +257,19 @@ void ChatTextEditPart::slotContactStatusChanged( Kopete::Contact *, const Kopete void ChatTextEditPart::sendMessage() { - TQString txt = text( Qt::PlainText ); + TQString txt = text( TQt::PlainText ); // avoid sending emtpy messages or enter keys (see bug 100334) if ( txt.isEmpty() || txt == "\n" ) return; - if ( m_lastMatch.isNull() && ( txt.find( TQRegExp( TQString::fromLatin1("^\\w+:\\s") ) ) > -1 ) ) + if ( m_lastMatch.isNull() && ( txt.tqfind( TQRegExp( TQString::tqfromLatin1("^\\w+:\\s") ) ) > -1 ) ) { //no last match and it finds something of the form of "word:" at the start of a line - TQString search = txt.left( txt.find(':') ); + TQString search = txt.left( txt.tqfind(':') ); if( !search.isEmpty() ) { TQString match = mComplete->makeCompletion( search ); if( !match.isNull() ) - edit()->setText( txt.replace(0,search.length(),match) ); + edit()->setText( txt.tqreplace(0,search.length(),match) ); } } @@ -277,7 +277,7 @@ void ChatTextEditPart::sendMessage() { //FIXME: what is the next line for? mComplete->addItem( m_lastMatch ); - m_lastMatch = TQString::null; + m_lastMatch = TQString(); } slotStoppedTypingTimer(); @@ -291,7 +291,7 @@ void ChatTextEditPart::sendMessage() bool ChatTextEditPart::isTyping() { - TQString txt = text( Qt::PlainText ); + TQString txt = text( TQt::PlainText ); //Make sure the message is empty. TQString::isEmpty() //returns false if a message contains just whitespace @@ -365,7 +365,7 @@ void ChatTextEditPart::historyDown() historyPos--; - TQString newText = ( historyPos >= 0 ? historyList[historyPos] : TQString::null ); + TQString newText = ( historyPos >= 0 ? historyList[historyPos] : TQString() ); TextFormat format=edit()->textFormat(); diff --git a/kopete/kopete/chatwindow/chattexteditpart.h b/kopete/kopete/chatwindow/chattexteditpart.h index 03b2ff3c..d73209b2 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.h +++ b/kopete/kopete/chatwindow/chattexteditpart.h @@ -47,8 +47,9 @@ class ChatSession; class ChatTextEditPart : public KopeteRichTextEditPart { Q_OBJECT + TQ_OBJECT public: - ChatTextEditPart( Kopete::ChatSession *session, TQWidget *parent, const char *name = 0 ); + ChatTextEditPart( Kopete::ChatSession *session, TQWidget *tqparent, const char *name = 0 ); ~ChatTextEditPart(); /** diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 514aaac8..9d42e9f4 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory ChatWindowPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_chatwindow, ChatWindowPluginFactory( "kopete_chatwindow" ) ) -ChatWindowPlugin::ChatWindowPlugin(TQObject *parent, const char *name, const TQStringList &) : - Kopete::ViewPlugin( ChatWindowPluginFactory::instance(), parent, name ) +ChatWindowPlugin::ChatWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &) : + Kopete::ViewPlugin( ChatWindowPluginFactory::instance(), tqparent, name ) {} KopeteView* ChatWindowPlugin::createView( Kopete::ChatSession *manager ) @@ -70,8 +70,8 @@ public: bool visibleMembers; }; -ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const char *name ) - : KDockMainWindow( 0L, name, 0L ), KopeteView( mgr, parent ) +ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *tqparent, const char *name ) + : KDockMainWindow( 0L, name, 0L ), KopeteView( mgr, tqparent ) { d = new KopeteChatViewPrivate; d->isActive = false; @@ -81,7 +81,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch m_mainWindow = 0L; membersDock = 0L; - membersStatus = Smart; + memberstqStatus = Smart; m_tabState = Normal; @@ -89,8 +89,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch hide(); //Create the view dock widget (KHTML Part), and set it to no docking (lock it in place) - viewDock = createDockWidget(TQString::fromLatin1( "viewDock" ), TQPixmap(), - 0L,TQString::fromLatin1("viewDock"), TQString::fromLatin1(" ")); + viewDock = createDockWidget(TQString::tqfromLatin1( "viewDock" ), TQPixmap(), + 0L,TQString::tqfromLatin1("viewDock"), TQString::tqfromLatin1(" ")); m_messagePart = new ChatMessagePart( mgr, viewDock, "m_messagePart" ); viewDock->setWidget(messagePart()->widget()); @@ -98,8 +98,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch viewDock->setEnableDocking(KDockWidget::DockNone); //Create the bottom dock widget, with the edit area, statusbar and send button - editDock = createDockWidget( TQString::fromLatin1( "editDock" ), TQPixmap(), - 0L, TQString::fromLatin1("editDock"), TQString::fromLatin1(" ") ); + editDock = createDockWidget( TQString::tqfromLatin1( "editDock" ), TQPixmap(), + 0L, TQString::tqfromLatin1("editDock"), TQString::tqfromLatin1(" ") ); m_editPart = new ChatTextEditPart( mgr, editDock, "kopeterichtexteditpart" ); // FIXME: is this used these days? it seems totally unnecessary @@ -161,8 +161,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch editPart()->widget()->setFocus(); // init actions - KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() ); - KStdAction::close( this, TQT_SLOT(closeView()),actionCollection() ); + KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection() ); + KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(closeView()),actionCollection() ); setCaption( m_manager->displayName(), false ); @@ -310,14 +310,14 @@ void ChatView::makeVisible() { m_mainWindow = KopeteChatWindow::window( m_manager ); // if ( root ) -// root->repaint( true ); +// root->tqrepaint( true ); emit windowCreated(); } if ( !m_mainWindow->isVisible() ) { m_mainWindow->show(); - // scroll down post show and layout, otherwise the geometry is wrong to scroll to the bottom. + // scroll down post show and tqlayout, otherwise the tqgeometry is wrong to scroll to the bottom. m_messagePart->keepScrolledDown(); } @@ -353,22 +353,22 @@ bool ChatView::closeView( bool force ) shortCaption = KStringHandler::rsqueeze( shortCaption ); response = KMessageBox::warningContinueCancel( this, i18n("You are about to leave the group chat session %1.
" - "You will not receive future messages from this conversation.").arg( shortCaption ), i18n( "Closing Group Chat" ), - i18n( "Cl&ose Chat" ), TQString::fromLatin1( "AskCloseGroupChat" ) ); + "You will not receive future messages from this conversation.").tqarg( shortCaption ), i18n( "Closing Group Chat" ), + i18n( "Cl&ose Chat" ), TQString::tqfromLatin1( "AskCloseGroupChat" ) ); } if ( !unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel( this, i18n("You have received a message from %1 in the last " - "second. Are you sure you want to close this chat?").arg( unreadMessageFrom ), i18n( "Unread Message" ), - i18n( "Cl&ose Chat" ), TQString::fromLatin1("AskCloseChatRecentMessage" ) ); + "second. Are you sure you want to close this chat?").tqarg( unreadMessageFrom ), i18n( "Unread Message" ), + i18n( "Cl&ose Chat" ), TQString::tqfromLatin1("AskCloseChatRecentMessage" ) ); } if ( d->sendInProgress && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel( this, i18n( "You have a message send in progress, which will be " "aborted if this chat is closed. Are you sure you want to close this chat?" ), i18n( "Message in Transit" ), - i18n( "Cl&ose Chat" ), TQString::fromLatin1( "AskCloseChatMessageInProgress" ) ); + i18n( "Cl&ose Chat" ), TQString::tqfromLatin1( "AskCloseChatMessageInProgress" ) ); } } @@ -408,9 +408,9 @@ void ChatView::updateChatState( KopeteTabState newState ) } } -void ChatView::setMainWindow( KopeteChatWindow* parent ) +void ChatView::setMainWindow( KopeteChatWindow* tqparent ) { - m_mainWindow = parent; + m_mainWindow = tqparent; } void ChatView::createMembersList() @@ -418,8 +418,8 @@ void ChatView::createMembersList() if ( !membersDock ) { //Create the chat members list - membersDock = createDockWidget( TQString::fromLatin1( "membersDock" ), TQPixmap(), 0L, - TQString::fromLatin1( "membersDock" ), TQString::fromLatin1( " " ) ); + membersDock = createDockWidget( TQString::tqfromLatin1( "membersDock" ), TQPixmap(), 0L, + TQString::tqfromLatin1( "membersDock" ), TQString::tqfromLatin1( " " ) ); m_membersList = new ChatMembersListWidget( m_manager, this, "m_membersList" ); membersDock->setWidget( m_membersList ); @@ -428,21 +428,21 @@ void ChatView::createMembersList() if ( members.first() && members.first()->metaContact() != 0 ) { - membersStatus = static_cast + memberstqStatus = static_cast ( members.first()->metaContact()->pluginData - ( m_manager->protocol(), TQString::fromLatin1( "MembersListPolicy" ) ).toInt() + ( m_manager->protocol(), TQString::tqfromLatin1( "MembersListPolicy" ) ).toInt() ); } else { - membersStatus = Smart; + memberstqStatus = Smart; } - if( membersStatus == Smart ) + if( memberstqStatus == Smart ) d->visibleMembers = ( m_manager->members().count() > 1 ); else - d->visibleMembers = ( membersStatus == Visible ); + d->visibleMembers = ( memberstqStatus == Visible ); placeMembersList( membersDockPosition ); } @@ -453,13 +453,13 @@ void ChatView::toggleMembersVisibility() if( membersDock ) { d->visibleMembers = !d->visibleMembers; - membersStatus = d->visibleMembers ? Visible : Hidden; + memberstqStatus = d->visibleMembers ? Visible : Hidden; placeMembersList( membersDockPosition ); Kopete::ContactPtrList members = m_manager->members(); if ( members.first()->metaContact() ) { members.first()->metaContact()->setPluginData( m_manager->protocol(), - TQString::fromLatin1( "MembersListPolicy" ), TQString::number(membersStatus) ); + TQString::tqfromLatin1( "MembersListPolicy" ), TQString::number(memberstqStatus) ); } //refreshView(); } @@ -467,7 +467,7 @@ void ChatView::toggleMembersVisibility() void ChatView::placeMembersList( KDockWidget::DockPosition dp ) { -// kdDebug(14000) << k_funcinfo << "Members list policy " << membersStatus << +// kdDebug(14000) << k_funcinfo << "Members list policy " << memberstqStatus << // ", visible " << d->visibleMembers << endl; if ( d->visibleMembers ) @@ -476,17 +476,17 @@ void ChatView::placeMembersList( KDockWidget::DockPosition dp ) // look up the dock width int dockWidth; - KGlobal::config()->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); + KGlobal::config()->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); if( membersDockPosition == KDockWidget::DockLeft ) { dockWidth = KGlobal::config()->readNumEntry( - TQString::fromLatin1( "membersDock,viewDock:sepPos" ), 30); + TQString::tqfromLatin1( "membersDock,viewDock:sepPos" ), 30); } else { dockWidth = KGlobal::config()->readNumEntry( - TQString::fromLatin1( "viewDock,membersDock:sepPos" ), 70); + TQString::tqfromLatin1( "viewDock,membersDock:sepPos" ), 70); } // Make sure it is shown then place it wherever @@ -514,7 +514,7 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping ) // remove the first timer // And yes, the const_cast is a bit ugly, but it's only used as key // value in this dictionary (no indirections) so it's basically - // harmless. Unfortunately there's no QConstPtrDictionary in Qt... + // harmless. Unfortunately there's no TQConstPtrDictionary in TQt... void *key = const_cast( contact ); m_remoteTypingMap.remove( key ); if( isTyping ) @@ -547,11 +547,11 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping ) if( !typingList.isEmpty() ) { if ( typingList.count() == 1 ) - setStatusText( i18n( "%1 is typing a message" ).arg( typingList.first() ) ); + setStatusText( i18n( "%1 is typing a message" ).tqarg( typingList.first() ) ); else { - TQString statusTyping = typingList.join( TQString::fromLatin1( ", " ) ); - setStatusText( i18n( "%1 is a list of names", "%1 are typing a message" ).arg( statusTyping ) ); + TQString statusTyping = typingList.join( TQString::tqfromLatin1( ", " ) ); + setStatusText( i18n( "%1 is a list of names", "%1 are typing a message" ).tqarg( statusTyping ) ); } updateChatState( Typing ); } @@ -565,7 +565,7 @@ void ChatView::setStatusText( const TQString &status ) { d->statusText = status; if ( d->isActive ) - m_mainWindow->setStatus( status ); + m_mainWindow->settqStatus( status ); } const TQString& ChatView::statusText() @@ -631,9 +631,9 @@ void ChatView::slotContactAdded(const Kopete::Contact *contact, bool suppress) } if( !suppress && m_manager->members().count() > 1 ) - sendInternalMessage( i18n("%1 has joined the chat.").arg(contactName) ); + sendInternalMessage( i18n("%1 has joined the chat.").tqarg(contactName) ); - if( membersStatus == Smart && membersDock ) + if( memberstqStatus == Smart && membersDock ) { bool shouldShowMembers = ( m_manager->members().count() > 1); if( shouldShowMembers != d->visibleMembers ) @@ -682,9 +682,9 @@ void ChatView::slotContactRemoved( const Kopete::Contact *contact, const TQStrin if ( !suppressNotification ) { if ( reason.isEmpty() ) - sendInternalMessage( i18n( "%1 has left the chat." ).arg( contactName ), format ) ; + sendInternalMessage( i18n( "%1 has left the chat." ).tqarg( contactName ), format ) ; else - sendInternalMessage( i18n( "%1 has left the chat (%2)." ).arg( contactName, reason ), format); + sendInternalMessage( i18n( "%1 has left the chat (%2)." ).tqarg( contactName, reason ), format); } } @@ -711,7 +711,7 @@ void ChatView::setCaption( const TQString &text, bool modified ) //Call the original set caption KDockMainWindow::setCaption( newCaption, false ); - emit updateChatTooltip( this, TQString::fromLatin1("%1").arg( d->captionText ) ); + emit updateChatTooltip( this, TQString::tqfromLatin1("%1").tqarg( d->captionText ) ); emit updateChatLabel( this, newCaption ); //Blink icon if modified and not active if( !d->isActive && modified ) @@ -719,7 +719,7 @@ void ChatView::setCaption( const TQString &text, bool modified ) else updateChatState(); - //Tell the parent we changed our caption + //Tell the tqparent we changed our caption emit( captionChanged( d->isActive ) ); } @@ -760,12 +760,12 @@ void ChatView::appendMessage(Kopete::Message &message) TQTimer::singleShot( 1000, this, TQT_SLOT( slotMarkMessageRead() ) ); } else - unreadMessageFrom = TQString::null; + unreadMessageFrom = TQString(); } void ChatView::slotMarkMessageRead() { - unreadMessageFrom = TQString::null; + unreadMessageFrom = TQString(); } void ChatView::slotToggleRtfToolbar( bool enabled ) @@ -773,18 +773,18 @@ void ChatView::slotToggleRtfToolbar( bool enabled ) emit rtfEnabled( this, enabled ); } -void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) +void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) { kdDebug(14000) << k_funcinfo << contact << endl; - bool inhibitNotification = ( newStatus.status() == Kopete::OnlineStatus::Unknown || - oldStatus.status() == Kopete::OnlineStatus::Unknown ); + bool inhibitNotification = ( newtqStatus.status() == Kopete::OnlineStatus::Unknown || + oldtqStatus.status() == Kopete::OnlineStatus::Unknown ); if ( contact && KopetePrefs::prefs()->showEvents() && !inhibitNotification ) { if ( contact->account() && contact == contact->account()->myself() ) { // Separate notification for the 'self' contact - if ( newStatus.status() != Kopete::OnlineStatus::Connecting ) - sendInternalMessage( i18n( "You are now marked as %1." ).arg( newStatus.description() ) ); + if ( newtqStatus.status() != Kopete::OnlineStatus::Connecting ) + sendInternalMessage( i18n( "You are now marked as %1." ).tqarg( newtqStatus.description() ) ); } else if ( !contact->account() || !contact->account()->suppressStatusNotification() ) { @@ -792,13 +792,13 @@ void ChatView::slotContactStatusChanged( Kopete::Contact *contact, const Kopete: if ( contact->metaContact() && contact->metaContact() != Kopete::ContactList::self()->myself() ) { sendInternalMessage( i18n( "%2 is now %1." ) - .arg( newStatus.description(), contact->metaContact()->displayName() ) ); + .tqarg( newtqStatus.description(), contact->metaContact()->displayName() ) ); } else { TQString nick=contact->nickName(); sendInternalMessage( i18n( "%2 is now %1." ) - .arg( newStatus.description(), nick ) ); + .tqarg( newtqStatus.description(), nick ) ); } } } @@ -835,9 +835,9 @@ void ChatView::saveOptions() { KConfig *config = KGlobal::config(); - writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) ); - config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); - config->writeEntry( TQString::fromLatin1( "membersDockPosition" ), membersDockPosition ); + writeDockConfig ( config, TQString::tqfromLatin1( "ChatViewDock" ) ); + config->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); + config->writeEntry( TQString::tqfromLatin1( "membersDockPosition" ), membersDockPosition ); saveChatSettings(); config->sync(); } @@ -859,7 +859,7 @@ void ChatView::saveChatSettings() KConfig* config = KGlobal::config(); - TQString contactListGroup = TQString::fromLatin1("chatwindow_") + + TQString contactListGroup = TQString::tqfromLatin1("chatwindow_") + mc->metaContactId(); config->setGroup( contactListGroup ); @@ -875,7 +875,7 @@ void ChatView::loadChatSettings() return; //can't load with more than one other person in the chat //read settings for metacontact - TQString contactListGroup = TQString::fromLatin1("chatwindow_") + + TQString contactListGroup = TQString::tqfromLatin1("chatwindow_") + contacts.first()->metaContact()->metaContactId(); KConfig* config = KGlobal::config(); config->setGroup( contactListGroup ); @@ -891,24 +891,24 @@ void ChatView::readOptions() KConfig *config = KGlobal::config(); /** THIS IS BROKEN !!! */ - //dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") ); + //dockManager->readConfig ( config, TQString::tqfromLatin1("ChatViewDock") ); //Work-around to restore dock widget positions - config->setGroup( TQString::fromLatin1( "ChatViewDock" ) ); + config->setGroup( TQString::tqfromLatin1( "ChatViewDock" ) ); membersDockPosition = static_cast( - config->readNumEntry( TQString::fromLatin1( "membersDockPosition" ), KDockWidget::DockRight ) ); + config->readNumEntry( TQString::tqfromLatin1( "membersDockPosition" ), KDockWidget::DockRight ) ); - TQString dockKey = TQString::fromLatin1( "viewDock" ); + TQString dockKey = TQString::tqfromLatin1( "viewDock" ); if ( d->visibleMembers ) { if( membersDockPosition == KDockWidget::DockLeft ) - dockKey.prepend( TQString::fromLatin1( "membersDock," ) ); + dockKey.prepend( TQString::tqfromLatin1( "membersDock," ) ); else if( membersDockPosition == KDockWidget::DockRight ) - dockKey.append( TQString::fromLatin1( ",membersDock" ) ); + dockKey.append( TQString::tqfromLatin1( ",membersDock" ) ); } - dockKey.append( TQString::fromLatin1( ",editDock:sepPos" ) ); + dockKey.append( TQString::tqfromLatin1( ",editDock:sepPos" ) ); //kdDebug(14000) << k_funcinfo << "reading splitterpos from key: " << dockKey << endl; int splitterPos = config->readNumEntry( dockKey, 70 ); editDock->manualDock( viewDock, KDockWidget::DockBottom, splitterPos ); @@ -937,7 +937,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) { if( event->provides( "kopete/x-contact" ) ) { - TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->encodedData ( "kopete/x-contact" )) ); + TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->tqencodedData ( "kopete/x-contact" )) ); if(m_manager->mayInvite() && m_manager->protocol()->pluginId() == lst[0] && m_manager->account()->accountId() == lst[1]) { TQString contact=lst[2]; @@ -959,7 +959,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) } else if( event->provides( "kopete/x-metacontact" ) ) { - TQString metacontactID=TQString::fromUtf8(event->encodedData ( "kopete/x-metacontact" )); + TQString metacontactID=TQString::fromUtf8(event->tqencodedData ( "kopete/x-metacontact" )); Kopete::MetaContact *m=Kopete::ContactList::self()->metaContact(metacontactID); if( m && m_manager->mayInvite()) @@ -970,7 +970,7 @@ void ChatView::dragEnterEvent ( TQDragEnterEvent * event ) Kopete::Contact *c=it.current(); if(c && c->account() == m_manager->account()) { - if( c != m_manager->myself() && !m_manager->members().contains(c) && c->isOnline()) + if( c != m_manager->myself() && !m_manager->members().tqcontains(c) && c->isOnline()) event->accept(); } } @@ -993,7 +993,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) { if( event->provides( "kopete/x-contact" ) ) { - TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->encodedData ( "kopete/x-contact" )) ); + TQStringList lst=TQStringList::split( TQChar( 0xE000 ) , TQString::fromUtf8(event->tqencodedData ( "kopete/x-contact" )) ); if(m_manager->mayInvite() && m_manager->protocol()->pluginId() == lst[0] && m_manager->account()->accountId() == lst[1]) { TQString contact=lst[2]; @@ -1014,7 +1014,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) } else if( event->provides( "kopete/x-metacontact" ) ) { - TQString metacontactID=TQString::fromUtf8(event->encodedData ( "kopete/x-metacontact" )); + TQString metacontactID=TQString::fromUtf8(event->tqencodedData ( "kopete/x-metacontact" )); Kopete::MetaContact *m=Kopete::ContactList::self()->metaContact(metacontactID); if(m && m_manager->mayInvite()) { @@ -1024,7 +1024,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) Kopete::Contact *c=it.current(); if(c && c->account() == m_manager->account() && c->isOnline()) { - if( c != m_manager->myself() && !m_manager->members().contains(c) ) + if( c != m_manager->myself() && !m_manager->members().tqcontains(c) ) m_manager->inviteContact(c->contactId()); } } diff --git a/kopete/kopete/chatwindow/chatview.h b/kopete/kopete/chatwindow/chatview.h index 1a89af99..039918dd 100644 --- a/kopete/kopete/chatwindow/chatview.h +++ b/kopete/kopete/chatwindow/chatview.h @@ -54,8 +54,9 @@ namespace Kopete class ChatView : public KDockMainWindow, public KopeteView { Q_OBJECT + TQ_OBJECT public: - ChatView( Kopete::ChatSession *manager, ChatWindowPlugin *parent, const char *name = 0 ); + ChatView( Kopete::ChatSession *manager, ChatWindowPlugin *tqparent, const char *name = 0 ); ~ChatView(); /** the state of our chat */ @@ -104,10 +105,10 @@ public: void setCaption( const TQString &text, bool modified ); /** - * Changes the pointer to the chat window. Used to re-parent the view - * @param parent The new chat window + * Changes the pointer to the chat window. Used to re-tqparent the view + * @param tqparent The new chat window */ - void setMainWindow( KopeteChatWindow* parent ); + void setMainWindow( KopeteChatWindow* tqparent ); /** * Returns the message currently in the edit area @@ -119,7 +120,7 @@ public: /** * Sets the current message in the chat window - * @param parent The new chat window + * @param tqparent The new chat window * * Reimplemented from KopeteView */ @@ -300,7 +301,7 @@ signals: void canSendChanged(bool); /** - * Emitted when we re-parent ourselves with a new window + * Emitted when we re-tqparent ourselves with a new window */ void windowCreated(); @@ -381,7 +382,7 @@ private: // position and visibility of the chat member list KDockWidget::DockPosition membersDockPosition; enum MembersListPolicy { Smart = 0, Visible = 1, Hidden = 2 }; - MembersListPolicy membersStatus; + MembersListPolicy memberstqStatus; // miscellany TQPtrDict m_remoteTypingMap; @@ -411,7 +412,7 @@ private: class ChatWindowPlugin : public Kopete::ViewPlugin { public: - ChatWindowPlugin(TQObject *parent, const char *name, const TQStringList &args); + ChatWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &args); KopeteView* createView( Kopete::ChatSession *manager ); }; diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 719068d0..015f2f5c 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -32,12 +32,12 @@ #include -EmoticonLabel::EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *parent, const char *name) - : TQLabel(parent,name) +EmoticonLabel::EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *tqparent, const char *name) + : TQLabel(tqparent,name) { mText = emoticonText; setMovie( TQMovie(pixmapPath) ); - setAlignment(Qt::AlignCenter); + tqsetAlignment(TQt::AlignCenter); TQToolTip::add(this,emoticonText); // Somehow TQLabel doesn't tell a reasonable size when you use setMovie // although it does it correctly for setPixmap. Therefore here is a little workaround @@ -57,8 +57,8 @@ void EmoticonLabel::mouseReleaseEvent(TQMouseEvent*) emit clicked(mText); } -EmoticonSelector::EmoticonSelector(TQWidget *parent, const char *name) - : TQWidget(parent, name) +EmoticonSelector::EmoticonSelector(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { // kdDebug(14000) << k_funcinfo << "called." << endl; lay = 0L; @@ -100,18 +100,18 @@ void EmoticonSelector::prepareList(void) else col++; } - resize(minimumSizeHint()); + resize(tqminimumSizeHint()); } void EmoticonSelector::emoticonClicked(const TQString &str) { // kdDebug(14000) << "selected emoticon '" << str << "'" << endl; - // KDE4/Qt TODO: use qobject_cast instead. + // KDE4/TQt TODO: use qobject_cast instead. emit ItemSelected ( str ); - if ( isVisible() && parentWidget() && - parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( isVisible() && tqparentWidget() && + tqparentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { - parentWidget()->close(); + tqparentWidget()->close(); } } diff --git a/kopete/kopete/chatwindow/emoticonselector.h b/kopete/kopete/chatwindow/emoticonselector.h index 1b23f2f8..b78201d8 100644 --- a/kopete/kopete/chatwindow/emoticonselector.h +++ b/kopete/kopete/chatwindow/emoticonselector.h @@ -26,12 +26,13 @@ class TQGridLayout; class TQHideEvent; class TQShowEvent; -class EmoticonLabel : public QLabel +class EmoticonLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *parent=0, const char *name=0); + EmoticonLabel(const TQString &emoticonText, const TQString &pixmapPath, TQWidget *tqparent=0, const char *name=0); // ~EmoticonLabel(); signals: @@ -42,13 +43,14 @@ protected: TQString mText; }; -class EmoticonSelector : public QWidget +class EmoticonSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EmoticonSelector ( TQWidget *parent = 0, const char *name = 0 ); + EmoticonSelector ( TQWidget *tqparent = 0, const char *name = 0 ); // ~EmoticonSelector(); typedef TQValueList MovieList; diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index ad002edc..64bf5099 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -98,21 +98,21 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) switch( KopetePrefs::prefs()->chatWindowPolicy() ) { case GROUP_BY_ACCOUNT: //Open chats from the same protocol in the same window - if( accountMap.contains( manager->account() ) ) + if( accountMap.tqcontains( manager->account() ) ) myWindow = accountMap[ manager->account() ]; else windowCreated = true; break; case GROUP_BY_GROUP: //Open chats from the same group in the same window - if( group && groupMap.contains( group ) ) + if( group && groupMap.tqcontains( group ) ) myWindow = groupMap[ group ]; else windowCreated = true; break; case GROUP_BY_METACONTACT: //Open chats from the same metacontact in the same window - if( mcMap.contains( metaContact ) ) + if( mcMap.tqcontains( metaContact ) ) myWindow = mcMap[ metaContact ]; else windowCreated = true; @@ -149,13 +149,13 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) { myWindow = new KopeteChatWindow(); - if ( !accountMap.contains( manager->account() ) ) + if ( !accountMap.tqcontains( manager->account() ) ) accountMap.insert( manager->account(), myWindow ); - if ( !mcMap.contains( metaContact ) ) + if ( !mcMap.tqcontains( metaContact ) ) mcMap.insert( metaContact, myWindow ); - if ( group && !groupMap.contains( group ) ) + if ( group && !groupMap.tqcontains( group ) ) groupMap.insert( group, myWindow ); } @@ -164,8 +164,8 @@ KopeteChatWindow *KopeteChatWindow::window( Kopete::ChatSession *manager ) return myWindow; } -KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) - : KParts::MainWindow( parent, name ) +KopeteChatWindow::KopeteChatWindow( TQWidget *tqparent, const char* name ) + : KParts::MainWindow( tqparent, name ) { m_activeView = 0L; m_popupView = 0L; @@ -185,17 +185,17 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) mainArea = new TQFrame( vBox ); mainArea->setLineWidth( 0 ); - mainArea->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + mainArea->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); mainLayout = new TQVBoxLayout( mainArea ); if ( KopetePrefs::prefs()->chatWShowSend() ) { //Send Button m_button_send = new KPushButton( i18n("Send"), statusBar() ); - m_button_send->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + m_button_send->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_button_send->setEnabled( false ); m_button_send->setFont( statusBar()->font() ); - m_button_send->setFixedHeight( statusBar()->sizeHint().height() ); + m_button_send->setFixedHeight( statusBar()->tqsizeHint().height() ); connect( m_button_send, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSendMessage() ) ); statusBar()->addWidget( m_button_send, 0, true ); } @@ -203,20 +203,20 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) m_button_send = 0L; m_status_text = new KSqueezedTextLabel( i18n("Ready."), statusBar(), "m_status_text" ); - m_status_text->setAlignment( AlignLeft | AlignVCenter ); + m_status_text->tqsetAlignment( AlignLeft | AlignVCenter ); m_status_text->setFont( statusBar()->font() ); - m_status_text->setFixedHeight( statusBar()->sizeHint().height() ); + m_status_text->setFixedHeight( statusBar()->tqsizeHint().height() ); statusBar()->addWidget( m_status_text, 1 ); readOptions(); - setWFlags( Qt::WDestructiveClose ); + setWFlags( TQt::WDestructiveClose ); windows.append( this ); windowListChanged(); - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); - m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::fromLatin1("AlwaysShowTabs"), false ); - m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); + KGlobal::config()->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); + m_alwaysShowTabs = KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("AlwaysShowTabs"), false ); + m_showFormatToolbar = KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("Show Format Toolbar"), true ); adjustingFormatToolbar = false; // kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl; kapp->ref(); @@ -313,32 +313,32 @@ void KopeteChatWindow::initActions(void) createStandardStatusBarAction(); - chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) , - this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" ); + chatSend = new KAction( i18n( "&Send Message" ), TQString::tqfromLatin1( "mail_send" ), TQKeySequence(Key_Return) , + TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" ); chatSend->setEnabled( false ); - KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll ); - KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll ); - KAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll ); + KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll ); + KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll ); + KAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll ); quitAction->setText( i18n("Close All Chats") ); - tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" ); + tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" ); tabRight=new KAction( i18n( "&Activate Next Tab" ), 0, KStdAccel::tabNext(), - this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" ); + TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" ); tabLeft=new KAction( i18n( "&Activate Previous Tab" ), 0, KStdAccel::tabPrev(), - this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" ); + TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" ); tabLeft->setEnabled( false ); tabRight->setEnabled( false ); - nickComplete = new KAction( i18n( "Nic&k Completion" ), TQString::null, 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete"); + nickComplete = new KAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete"); nickComplete->setShortcut( TQKeySequence( Key_Tab ) ); - tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0, - this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" ); + tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::tqfromLatin1( "tab_breakoff" ), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" ); tabDetach->setEnabled( false ); - actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); + actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::tqfromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); actionDetachMenu->setDelayed( false ); connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) ); @@ -350,36 +350,36 @@ void KopeteChatWindow::initActions(void) tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) ); - KStdAction::cut( this, TQT_SLOT(slotCut()), coll); - KStdAction::copy( this, TQT_SLOT(slotCopy()), coll); - KStdAction::paste( this, TQT_SLOT(slotPaste()), coll); + KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCut()), coll); + KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); + KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll); - new KAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQT_SLOT( slotSetFont() ), coll, "format_font" ); - new KAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); - new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); + new KAction( i18n( "Set Default &Font..." ), TQString::tqfromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" ); + new KAction( i18n( "Set Default Text &Color..." ), TQString::tqfromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); + new KAction( i18n( "Set &Background Color..." ), TQString::tqfromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); - historyUp = new KAction( i18n( "Previous History" ), TQString::null, 0, - this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" ); + historyUp = new KAction( i18n( "Previous History" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" ); historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) ); - historyDown = new KAction( i18n( "Next History" ), TQString::null, 0, - this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" ); + historyDown = new KAction( i18n( "Next History" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" ); historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) ); - KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" ); - KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" ); + KStdAction::prior( TQT_TQOBJECT(this), TQT_SLOT( slotPageUp() ), coll, "scroll_up" ); + KStdAction::next( TQT_TQOBJECT(this), TQT_SLOT( slotPageDown() ), coll, "scroll_down" ); - KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll ); + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll ); - membersLeft = new KToggleAction( i18n( "Place to Left of Chat Area" ), TQString::null, 0, - this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" ); - membersRight = new KToggleAction( i18n( "Place to Right of Chat Area" ), TQString::null, 0, - this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" ); - toggleMembers = new KToggleAction( i18n( "Show" ), TQString::null, 0, - this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" ); + membersLeft = new KToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" ); + membersRight = new KToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" ); + toggleMembers = new KToggleAction( i18n( "Show" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" ); toggleMembers->setCheckedState(i18n("Hide")); - toggleAutoSpellCheck = new KToggleAction( i18n( "Automatic Spell Checking" ), TQString::null, 0, - this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" ); + toggleAutoSpellCheck = new KToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0, + TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" ); toggleAutoSpellCheck->setChecked( true ); actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" ); @@ -393,21 +393,21 @@ void KopeteChatWindow::initActions(void) // add configure key bindings menu item KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll ); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), coll); KopeteStdAction::preferences( coll , "settings_prefs" ); //The Sending movie - normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + normalIcon = TQPixmap( BarIcon( TQString::tqfromLatin1( "kopete" ) ) ); + animIcon = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Toolbar); // Pause the animation because otherwise it's running even when we're not // showing it. This eats resources, and also triggers a pixmap leak in - // TQMovie in at least Qt 3.1, Qt 3.2 and the current Qt 3.3 beta + // TQMovie in at least TQt 3.1, TQt 3.2 and the current TQt 3.3 beta if( !animIcon.isNull() ) //and another QT bug: it crash if we pause a null movie animIcon.pause(); - // we can't set the tool bar as parent, if we do, it will be deleted when we configure toolbars - anim = new TQLabel( TQString::null, 0L ,"kde toolbar widget" ); + // we can't set the tool bar as tqparent, if we do, it will be deleted when we configure toolbars + anim = new TQLabel( TQString(), 0L ,"kde toolbar widget" ); anim->setMargin(5); anim->setPixmap( normalIcon ); @@ -418,7 +418,7 @@ void KopeteChatWindow::initActions(void) //toolBar()->alignItemRight( 99 ); setStandardToolBarMenuEnabled( true ); - setXMLFile( TQString::fromLatin1( "kopetechatwindow.rc" ) ); + setXMLFile( TQString::tqfromLatin1( "kopetechatwindow.rc" ) ); createGUI( 0L ); // Special handling for remembering whether the format toolbar is visible or not @@ -581,7 +581,7 @@ void KopeteChatWindow::slotSetBgColor() m_activeView->setBgColor(); } -void KopeteChatWindow::setStatus(const TQString &text) +void KopeteChatWindow::settqStatus(const TQString &text) { m_status_text->setText(text); } @@ -590,11 +590,11 @@ void KopeteChatWindow::createTabBar() { if( !m_tabBar ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + KGlobal::config()->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); m_tabBar = new KTabWidget( mainArea ); - m_tabBar->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); - m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::fromLatin1("HoverClose"), false )); + m_tabBar->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + m_tabBar->setHoverCloseButton(KGlobal::config()->readBoolEntry( TQString::tqfromLatin1("HoverClose"), false )); m_tabBar->setTabReorderingEnabled(true); #if KDE_IS_VERSION(3,4,0) m_tabBar->setAutomaticResizeTabs(true); @@ -621,7 +621,7 @@ void KopeteChatWindow::createTabBar() else setActiveView( chatViewList.first() ); - int tabPosition = KGlobal::config()->readNumEntry( TQString::fromLatin1("Tab Placement") , 0 ); + int tabPosition = KGlobal::config()->readNumEntry( TQString::tqfromLatin1("Tab Placement") , 0 ); slotPlaceTabs( tabPosition ); } } @@ -637,7 +637,7 @@ void KopeteChatWindow::addTab( ChatView *view ) Kopete::Contact *c=0L; for ( Kopete::Contact *contact = chatMembers.first(); contact; contact = chatMembers.next() ) { - if(!c || c->onlineStatus() < contact->onlineStatus()) + if(!c || c->onlinetqStatus() < contact->onlinetqStatus()) c=contact; } TQPixmap pluginIcon = c ? view->msgManager()->contactOnlineStatus( c ).iconFor( c) : SmallIcon( view->msgManager()->protocol()->pluginIcon() ); @@ -829,7 +829,7 @@ void KopeteChatWindow::updateBackground( const TQPixmap &pm ) backgroundFile->unlink(); } - backgroundFile = new KTempFile( TQString::null, TQString::fromLatin1( ".bmp" ) ); + backgroundFile = new KTempFile( TQString(), TQString::tqfromLatin1( ".bmp" ) ); pm.save( backgroundFile->name(), "BMP" ); TQTimer::singleShot( 100, this, TQT_SLOT( slotEnableUpdateBg() ) ); } @@ -857,7 +857,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) m_activeView = view; - if( !chatViewList.contains( view ) ) + if( !chatViewList.tqcontains( view ) ) attachChatView( view ); connect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) ); @@ -892,7 +892,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) } setCaption( m_activeView->caption() ); - setStatus( m_activeView->statusText() ); + settqStatus( m_activeView->statusText() ); m_activeView->setFocus(); updateSpellCheckAction(); slotUpdateSendEnabled(); @@ -909,7 +909,7 @@ void KopeteChatWindow::slotUpdateCaptionIcons( ChatView *view ) Kopete::Contact *c=0L; for ( Kopete::Contact *contact = chatMembers.first(); contact; contact = chatMembers.next() ) { - if(!c || c->onlineStatus() < contact->onlineStatus()) + if(!c || c->onlinetqStatus() < contact->onlinetqStatus()) c=contact; } @@ -986,15 +986,15 @@ void KopeteChatWindow::slotPrepareContactMenu(void) p, TQT_SLOT(deleteLater() ) ); if( contact->metaContact() ) - contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->metaContact()->displayName(), p ); + contactsMenu->insertItem( contact->onlinetqStatus().iconFor( contact ) , contact->metaContact()->displayName(), p ); else - contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->contactId(), p ); + contactsMenu->insertItem( contact->onlinetqStatus().iconFor( contact ) , contact->contactId(), p ); //FIXME: This number should be a config option if( ++contactCount == 15 && contact != m_them.getLast() ) { KActionMenu *moreMenu = new KActionMenu( i18n("More..."), - TQString::fromLatin1("folder_open"), contactsMenu ); + TQString::tqfromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) ); connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), moreMenu, TQT_SLOT(deleteLater() ) ); moreMenu->plug( contactsMenu ); @@ -1032,9 +1032,9 @@ void KopeteChatWindow::readOptions() // load and apply config file settings affecting the appearance of the UI // kdDebug(14010) << k_funcinfo << endl; KConfig *config = KGlobal::config(); - applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); - config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); - m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true ); + applyMainWindowSettings( config, TQString::tqfromLatin1( "KopeteChatWindow" ) ); + config->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); + m_showFormatToolbar = config->readBoolEntry( TQString::tqfromLatin1("Show Format Toolbar"), true ); } void KopeteChatWindow::saveOptions() @@ -1044,12 +1044,12 @@ void KopeteChatWindow::saveOptions() KConfig *config = KGlobal::config(); // saves menubar,toolbar and statusbar setting - saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) ); - config->setGroup( TQString::fromLatin1("ChatWindowSettings") ); + saveMainWindowSettings( config, TQString::tqfromLatin1( "KopeteChatWindow" ) ); + config->setGroup( TQString::tqfromLatin1("ChatWindowSettings") ); if( m_tabBar ) - config->writeEntry ( TQString::fromLatin1("Tab Placement"), m_tabBar->tabPosition() ); + config->writeEntry ( TQString::tqfromLatin1("Tab Placement"), m_tabBar->tabPosition() ); - config->writeEntry( TQString::fromLatin1("Show Format Toolbar"), m_showFormatToolbar ); + config->writeEntry( TQString::tqfromLatin1("Show Format Toolbar"), m_showFormatToolbar ); config->sync(); } @@ -1214,7 +1214,7 @@ void KopeteChatWindow::slotConfKeys() void KopeteChatWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteChatWindow" )); KEditToolbar *dlg = new KEditToolbar(factory(), this ); if (dlg->exec()) { @@ -1222,7 +1222,7 @@ void KopeteChatWindow::slotConfToolbar() createGUI( m_activeView->editPart() ); else createGUI( 0L ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteChatWindow" )); + applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteChatWindow" )); } delete dlg; } @@ -1234,16 +1234,16 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) switch( newState ) { case ChatView::Highlighted: - m_tabBar->setTabColor( cv, Qt::blue ); + m_tabBar->setTabColor( cv, TQt::blue ); break; case ChatView::Message: - m_tabBar->setTabColor( cv, Qt::red ); + m_tabBar->setTabColor( cv, TQt::red ); break; case ChatView::Changed: - m_tabBar->setTabColor( cv, Qt::darkRed ); + m_tabBar->setTabColor( cv, TQt::darkRed ); break; case ChatView::Typing: - m_tabBar->setTabColor( cv, Qt::darkGreen ); + m_tabBar->setTabColor( cv, TQt::darkGreen ); break; case ChatView::Normal: default: @@ -1256,7 +1256,7 @@ void KopeteChatWindow::updateChatState( ChatView* cv, int newState ) void KopeteChatWindow::updateChatTooltip( ChatView* cv ) { if ( m_tabBar ) - m_tabBar->setTabToolTip( cv, TQString::fromLatin1("%1").arg( cv->caption() ) ); + m_tabBar->setTabToolTip( cv, TQString::tqfromLatin1("%1").tqarg( cv->caption() ) ); } void KopeteChatWindow::updateChatLabel() diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h index c80a0dad..b1f9698b 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.h +++ b/kopete/kopete/chatwindow/kopetechatwindow.h @@ -54,6 +54,7 @@ typedef TQPtrList ContactPtrList; class KopeteChatWindow : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT enum {NEW_WINDOW, GROUP_BY_ACCOUNT, GROUP_ALL, GROUP_BY_GROUP, GROUP_BY_METACONTACT}; @@ -92,7 +93,7 @@ public: ChatView *activeView(); void updateMembersActions(); - void setStatus( const TQString & ); + void settqStatus( const TQString & ); /** * Reimplemented from KMainWindow - asks each ChatView in the window if it is ok to close the window @@ -106,7 +107,7 @@ public: private: // All KopeteChatWindows are created by the window function - KopeteChatWindow( TQWidget *parent = 0, const char* name = "KopeteChatWindow" ); + KopeteChatWindow( TQWidget *tqparent = 0, const char* name = "KopeteChatWindow" ); /** * The window list has changed: diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp index 76e7fd54..646b8259 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp @@ -17,7 +17,7 @@ #include "kopetechatwindowstyle.h" -// Qt includes +// TQt includes #include #include #include @@ -157,9 +157,9 @@ void ChatWindowStyle::listVariants() { TQString variantName = *it, variantPath; // Retrieve only the file name. - variantName = variantName.left(variantName.findRev(".")); + variantName = variantName.left(variantName.tqfindRev(".")); // variantPath is relative to baseHref. - variantPath = TQString("Variants/%1").arg(*it); + variantPath = TQString("Variants/%1").tqarg(*it); d->variantsList.insert(variantName, variantPath); } } @@ -172,7 +172,7 @@ void ChatWindowStyle::readStyleFiles() TQString nextIncomingFile = d->baseHref + TQString("Incoming/NextContent.html"); TQString outgoingFile = d->baseHref + TQString("Outgoing/Content.html"); TQString nextOutgoingFile = d->baseHref + TQString("Outgoing/NextContent.html"); - TQString statusFile = d->baseHref + TQString("Status.html"); + TQString statusFile = d->baseHref + TQString("tqStatus.html"); TQString actionIncomingFile = d->baseHref + TQString("Incoming/Action.html"); TQString actionOutgoingFile = d->baseHref + TQString("Outgoing/Action.html"); @@ -251,7 +251,7 @@ void ChatWindowStyle::readStyleFiles() TQTextStream headerStream(&fileAccess); headerStream.setEncoding(TQTextStream::UnicodeUTF8); d->statusHtml = headerStream.read(); - kdDebug(14000) << k_funcinfo << "Status HTML: " << d->statusHtml << endl; + kdDebug(14000) << k_funcinfo << "tqStatus HTML: " << d->statusHtml << endl; fileAccess.close(); } diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.h b/kopete/kopete/chatwindow/kopetechatwindowstyle.h index 43c54887..38c5f35b 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstyle.h +++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.h @@ -30,7 +30,7 @@ class ChatWindowStyle { public: /** - * StyleVariants is a typedef to a QMap + * StyleVariants is a typedef to a TQMap * key = Variant Name * value = Path to variant CSS file. * Path is relative to Ressources directory. diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index cb3291e7..56f1844a 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -17,7 +17,7 @@ #include "kopetechatwindowstylemanager.h" -// Qt includes +// TQt includes #include // KDE includes @@ -81,8 +81,8 @@ ChatWindowStyleManager *ChatWindowStyleManager::self() return s_self; } -ChatWindowStyleManager::ChatWindowStyleManager(TQObject *parent, const char *name) - : TQObject(parent, name), d(new Private()) +ChatWindowStyleManager::ChatWindowStyleManager(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), d(new Private()) { kdDebug(14000) << k_funcinfo << endl; loadStyles(); @@ -98,7 +98,7 @@ void ChatWindowStyleManager::loadStyles() { TQStringList chatStyles = KGlobal::dirs()->findDirs( "appdata", TQString::fromUtf8( "styles" ) ); TQString localStyleDir( locateLocal( "appdata", TQString::fromUtf8("styles/"),true) ); - if( !chatStyles.contains(localStyleDir)) + if( !chatStyles.tqcontains(localStyleDir)) chatStyles<entries(); @@ -209,9 +209,9 @@ int ChatWindowStyleManager::installStyle(const TQString &styleBundlePath) // kdDebug() << k_funcinfo << "Contents/Resources/Footer.html found" << endl; validResult += 1; } - if( currentDir->entry(TQString::fromUtf8("Contents/Resources/Status.html")) ) + if( currentDir->entry(TQString::fromUtf8("Contents/Resources/tqStatus.html")) ) { -// kdDebug() << k_funcinfo << "Contents/Resources/Status.html found" << endl; +// kdDebug() << k_funcinfo << "Contents/Resources/tqStatus.html found" << endl; validResult += 1; } if( currentDir->entry(TQString::fromUtf8("Contents/Resources/Header.html")) ) @@ -289,14 +289,14 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath) // Find for the current style in avaiableStyles map. KURL urlStyle(stylePath); TQString styleName=urlStyle.fileName(); - StyleList::Iterator foundStyle = d->availableStyles.find(styleName); + StyleList::Iterator foundStyle = d->availableStyles.tqfind(styleName); // TQMap iterator return end() if it found no item. if(foundStyle != d->availableStyles.end()) { d->availableStyles.remove(foundStyle); // Remove and delete style from pool if needed. - if( d->stylePool.contains(stylePath) ) + if( d->stylePool.tqcontains(stylePath) ) { ChatWindowStyle *deletedStyle = d->stylePool[stylePath]; d->stylePool.remove(stylePath); @@ -314,7 +314,7 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath) ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &stylePath) { - if( d->stylePool.contains(stylePath) ) + if( d->stylePool.tqcontains(stylePath) ) { // NOTE: This is a hidden config switch for style developers // Check in the config if the cache is disabled. @@ -348,19 +348,19 @@ void ChatWindowStyleManager::slotNewStyles(const KFileItemList &dirList) while( (item = it.current()) != 0 ) { // Ignore data dir(from deprecated XSLT themes) - if( !item->url().fileName().contains(TQString::fromUtf8("data")) ) + if( !item->url().fileName().tqcontains(TQString::fromUtf8("data")) ) { kdDebug(14000) << k_funcinfo << "Listing: " << item->url().fileName() << endl; // If the style path is already in the pool, that's mean the style was updated on disk // Reload the style - if( d->stylePool.contains(item->url().path()) ) + if( d->stylePool.tqcontains(item->url().path()) ) { kdDebug(14000) << k_funcinfo << "Updating style: " << item->url().path() << endl; d->stylePool[item->url().path()]->reload(); // Add to avaialble if required. - if( !d->availableStyles.contains(item->url().fileName()) ) + if( !d->availableStyles.tqcontains(item->url().fileName()) ) d->availableStyles.insert(item->url().fileName(), item->url().path()); } else diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h index dcc56cf0..712f9bfc 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.h @@ -41,9 +41,10 @@ class ChatWindowStyle; * * @author Michaël Larouche */ -class KOPETE_EXPORT ChatWindowStyleManager : public QObject +class KOPETE_EXPORT ChatWindowStyleManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * StyleList typedef (a TQMap) @@ -53,14 +54,14 @@ public: typedef TQMap StyleList; /** - * The StyleInstallStatus enum. It gives better return value for installStyle(). + * The StyleInstalltqStatus enum. It gives better return value for installStyle(). * - StyleInstallOk : The install went fine. * - StyleNotValid : The archive didn't contain a valid Chat Window style. * - StyleNoDirectoryValid : It didn't find a suitable directory to install the theme. * - StyleCannotOpen : The archive couldn't be openned. * - StyleUnknow : Unknow error. */ - enum StyleInstallStatus { StyleInstallOk = 0, StyleNotValid, StyleNoDirectoryValid, StyleCannotOpen, StyleUnknow }; + enum StyleInstalltqStatus { StyleInstallOk = 0, StyleNotValid, StyleNoDirectoryValid, StyleCannotOpen, StyleUnknow }; /** * Destructor. @@ -90,7 +91,7 @@ public slots: * Note that you must pass a path to a archive. * * @param styleBundlePath Path to the container file to install. - * @return A status code from StyleInstallStatus enum. + * @return A status code from StyleInstalltqStatus enum. */ int installStyle(const TQString &styleBundlePath); @@ -136,7 +137,7 @@ private: * Private constructor(it's a singleton class) * Call loadStyles() to list all avaiable styles. */ - ChatWindowStyleManager(TQObject *parent = 0, const char *name = 0); + ChatWindowStyleManager(TQObject *tqparent = 0, const char *name = 0); static ChatWindowStyleManager *s_self; diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 89f99eb9..6f42c374 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -62,8 +62,8 @@ typedef KGenericFactory EmailWindowPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_emailwindow, EmailWindowPluginFactory( "kopete_emailwindow" ) ) -EmailWindowPlugin::EmailWindowPlugin(TQObject *parent, const char *name, const TQStringList &) : - Kopete::ViewPlugin( EmailWindowPluginFactory::instance(), parent, name ) +EmailWindowPlugin::EmailWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &) : + Kopete::ViewPlugin( EmailWindowPluginFactory::instance(), tqparent, name ) {} KopeteView* EmailWindowPlugin::createView( Kopete::ChatSession *manager ) @@ -97,8 +97,8 @@ public: KopeteEmoticonAction *actionSmileyMenu; }; -KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowPlugin *parent, bool foreignMessage ) - : KParts::MainWindow( ), KopeteView( manager, parent ), d( new Private ) +KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowPlugin *tqparent, bool foreignMessage ) + : KParts::MainWindow( ), KopeteView( manager, tqparent ), d( new Private ) { TQVBox *v = new TQVBox( this ); setCentralWidget( v ); @@ -106,7 +106,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP setMinimumSize( TQSize( 75, 20 ) ); d->split = new TQSplitter( v ); - d->split->setOrientation( TQSplitter::Vertical ); + d->split->setOrientation( Qt::Vertical ); d->messagePart = new ChatMessagePart( manager, d->split, "messagePart" ); @@ -147,26 +147,26 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP this, TQT_SLOT( messageSentSuccessfully() )); TQWidget *containerWidget = new TQWidget( v ); - containerWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); + containerWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); TQHBoxLayout *h = new TQHBoxLayout( containerWidget, 4, 4 ); h->addStretch(); d->btnReadPrev = new KPushButton( i18n( "<< Prev" ), containerWidget ); connect( d->btnReadPrev, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadPrev() ) ); - h->addWidget( d->btnReadPrev, 0, Qt::AlignRight | Qt::AlignVCenter ); + h->addWidget( d->btnReadPrev, 0, TQt::AlignRight | TQt::AlignVCenter ); d->btnReadPrev->setEnabled( false ); d->btnReadNext = new KPushButton( i18n( "(0) Next >>" ), containerWidget ); connect( d->btnReadNext, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadNext() ) ); - h->addWidget( d->btnReadNext, 0, Qt::AlignRight | Qt::AlignVCenter ); + h->addWidget( d->btnReadNext, 0, TQt::AlignRight | TQt::AlignVCenter ); d->btnReplySend = new KPushButton( containerWidget ); connect( d->btnReplySend, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReplySend() ) ); - h->addWidget( d->btnReplySend, 0, Qt::AlignRight | Qt::AlignVCenter ); + h->addWidget( d->btnReplySend, 0, TQt::AlignRight | TQt::AlignVCenter ); initActions(); - setWFlags(Qt::WDestructiveClose); + setWFlags(TQt::WDestructiveClose); d->showingMessage = false; @@ -176,7 +176,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP toggleMode( Send ); KConfig *config = KGlobal::config(); - applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); + applyMainWindowSettings( config, TQString::tqfromLatin1( "KopeteEmailWindow" ) ); d->sendInProgress = false; @@ -196,7 +196,7 @@ KopeteEmailWindow::~KopeteEmailWindow() // saves menubar, toolbar and statusbar setting KConfig *config = KGlobal::config(); - saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) ); + saveMainWindowSettings( config, TQString::tqfromLatin1( "KopeteEmailWindow" ) ); config->sync(); delete d; @@ -206,25 +206,25 @@ void KopeteEmailWindow::initActions(void) { KActionCollection *coll = actionCollection(); - d->chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0, - this, TQT_SLOT( slotReplySend() ), coll, "chat_send" ); + d->chatSend = new KAction( i18n( "&Send Message" ), TQString::tqfromLatin1( "mail_send" ), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" ); //Default to 'Return' for sending messages d->chatSend->setShortcut( TQKeySequence( Key_Return ) ); - KStdAction::quit ( this, TQT_SLOT( slotCloseView() ), coll ); + KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT( slotCloseView() ), coll ); - KStdAction::cut( d->editPart->widget(), TQT_SLOT( cut() ), coll ); - KStdAction::copy( this, TQT_SLOT(slotCopy()), coll); - KStdAction::paste( d->editPart->widget(), TQT_SLOT( paste() ), coll ); + KStdAction::cut( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( cut() ), coll ); + KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); + KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll ); - new KAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0, + new KAction( i18n( "&Set Font..." ), TQString::tqfromLatin1( "charset" ), 0, d->editPart, TQT_SLOT( setFont() ), coll, "format_font" ); - new KAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, + new KAction( i18n( "Set Text &Color..." ), TQString::tqfromLatin1( "pencil" ), 0, d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" ); - new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, + new KAction( i18n( "Set &Background Color..." ), TQString::tqfromLatin1( "fill" ), 0, d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" ); - KStdAction::showMenubar( this, TQT_SLOT( slotViewMenuBar() ), coll ); + KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll ); setStandardToolBarMenuEnabled( true ); d->actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" ); @@ -233,13 +233,13 @@ void KopeteEmailWindow::initActions(void) // add configure key bindings menu item KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll ); - KStdAction::configureToolbars(this, TQT_SLOT( slotConfToolbar() ), coll); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotConfToolbar() ), coll); //FIXME: no longer works? KopeteStdAction::preferences( coll , "settings_prefs" ); // The animated toolbarbutton - d->normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) ); - d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar); + d->normalIcon = TQPixmap( BarIcon( TQString::tqfromLatin1( "kopete" ) ) ); + d->animIcon = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Toolbar); d->animIcon.pause(); d->anim = new TQLabel( this, "kde toolbar widget" ); @@ -247,9 +247,9 @@ void KopeteEmailWindow::initActions(void) d->anim->setPixmap( d->normalIcon ); new KWidgetAction( d->anim, i18n("Toolbar Animation"), 0, 0, 0, coll, "toolbar_animation" ); - setXMLFile( TQString::fromLatin1( "kopeteemailwindow.rc" ) ); + setXMLFile( TQString::tqfromLatin1( "kopeteemailwindow.rc" ) ); createGUI( d->editPart ); - //createGUI( TQString::fromLatin1( "kopeteemailwindow.rc" ) ); + //createGUI( TQString::tqfromLatin1( "kopeteemailwindow.rc" ) ); guiFactory()->addClient(m_manager); } @@ -280,12 +280,12 @@ void KopeteEmailWindow::slotSmileyActivated(const TQString &sm ) void KopeteEmailWindow::slotConfToolbar() { - saveMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); - KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::fromLatin1("kopeteemailwindow.rc") ); + saveMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteEmailWindow" )); + KEditToolbar *dlg = new KEditToolbar(actionCollection(), TQString::tqfromLatin1("kopeteemailwindow.rc") ); if (dlg->exec()) { createGUI( d->editPart ); - applyMainWindowSettings(KGlobal::config(), TQString::fromLatin1( "KopeteEmailWindow" )); + applyMainWindowSettings(KGlobal::config(), TQString::tqfromLatin1( "KopeteEmailWindow" )); } delete dlg; } @@ -325,7 +325,7 @@ void KopeteEmailWindow::appendMessage(Kopete::Message &message) void KopeteEmailWindow::slotMarkMessageRead() { - d->unreadMessageFrom = TQString::null; + d->unreadMessageFrom = TQString(); } void KopeteEmailWindow::updateNextButton() @@ -344,7 +344,7 @@ void KopeteEmailWindow::updateNextButton() else d->btnReadPrev->setEnabled( true ); - d->btnReadNext->setText( i18n( "(%1) Next >>" ).arg( d->messageQueue.count() - d->queuePosition ) ); + d->btnReadNext->setText( i18n( "(%1) Next >>" ).tqarg( d->messageQueue.count() - d->queuePosition ) ); } void KopeteEmailWindow::slotUpdateReplySend() @@ -420,25 +420,25 @@ bool KopeteEmailWindow::closeView( bool force ) { TQString shortCaption = caption(); if( shortCaption.length() > 40 ) - shortCaption = shortCaption.left( 40 ) + TQString::fromLatin1("..."); + shortCaption = shortCaption.left( 40 ) + TQString::tqfromLatin1("..."); response = KMessageBox::warningContinueCancel(this, i18n("You are about to leave the group chat session %1.
" - "You will not receive future messages from this conversation.").arg(shortCaption), i18n("Closing Group Chat"), - i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseGroupChat")); + "You will not receive future messages from this conversation.").tqarg(shortCaption), i18n("Closing Group Chat"), + i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseGroupChat")); } if( !d->unreadMessageFrom.isNull() && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel(this, i18n("You have received a message from %1 in the last " - "second. Are you sure you want to close this chat?").arg(d->unreadMessageFrom), i18n("Unread Message"), - i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseChatRecentMessage")); + "second. Are you sure you want to close this chat?").tqarg(d->unreadMessageFrom), i18n("Unread Message"), + i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseChatRecentMessage")); } if( d->sendInProgress && ( response == KMessageBox::Continue ) ) { response = KMessageBox::warningContinueCancel(this, i18n("You have a message send in progress, which will be " "aborted if this chat is closed. Are you sure you want to close this chat?"), i18n("Message in Transit"), - i18n("Cl&ose Chat"), TQString::fromLatin1("AskCloseChatMessageInProgress") ); + i18n("Cl&ose Chat"), TQString::tqfromLatin1("AskCloseChatMessageInProgress") ); } } diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h index 165ee53a..50b1195f 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.h +++ b/kopete/kopete/chatwindow/kopeteemailwindow.h @@ -31,11 +31,12 @@ class EmailWindowPlugin; class KopeteEmailWindow : KParts::MainWindow, public KopeteView { Q_OBJECT + TQ_OBJECT public: enum WindowMode { Send, Read, Reply }; - KopeteEmailWindow( Kopete::ChatSession *, EmailWindowPlugin *parent, bool foreignMessage ); + KopeteEmailWindow( Kopete::ChatSession *, EmailWindowPlugin *tqparent, bool foreignMessage ); ~KopeteEmailWindow(); virtual Kopete::Message currentMessage(); @@ -94,7 +95,7 @@ private: class EmailWindowPlugin : public Kopete::ViewPlugin { public: - EmailWindowPlugin(TQObject *parent, const char *name, const TQStringList &args); + EmailWindowPlugin(TQObject *tqparent, const char *name, const TQStringList &args); KopeteView* createView( Kopete::ChatSession *manager ); }; diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index fd9053ec..34c0781b 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -61,8 +61,8 @@ public: bool m_stickyMenu; }; -KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) - : KAction( i18n( "Add Smiley" ), 0, parent, name ) +KopeteEmoticonAction::KopeteEmoticonAction( TQObject* tqparent, const char* name ) + : KAction( i18n( "Add Smiley" ), 0, tqparent, name ) { d = new KopeteEmoticonActionPrivate; @@ -73,7 +73,7 @@ KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) for( TQMap::const_iterator it = emoticonsMap.constBegin(); it != emoticonsMap.constEnd(); ++it ) { - if( ( *it ).contains( ":)" ) || ( *it ).contains( ":-)" ) ) + if( ( *it ).tqcontains( ":)" ) || ( *it ).tqcontains( ":-)" ) ) { icon = it.key(); break; @@ -135,7 +135,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) // kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl; - // KDE4/Qt TODO: Use qobject_cast instead. + // KDE4/TQt TODO: Use qobject_cast instead. if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { TQPopupMenu* menu = static_cast( widget ); @@ -156,7 +156,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) return containerCount() - 1; } - // KDE4/Qt TODO: Use qobject_cast instead. + // KDE4/TQt TODO: Use qobject_cast instead. else if ( widget->inherits( "KToolBar" ) ) { KToolBar *bar = static_cast( widget ); @@ -201,7 +201,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) return containerCount() - 1; } - // KDE4/Qt TODO: Use qobject_cast instead. + // KDE4/TQt TODO: Use qobject_cast instead. else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) ) { TQMenuBar *bar = static_cast( widget ); diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.h b/kopete/kopete/chatwindow/kopeteemoticonaction.h index 15b1fd14..7ae3291c 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.h +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.h @@ -26,12 +26,13 @@ class KopeteEmoticonAction : public KAction { Q_OBJECT + TQ_OBJECT - Q_PROPERTY( bool delayed READ delayed WRITE setDelayed ) - Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) + TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed ) + TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu ) public: - KopeteEmoticonAction( TQObject *parent = 0, const char *name = 0 ); + KopeteEmoticonAction( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KopeteEmoticonAction(); KPopupMenu * popupMenu() const; @@ -52,7 +53,7 @@ public: * cannot be clicked, then you should call setDelayed(false). * * On the opposite, if the main action can be clicked, it can only happen - * in a toolbar: in a menu, the parent of a submenu can't be activated. + * in a toolbar: in a menu, the tqparent of a submenu can't be activated. * To get a "normal" menu item when plugged a menu (and no submenu) * use KToolBarPopupAction. */ diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 392e187a..61149c0d 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "krichtexteditpart.h" #include "krichtexteditpart.moc" @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libkopeterichtexteditpart, KopeteRichTextEditPartFac class KopeteTextEdit : public KTextEdit { public: - KopeteTextEdit( TQWidget *parent ) : KTextEdit( parent ) {} - const QTextCursor * cursor() { return textCursor(); } + KopeteTextEdit( TQWidget *tqparent ) : KTextEdit( tqparent ) {} + const TQTextCursor * cursor() { return textCursor(); } bool event(TQEvent *event) { // don't allow TQTextEdit to override accels @@ -35,21 +35,21 @@ public: } }; -KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) +KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, TQObject*, const char*, const TQStringList& ) + : KParts::ReadOnlyPart( TQT_TQOBJECT(wtqparent), wname ? wname : "rich_text_part" ) { - KopeteRichTextEditPart( wparent, wname, false ); + KopeteRichTextEditPart( wtqparent, wname, false ); } -KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) - : KParts::ReadOnlyPart( parent, name ? name : "rich_text_part" ), +KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *tqparent, const char *name, int capabilities ) + : KParts::ReadOnlyPart( TQT_TQOBJECT(tqparent), name ? name : "rich_text_part" ), m_capabilities( capabilities ), m_richTextEnabled( true ) { // we need an instance setInstance( KopeteRichTextEditPartFactory::instance() ); - editor = new KopeteTextEdit( parent ); + editor = new KopeteTextEdit( tqparent ); editor->setReadOnly( false ); setWidget( editor ); @@ -78,11 +78,11 @@ void KopeteRichTextEditPart::slotSetRichTextEnabled( bool enable ) if( m_richTextEnabled ) { - editor->setTextFormat( Qt::RichText ); + editor->setTextFormat( TQt::RichText ); } else { - editor->setTextFormat( Qt::PlainText ); + editor->setTextFormat( TQt::PlainText ); } emit toggleToolbar( buttonsEnabled() ); @@ -131,7 +131,7 @@ void KopeteRichTextEditPart::createActions( KActionCollection *ac ) this, TQT_SLOT( slotSetRichTextEnabled(bool) ) ); checkSpelling = new KAction( i18n("Check &Spelling"), "spellcheck", 0, - editor, TQT_SLOT( checkSpelling() ), ac, "check_spelling" ); + TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" ); //Fg Color actionFgColor = new KAction( i18n("Text &Color..."), "color_line", 0, @@ -200,10 +200,10 @@ void KopeteRichTextEditPart::createActions( KActionCollection *ac ) connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( setAlignJustify(bool) ) ); - action_align_left->setExclusiveGroup( "alignment" ); - action_align_center->setExclusiveGroup( "alignment" ); - action_align_right->setExclusiveGroup( "alignment" ); - action_align_justify->setExclusiveGroup( "alignment" ); + action_align_left->setExclusiveGroup( "tqalignment" ); + action_align_center->setExclusiveGroup( "tqalignment" ); + action_align_right->setExclusiveGroup( "tqalignment" ); + action_align_justify->setExclusiveGroup( "tqalignment" ); connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), this, TQT_SLOT( updateAligment() ) ); @@ -248,7 +248,7 @@ void KopeteRichTextEditPart::updateCharFmt() void KopeteRichTextEditPart::clear() { - editor->setText( TQString::null ); + editor->setText( TQString() ); setFont( mFont ); setFgColor( mFgColor ); @@ -268,7 +268,7 @@ void KopeteRichTextEditPart::clear() void KopeteRichTextEditPart::updateAligment() { - int align = editor->alignment(); + int align = editor->tqalignment(); switch ( align ) { @@ -351,7 +351,7 @@ void KopeteRichTextEditPart::writeConfig() config->writeEntry("FontUnderline", mFont.underline() ); config->writeEntry("BgColor", mBgColor ); config->writeEntry("FgColor", mFgColor ); - config->writeEntry("EditAlignment", editor->alignment() ); + config->writeEntry("EditAlignment", editor->tqalignment() ); config->sync(); } @@ -515,34 +515,34 @@ void KopeteRichTextEditPart::setUnderline( bool b ) void KopeteRichTextEditPart::setAlignLeft( bool yes ) { if ( yes ) - editor->setAlignment( AlignLeft ); + editor->tqsetAlignment( AlignLeft ); writeConfig(); } void KopeteRichTextEditPart::setAlignRight( bool yes ) { if ( yes ) - editor->setAlignment( AlignRight ); + editor->tqsetAlignment( AlignRight ); writeConfig(); } void KopeteRichTextEditPart::setAlignCenter( bool yes ) { if ( yes ) - editor->setAlignment( AlignCenter ); + editor->tqsetAlignment( AlignCenter ); writeConfig(); } void KopeteRichTextEditPart::setAlignJustify( bool yes ) { if ( yes ) - editor->setAlignment( AlignJustify ); + editor->tqsetAlignment( AlignJustify ); writeConfig(); } -TQString KopeteRichTextEditPart::text( Qt::TextFormat fmt ) const +TQString KopeteRichTextEditPart::text( TQt::TextFormat fmt ) const { - if( fmt == editor->textFormat() || fmt != Qt::PlainText ) + if( fmt == editor->textFormat() || fmt != TQt::PlainText ) return editor->text(); else return editor->cursor()->document()->plainText(); diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h index 06c4b80d..45ad1ed5 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.h +++ b/kopete/kopete/chatwindow/krichtexteditpart.h @@ -24,17 +24,18 @@ class KopeteTextEdit; class KopeteRichTextEditPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ); - KopeteRichTextEditPart( TQWidget *wparent, const char *wname, int capabilities ); + KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, TQObject*, const char*, const TQStringList& ); + KopeteRichTextEditPart( TQWidget *wtqparent, const char *wname, int capabilities ); /** * Returns the current editor widget. */ KTextEdit *widget() const { return (KTextEdit*)editor; } - TQString text( Qt::TextFormat = Qt::AutoText ) const; + TQString text( TQt::TextFormat = TQt::AutoText ) const; TQFont font() { return mFont; } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp index 31535603..2f6ea711 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp @@ -92,7 +92,7 @@ void ChatWindowStyle_Test::testHtml() "

%message%
\n" "
" ); - TQString exceptedStatus = TQString::fromUtf8( + TQString exceptedtqStatus = TQString::fromUtf8( "
%message%
\n" "
%time%
\n" "
%time{%H:%M}%
"); @@ -103,7 +103,7 @@ void ChatWindowStyle_Test::testHtml() CHECK(testStyle->getNextIncomingHtml(), exceptedNextIncoming); CHECK(testStyle->getOutgoingHtml(), exceptedOutgoing); CHECK(testStyle->getNextOutgoingHtml(), exceptedNextOutgoing); - CHECK(testStyle->getStatusHtml(), exceptedStatus); + CHECK(testStyle->getStatusHtml(), exceptedtqStatus); } void ChatWindowStyle_Test::testAction() diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 9fe66c06..6649f6b3 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -20,7 +20,7 @@ #include -// Qt includes +// TQt includes #include #include #include @@ -61,7 +61,7 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) +FakeProtocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name) { } @@ -71,12 +71,12 @@ Account* createNewAccount( const TQString &/*accountId*/ ) return 0L; } -AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/) +AddContactPage* createAddContactWidget( TQWidget */*tqparent*/, Kopete::Account */*account*/) { return 0L; } -KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */) +KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*tqparent */) { return 0L; } @@ -86,7 +86,7 @@ KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, class FakeAccount : public Kopete::Account { public: -FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) +FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name) { } @@ -96,12 +96,12 @@ FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *nam } -bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ) +bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ) { return true; } -void connect( const Kopete::OnlineStatus& /*initialStatus*/) +void connect( const Kopete::OnlineStatus& /*initialtqStatus*/) { // do nothing } @@ -205,8 +205,8 @@ void ChatWindowStyleRendering_Test::testHeaderRendering() "
Outgoing/buddy_icon.png
\n" "
%1
\n" "
%2
" - ).arg(KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), true, true ) ) - .arg(TQDateTime::currentDateTime().toString("hh:mm")); + ).tqarg(KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), true, true ) ) + .tqarg(TQDateTime::tqcurrentDateTime().toString("hh:mm")); TQString headerHtml = d->testStyle->getHeaderHtml(); TQString resultHtml; @@ -230,7 +230,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "
%1
\n" "
%2
\n" "
" - ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); TQString expectedOutgoingHtml = TQString( "Outgoing:\n" @@ -242,7 +242,7 @@ void ChatWindowStyleRendering_Test::testMessageRendering() "
%1
\n" "
%2
\n" "
" - ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); TQString tempHtml; @@ -272,13 +272,13 @@ void ChatWindowStyleRendering_Test::testStatusRendering() "
A contact went offline.
\n" "
%1
\n" "
%2
" - ).arg( TQDateTime::currentDateTime().toString( "hh:mm:ss" ), TQDateTime::currentDateTime().toString( "hh:mm" ) ); + ).tqarg( TQDateTime::tqcurrentDateTime().toString( "hh:mm:ss" ), TQDateTime::tqcurrentDateTime().toString( "hh:mm" ) ); TQString statusHtml = d->testStyle->getStatusHtml(); TQString resultHtml; - Kopete::Message msgStatus(0,0, TQString::fromUtf8("A contact went offline."), Kopete::Message::Internal); - resultHtml = chatPart->formatStyleKeywords(statusHtml, msgStatus); + Kopete::Message msgtqStatus(0,0, TQString::fromUtf8("A contact went offline."), Kopete::Message::Internal); + resultHtml = chatPart->formatStyleKeywords(statusHtml, msgtqStatus); CHECK(resultHtml, expectedStatusHtml); } @@ -291,8 +291,8 @@ void ChatWindowStyleRendering_Test::testFullRendering() Kopete::Message msgIn1(d->myself, d->other, TQString("Hello there !"), Kopete::Message::Inbound); Kopete::Message msgIn2(d->myself, d->other, TQString("How are you doing ?"), Kopete::Message::Inbound); Kopete::Message msgOut1(d->other, d->myself, TQString("Fine and you ?"), Kopete::Message::Outbound); - Kopete::Message msgStatus1(d->myself,d->other, TQString("You are now marked as away."), Kopete::Message::Internal); - Kopete::Message msgStatus2(d->myself,d->other, TQString("You are now marked as online."), Kopete::Message::Internal); + Kopete::Message msgtqStatus1(d->myself,d->other, TQString("You are now marked as away."), Kopete::Message::Internal); + Kopete::Message msgtqStatus2(d->myself,d->other, TQString("You are now marked as online."), Kopete::Message::Internal); Kopete::Message msgIn3(d->myself, d->other, TQString("Well, doing some tests."), Kopete::Message::Internal); Kopete::Message msgOut2(d->other, d->myself, TQString("All your bases are belong to us."), Kopete::Message::Outbound); Kopete::Message msgOut3(d->other, d->myself, TQString("You are on the way to destruction"), Kopete::Message::Outbound); @@ -304,8 +304,8 @@ void ChatWindowStyleRendering_Test::testFullRendering() chatPart->appendMessage(msgIn1); chatPart->appendMessage(msgIn2); chatPart->appendMessage(msgOut1); - chatPart->appendMessage(msgStatus1); - chatPart->appendMessage(msgStatus2); + chatPart->appendMessage(msgtqStatus1); + chatPart->appendMessage(msgtqStatus2); chatPart->appendMessage(msgIn3); chatPart->appendMessage(msgOut2); chatPart->appendMessage(msgOut3); diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index feaa88fd..356f0528 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -53,8 +53,8 @@ class KopeteAccountLVI : public KListViewItem typedef KGenericFactory KopeteAccountConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_accountconfig, KopeteAccountConfigFactory( "kcm_kopete_accountconfig" ) ) -KopeteAccountConfig::KopeteAccountConfig( TQWidget *parent, const char * /* name */, const TQStringList &args ) -: KCModule( KopeteAccountConfigFactory::instance(), parent, args ) +KopeteAccountConfig::KopeteAccountConfig( TQWidget *tqparent, const char * /* name */, const TQStringList &args ) +: KCModule( KopeteAccountConfigFactory::instance(), tqparent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -136,7 +136,7 @@ void KopeteAccountConfig::slotItemSelected() m_view->mButtonDown->setEnabled( itemSelected->itemBelow() ); Kopete::Account *account = itemSelected->account(); - TQColor color= m_newColors.contains(account) ? m_newColors[account] : account->color(); + TQColor color= m_newColors.tqcontains(account) ? m_newColors[account] : account->color(); m_view->mUseColor->setEnabled( true ); m_view->mUseColor->setChecked( color.isValid() ); m_view->mColorButton->setColor( color ); @@ -201,7 +201,7 @@ void KopeteAccountConfig::slotEditAccount() if ( !m_accountWidget ) return; - // FIXME: Why the #### is EditAccountWidget not a QWidget?!? This sideways casting + // FIXME: Why the #### is EditAccountWidget not a TQWidget?!? This sideways casting // is braindead and error-prone. Looking at MSN the only reason I can see is // because it allows direct subclassing of designer widgets. But what is // wrong with embedding the designer widget in an empty TQWidget instead? @@ -231,7 +231,7 @@ void KopeteAccountConfig::slotRemoveAccount() return; Kopete::Account *i = lvi->account(); - if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).arg( i->accountLabel() ), + if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).tqarg( i->accountLabel() ), i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"), "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.h b/kopete/kopete/config/accounts/kopeteaccountconfig.h index cfaf1064..9e939ea6 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.h +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.h @@ -33,9 +33,10 @@ class KopeteAccountConfigBase; class KopeteAccountConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KopeteAccountConfig(TQWidget *parent, const char *name, const TQStringList &args ); + KopeteAccountConfig(TQWidget *tqparent, const char *name, const TQStringList &args ); public slots: virtual void save(); diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index eea90c35..04a67f16 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -1,7 +1,7 @@ KopeteAccountConfigBase Olivier Goffart - + KopeteAccountConfigBase @@ -23,7 +23,7 @@ 0 - + mButtonNew @@ -34,7 +34,7 @@ Add new account - + mButtonEdit @@ -48,7 +48,7 @@ Let you edit the account's properties. - + mButtonRemove @@ -92,7 +92,7 @@ true - + mUseColor @@ -131,16 +131,16 @@ The icon of every contact of this account will be coloured with this color. Usef Minimum - + 16 16 - + - layout27 + tqlayout27 @@ -150,7 +150,7 @@ The icon of every contact of this account will be coloured with this color. Usef mButtonUp - + 60 10 @@ -177,7 +177,7 @@ The priority is used to determine which contact to use when you click on a metac Expanding - + 20 40 @@ -188,7 +188,7 @@ The priority is used to determine which contact to use when you click on a metac mButtonDown - + 60 10 @@ -217,7 +217,7 @@ The priority is used to determine which contact to use when you click on a metac Expanding - + 70 50 @@ -234,7 +234,7 @@ The priority is used to determine which contact to use when you click on a metac Fixed - + 70 20 @@ -259,7 +259,7 @@ The priority is used to determine which contact to use when you click on a metac mButtonEdit mButtonRemove - + klistview.h kpushbutton.h diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 35c68e05..73a3ef79 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -131,8 +131,8 @@ public: class KopeteStyleNewStuff : public KNewStuff { public: - KopeteStyleNewStuff(const TQString &type, TQWidget *parentWidget = 0) - : KNewStuff( type, parentWidget) + KopeteStyleNewStuff(const TQString &type, TQWidget *tqparentWidget = 0) + : KNewStuff( type, tqparentWidget) {} bool createUploadFile(const TQString &) @@ -149,29 +149,29 @@ public: { case ChatWindowStyleManager::StyleInstallOk: { - KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") ); + KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") ); return true; } case ChatWindowStyleManager::StyleCannotOpen: { - KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("The specified archive cannot be opened.\nMake sure that the archive is valid ZIP or TAR archive."), i18n("Cannot open archive") ); + KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("The specified archive cannot be opened.\nMake sure that the archive is valid ZIP or TAR archive."), i18n("Cannot open archive") ); break; } case ChatWindowStyleManager::StyleNoDirectoryValid: { - KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("Could not find a suitable place to install the Chat Window style in user directory."), i18n("Cannot find styles directory") ); + KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("Could not find a suitable place to install the Chat Window style in user directory."), i18n("Cannot find styles directory") ); break; } case ChatWindowStyleManager::StyleNotValid: { - KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("The specified archive does not contain a valid Chat Window style."), i18n("Invalid Style") ); + KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("The specified archive does not contain a valid Chat Window style."), i18n("Invalid Style") ); break; } case ChatWindowStyleManager::StyleUnknow: default: { - KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") ); + KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") ); break; } } @@ -180,8 +180,8 @@ public: }; // TODO: Someday, this configuration dialog must(not should) use KConfigXT -AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const TQStringList &args ) -: KCModule( KopeteAppearanceConfigFactory::instance(), parent, args ) +AppearanceConfig::AppearanceConfig(TQWidget *tqparent, const char* /*name*/, const TQStringList &args ) +: KCModule( KopeteAppearanceConfigFactory::instance(), tqparent, args ) { d = new Private; @@ -241,8 +241,8 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const KHTMLView *htmlWidget = d->preview->view(); htmlWidget->setMarginWidth(4); htmlWidget->setMarginHeight(4); - htmlWidget->setFocusPolicy(NoFocus); - htmlWidget->setSizePolicy( + htmlWidget->setFocusPolicy(TQ_NoFocus); + htmlWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); l->addWidget(htmlWidget); // Add the preview message to the ChatMessagePart @@ -512,24 +512,24 @@ void AppearanceConfig::updateEmoticonlist() // loop adding themes from all dirs into theme-list for(unsigned int x = 0;x < themeDirs.count();x++) { - TQDir themeQDir(themeDirs[x]); - themeQDir.setFilter( TQDir::Dirs ); // only scan for subdirs - themeQDir.setSorting( TQDir::Name ); // I guess name is as good as any - for(unsigned int y = 0; y < themeQDir.count(); y++) + TQDir themeTQDir(themeDirs[x]); + themeTQDir.setFilter( TQDir::Dirs ); // only scan for subdirs + themeTQDir.setSorting( TQDir::Name ); // I guess name is as good as any + for(unsigned int y = 0; y < themeTQDir.count(); y++) { - TQStringList themes = themeQDir.entryList(TQDir::Dirs, TQDir::Name); + TQStringList themes = themeTQDir.entryList(TQDir::Dirs, TQDir::Name); // We don't care for '.' and '..' - if ( themeQDir[y] != "." && themeQDir[y] != ".." ) + if ( themeTQDir[y] != "." && themeTQDir[y] != ".." ) { // Add ourselves to the list, using our directory name FIXME: use the first emoticon of the theme. - TQPixmap previewPixmap = TQPixmap(locate("emoticons", themeQDir[y]+"/smile.png")); - d->mPrfsEmoticons->icon_theme_list->insertItem(previewPixmap,themeQDir[y]); + TQPixmap previewPixmap = TQPixmap(locate("emoticons", themeTQDir[y]+"/smile.png")); + d->mPrfsEmoticons->icon_theme_list->insertItem(previewPixmap,themeTQDir[y]); } } } // Where is that theme in our big-list-o-themes? - TQListBoxItem *item = d->mPrfsEmoticons->icon_theme_list->findItem( p->iconTheme() ); + TQListBoxItem *item = d->mPrfsEmoticons->icon_theme_list->tqfindItem( p->iconTheme() ); if (item) // found it... make it the currently selected theme d->mPrfsEmoticons->icon_theme_list->setCurrentItem( item ); @@ -548,9 +548,9 @@ void AppearanceConfig::slotSelectedEmoticonsThemeChanged() TQString newContentText = ""; for(TQStringList::Iterator it = smileys.begin(); it != smileys.end(); ++it ) - newContentText += TQString::fromLatin1(" ").arg(*it); + newContentText += TQString::tqfromLatin1(" ").tqarg(*it); - newContentText += TQString::fromLatin1(""); + newContentText += TQString::tqfromLatin1(""); d->mPrfsEmoticons->icon_theme_preview->setText(newContentText); emitChanged(); } @@ -624,7 +624,7 @@ void AppearanceConfig::slotChatStyleVariantSelected(const TQString &variantName) void AppearanceConfig::slotInstallChatStyle() { - KURL styleToInstall = KFileDialog::getOpenURL( TQString::null, TQString::fromUtf8("application/x-zip application/x-tgz application/x-tbz"), this, i18n("Choose Chat Window style to install.") ); + KURL styleToInstall = KFileDialog::getOpenURL( TQString(), TQString::fromUtf8("application/x-zip application/x-tgz application/x-tbz"), this, i18n("Choose Chat Window style to install.") ); if( !styleToInstall.isEmpty() ) { @@ -673,7 +673,7 @@ void AppearanceConfig::slotDeleteChatStyle() TQString stylePathToDelete = d->styleItemMap[d->mPrfsChatWindow->styleList->selectedItem()]; if( ChatWindowStyleManager::self()->removeStyle(stylePathToDelete) ) { - KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").arg(styleName)); + KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "The style %1 was successfully deleted.").tqarg(styleName)); // Get the first item in the stye List. TQString stylePath = (*d->styleItemMap.begin()); @@ -682,7 +682,7 @@ void AppearanceConfig::slotDeleteChatStyle() } else { - KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").arg(styleName)); + KMessageBox::queuedMessageBox(this, KMessageBox::Information, i18n("It's the deleted style name", "An error occured while trying to delete %1 style.").tqarg(styleName)); } } @@ -714,21 +714,21 @@ public: class FakeProtocol : public Kopete::Protocol { public: -FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){} +FakeProtocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name){} Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;} -AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;} -KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;} +AddContactPage* createAddContactWidget( TQWidget */*tqparent*/, Kopete::Account */*account*/){return 0L;} +KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*tqparent */){return 0L;} }; // This is for style preview. class FakeAccount : public Kopete::Account { public: -FakeAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name){} +FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name){} ~FakeAccount() {} -bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;} -void connect( const Kopete::OnlineStatus& /*initialStatus*/){} +bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ){return true;} +void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){} void disconnect(){} void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){} }; @@ -770,7 +770,7 @@ void AppearanceConfig::createPreviewMessages() msgCol.setBg( TQColor( "LightSteelBlue" ) ); Kopete::Message msgInt( d->jack, d->myself, i18n( "This is an internal message" ), Kopete::Message::Internal ); Kopete::Message msgAct( d->jack, d->myself, i18n( "performed an action" ), Kopete::Message::Inbound, - Kopete::Message::PlainText, TQString::null, Kopete::Message::TypeAction ); + Kopete::Message::PlainText, TQString(), Kopete::Message::TypeAction ); Kopete::Message msgHigh( d->jack, d->myself, i18n( "This is a highlighted message" ), Kopete::Message::Inbound ); msgHigh.setImportance( Kopete::Message::Highlight ); // This is a UTF-8 string btw. @@ -810,7 +810,7 @@ void AppearanceConfig::emitChanged() void AppearanceConfig::installEmoticonTheme() { - KURL themeURL = KURLRequesterDlg::getURL(TQString::null, this, + KURL themeURL = KURLRequesterDlg::getURL(TQString(), this, i18n("Drag or Type Emoticon Theme URL")); if ( themeURL.isEmpty() ) return; diff --git a/kopete/kopete/config/appearance/appearanceconfig.h b/kopete/kopete/config/appearance/appearanceconfig.h index e380542d..3fe8efb8 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.h +++ b/kopete/kopete/config/appearance/appearanceconfig.h @@ -30,11 +30,12 @@ class AppearanceConfig : public KCModule { Q_OBJECT + TQ_OBJECT friend class KopeteStyleNewStuff; public: - AppearanceConfig( TQWidget *parent, const char *name, const TQStringList &args ); + AppearanceConfig( TQWidget *tqparent, const char *name, const TQStringList &args ); ~AppearanceConfig(); virtual void save(); diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui index 129abdd5..23cf85bf 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui @@ -1,6 +1,6 @@ AppearanceConfig_ChatWindow - + AppearanceConfig_ChatWindow @@ -27,7 +27,7 @@ unnamed - + stylesGroupBox @@ -46,7 +46,7 @@ unnamed - + splitter1 @@ -74,7 +74,7 @@ - + htmlFrame @@ -94,9 +94,9 @@ - + - layout10 + tqlayout10 @@ -134,7 +134,7 @@ - + textLabel1 @@ -142,7 +142,7 @@ Style Variant: - + variantList @@ -157,7 +157,7 @@ - + buttonGroup2 @@ -168,7 +168,7 @@ unnamed - + groupConsecutiveMessages @@ -185,7 +185,7 @@ installButton deleteButton - + klistbox.h kpushbutton.h diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui index 5ec00eb3..29f1b544 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -1,6 +1,6 @@ AppearanceConfig_Colors - + AppearanceConfig_Colors @@ -19,7 +19,7 @@ unnamed - + groupBox3 @@ -36,7 +36,7 @@ unnamed - + textLabel3 @@ -52,7 +52,7 @@ - + textLabel2 @@ -83,7 +83,7 @@ - + textLabel1_2 @@ -114,7 +114,7 @@ - + textLabel1 @@ -122,7 +122,7 @@ Highlight background: - + textLabel1_3 @@ -130,7 +130,7 @@ Link color: - + textLabel2_2 @@ -145,7 +145,7 @@ - + groupBox4 @@ -156,7 +156,7 @@ unnamed - + mBgOverride @@ -164,7 +164,7 @@ Do not show user specified &background color - + mFgOverride @@ -172,7 +172,7 @@ Do not show user specified &foreground color - + mRtfOverride @@ -182,7 +182,7 @@ - + groupBox3_2 @@ -193,7 +193,7 @@ unnamed - + mUseCustomFonts @@ -201,9 +201,9 @@ Use custom fonts for contact list items - + - layout9 + tqlayout9 @@ -219,30 +219,30 @@ Fixed - + 20 16 - + - layout8 + tqlayout8 unnamed - + - layout5 + tqlayout5 unnamed - + mGroupFontLabel @@ -263,15 +263,15 @@ - + - layout6 + tqlayout6 unnamed - + mNormalFontLabel @@ -292,15 +292,15 @@ - + - layout7 + tqlayout7 unnamed - + mSmallFontLabel @@ -325,9 +325,9 @@ - + - layout6 + tqlayout6 @@ -352,7 +352,7 @@ - + mGreyIdleMetaContacts @@ -360,7 +360,7 @@ Recolor contacts marked as idle: - + textLabel1_4 @@ -382,7 +382,7 @@ Expanding - + 20 80 @@ -440,7 +440,7 @@ textColor linkColor - + kcolorbutton.h kcolorbutton.h diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index 14f450a4..ecf668f1 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -1,6 +1,6 @@ AppearanceConfig_ContactList - + AppearanceConfig_ContactList @@ -19,15 +19,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + groupBox1 @@ -38,7 +38,7 @@ unnamed - + mSortByGroup @@ -46,7 +46,7 @@ Arrange metacontacts by &group - + mTreeContactList @@ -54,9 +54,9 @@ Show tree &branch lines - + - layout3 + tqlayout3 @@ -72,14 +72,14 @@ Fixed - + 16 16 - + mIndentContacts @@ -91,7 +91,7 @@ - + groupBox10 @@ -102,7 +102,7 @@ unnamed - + mDisplayMode @@ -113,7 +113,7 @@ unnamed - + radioButton8 @@ -127,7 +127,7 @@ true - + radioButton9 @@ -138,7 +138,7 @@ Alt+R - + radioButton10 @@ -151,7 +151,7 @@ - + mIconMode @@ -163,7 +163,7 @@ - + groupBox5 @@ -184,7 +184,7 @@ - + groupBox2 @@ -195,7 +195,7 @@ unnamed - + mAnimateChanges @@ -206,7 +206,7 @@ Alt+A - + mFadeVisibility @@ -214,7 +214,7 @@ Fade in / out contacts as the&y appear / disappear - + mFoldVisibility @@ -224,7 +224,7 @@ - + groupBox3 @@ -238,7 +238,7 @@ unnamed - + mAutoHide @@ -246,9 +246,9 @@ A&uto-hide contact list - + - layout2 + tqlayout2 @@ -264,14 +264,14 @@ Fixed - + 16 16 - + mAutoHideTimeout @@ -294,7 +294,7 @@ The timeout value for both contact list and scrollbar auto-hiding. - + textLabel1 @@ -315,7 +315,7 @@ Expanding - + 81 20 @@ -326,15 +326,15 @@ - + - layout8 + tqlayout8 unnamed - + mEditTooltips @@ -352,7 +352,7 @@ Expanding - + 16 16 @@ -371,7 +371,7 @@ Expanding - + 20 16 @@ -388,7 +388,7 @@ setDisabled(bool) - + kurlrequester.h klineedit.h diff --git a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui index 03020976..bf2678d1 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -1,6 +1,6 @@ AppearanceConfig_Emoticons - + AppearanceConfig_Emoticons @@ -16,7 +16,7 @@ unnamed - + chkUseEmoticons @@ -30,7 +30,7 @@ If this is checked, the text representation of emoticons in messages will be replaced by an image - + chkRequireSpaces @@ -44,7 +44,7 @@ If this is checked, only emoticons that are separated from the text by spaces will be shown as images. - + textLabel1 @@ -60,7 +60,7 @@ icon_theme_list - + lblPreview @@ -80,7 +80,7 @@ 0 - + 32767 64 @@ -90,15 +90,15 @@ true - + - layout2 + tqlayout2 unnamed - + btnGetThemes @@ -109,7 +109,7 @@ Download emoticon theme from the Internet - + btnEditThemes @@ -120,7 +120,7 @@ Edit the selected emoticons theme - + btnEditThemes @@ -131,7 +131,7 @@ Edit the selected emoticons theme - + btnInstallTheme @@ -139,7 +139,7 @@ &Install Theme File... - + btnRemoveTheme @@ -165,7 +165,7 @@ Expanding - + 31 20 @@ -228,7 +228,7 @@ setEnabled(bool) - + klistbox.h ktextedit.h diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index ea2fff3d..c8545a82 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -31,14 +31,14 @@ #include -EditDialog::EditDialog(TQWidget *parent, const char* name) - : KDialogBase(parent, name, true, i18n(name), Ok|Cancel, Ok, true) +EditDialog::EditDialog(TQWidget *tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n(name), Ok|Cancel, Ok, true) { setupDlg(); } -EditDialog::EditDialog(TQWidget *parent, const char* name, TQPixmap emot, TQString text, TQString file) - : KDialogBase(parent, name, true, i18n(name), Ok|Cancel, Ok, true) +EditDialog::EditDialog(TQWidget *tqparent, const char* name, TQPixmap emot, TQString text, TQString file) + : KDialogBase(tqparent, name, true, i18n(name), Ok|Cancel, Ok, true) { setupDlg(); leText->setText(text); @@ -78,8 +78,8 @@ void EditDialog::btnIconClicked() btnIcon->setPixmap(TQPixmap(emoticon)); } -EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const char* name) - : KDialogBase(parent, name, true, i18n("Emoticons Editor"), Ok|Cancel, Ok, true) +EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *tqparent, TQString theme, const char* name) + : KDialogBase(tqparent, name, true, i18n("Emoticons Editor"), Ok|Cancel, Ok, true) { themeName = theme; @@ -197,14 +197,14 @@ void EmoticonsEditDialog::slotEditClicked() TQString f = mMainWidget->klvEmoticons->selectedItem()->text(2); KStandardDirs *dir = KGlobal::dirs(); - emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f ); + emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f ); if( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".mng" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".mng" ) ); if ( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".png" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".png" ) ); if ( emo.isNull() ) - emo = dir->findResource( "emoticons", themeName + TQString::fromLatin1( "/" ) + f + TQString::fromLatin1( ".gif" ) ); + emo = dir->findResource( "emoticons", themeName + TQString::tqfromLatin1( "/" ) + f + TQString::tqfromLatin1( ".gif" ) ); if ( emo.isNull() ) return; } diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.h b/kopete/kopete/config/appearance/emoticonseditdialog.h index fe5b8426..cd7bf7b3 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.h +++ b/kopete/kopete/config/appearance/emoticonseditdialog.h @@ -29,10 +29,11 @@ class EmoticonsEditWidget; class EditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EditDialog(TQWidget *parent, const char* name); - EditDialog(TQWidget *parent, const char* name, TQPixmap emot, TQString text, TQString file); + EditDialog(TQWidget *tqparent, const char* name); + EditDialog(TQWidget *tqparent, const char* name, TQPixmap emot, TQString text, TQString file); const TQString getText() { return leText->text(); }; const TQString getEmoticon() { return emoticon; }; private slots: @@ -48,9 +49,10 @@ class EditDialog : public KDialogBase class EmoticonsEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EmoticonsEditDialog(TQWidget *parent=0, TQString theme = TQString::null, const char* name="EmoticonsEditDialog"); + EmoticonsEditDialog(TQWidget *tqparent=0, TQString theme = TQString(), const char* name="EmoticonsEditDialog"); void addEmoticon(TQString emo, TQString text, bool copy); private slots: diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui index 10f0b6ca..b3e8f0d5 100644 --- a/kopete/kopete/config/appearance/emoticonseditwidget.ui +++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui @@ -1,6 +1,6 @@ EmoticonsEditWidget - + EmoticonsEditWidget @@ -19,9 +19,9 @@ unnamed - + - layout5 + tqlayout5 @@ -61,7 +61,7 @@ Expanding - + 20 40 @@ -77,7 +77,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp index eef1ccb0..b5f55973 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp +++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp @@ -33,14 +33,14 @@ class TooltipItem : public KListViewItem { public: - TooltipItem(KListView *parent, const TQString& label, const TQString& propertyName) - : KListViewItem(parent, label), + TooltipItem(KListView *tqparent, const TQString& label, const TQString& propertyName) + : KListViewItem(tqparent, label), mPropName(propertyName) { } - TooltipItem(KListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName) - : KListViewItem(parent, item, label), + TooltipItem(KListView *tqparent, TQListViewItem *item, const TQString& label, const TQString& propertyName) + : KListViewItem(tqparent, item, label), mPropName(propertyName) { } @@ -52,8 +52,8 @@ class TooltipItem : public KListViewItem -TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) - : KDialogBase(parent, name, true, i18n("Tooltip Editor"), Ok|Cancel, Ok, true) +TooltipEditDialog::TooltipEditDialog(TQWidget *tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Tooltip Editor"), Ok|Cancel, Ok, true) { mMainWidget = new TooltipEditWidget(this, "TooltipEditDialog::mMainWidget"); setMainWidget(mMainWidget); @@ -75,7 +75,7 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) { usedIt--; // only add if that property key is really known - if(propmap.contains(*usedIt) && !propmap[*usedIt].isPrivate()) + if(propmap.tqcontains(*usedIt) && !propmap[*usedIt].isPrivate()) { new TooltipItem(mMainWidget->lstUsedItems, propmap[*usedIt].label(), *usedIt); @@ -87,7 +87,7 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) Kopete::ContactPropertyTmpl::Map::ConstIterator it; for(it = propmap.begin(); it != propmap.end(); ++it) { - if((usedKeys.contains(it.key())==0) && (!it.data().isPrivate())) + if((usedKeys.tqcontains(it.key())==0) && (!it.data().isPrivate())) new TooltipItem(mMainWidget->lstUnusedItems, it.data().label(), it.key()); } diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.h b/kopete/kopete/config/appearance/tooltipeditdialog.h index 54807df4..f828278b 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.h +++ b/kopete/kopete/config/appearance/tooltipeditdialog.h @@ -25,9 +25,10 @@ class TooltipEditWidget; class TooltipEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TooltipEditDialog(TQWidget *parent=0, const char* name="ToolTipEditDialog"); + TooltipEditDialog(TQWidget *tqparent=0, const char* name="ToolTipEditDialog"); private slots: void slotUnusedSelected(TQListViewItem *); diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index f00b8f26..f08bfe5c 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -1,6 +1,6 @@ TooltipEditWidget - + TooltipEditWidget @@ -38,18 +38,18 @@ Horizontal - + textLabel1 Using the arrow buttons, put on the right the items you want to see in the contact tooltips. You can then sort them. - + WordBreak|AlignVCenter - + textLabel2 @@ -57,9 +57,9 @@ <b>Here you can customize the contact tooltips</b> - + - layout5 + tqlayout5 @@ -87,9 +87,9 @@ This list contains elements which are currently <b>not present</b> in the contact tooltip. - + - layout4 + tqlayout4 @@ -105,22 +105,22 @@ Expanding - + 20 60 - + - layout1 + tqlayout1 unnamed - + tbDown @@ -131,7 +131,7 @@ Use this arrow to reorder the items in the list. - + tbUp @@ -139,7 +139,7 @@ ^ - + tbRemove @@ -147,7 +147,7 @@ < - + tbAdd @@ -170,7 +170,7 @@ Expanding - + 20 30 @@ -207,7 +207,7 @@ - + klistview.h klistview.h diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp index 898f00b4..38bb3c1e 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp +++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp @@ -43,8 +43,8 @@ typedef KGenericFactory KopeteAVDeviceConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_avdeviceconfig, KopeteAVDeviceConfigFactory( "kcm_kopete_avdeviceconfig" ) ) -AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args) - : KCModule( KopeteAVDeviceConfigFactory::instance(), parent, args ) +AVDeviceConfig::AVDeviceConfig(TQWidget *tqparent, const char * name , const TQStringList &args) + : KCModule( KopeteAVDeviceConfigFactory::instance(), tqparent, args ) { kdDebug() << "kopete:config (avdevice): KopeteAVDeviceConfigFactory::instance() called. " << endl; (new TQVBoxLayout(this))->setAutoAdd(true); @@ -224,7 +224,7 @@ void AVDeviceConfig::slotUpdateImage() { mVideoDevicePool->getFrame(); mVideoDevicePool->getImage(&qimage); - bitBlt(mPrfsVideoDevice->mVideoImageLabel, 0, 0, &qimage, 0, Qt::CopyROP); + bitBlt(mPrfsVideoDevice->mVideoImageLabel, 0, 0, &qimage, 0, TQt::CopyROP); // kdDebug() << "kopete (avdeviceconfig_videoconfig): Image updated." << endl; } diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.h b/kopete/kopete/config/avdevice/avdeviceconfig.h index b6c52a03..4fc2fe04 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.h +++ b/kopete/kopete/config/avdevice/avdeviceconfig.h @@ -40,8 +40,9 @@ class AVDeviceConfig_AudioDevice; class AVDeviceConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args); + AVDeviceConfig(TQWidget *tqparent, const char * name , const TQStringList &args); ~AVDeviceConfig(); virtual void save(); diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui index 90464a8b..58f9b7f3 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui +++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui @@ -1,6 +1,6 @@ AVDeviceConfig_VideoDevice - + AVDeviceConfig_VideoDevice @@ -27,7 +27,7 @@ unnamed - + VideoTabWidget @@ -39,7 +39,7 @@ 0 - + tab @@ -50,7 +50,7 @@ unnamed - + buttonGroup7 @@ -69,7 +69,7 @@ unnamed - + videodevice_selection_layout @@ -77,7 +77,7 @@ unnamed - + videodevice_selection_labels @@ -85,7 +85,7 @@ unnamed - + deviceLabel @@ -93,7 +93,7 @@ Device: - + inputLabel @@ -101,7 +101,7 @@ Input: - + standardLabel @@ -111,7 +111,7 @@ - + videodevice_selection_combos @@ -166,7 +166,7 @@ - + tab @@ -177,7 +177,7 @@ unnamed - + buttonGroup12 @@ -196,23 +196,23 @@ unnamed - + - layout11 + tqlayout11 unnamed - + - layout9 + tqlayout9 unnamed - + brightnessLabel @@ -228,7 +228,7 @@ Brightness: - + contrastLabel @@ -244,7 +244,7 @@ Contrast: - + saturationLabel @@ -260,7 +260,7 @@ Saturation: - + whitenessLabel @@ -276,7 +276,7 @@ Whiteness: - + hueLabel @@ -294,15 +294,15 @@ - + - layout10 + tqlayout10 unnamed - + mBrightnessSlider @@ -327,7 +327,7 @@ Horizontal - + mContrastSlider @@ -352,7 +352,7 @@ Horizontal - + mSaturationSlider @@ -377,7 +377,7 @@ Horizontal - + mWhitenessSlider @@ -402,7 +402,7 @@ Horizontal - + mHueSlider @@ -435,7 +435,7 @@ - + TabPage @@ -446,15 +446,15 @@ unnamed - + - layout8 + tqlayout8 unnamed - + ImageOptions @@ -473,7 +473,7 @@ unnamed - + mImageAutoBrightnessContrast @@ -489,7 +489,7 @@ Au&tomatic brightness/contrast adjustment - + mImageAutoColorCorrection @@ -508,7 +508,7 @@ - + mImageAsMirror @@ -534,9 +534,9 @@ - + - layout19 + tqlayout19 @@ -552,14 +552,14 @@ Expanding - + 40 20 - + mVideoImageLabel @@ -571,7 +571,7 @@ 0 - + 320 240 @@ -594,7 +594,7 @@ Expanding - + 40 20 @@ -610,12 +610,12 @@ 789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8 - + mHueSlider_valueChanged(int) mHueSlider_sliderPressed() mHueSlider_destroyed(QObject*) - - + + kcombobox.h kcombobox.h diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index b133a64b..bfc823fe 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -48,8 +48,8 @@ typedef KGenericFactory KopeteBehaviorConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_behaviorconfig, KopeteBehaviorConfigFactory( "kcm_kopete_behaviorconfig" ) ) -BehaviorConfig::BehaviorConfig(TQWidget *parent, const char * /* name */, const TQStringList &args) : - KCModule( KopeteBehaviorConfigFactory::instance(), parent, args ) +BehaviorConfig::BehaviorConfig(TQWidget *tqparent, const char * /* name */, const TQStringList &args) : + KCModule( KopeteBehaviorConfigFactory::instance(), tqparent, args ) { (new TQVBoxLayout(this))->setAutoAdd(true); mBehaviorTabCtl = new TQTabWidget(this, "mBehaviorTabCtl"); diff --git a/kopete/kopete/config/behavior/behaviorconfig.h b/kopete/kopete/config/behavior/behaviorconfig.h index 7fa4c992..c4f4c33b 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.h +++ b/kopete/kopete/config/behavior/behaviorconfig.h @@ -35,9 +35,10 @@ class KPluginInfo; class BehaviorConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - BehaviorConfig(TQWidget *parent, const char * name , const TQStringList &args) ; + BehaviorConfig(TQWidget *tqparent, const char * name , const TQStringList &args) ; virtual void save(); virtual void load(); diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui index 26bfae46..32f2a1f1 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui @@ -1,6 +1,6 @@ BehaviorConfig_Chat - + BehaviorConfig_Chat @@ -19,7 +19,7 @@ unnamed - + interfaceGroup @@ -30,12 +30,12 @@ unnamed - + viewPlugin - + viewPluginLabel @@ -56,7 +56,7 @@ Expanding - + 40 20 @@ -75,14 +75,14 @@ Expanding - + 20 240 - + chatWindowGroup @@ -93,7 +93,7 @@ unnamed - + Open All Messages in New Chat Window @@ -140,7 +140,7 @@ - + highlightEnabled @@ -156,7 +156,7 @@ High&light messages containing your nickname - + cb_SpellCheckChk @@ -172,7 +172,7 @@ E&nable automatic spell checking - + cb_ShowEventsChk @@ -180,15 +180,15 @@ &Show events in chat window - + - layout3 + tqlayout3 unnamed - + truncateContactNameEnabled @@ -206,14 +206,14 @@ Expanding - + 120 20 - + mMaxContactNameLength @@ -229,15 +229,15 @@ - + - layout4 + tqlayout4 unnamed - + txtChatViewBufferSize @@ -248,7 +248,7 @@ mChatViewBufferSize - Limit the maximum number of lines visible in a chat window to improve speed for complex layouts. + Limit the maximum number of lines visible in a chat window to improve speed for complex tqlayouts. @@ -261,14 +261,14 @@ Expanding - + 212 20 - + mChatViewBufferSize @@ -304,5 +304,5 @@ mMaxContactNameLength mChatViewBufferSize - + diff --git a/kopete/kopete/config/behavior/behaviorconfig_events.ui b/kopete/kopete/config/behavior/behaviorconfig_events.ui index ea2d1ea3..9d5343a4 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_events.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_events.ui @@ -1,6 +1,6 @@ BehaviorConfig_Events - + BehaviorConfig_Events @@ -19,7 +19,7 @@ unnamed - + notifyGroupBox @@ -30,7 +30,7 @@ unnamed - + mTrayflashNotifyChk @@ -44,9 +44,9 @@ Flash the system tray icon whenever a message comes in. - + - layout11_2 + tqlayout11_2 @@ -62,14 +62,14 @@ Fixed - + 16 16 - + mTrayflashNotifyLeftClickOpensMessageChk @@ -88,7 +88,7 @@ - + mBalloonNotifyChk @@ -102,9 +102,9 @@ Show a bubble whenever a message comes in. - + - layout11 + tqlayout11 @@ -120,14 +120,14 @@ Fixed - + 16 16 - + mBalloonNotifyIgnoreClosesChatViewChk @@ -146,9 +146,9 @@ - + - layout7 + tqlayout7 @@ -164,14 +164,14 @@ Fixed - + 16 16 - + mCloseBalloonChk @@ -191,7 +191,7 @@ Bubbles will automatically be closed after a fixed amount of time. A closed one will be replaced by a new one if another message is waiting. - + mBalloonCloseDelay @@ -221,7 +221,7 @@ Expanding - + 70 20 @@ -230,7 +230,7 @@ - + mQueueOnlyHighlightedMessagesInGroupChatsChk @@ -244,7 +244,7 @@ In very active group chats important messages can be singled out by excluding non-highlighted messages from notification. - + mQueueOnlyMessagesOnAnotherDesktopChk @@ -260,7 +260,7 @@ - + groupBox1 @@ -271,7 +271,7 @@ unnamed - + mSoundIfAwayChk @@ -285,7 +285,7 @@ Enable notification events even if your account status is "Away" or less available, e.g. "Not Available" or "Do not Disturb". Note: This does not affect the flashing of the system tray icon. - + mEventIfActive @@ -299,7 +299,7 @@ Enable notification events for incoming messages even if the receiving chat window is active. Note: Neither the system tray icon flashes nor the bubble is shown. - + mTrayflashNotifySetCurrentDesktopToChatViewChk @@ -313,7 +313,7 @@ If there is already a chat window open for the sender of the message, opening his/her message will cause a switch to the desktop which contains this chat window. - + mRaiseMsgWindowChk @@ -339,7 +339,7 @@ Expanding - + 20 16 @@ -384,5 +384,5 @@ mTrayflashNotifySetCurrentDesktopToChatViewChk mRaiseMsgWindowChk - + diff --git a/kopete/kopete/config/behavior/behaviorconfig_general.ui b/kopete/kopete/config/behavior/behaviorconfig_general.ui index d15815ad..1595f4b3 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_general.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_general.ui @@ -1,6 +1,6 @@ BehaviorConfig_General - + BehaviorConfig_General @@ -19,7 +19,7 @@ unnamed - + buttonGroup2 @@ -30,7 +30,7 @@ unnamed - + mShowTrayChk @@ -44,7 +44,7 @@ By default, the system tray icon indicates new incoming messages by flashing and showing a bubble. A left or middle mouse click on the icon will open the message in a new chat window. Pressing the "View" button in the bubble has the same effect. - + mStartDockedChk @@ -63,7 +63,7 @@ - + buttonGroup1 @@ -74,7 +74,7 @@ unnamed - + mInstantMessageOpeningChk @@ -88,7 +88,7 @@ If there is no existing chat window a new window will be opened when a new message comes in. If there is already a chat window opened for the sender of the message it will be displayed there instantly. - + mUseQueueChk @@ -102,7 +102,7 @@ Store new incoming messages in a message queue. New messages are messages that cannot be displayed in an already open chat window. Only queued or stacked messages trigger notification via bubble, a flashing tray icon, or both.. - + mUseStackChk @@ -116,7 +116,7 @@ Store new incoming messages in a message stack. New messages are messages that cannot be displayed in an already open chat window. Only queued or stacked messages trigger notification via bubble and flashing tray. - + mQueueUnreadMessagesChk @@ -135,7 +135,7 @@ - + groupBox2 @@ -146,7 +146,7 @@ unnamed - + mAutoConnect @@ -172,7 +172,7 @@ Expanding - + 20 16 @@ -207,5 +207,5 @@ mUseQueueChk mAutoConnect - + diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui index 8d0b8441..f9dcb01e 100644 --- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui +++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui @@ -1,6 +1,6 @@ KopeteAwayConfigBaseUI - + KopeteAwayConfigBaseUI @@ -19,7 +19,7 @@ unnamed - + groupBox2 @@ -36,7 +36,7 @@ unnamed - + textLabel1 @@ -50,7 +50,7 @@ Kopete will remember this many away messages for use at a later date; if this limit is exceeded, the least-used message will be removed. - + rememberedMessages @@ -77,7 +77,7 @@ Expanding - + 61 20 @@ -86,7 +86,7 @@ - + groupBox3 @@ -101,7 +101,7 @@ unnamed - + mUseAutoAway @@ -109,15 +109,15 @@ &Use auto away - + - layout3 + tqlayout3 unnamed - + TextLabel2 @@ -128,7 +128,7 @@ Become away after - + mAutoAwayTimeout @@ -142,7 +142,7 @@ 1 - + TextLabel3 @@ -163,7 +163,7 @@ Expanding - + 81 20 @@ -172,7 +172,7 @@ - + mGoAvailable @@ -185,7 +185,7 @@ - + autoAwayMessageGroup @@ -199,7 +199,7 @@ unnamed - + mDisplayLastAwayMessage @@ -213,7 +213,7 @@ true - + mDisplayCustomAwayMessage @@ -224,9 +224,9 @@ Display the following away message: - + - layout3 + tqlayout3 @@ -242,7 +242,7 @@ Fixed - + 16 16 @@ -264,7 +264,7 @@ 0 - + 300 0 @@ -285,7 +285,7 @@ Expanding - + 20 30 @@ -349,7 +349,7 @@ mAutoAwayTimeout mGoAvailable - + klineedit.h diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.cpp b/kopete/kopete/config/identity/globalidentitiesmanager.cpp index 52da32a7..00c4aadc 100644 --- a/kopete/kopete/config/identity/globalidentitiesmanager.cpp +++ b/kopete/kopete/config/identity/globalidentitiesmanager.cpp @@ -16,7 +16,7 @@ */ #include "globalidentitiesmanager.h" -// Qt includes +// TQt includes #include #include #include @@ -49,8 +49,8 @@ GlobalIdentitiesManager *GlobalIdentitiesManager::self() return s_self; } -GlobalIdentitiesManager::GlobalIdentitiesManager(TQObject *parent, const char *name) - : TQObject(parent, name) +GlobalIdentitiesManager::GlobalIdentitiesManager(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { d = new Private; } diff --git a/kopete/kopete/config/identity/globalidentitiesmanager.h b/kopete/kopete/config/identity/globalidentitiesmanager.h index 4beb3bfa..9efc2204 100644 --- a/kopete/kopete/config/identity/globalidentitiesmanager.h +++ b/kopete/kopete/config/identity/globalidentitiesmanager.h @@ -34,9 +34,10 @@ class TQDomDocument; * * @author Michaël Larouche */ -class GlobalIdentitiesManager : public QObject +class GlobalIdentitiesManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * @brief Return the single instance of GlobalIdentitiesManager class @@ -115,12 +116,12 @@ public: /** * @brief Return the list of global identities metacontact. - * @return The pointer list of metacontact as QValueList + * @return The pointer list of metacontact as TQValueList */ TQMap getGlobalIdentitiesList(); private: - GlobalIdentitiesManager(TQObject *parent = 0, const char *name = 0); + GlobalIdentitiesManager(TQObject *tqparent = 0, const char *name = 0); /** * @brief Return a XML representation of the global identities list. diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index 0f718e70..ec727e98 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -17,7 +17,7 @@ #include "kopeteidentityconfig.h" -// Qt includes +// TQt includes #include #include #include @@ -85,7 +85,7 @@ public: typedef KGenericFactory KopeteIdentityConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_identityconfig, KopeteIdentityConfigFactory( "kcm_kopete_identityconfig" ) ) -KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), parent, args) +KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *tqparent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), tqparent, args) { d = new Private; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -383,7 +383,7 @@ void KopeteIdentityConfig::slotEnableAndDisableWidgets() } if(!photo.isNull()) - d->m_view->labelPhoto->setPixmap(TQPixmap(photo.smoothScale(64, 92, TQImage::ScaleMin))); + d->m_view->labelPhoto->setPixmap(TQPixmap(photo.smoothScale(64, 92, TQ_ScaleMin))); else d->m_view->labelPhoto->setPixmap(TQPixmap()); @@ -413,7 +413,7 @@ void KopeteIdentityConfig::slotUpdateCurrentIdentity(const TQString &selectedIde void KopeteIdentityConfig::slotNewIdentity() { bool ok; - TQString newIdentityName = KInputDialog::getText(i18n("New Identity"), i18n("Identity name:") , TQString::null , &ok); + TQString newIdentityName = KInputDialog::getText(i18n("New Identity"), i18n("Identity name:") , TQString() , &ok); if(newIdentityName.isEmpty() || !ok) return; @@ -428,7 +428,7 @@ void KopeteIdentityConfig::slotNewIdentity() void KopeteIdentityConfig::slotCopyIdentity() { bool ok; - TQString copyName = KInputDialog::getText(i18n("Copy Identity"), i18n("Identity name:") , TQString::null, &ok); + TQString copyName = KInputDialog::getText(i18n("Copy Identity"), i18n("Identity name:") , TQString(), &ok); if(copyName.isEmpty() || !ok) return; @@ -528,7 +528,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) if(photo.width() > 96 || photo.height() > 96) { // Scale and crop the picture. - photo = photo.smoothScale( 96, 96, TQImage::ScaleMin ); + photo = photo.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(photo.width() < photo.height()) photo = photo.copy((photo.width()-photo.height())/2, 0, 96, 96); @@ -539,7 +539,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) else if (photo.width() < 32 || photo.height() < 32) { // Scale and crop the picture. - photo = photo.smoothScale( 32, 32, TQImage::ScaleMin ); + photo = photo.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(photo.width() < photo.height()) photo = photo.copy((photo.width()-photo.height())/2, 0, 32, 32); @@ -564,12 +564,12 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) KMD5 context(tempArray); // Save the image to a file. saveLocation = context.hexDigest() + ".png"; - saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").arg( saveLocation ) ); + saveLocation = locateLocal( "appdata", TQString::fromUtf8("globalidentitiespictures/%1").tqarg( saveLocation ) ); if(!photo.save(saveLocation, "PNG")) { KMessageBox::sorry(this, - i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity), + i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity), i18n("Identity Configuration")); } d->m_view->comboPhotoURL->setURL(saveLocation); @@ -578,14 +578,14 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl) else { KMessageBox::sorry(this, - i18n("An error occurred when trying to save the custom photo for %1 identity.").arg(d->selectedIdentity), + i18n("An error occurred when trying to save the custom photo for %1 identity.").tqarg(d->selectedIdentity), i18n("Identity Configuration")); } } void KopeteIdentityConfig::slotClearPhoto() { - d->m_view->comboPhotoURL->setURL( TQString::null ); + d->m_view->comboPhotoURL->setURL( TQString() ); slotEnableAndDisableWidgets(); } diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h index 88644be8..9385b866 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.h +++ b/kopete/kopete/config/identity/kopeteidentityconfig.h @@ -36,8 +36,9 @@ class KopeteIdentityConfigBase; class KopeteIdentityConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KopeteIdentityConfig(TQWidget *parent, const char *name, const TQStringList &args ); + KopeteIdentityConfig(TQWidget *tqparent, const char *name, const TQStringList &args ); ~KopeteIdentityConfig(); public slots: diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui index 4e31a29f..7602a2ae 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui +++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui @@ -1,7 +1,7 @@ KopeteIdentityConfigBase Michaël Larouche - + KopeteIdentityConfigBase @@ -17,7 +17,7 @@ unnamed - + kcfg_EnableGlobalIdentity @@ -25,15 +25,15 @@ Enable &global identity - + - layout6 + tqlayout6 unnamed - + textLabel1 @@ -59,9 +59,9 @@ - + - layout7 + tqlayout7 @@ -101,11 +101,11 @@ - + tabWidget2 - + tab @@ -116,7 +116,7 @@ unnamed - + nicknameButtonGroup @@ -136,15 +136,15 @@ unnamed - + - layout12 + tqlayout12 unnamed - + radioNicknameCustom @@ -152,12 +152,12 @@ Cu&stom: - + lineNickname - + radioNicknameKABC @@ -165,7 +165,7 @@ Use address boo&k name (need address book link) - + radioNicknameContact @@ -173,7 +173,7 @@ Use nickname from con&tact for global nickname: - + comboNameContact @@ -203,7 +203,7 @@ Expanding - + 20 16 @@ -212,7 +212,7 @@ - + tab @@ -223,7 +223,7 @@ unnamed - + photoButtonGroup @@ -240,9 +240,9 @@ unnamed - + - layout7 + tqlayout7 @@ -257,7 +257,7 @@ buttonClearPhoto - + 32 3232 @@ -267,7 +267,7 @@ - + checkSyncPhotoKABC @@ -275,7 +275,7 @@ S&ync address book photo with global photo - + comboPhotoContact @@ -288,7 +288,7 @@ - + radioPhotoCustom @@ -296,7 +296,7 @@ Cus&tom: - + radioPhotoContact @@ -304,7 +304,7 @@ U&se photo from contact for global photo: - + radioPhotoKABC @@ -314,9 +314,9 @@ - + - layout11 + tqlayout11 @@ -332,24 +332,24 @@ Expanding - + 20 36 - + labelPhoto - + 64 92 - + 64 32767 @@ -381,7 +381,7 @@ Expanding - + 20 40 @@ -402,7 +402,7 @@ Expanding - + 20 40 @@ -411,7 +411,7 @@ - + TabPage @@ -422,9 +422,9 @@ unnamed - + - layout7 + tqlayout7 @@ -438,7 +438,7 @@ true - + buttonChangeAddressee @@ -451,7 +451,7 @@ - + textLabel1_2 @@ -470,7 +470,7 @@ current user contact. Expanding - + 20 100 @@ -490,7 +490,7 @@ current user contact. Expanding - + 20 16 @@ -525,7 +525,7 @@ current user contact. setEnabled(bool) - + kcombobox.h kpushbutton.h diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.cpp b/kopete/kopete/config/plugins/kopetepluginconfig.cpp index 7f790a0b..973eadd7 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.cpp +++ b/kopete/kopete/config/plugins/kopetepluginconfig.cpp @@ -39,9 +39,9 @@ KopetePluginConfig::~KopetePluginConfig() delete d; } -KopetePluginConfig::KopetePluginConfig( TQWidget *parent, const char *name ) +KopetePluginConfig::KopetePluginConfig( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Configure Plugins" ), /*Help |*/ Cancel | Apply | Ok | User1, - Ok, parent, name, false, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) + Ok, tqparent, name, false, true, KGuiItem( i18n( "&Reset" ), "undo" ) ) { d = new KopetePluginConfigPrivate; showButton( User1, false ); diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.h b/kopete/kopete/config/plugins/kopetepluginconfig.h index 04d1cfa1..5c1a57a5 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.h +++ b/kopete/kopete/config/plugins/kopetepluginconfig.h @@ -30,9 +30,10 @@ class KopetePluginConfigPrivate; class KopetePluginConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopetePluginConfig( TQWidget *parent, const char *name = 0L ); + KopetePluginConfig( TQWidget *tqparent, const char *name = 0L ); ~KopetePluginConfig(); void apply(); diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index 2f341426..95333c92 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -33,10 +33,10 @@ #include "customnotificationprops.h" -CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name ) -: TQObject( parent, name ) +CustomNotificationProps::CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name ) +: TQObject( tqparent, name ) { - m_notifyWidget = new CustomNotificationWidget( parent, "notificationWidget" ); + m_notifyWidget = new CustomNotificationWidget( tqparent, "notificationWidget" ); m_item = item; TQString path = "kopete/eventsrc"; @@ -47,12 +47,12 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti TQStringList::Iterator end = m_eventList.end(); for ( ; it != end; ++it ) { - if ( !(*it).startsWith( TQString::fromLatin1( "kopete_contact_" ) ) ) + if ( !(*it).startsWith( TQString::tqfromLatin1( "kopete_contact_" ) ) ) continue; contactSpecificEvents.append( *it ); TQMap entries = eventsfile.entryMap( *it ); eventsfile.setGroup( *it ); - TQString comment = eventsfile.readEntry( "Comment", TQString::fromLatin1( "Found nothing!" ) ); + TQString comment = eventsfile.readEntry( "Comment", TQString::tqfromLatin1( "Found nothing!" ) ); m_notifyWidget->cmbEvents->insertItem( comment ); } m_eventList = contactSpecificEvents; @@ -152,7 +152,7 @@ void CustomNotificationProps::storeCurrentCustoms() evt->setPresentation( Kopete::EventPresentation::Message, eventNotify ); // set chat attributes eventNotify = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, - TQString::null, + TQString(), m_notifyWidget->chkChatSS->isChecked(), m_notifyWidget->chkCustomChat->isChecked() ); evt->setPresentation( Kopete::EventPresentation::Chat, eventNotify ); diff --git a/kopete/kopete/contactlist/customnotificationprops.h b/kopete/kopete/contactlist/customnotificationprops.h index af1fc4f5..9008123d 100644 --- a/kopete/kopete/contactlist/customnotificationprops.h +++ b/kopete/kopete/contactlist/customnotificationprops.h @@ -27,11 +27,12 @@ namespace Kopete class NotifyDataObject; } -class CustomNotificationProps : public QObject +class CustomNotificationProps : public TQObject { Q_OBJECT + TQ_OBJECT public: - CustomNotificationProps( TQWidget *parent, Kopete::NotifyDataObject* item, const char * name = 0 ); + CustomNotificationProps( TQWidget *tqparent, Kopete::NotifyDataObject* item, const char * name = 0 ); ~CustomNotificationProps() {} void dumpData(); void resetEventWidgets(); diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index 86224af2..4f33add2 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -1,6 +1,6 @@ CustomNotificationWidget - + CustomNotificationWidget @@ -16,15 +16,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -35,7 +35,7 @@ cmbEvents - + cmbEvents @@ -45,9 +45,9 @@ - + - layout12 + tqlayout12 @@ -64,7 +64,7 @@ Select the sound to play - + chkCustomSound @@ -85,14 +85,14 @@ Expanding - + 140 20 - + chkCustomChat @@ -103,7 +103,7 @@ Open a chat window with this contact when this event occurs for this contact - + chkCustomMsg @@ -114,7 +114,7 @@ Display a message on your screen when this event occurs for this contact - + customMsg @@ -125,7 +125,7 @@ Enter the message to display - + chkMsgSS @@ -139,7 +139,7 @@ Only display a message the next time the event occurs - + chkSoundSS @@ -153,7 +153,7 @@ Only play a sound the next time the event occurs - + chkChatSS @@ -169,7 +169,7 @@ - + chkSuppressCommon @@ -229,7 +229,7 @@ chkChatSS chkSuppressCommon - + kurlrequester.h klineedit.h diff --git a/kopete/kopete/contactlist/kabcexport.cpp b/kopete/kopete/contactlist/kabcexport.cpp index 0051f585..2e99c2a4 100644 --- a/kopete/kopete/contactlist/kabcexport.cpp +++ b/kopete/kopete/contactlist/kabcexport.cpp @@ -45,18 +45,18 @@ #include "kabcexport.h" -class ContactLVI : public QCheckListItem +class ContactLVI : public TQCheckListItem { public: - ContactLVI ( Kopete::MetaContact * mc, TQListView * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( parent, text, tt ), mc( mc ) + ContactLVI ( Kopete::MetaContact * mc, TQListView * tqparent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem( tqparent, text, tt ), mc( mc ) { } Kopete::MetaContact * mc; TQString uid; }; // ctor populates the resource list and contact list, and enables the next button on the first page -KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) - : KabcExportWizard_Base( parent, name ) +KabcExportWizard::KabcExportWizard( TQWidget *tqparent, const char *name ) + : KabcExportWizard_Base( tqparent, name ) { connect( m_addrBooks, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( slotResourceSelectionChanged( TQListBoxItem * ) ) ); @@ -106,7 +106,7 @@ KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) TQCheckListItem * lvi = new ContactLVI( it.current(), m_contactList, it.current()->displayName(), TQCheckListItem::CheckBox ); lvi->setOn( false ); - if ( it.current()->metaContactId().contains(':') ) + if ( it.current()->metaContactId().tqcontains(':') ) { lvi->setOn( true ); lvi->setEnabled( true ); diff --git a/kopete/kopete/contactlist/kabcexport.h b/kopete/kopete/contactlist/kabcexport.h index 0ebfb75b..74029796 100644 --- a/kopete/kopete/contactlist/kabcexport.h +++ b/kopete/kopete/contactlist/kabcexport.h @@ -36,8 +36,9 @@ namespace KRES { class KabcExportWizard : public KabcExportWizard_Base { Q_OBJECT + TQ_OBJECT public: - KabcExportWizard( TQWidget *parent = 0, const char *name = 0 ); + KabcExportWizard( TQWidget *tqparent = 0, const char *name = 0 ); ~KabcExportWizard(); public slots: void accept(); diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index 80ace5c6..367a474b 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -1,6 +1,6 @@ KabcExportWizard_Base - + KabcExportWizard_Base @@ -15,7 +15,7 @@ Export Contacts - + page @@ -26,7 +26,7 @@ unnamed - + textLabel1 @@ -41,11 +41,11 @@ This wizard helps you export instant messaging contacts to the KDE address book. - + WordBreak|AlignVCenter - + groupBox1 @@ -60,7 +60,7 @@ &Select Address Book - + m_addrBooks @@ -84,7 +84,7 @@ - + WizardPage @@ -95,7 +95,7 @@ unnamed - + textLabel3 @@ -111,7 +111,7 @@ Selected contacts will be added to the KDE address book. - + Contact @@ -133,15 +133,15 @@ AllColumns - + - layout3 + tqlayout3 unnamed - + m_btnSelectAll @@ -149,7 +149,7 @@ Select &All - + m_btnDeselectAll @@ -167,7 +167,7 @@ Expanding - + 51 20 @@ -179,5 +179,5 @@ - + diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp index bcb9c434..eda83970 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.cpp +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.cpp @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.cpp - Kopete Online Status + kopeteaddrbookexport.cpp - Kopete Online tqStatus Logic for exporting data acquired from messaging systems to the KDE address book @@ -35,10 +35,10 @@ #include "kopeteaddrbookexport.h" #include "kopeteaddrbookexportui.h" -KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ) : TQObject( parent ) +KopeteAddressBookExport::KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ) : TQObject( tqparent ) { // instantiate dialog and populate widgets - mParent = parent; + mParent = tqparent; mAddressBook = KABC::StdAddressBook::self(); mMetaContact = mc; } @@ -178,7 +178,7 @@ int KopeteAddressBookExport::showDialog() mUI = new AddressBookExportUI( mDialog ); mDialog->setMainWidget( mUI ); mDialog->setButtonOK( KGuiItem( i18n( "Export" ), - TQString::null, i18n( "Set address book fields using the selected data from Kopete" ) ) ); + TQString(), i18n( "Set address book fields using the selected data from Kopete" ) ) ); initLabels(); // fetch existing data from kabc diff --git a/kopete/kopete/contactlist/kopeteaddrbookexport.h b/kopete/kopete/contactlist/kopeteaddrbookexport.h index 131dad96..0bc79dbb 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexport.h +++ b/kopete/kopete/contactlist/kopeteaddrbookexport.h @@ -1,5 +1,5 @@ /* - kopeteaddrbookexport.h - Kopete Online Status + kopeteaddrbookexport.h - Kopete Online tqStatus Logic for exporting data acquired from messaging systems to the KDE address book @@ -37,10 +37,10 @@ class Contact; class MetaContact; } -class KopeteAddressBookExport : public QObject +class KopeteAddressBookExport : public TQObject { public: - KopeteAddressBookExport( TQWidget *parent, Kopete::MetaContact *mc ); + KopeteAddressBookExport( TQWidget *tqparent, Kopete::MetaContact *mc ); ~KopeteAddressBookExport(); /** diff --git a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui index 9613d44f..b0728e8d 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui +++ b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui @@ -1,6 +1,6 @@ AddressBookExportUI - + AddressBookExportUI @@ -19,7 +19,7 @@ unnamed - + mLblFirstName @@ -30,7 +30,7 @@ comboBox1 - + mLblHomePhone @@ -65,7 +65,7 @@ Extended - + mLblWorkPhone @@ -76,7 +76,7 @@ mPhones_2 - + mLblMobilePhone @@ -87,7 +87,7 @@ mPhones_3 - + mLblUrl @@ -98,22 +98,22 @@ comboBox4 - + mUrl - + mFirstName - + mLastName - + mLblLastName @@ -132,7 +132,7 @@ Extended - + mLblEmail @@ -145,5 +145,5 @@ - + diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 4e45f602..af5abcc2 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -120,7 +120,7 @@ public: protected: // work around TQListView design stupidity. - // GroupViewItem will be QListView-derived, or QListViewItem-derived. + // GroupViewItem will be TQListView-derived, or TQListViewItem-derived. template void addMetaContactToGroupInner( Kopete::MetaContact *mc, GroupViewItem *gpi ) { @@ -198,7 +198,7 @@ public: { removeMetaContactFromGroupInner( mc, gpi ); - // update the group's display of its number of children. + // update the group's display of its number of tqchildren. // TODO: make the KopeteGroupViewItem not need this, by overriding insertItem and takeItem gpi->refreshDisplayName(); @@ -288,8 +288,8 @@ private: updateMetaContactInner( mc ); // FIXME: these items should do this for themselves... - m_onlineItem->setText(0,i18n("Online contacts (%1)").arg(m_onlineItem->childCount())); - m_offlineItem->setText(0,i18n("Offline contacts (%1)").arg(m_offlineItem->childCount())); + m_onlineItem->setText(0,i18n("Online contacts (%1)").tqarg(m_onlineItem->childCount())); + m_offlineItem->setText(0,i18n("Offline contacts (%1)").tqarg(m_offlineItem->childCount())); } void updateMetaContactInner( Kopete::MetaContact *mc ) { @@ -375,13 +375,13 @@ void KopeteContactListViewPrivate::updateViewStrategy( KListView *view ) } // returns the next item in a depth-first descent of the list view. -// much like QLVI::itemBelow but does not depend on visibility of items, etc. +// much like TQLVI::itemBelow but does not depend on visibility of items, etc. static TQListViewItem *nextItem( TQListViewItem *item ) { if ( TQListViewItem *it = item->firstChild() ) return it; while ( item && !item->nextSibling() ) - item = item->parent(); + item = item->tqparent(); if ( !item ) return 0; return item->nextSibling(); @@ -389,8 +389,8 @@ static TQListViewItem *nextItem( TQListViewItem *item ) -KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name ) - : Kopete::UI::ListView::ListView( parent, name ) +KopeteContactListView::KopeteContactListView( TQWidget *tqparent, const char *name ) + : Kopete::UI::ListView::ListView( tqparent, name ) { d = new KopeteContactListViewPrivate; m_undo=0L; @@ -461,49 +461,49 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name void KopeteContactListView::initActions( KActionCollection *ac ) { - actionUndo = KStdAction::undo( this , TQT_SLOT( slotUndo() ) , ac ); - actionRedo = KStdAction::redo( this , TQT_SLOT( slotRedo() ) , ac ); + actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac ); + actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac ); actionUndo->setEnabled(false); actionRedo->setEnabled(false); - new KAction( i18n( "Create New Group..." ), 0, 0, this, TQT_SLOT( addGroup() ), + new KAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), ac, "AddGroup" ); actionSendMessage = KopeteStdAction::sendMessage( - this, TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); - actionStartChat = KopeteStdAction::chat( this, TQT_SLOT( slotStartChat() ), + TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); + actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ), ac, "contactStartChat" ); - actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ), - 0, this, TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); - actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "editcopy" ), 0, - this, TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); + actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::tqfromLatin1( "editcut" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); + actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::tqfromLatin1( "editcopy" ), 0, + TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); - actionRemove = KopeteStdAction::deleteContact( this, TQT_SLOT( slotRemove() ), + actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), ac, "contactRemove" ); - actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), - 0, this, TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); + actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::tqfromLatin1( "mail_generic" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ actionRename = new KAction( i18n( "Rename" ), "filesaveas", 0, - this, TQT_SLOT( slotRename() ), ac, "contactRename" ); - actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( slotSendFile() ), + TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" ); + actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), ac, "contactSendFile" ); actionAddContact = new KActionMenu( i18n( "&Add Contact" ), - TQString::fromLatin1( "add_user" ), ac , "contactAddContact" ); + TQString::tqfromLatin1( "add_user" ), ac , "contactAddContact" ); actionAddContact->popupMenu()->insertTitle( i18n("Select Account") ); actionAddTemporaryContact = new KAction( i18n( "Add to Your Contact List" ), "add_user", 0, - this, TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); + TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) ); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*))); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *))); - actionProperties = new KAction( i18n( "&Properties" ), "edit_user", Qt::Key_Alt + Qt::Key_Return, - this, TQT_SLOT( slotProperties() ), ac, "contactProperties" ); + actionProperties = new KAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return, + TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" ); // Update enabled/disabled actions slotViewSelectionChanged(); @@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView() void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account) { - KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , this, TQT_SLOT(slotAddContact()), account); + KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account); m_accountAddContactMap.insert( account, action); actionAddContact->insert( action ); } @@ -524,7 +524,7 @@ void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* a void KopeteContactListView::slotAddSubContactActionAccountDeleted(const Kopete::Account *account) { kdDebug(14000) << k_funcinfo << endl; - if ( m_accountAddContactMap.contains( account ) ) + if ( m_accountAddContactMap.tqcontains( account ) ) { KAction *action = m_accountAddContactMap[account]; m_accountAddContactMap.remove( account ); @@ -659,7 +659,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, int nb = Kopete::ContactList::self()->selectedMetaContacts().count() + Kopete::ContactList::self()->selectedGroups().count(); - KMainWindow *window = dynamic_cast(topLevelWidget()); + KMainWindow *window = dynamic_cast(tqtopLevelWidget()); if ( !window ) { kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; " @@ -671,7 +671,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { int px = mapFromGlobal( point ).x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = mapFromGlobal( point ).y() - itemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; + int py = mapFromGlobal( point ).y() - tqitemRect( item ).y() - (header()->isVisible() ? header()->height() : 0) ; //kdDebug( 14000 ) << k_funcinfo << "x: " << px << ", y: " << py << endl; Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ; @@ -691,7 +691,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, arg( metaLVI->metaContact()->displayName(), metaLVI->metaContact()->statusString() ); if ( title.length() > 43 ) - title = title.left( 40 ) + TQString::fromLatin1( "..." ); + title = title.left( 40 ) + TQString::tqfromLatin1( "..." ); if ( popup->title( 0 ).isNull() ) popup->insertTitle ( title, 0, 0 ); @@ -713,12 +713,12 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) ); TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString(); TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: ' ()'", "%2 <%1>" ). arg( c->contactId(), nick ); - text=text.replace("&","&&"); // cf BUG 115449 + text=text.tqreplace("&","&&"); // cf BUG 115449 if ( text.length() > 41 ) - text = text.left( 38 ) + TQString::fromLatin1( "..." ); + text = text.left( 38 ) + TQString::tqfromLatin1( "..." ); - popup->insertItem( c->onlineStatus().iconFor( c, 16 ), text , contactMenu ); + popup->insertItem( c->onlinetqStatus().iconFor( c, 16 ), text , contactMenu ); } popup->popup( point ); @@ -733,7 +733,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/, { TQString title = groupvi->group()->displayName(); if ( title.length() > 32 ) - title = title.left( 30 ) + TQString::fromLatin1( "..." ); + title = title.left( 30 ) + TQString::tqfromLatin1( "..." ); if( popup->title( 0 ).isNull() ) popup->insertTitle( title, 0, 0 ); @@ -814,7 +814,7 @@ void KopeteContactListView::slotExecuted( TQListViewItem *item, const TQPoint &p { // Try if we are clicking a protocol icon. If so, open a direct // connection for that protocol - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); TQPoint relativePos( pos.x() - r.left() - ( treeStepSize() * ( item->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ), pos.y() - r.top() ); @@ -905,7 +905,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList } else if( e->provides("kopete/x-contact") ) { - TQString contactInfo = TQString::fromUtf8( e->encodedData("kopete/x-contact") ); + TQString contactInfo = TQString::fromUtf8( e->tqencodedData("kopete/x-contact") ); TQString protocolId = contactInfo.section( TQChar( 0xE000 ), 0, 0 ); TQString accountId = contactInfo.section( TQChar( 0xE000 ), 1, 1 ); TQString contactId = contactInfo.section( TQChar( 0xE000 ), 2 ); @@ -927,7 +927,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { KURL url = (*it); - if( url.protocol() == TQString::fromLatin1("kopetemessage") ) + if( url.protocol() == TQString::tqfromLatin1("kopetemessage") ) { //Add a contact addDraggedContactByInfo( url.queryItem("protocolId"), @@ -938,7 +938,7 @@ void KopeteContactListView::slotDropped(TQDropEvent *e, TQListViewItem *, TQList TQPoint p = contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( dest_metaLVI ).y(); + int py = p.y() - tqitemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ); @@ -987,7 +987,7 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta { int r=KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "Would you like to add %1 to your contact list as a member of %2?" ) - .arg( contact->displayName(), group->displayName() ), + .tqarg( contact->displayName(), group->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); @@ -999,17 +999,17 @@ void KopeteContactListView::addDraggedContactToGroup( Kopete::MetaContact *conta } } -void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ) +void KopeteContactListView::addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ) { int r = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "Would you like to add %1 to your contact list as a child contact of %2?" ) - .arg( contact->contactId(), parent->displayName() ), + .tqarg( contact->contactId(), tqparent->displayName() ), i18n( "Kopete" ), i18n("Add"), i18n("Do Not Add"), "addTemporaryWhenMoving" ); if( r == KMessageBox::Yes ) { - contact->setMetaContact(parent); + contact->setMetaContact(tqparent); UndoItem *u=new UndoItem; u->type=UndoItem::ContactAdd; @@ -1054,7 +1054,7 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, { KMessageBox::sorry( Kopete::UI::Global::mainWidget(), i18n("This contact is already on your contact list. It is a child contact of %1") - .arg( source_contact->metaContact()->displayName() ) + .tqarg( source_contact->metaContact()->displayName() ) ); } } @@ -1064,13 +1064,13 @@ void KopeteContactListView::addDraggedContactByInfo( const TQString &protocolId, bool KopeteContactListView::acceptDrag(TQDropEvent *e) const { TQListViewItem *source=currentItem(); - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *afterme; // Due to a little design problem in KListView::findDrop() we can't // call it directly from a const method until KDE 4.0, but as the // method is in fact const we can of course get away with a // const_cast... - const_cast( this )->findDrop( e->pos(), parent, afterme ); + const_cast( this )->findDrop( e->pos(), tqparent, afterme ); KopeteMetaContactLVI *dest_metaLVI=dynamic_cast(afterme); @@ -1116,14 +1116,14 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const return false; if(source_groupLVI->group() == Kopete::Group::temporary) return false; - if(source_groupLVI->group()->parentGroup() == dest_groupLVI->group() ) + if(source_groupLVI->group()->tqparentGroup() == dest_groupLVI->group() ) return false; - Kopete::Group *g=dest_groupLVI->group()->parentGroup(); + Kopete::Group *g=dest_groupLVI->group()->tqparentGroup(); while(g && g != Kopete::Group::toplevel) { if(g==source_groupLVI->group()) return false; - g=g->parentGroup(); + g=g->tqparentGroup(); } return true; } @@ -1131,7 +1131,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const { if(source_groupLVI->group() == Kopete::Group::temporary) return false; - if(source_groupLVI->group()->parentGroup() == Kopete::Group::toplevel) + if(source_groupLVI->group()->tqparentGroup() == Kopete::Group::toplevel) return false; return true; }*/ @@ -1146,7 +1146,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const TQPoint p=contentsToViewport(e->pos()); int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( dest_metaLVI->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( dest_metaLVI ).y(); + int py = p.y() - tqitemRect( dest_metaLVI ).y(); Kopete::Contact *c = dest_metaLVI->contactForPoint( TQPoint( px, py ) ) ; if( c ? !c->isReachable() : !dest_metaLVI->metaContact()->isReachable() ) @@ -1168,7 +1168,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const for ( KURL::List::Iterator it = urlList.begin(); it != urlList.end(); ++it ) { - if( (*it).protocol() != TQString::fromLatin1("kopetemessage") && (*it).isLocalFile() ) + if( (*it).protocol() != TQString::tqfromLatin1("kopetemessage") && (*it).isLocalFile() ) return false; //we can't send links if a locale file is in link } @@ -1191,12 +1191,12 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const return false; } -void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent, +void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after) { //Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. //This woraround allow us to keep the highlight of the item, and give always a correct position - parent=0L; + tqparent=0L; TQPoint p (contentsToViewport(pos)); after=itemAt(p); } @@ -1205,7 +1205,7 @@ void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) { KListView::contentsMousePressEvent( e ); - if (e->button() == LeftButton ) + if (e->button() == Qt::LeftButton ) { TQPoint p=contentsToViewport(e->pos()); TQListViewItem *i=itemAt( p ); @@ -1216,7 +1216,7 @@ void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) int px = p.x() - ( header()->sectionPos( header()->mapToIndex( 0 ) ) + treeStepSize() * ( i->depth() + ( rootIsDecorated() ? 1 : 0 ) ) + itemMargin() ); - int py = p.y() - itemRect( i ).y(); + int py = p.y() - tqitemRect( i ).y(); m_startDragPos = TQPoint( px , py ); } @@ -1272,7 +1272,7 @@ TQDragObject *KopeteContactListView::dragObject() d->setEncodedData( TQString( c->protocol()->pluginId() +TQChar( 0xE000 )+ c->account()->accountId() +TQChar( 0xE000 )+ c->contactId() ).utf8() ); drag->addDragObject( d ); - pm = c->onlineStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling + pm = c->onlinetqStatus().iconFor( c, 12 ); // FIXME: fixed icon scaling } else // dragging a metacontact { @@ -1326,14 +1326,14 @@ void KopeteContactListView::slotViewSelectionChanged() if(metaLVI) { m_selectedContacts.append( metaLVI ); - if(!contacts.contains(metaLVI->metaContact())) + if(!contacts.tqcontains(metaLVI->metaContact())) contacts.append( metaLVI->metaContact() ); } KopeteGroupViewItem *groupLVI=dynamic_cast(item); if(groupLVI) { m_selectedGroups.append( groupLVI ); - if(!groups.contains(groupLVI->group())) + if(!groups.tqcontains(groupLVI->group())) groups.append( groupLVI->group() ); } @@ -1362,7 +1362,7 @@ void KopeteContactListView::updateActionsForSelection( if(singleContactSelected) { TQString kabcid=contacts.first()->metaContactId(); - inkabc= !kabcid.isEmpty() && !kabcid.contains(":"); + inkabc= !kabcid.isEmpty() && !kabcid.tqcontains(":"); } actionSendFile->setEnabled( singleContactSelected && contacts.first()->canAcceptFiles()); @@ -1443,7 +1443,7 @@ void KopeteContactListView::slotSendFile() kdDebug( 14000 ) << "Email: " << emailAddr << "!" << endl; if ( !emailAddr.isEmpty() ) - kapp->invokeMailer( emailAddr, TQString::null ); + kapp->invokeMailer( emailAddr, TQString() ); else KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "There is no email address set for this contact in the KDE address book." ), i18n( "No Email Address in Address Book" ) ); } @@ -1482,7 +1482,7 @@ void KopeteContactListView::slotMoveToGroup() insertUndoItem( new UndoItem( UndoItem::MetaContactAdd , m ) ); } } - else if( !m->groups().contains( to ) ) + else if( !m->groups().tqcontains( to ) ) { m->moveToGroup( g, to ); @@ -1515,7 +1515,7 @@ void KopeteContactListView::slotCopyToGroup() if( m->isTemporary() ) return; - if( !m->groups().contains( to ) ) + if( !m->groups().tqcontains( to ) ) { m->addToGroup( to ); @@ -1555,13 +1555,13 @@ void KopeteContactListView::slotRemove() { msg = i18n( "Are you sure you want to remove the contact %1" \ " from your contact list?" ) - .arg( contacts.first()->displayName() ) ; + .tqarg( contacts.first()->displayName() ) ; } else if( !groups.isEmpty() ) { msg = i18n( "Are you sure you want to remove the group %1 " \ "and all contacts that are contained within it?" ) - .arg( groups.first()->displayName() ); + .tqarg( groups.first()->displayName() ); } else return; // this should never happen @@ -1676,7 +1676,7 @@ void KopeteContactListView::slotAddContact() Kopete::ContactList::self()->selectedMetaContacts().first(); Kopete::Group *group = Kopete::ContactList::self()->selectedGroups().first(); - Kopete::Account *account = dynamic_cast( sender()->parent() ); + Kopete::Account *account = dynamic_cast( TQT_TQOBJECT(const_cast(sender()))->tqparent() ); if ( ( metacontact && metacontact->isTemporary() ) || (group && group->type()!=Kopete::Group::Normal ) ) @@ -1772,7 +1772,7 @@ void KopeteContactListView::slotProperties() { } */ - metaLVI->repaint(); + metaLVI->tqrepaint(); } else if(groupLVI) { diff --git a/kopete/kopete/contactlist/kopetecontactlistview.h b/kopete/kopete/contactlist/kopetecontactlistview.h index 4c5a8d37..ff4d523d 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.h +++ b/kopete/kopete/contactlist/kopetecontactlistview.h @@ -59,9 +59,10 @@ class MessageEvent; class KopeteContactListView : public Kopete::UI::ListView::ListView { Q_OBJECT + TQ_OBJECT public: - KopeteContactListView( TQWidget *parent = 0, const char *name = 0 ); + KopeteContactListView( TQWidget *tqparent = 0, const char *name = 0 ); ~KopeteContactListView(); /** @@ -106,7 +107,7 @@ protected: * Since KDE 3.1.1 , the original find Drop return 0L for afterme if the group is open. * This woraround allow us to keep the highlight of the item, and give always a correct position */ - virtual void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); + virtual void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); /** * The selected items have changed; update our actions to show what's possible. @@ -149,7 +150,7 @@ private slots: void slotContactStatusChanged( Kopete::MetaContact *mc ); - void slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListViewItem*); + void slotDropped(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem*); void slotShowAddContactDialog(); void slotNewMessageEvent(Kopete::MessageEvent *); @@ -208,7 +209,7 @@ private: void moveDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *from, Kopete::Group *to ); void addDraggedContactToGroup( Kopete::MetaContact *contact, Kopete::Group *group ); - void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *parent ); + void addDraggedContactToMetaContact( Kopete::Contact *contact, Kopete::MetaContact *tqparent ); void addDraggedContactByInfo( const TQString &protocolId, const TQString &accountId, const TQString &contactId, TQListViewItem *after ); diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp index 802df117..1e415884 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp +++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp @@ -30,8 +30,8 @@ #include "kopetegroup.h" KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const KShortcut &cut, const TQObject *receiver, - const char *slot, TQObject *parent, const char *name ) -: KListAction( text, pix, cut, parent, name ) + const char *slot, TQObject *tqparent, const char *name ) +: KListAction( text, pix, cut, tqparent, name ) { connect( this, TQT_SIGNAL( activated() ), receiver, slot ); @@ -58,7 +58,7 @@ void KopeteGroupListAction::slotUpdateList() } groupList.sort(); - groupList.prepend(TQString::null); //add a separator; + groupList.prepend(TQString()); //add a separator; groupList.prepend( i18n("Top Level") ); //the top-level group, with the id 0 setItems( groupList ); } diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.h b/kopete/kopete/contactlist/kopetegrouplistaction.h index 2b852632..1b1846e1 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.h +++ b/kopete/kopete/contactlist/kopetegrouplistaction.h @@ -29,6 +29,7 @@ class KopeteGroupListAction : public KListAction { Q_OBJECT + TQ_OBJECT public: KopeteGroupListAction( const TQString &, const TQString &, const KShortcut &, diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index b28b7cb3..75508159 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online Status + kopeteonlinestatus.cpp - Kopete Online tqStatus Copyright (c) 2002-2004 by Olivier Goffart Copyright (c) 2003 by Martijn Klingens @@ -68,15 +68,15 @@ private: } // END namespace UI } // END namespace Kopete -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *parent, const char *name ) -: Kopete::UI::ListView::Item( parent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListView *tqparent, const char *name ) +: Kopete::UI::ListView::Item( tqparent, group_, name ) { m_group = group_; initLVI(); } -KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *parent, const char *name ) - : Kopete::UI::ListView::Item( parent, group_, name ) +KopeteGroupViewItem::KopeteGroupViewItem( Kopete::Group *group_, TQListViewItem *tqparent, const char *name ) + : Kopete::UI::ListView::Item( tqparent, group_, name ) { m_group = group_; initLVI(); @@ -167,7 +167,7 @@ void KopeteGroupViewItem::refreshDisplayName() d->name->setText( m_group->displayName() ); d->count->setText( i18n( "(NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)", "(%1/%2)" ) - .arg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); + .tqarg( TQString::number( onlineMemberCount ), TQString::number( totalMemberCount ) ) ); updateVisibility(); diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.h b/kopete/kopete/contactlist/kopetegroupviewitem.h index 8891f992..091e791d 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.h +++ b/kopete/kopete/contactlist/kopetegroupviewitem.h @@ -35,9 +35,10 @@ class Group; class KopeteGroupViewItem : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - KopeteGroupViewItem( Kopete::Group *group , TQListView *parent, const char *name = 0 ); - KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *parent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListView *tqparent, const char *name = 0 ); + KopeteGroupViewItem( Kopete::Group *group , TQListViewItem *tqparent, const char *name = 0 ); ~KopeteGroupViewItem(); Kopete::Group * group() const; diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index 4dbb1599..23621b37 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -1,6 +1,6 @@ KopeteGVIPropsWidget - + KopeteGVIPropsWidget @@ -19,11 +19,11 @@ 0 - + tabWidget - + tab @@ -34,15 +34,15 @@ unnamed - + - layout7 + tqlayout7 unnamed - + lblDisplayName @@ -53,14 +53,14 @@ edtDisplayName - + edtDisplayName - + grpIcons @@ -79,7 +79,7 @@ - + lblOpen @@ -90,7 +90,7 @@ icnbOpen - + lblClosed @@ -109,7 +109,7 @@ - + chkUseCustomIcons @@ -127,7 +127,7 @@ Expanding - + 16 16 @@ -148,7 +148,7 @@ icnbOpen icnbClosed - + kicondialog.h kicondialog.h diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 1867dea5..f3c727ec 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -65,8 +65,8 @@ const char MC_AW[] = "metacontact_away"; const char MC_UNK[] = "metacontact_unknown"; -KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Group %1").arg(gvi->group()->displayName()), Ok|Cancel, Ok, false) +KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Properties of Group %1").tqarg(gvi->group()->displayName()), Ok|Cancel, Ok, false) { mainWidget = new KopeteGVIPropsWidget(this, "mainWidget"); mainWidget->icnbOpen->setIconSize(KIcon::SizeSmall); @@ -145,8 +145,8 @@ void KopeteGVIProps::slotIconChanged() // ============================================================================= -KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Properties of Meta Contact %1").arg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) +KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Properties of Meta Contact %1").tqarg(lvi->metaContact()->displayName()), Ok|Cancel, Ok, false) { m_countPhotoCapable = 0; mainWidget = new KopeteMetaLVIPropsWidget( this, "mainWidget" ); @@ -157,10 +157,10 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare mNotificationProps = new CustomNotificationProps( this, lvi->metaContact() ); // add a button to the notification props to get the sound from KABC - // the widget's vert box layout, horiz box layout containing button, spacer, followed by a spacer - TQBoxLayout * vb = static_cast( mNotificationProps->widget()->layout() ); + // the widget's vert box tqlayout, horiz box tqlayout containing button, spacer, followed by a spacer + TQBoxLayout * vb = static_cast( mNotificationProps->widget()->tqlayout() ); - TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABClayout" ); + TQHBoxLayout* hb = new TQHBoxLayout( vb, -1, "soundFromKABCtqlayout" ); mFromKABC = new TQPushButton( i18n( "Sync KABC..." ), mNotificationProps->widget(), "getSoundFromKABC" ); hb->addWidget( mFromKABC ); // [ [Button] <-xxxxx-> ] hb->addStretch(); @@ -187,19 +187,19 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare TQString offlineName = item->metaContact()->icon( Kopete::ContactListElement::Offline ); if(offlineName.isEmpty()) - offlineName = TQString::fromLatin1(MC_OFF); // Default + offlineName = TQString::tqfromLatin1(MC_OFF); // Default TQString onlineName = item->metaContact()->icon( Kopete::ContactListElement::Online ); if(onlineName.isEmpty()) - onlineName = TQString::fromLatin1(MC_ON); // Default + onlineName = TQString::tqfromLatin1(MC_ON); // Default TQString awayName = item->metaContact()->icon( Kopete::ContactListElement::Away ); if(awayName.isEmpty()) - awayName = TQString::fromLatin1(MC_AW); // Default + awayName = TQString::tqfromLatin1(MC_AW); // Default TQString unknownName = item->metaContact()->icon( Kopete::ContactListElement::Unknown ); if(unknownName.isEmpty()) - unknownName = TQString::fromLatin1(MC_UNK); // Default + unknownName = TQString::tqfromLatin1(MC_UNK); // Default mainWidget->icnbOffline->setIcon( offlineName ); mainWidget->icnbOnline->setIcon( onlineName ); @@ -372,7 +372,7 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets() break; } if( !photo.isNull() ) - mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQImage::ScaleMin ))); + mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQ_ScaleMin ))); else mainWidget->photoLabel->setPixmap( TQPixmap() ); } @@ -489,7 +489,7 @@ void KopeteMetaLVIProps::slotAddresseeChanged( const KABC::Addressee & a ) { mainWidget->btnExportKABC->setEnabled( false ); mainWidget->btnImportKABC->setEnabled( false ); - mAddressBookUid = TQString::null; + mAddressBookUid = TQString(); mainWidget->radioNameContact->setChecked( true ); mainWidget->radioPhotoContact->setChecked( true ); } @@ -560,7 +560,7 @@ void KopeteMetaLVIProps::slotClearPhotoClicked() #if KDE_IS_VERSION(3,4,0) mainWidget->cmbPhotoUrl->setKURL( KURL() ); #else - mainWidget->cmbPhotoUrl->setURL( TQString::null ); + mainWidget->cmbPhotoUrl->setURL( TQString() ); #endif item->metaContact()->setPhoto( KURL() ); diff --git a/kopete/kopete/contactlist/kopetelviprops.h b/kopete/kopete/contactlist/kopetelviprops.h index 54ff2540..d674f0ad 100644 --- a/kopete/kopete/contactlist/kopetelviprops.h +++ b/kopete/kopete/contactlist/kopetelviprops.h @@ -43,9 +43,10 @@ namespace Kopete { class Contact; } class KopeteGVIProps: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const char *name=0L); + KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *tqparent, const char *name=0L); ~KopeteGVIProps(); private: @@ -64,9 +65,10 @@ class KopeteGVIProps: public KDialogBase class KopeteMetaLVIProps: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *parent, const char *name=0L); + KopeteMetaLVIProps(KopeteMetaContactLVI *gvi, TQWidget *tqparent, const char *name=0L); ~KopeteMetaLVIProps(); private: diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 7d4cb12a..dc7fec18 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -82,18 +82,18 @@ public: { // We begin with the meta contact display name at the top of the tooltip - TQString toolTip = TQString::fromLatin1(""); + TQString toolTip = TQString::tqfromLatin1("
"); - toolTip += TQString::fromLatin1("
"); + toolTip += TQString::tqfromLatin1("
"); if ( ! metaContact->photo().isNull() ) { - TQString photoName = TQString::fromLatin1("kopete-metacontact-photo:%1").arg( KURL::encode_string( metaContact->metaContactId() )); + TQString photoName = TQString::tqfromLatin1("kopete-metacontact-photo:%1").tqarg( KURL::encode_string( metaContact->metaContactId() )); //TQMimeSourceFactory::defaultFactory()->setImage( "contactimg", metaContact->photo() ); - toolTip += TQString::fromLatin1("").arg( photoName ); + toolTip += TQString::tqfromLatin1("").tqarg( photoName ); } - toolTip += TQString::fromLatin1(""); + toolTip += TQString::tqfromLatin1(""); TQString displayName; Kopete::Emoticons *e = Kopete::Emoticons::self(); @@ -110,32 +110,32 @@ public: } } - toolTip += TQString::fromLatin1("%1

").arg( displayName ); + toolTip += TQString::tqfromLatin1("%1

").tqarg( displayName ); TQPtrList contacts = metaContact->contacts(); if ( contacts.count() == 1 ) { - return toolTip + contacts.first()->toolTip() + TQString::fromLatin1("
"); + return toolTip + contacts.first()->toolTip() + TQString::tqfromLatin1(""); } - toolTip += TQString::fromLatin1(""); + toolTip += TQString::tqfromLatin1("
"); // We are over a metacontact with > 1 child contacts, and not over a specific contact - // Iterate through children and display a summary tooltip + // Iterate through tqchildren and display a summary tooltip for(Contact *c = contacts.first(); c; c = contacts.next()) { - TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .arg( KURL::encode_string( c->protocol()->pluginId() ), + TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + .tqarg( KURL::encode_string( c->protocol()->pluginId() ), KURL::encode_string( c->account()->accountId() ), KURL::encode_string( c->contactId() ) ); toolTip += i18n("", "") - .arg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlineStatus().description() ); + .tqarg( iconName, Kopete::Emoticons::parseEmoticons(c->property(Kopete::Global::Properties::self()->nickName()).value().toString()) , c->contactId(), c->onlinetqStatus().description() ); } - return toolTip + TQString::fromLatin1("
STATUS ICON PROTOCOL NAME (ACCOUNT NAME)STATUS DESCRIPTION
 %2 (%3)%4
"); + return toolTip + TQString::tqfromLatin1(""); } private: MetaContact *metaContact; @@ -167,22 +167,22 @@ public: TQPtrList events; }; -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; m_isTopLevel = false; - m_parentGroup = parent; + m_parentGroup = tqparent; m_parentView = 0L; initLVI(); - parent->refreshDisplayName(); + tqparent->refreshDisplayName(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; @@ -193,15 +193,15 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQList initLVI(); } -KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ) -: ListView::Item( parent, contact, "MetaContactLVI" ) -//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) +KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ) +: ListView::Item( tqparent, contact, "MetaContactLVI" ) +//: TQObject( contact, "MetaContactLVI" ), KListViewItem( tqparent ) { m_metaContact = contact; m_isTopLevel = true; m_parentGroup = 0L; - m_parentView = parent; + m_parentView = tqparent; initLVI(); } @@ -212,7 +212,7 @@ void KopeteMetaContactLVI::initLVI() d->toolTipSource.reset( new ListView::MetaContactToolTipSource( m_metaContact ) ); - m_oldStatus = m_metaContact->status(); + m_oldtqStatus = m_metaContact->status(); connect( m_metaContact, TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), TQT_SLOT( slotDisplayNameChanged() ) ); @@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI() mIsBlinkIcon = false; //if ( !mBlinkIcon ) - // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) ); + // mBlinkIcon = new TQPixmap( KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "newmsg" ), KIcon::Small ) ); slotConfigChanged(); // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon slotDisplayNameChanged(); @@ -280,13 +280,13 @@ void KopeteMetaContactLVI::movedToDifferentGroup() // create a spacer if wanted // I assume that the safety property that allows the delete in slotConfigChanged holds here - Will delete d->spacerBox->component( 0 ); - if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); } - KopeteGroupViewItem *group_item = dynamic_cast(KListViewItem::parent()); + KopeteGroupViewItem *group_item = dynamic_cast(KListViewItem::tqparent()); if ( group_item ) { m_isTopLevel = false; @@ -363,18 +363,18 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) // multiple times if the user is in multiple groups - Jason // comparing the status of the previous and new preferred contact is the determining factor in deciding to notify - Kopete::OnlineStatus newStatus; + Kopete::OnlineStatus newtqStatus; if ( m_metaContact->preferredContact() ) - newStatus = m_metaContact->preferredContact()->onlineStatus(); + newtqStatus = m_metaContact->preferredContact()->onlinetqStatus(); else { // the last child contact has gone offline or otherwise unreachable, so take the changed contact's online status - newStatus = c->onlineStatus(); + newtqStatus = c->onlinetqStatus(); } // ensure we are not suppressing notifications, because connecting or disconnected if ( !(c->account()->suppressStatusNotification() - || ( c->account()->myself()->onlineStatus().status() == Kopete::OnlineStatus::Connecting ) + || ( c->account()->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Connecting ) || !c->account()->isConnected() ) ) { if ( !c->account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) @@ -382,47 +382,47 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) //int winId = KopeteSystemTray::systemTray() ? KopeteSystemTray::systemTray()->winId() : 0; TQString text = i18n( "%1 is now %2." ) - .arg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , - TQStyleSheet::escape(c->onlineStatus().description())); + .tqarg( Kopete::Emoticons::parseEmoticons( TQStyleSheet::escape(m_metaContact->displayName()) ) , + TQStyleSheet::escape(c->onlinetqStatus().description())); // figure out what's happened - enum ChangeType { noChange, noEvent, signedIn, changedStatus, signedOut }; + enum ChangeType { noChange, noEvent, signedIn, changedtqStatus, signedOut }; ChangeType t = noChange; //kdDebug( 14000 ) << k_funcinfo << m_metaContact->displayName() << - //" - Old MC Status: " << m_oldStatus.status() << ", New MC Status: " << newStatus.status() << endl; + //" - Old MC tqStatus: " << m_oldtqStatus.status() << ", New MC tqStatus: " << newtqStatus.status() << endl; // first, exclude changes due to blocking or subscription changes at the protocol level - if ( ( m_oldStatus.status() == Kopete::OnlineStatus::Unknown - || newStatus.status() == Kopete::OnlineStatus::Unknown ) ) + if ( ( m_oldtqStatus.status() == Kopete::OnlineStatus::Unknown + || newtqStatus.status() == Kopete::OnlineStatus::Unknown ) ) t = noEvent; // This means the contact's changed from or to unknown - due to a protocol state change, not a contact state change else // we're dealing with a genuine contact state change { - if ( m_oldStatus.status() == Kopete::OnlineStatus::Offline ) + if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Offline ) { - if ( newStatus.status() != Kopete::OnlineStatus::Offline ) + if ( newtqStatus.status() != Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed in" << endl; t = signedIn; // contact has gone from offline to something else, it's a sign-in } } - else if ( m_oldStatus.status() == Kopete::OnlineStatus::Online - || m_oldStatus.status() == Kopete::OnlineStatus::Away - || m_oldStatus.status() == Kopete::OnlineStatus::Invisible) + else if ( m_oldtqStatus.status() == Kopete::OnlineStatus::Online + || m_oldtqStatus.status() == Kopete::OnlineStatus::Away + || m_oldtqStatus.status() == Kopete::OnlineStatus::Invisible) { - if ( newStatus.status() == Kopete::OnlineStatus::Offline ) + if ( newtqStatus.status() == Kopete::OnlineStatus::Offline ) { //kdDebug( 14000 ) << "signed OUT" << endl; t = signedOut; // contact has gone from an online state to an offline state, it's a sign out } - else if ( m_oldStatus > newStatus || m_oldStatus < newStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator + else if ( m_oldtqStatus > newtqStatus || m_oldtqStatus < newtqStatus ) // operator!= is useless because it's an identity operator, not an equivalence operator { // contact has changed online states, it's a status change, // and the preferredContact changed status, or there is a new preferredContacat // so it's worth notifying //kdDebug( 14000 ) << "changed status" << endl; - t = changedStatus; + t = changedtqStatus; } } - else if ( m_oldStatus != newStatus ) + else if ( m_oldtqStatus != newtqStatus ) { //kdDebug( 14000 ) << "non-event" << endl; // catch-all for any other status change we don't know about @@ -441,7 +441,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) connect(KNotification::event(m_metaContact, "kopete_contact_online", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() ) ); break; - case changedStatus: + case changedtqStatus: connect(KNotification::event(m_metaContact, "kopete_contact_status_change", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() )); break; @@ -468,7 +468,7 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) } // make a note of the current status for the next time we get a status change - m_oldStatus = newStatus; + m_oldtqStatus = newtqStatus; if ( m_parentGroup ) m_parentGroup->refreshDisplayName(); @@ -521,7 +521,7 @@ void KopeteMetaContactLVI::slotPhotoChanged() { int photoSize = d->iconSize; - photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ); + photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ); KImageEffect *effect = 0L; switch ( m_metaContact->status() ) @@ -530,17 +530,17 @@ void KopeteMetaContactLVI::slotPhotoChanged() break; case Kopete::OnlineStatus::Away: effect = new KImageEffect(); - effect->fade(photoImg, 0.5, Qt::white); + effect->fade(photoImg, 0.5, TQt::white); break; case Kopete::OnlineStatus::Offline: effect = new KImageEffect(); - effect->fade(photoImg, 0.4, Qt::white); + effect->fade(photoImg, 0.4, TQt::white); effect->toGray(photoImg); break; case Kopete::OnlineStatus::Unknown: default: effect = new KImageEffect(); - effect->fade(photoImg, 0.8, Qt::white); + effect->fade(photoImg, 0.8, TQt::white); } delete effect; @@ -611,7 +611,7 @@ void KopeteMetaContactLVI::slotMoveToGroup() else { Kopete::Group *to = Kopete::ContactList::self()->getGroup( m_actionMove->currentText() ); - if ( !m_metaContact->groups().contains( to ) ) + if ( !m_metaContact->groups().tqcontains( to ) ) m_metaContact->moveToGroup( group(), to ); } } @@ -658,7 +658,7 @@ void KopeteMetaContactLVI::slotConfigChanged() // create a spacer if wanted delete d->spacerBox->component( 0 ); - if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && + if ( KListViewItem::tqparent() && KopetePrefs::prefs()->contactListIndentContacts() && !KopetePrefs::prefs()->treeView() ) { new ListView::SpacerComponent( d->spacerBox, 20, 0 ); @@ -802,9 +802,9 @@ void KopeteMetaContactLVI::updateVisibility() void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { -// if ( key == TQString::fromLatin1("awayMessage") ) +// if ( key == TQString::tqfromLatin1("awayMessage") ) // kdDebug( 14000 ) << k_funcinfo << "contact=" << contact->contactId() << ", isonline=" << contact->isOnline() << ", alloffline=" << !m_metaContact->isOnline() << ", oldvalue=" << old.toString() << ", newvalue=" << newVal.toString() << endl; - if ( key == TQString::fromLatin1("awayMessage") && d->extraText && old != newVal ) + if ( key == TQString::tqfromLatin1("awayMessage") && d->extraText && old != newVal ) { bool allOffline = !m_metaContact->isOnline(); if ( newVal.toString().isEmpty() || ( !contact->isOnline() && !allOffline ) ) @@ -829,7 +829,7 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, } } if ( allAwayMessagesEmpty ) - d->extraText->setText( TQString::null ); + d->extraText->setText( TQString() ); } else { @@ -839,7 +839,7 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, d->extraText->setText( newVal.toString() ); } } // wtf? KopeteMetaContact also connects this signals and emits photoChanged! why no connect photoChanged to slotPhotoChanged? - /*else if ( key == TQString::fromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) + /*else if ( key == TQString::tqfromLatin1("photo") && (m_metaContact->photoSourceContact() == contact) && (m_metaContact->photoSource() == Kopete::MetaContact::SourceContact)) { slotPhotoChanged(); }*/ @@ -855,8 +855,8 @@ void KopeteMetaContactLVI::slotContactAdded( Kopete::Contact *c ) updateContactIcon( c ); - slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), - TQVariant(), c->property( TQString::fromLatin1("awayMessage") ).value() ); + slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), + TQVariant(), c->property( TQString::tqfromLatin1("awayMessage") ).value() ); } void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) @@ -870,8 +870,8 @@ void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) if ( ListView::Component *comp = contactComponent( c ) ) delete comp; - slotContactPropertyChanged( c, TQString::fromLatin1("awayMessage"), - c->property( TQString::fromLatin1("awayMessage") ).value(), TQVariant() ); + slotContactPropertyChanged( c, TQString::tqfromLatin1("awayMessage"), + c->property( TQString::tqfromLatin1("awayMessage") ).value(), TQVariant() ); } void KopeteMetaContactLVI::updateContactIcons() @@ -884,9 +884,9 @@ void KopeteMetaContactLVI::updateContactIcons() void KopeteMetaContactLVI::updateContactIcon( Kopete::Contact *c ) { - KGlobal::config()->setGroup( TQString::fromLatin1("ContactList") ); + KGlobal::config()->setGroup( TQString::tqfromLatin1("ContactList") ); bool bHideOffline = KGlobal::config()->readBoolEntry( - TQString::fromLatin1("HideOfflineContacts"), false ); + TQString::tqfromLatin1("HideOfflineContacts"), false ); if ( KopetePrefs::prefs()->showOffline() ) bHideOffline = false; diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index 02b16be4..e9629df4 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -53,11 +53,12 @@ class KopeteGroupViewItem; class KopeteMetaContactLVI : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ); - KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *tqparent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *tqparent ); + KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *tqparent ); ~KopeteMetaContactLVI(); /** @@ -72,14 +73,14 @@ public: bool isTopLevel() const; /** - * parent when top-level + * tqparent when top-level */ - TQListView *parentView() const { return m_parentView; }; + TQListView *tqparentView() const { return m_parentView; }; /** - * parent when not top-level + * tqparent when not top-level */ - KopeteGroupViewItem *parentGroup() const { return m_parentGroup; }; + KopeteGroupViewItem *tqparentGroup() const { return m_parentGroup; }; /** * call this when the item has been moved to a different group @@ -170,7 +171,7 @@ private: int m_pixelWide; - Kopete::OnlineStatus m_oldStatus; + Kopete::OnlineStatus m_oldtqStatus; TQPixmap m_oldStatusIcon; TQPixmap m_originalBlinkIcon; diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index e191d4b9..6c28f40a 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -1,6 +1,6 @@ KopeteMetaLVIPropsWidget - + KopeteMetaLVIPropsWidget @@ -19,11 +19,11 @@ unnamed - + tabWidget - + tab @@ -34,7 +34,7 @@ unnamed - + grpAddressbook @@ -58,15 +58,15 @@ widAddresseeLink - + - layout8 + tqlayout8 unnamed - + btnExportKABC @@ -90,14 +90,14 @@ Expanding - + 107 20 - + btnImportKABC @@ -115,7 +115,7 @@ - + buttonGroup1 @@ -126,7 +126,7 @@ unnamed - + radioNameKABC @@ -134,15 +134,15 @@ Use addressbook &name (needs addressbook link) - + - layout11 + tqlayout11 unnamed - + radioNameContact @@ -160,14 +160,14 @@ Fixed - + 20 20 - + cmbAccountName @@ -185,15 +185,15 @@ - + - layout12 + tqlayout12 unnamed - + radioNameCustom @@ -211,14 +211,14 @@ Fixed - + 50 20 - + edtDisplayName @@ -227,7 +227,7 @@ - + buttonGroup2 @@ -238,17 +238,17 @@ unnamed - + photoLabel - + 64 92 - + 64 32767 @@ -267,7 +267,7 @@ false - + radioPhotoKABC @@ -275,15 +275,15 @@ U&se addressbook photo (needs addressbook link) - + - layout13 + tqlayout13 unnamed - + radioPhotoContact @@ -301,14 +301,14 @@ Fixed - + 20 20 - + cmbAccountPhoto @@ -326,15 +326,15 @@ - + - layout7 + tqlayout7 unnamed - + radioPhotoCustom @@ -352,7 +352,7 @@ Fixed - + 20 20 @@ -376,7 +376,7 @@ btnClearPhoto - + 32 32 @@ -390,7 +390,7 @@ - + chkSyncPhoto @@ -400,7 +400,7 @@ - + TabPage @@ -411,7 +411,7 @@ unnamed - + grpIcons @@ -422,7 +422,7 @@ unnamed - + lblAway @@ -433,7 +433,7 @@ icnbAway - + lblOnline @@ -444,7 +444,7 @@ icnbOnline - + chkUseCustomIcons @@ -487,7 +487,7 @@ - + lblOffline @@ -498,7 +498,7 @@ icnbOffline - + lblUnknown @@ -519,7 +519,7 @@ Expanding - + 16 16 @@ -538,7 +538,7 @@ Expanding - + 20 170 @@ -570,7 +570,7 @@
addressbooklinkwidget.h
- + addressbooklinkwidget.h klineedit.h diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp index 6595e237..b4dc9569 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.cpp @@ -20,8 +20,8 @@ #include #include "kopetestatusgroupviewitem.h" -KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name ) - : TQListViewItem(parent,name) +KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name ) + : TQListViewItem(tqparent,name) { m_status = status_; } diff --git a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h index 2f4f08b3..d3cc8281 100644 --- a/kopete/kopete/contactlist/kopetestatusgroupviewitem.h +++ b/kopete/kopete/contactlist/kopetestatusgroupviewitem.h @@ -27,10 +27,10 @@ *@author Duncan Mac-Vicar Prett */ - class KopeteStatusGroupViewItem : public QListViewItem + class KopeteStatusGroupViewItem : public TQListViewItem { public: - KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *parent, const char *name=0); + KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , TQListView *tqparent, const char *name=0); ~KopeteStatusGroupViewItem(); private: diff --git a/kopete/kopete/eventsrc b/kopete/kopete/eventsrc index 9d3cf2f7..3d05847b 100644 --- a/kopete/kopete/eventsrc +++ b/kopete/kopete/eventsrc @@ -503,7 +503,7 @@ default_presentation=0 [kopete_contact_status_change] -Name=Status Change +Name=tqStatus Change Name[ar]=تغير حالة Name[be]=Змена Ñтану Name[bg]=Променено ÑÑŠÑтоÑние на приÑтел @@ -512,10 +512,10 @@ Name[bs]=Izmjena statusa Name[ca]=Canvia estatus Name[cs]=ZmÄ›na stavu Name[cy]=Newid Cyflwr -Name[da]=Statusændring +Name[da]=tqStatusændring Name[de]=Statuswechsel Name[el]=Αλλαγή κατάστασης -Name[eo]=Status-ÅanÄo +Name[eo]=tqStatus-ÅanÄo Name[es]=Cambiar estado Name[et]=Staatuse muutus Name[eu]=Egoera aldaketa @@ -537,14 +537,14 @@ Name[km]=ការផ្លាស់ប្ដូរ​ស្ážáž¶áž“ភាព Name[lt]=BÅ«senos pakitimas Name[mk]=Промена на ÑтатуÑот Name[nb]=Endre status -Name[nds]=Statusännern +Name[nds]=tqStatusännern Name[ne]=वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ परिवरà¥à¤¤à¤¨ Name[nl]=Statusverandering Name[nn]=Statusendring Name[pa]=ਹਾਲਤ ਬਦਲੀ Name[pl]=Zmiana statusu Name[pt]=Mudança de Estado -Name[pt_BR]=Mudança de Status +Name[pt_BR]=Mudança de tqStatus Name[ro]=Modificare stare Name[ru]=Изменение ÑтатуÑа Name[se]=Stáhtusrievdadus @@ -552,7 +552,7 @@ Name[sk]=Zmena stavu Name[sl]=Sprememba stanja Name[sr]=Промена ÑтатуÑа Name[sr@Latn]=Promena statusa -Name[sv]=Statusändring +Name[sv]=tqStatusändring Name[ta]=நிலை மாறà¯à®±à®®à¯ Name[tg]=Ивази Ҳолат Name[tr]=Durum DeÄŸiÅŸimi @@ -571,7 +571,7 @@ Comment[bs]=Kontakt je promijenio svoj online status Comment[ca]=L'estat d'un contacte ha canviat Comment[cs]=Osoba zmÄ›nila online stav Comment[da]=En kontakts status pÃ¥ nettet er ændret -Comment[de]=Ein Benutzer wechselt seinen Status. +Comment[de]=Ein Benutzer wechselt seinen tqStatus. Comment[el]=Μια επαφή άλλαξε αυτή τη στιγμή κατάσταση Comment[es]=El estado de conexión de un contacto ha cambiado Comment[et]=Kontakt muutis oma võrgusoleku staatust @@ -591,7 +591,7 @@ Comment[km]=បាន​ផ្លាស់ប្ដូរ​ស្ážáž¶áž“áž— Comment[lt]=Kontaktinio asmens bÅ«sena pakito Comment[mk]=СтатуÑот на контактот на линија Ñе измени Comment[nb]=En bruker endret tilkobling til nettet -Comment[nds]=De Tokoppel-Status vun en Kontakt hett sik ännert +Comment[nds]=De Tokoppel-tqStatus vun en Kontakt hett sik ännert Comment[ne]=समà¥à¤ªà¤°à¥à¤•à¤•à¥‹ अनलाइन वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ परिवरà¥à¤¤à¤¨ भयो Comment[nl]=Gebruiker wijzigde online status Comment[nn]=Kontakt endrar status diff --git a/kopete/kopete/groupkabcselectorwidget.ui b/kopete/kopete/groupkabcselectorwidget.ui index fe0223ba..26cfb9b2 100644 --- a/kopete/kopete/groupkabcselectorwidget.ui +++ b/kopete/kopete/groupkabcselectorwidget.ui @@ -1,6 +1,6 @@ GroupKABCSelectorWidget - + GroupKABCSelectorWidget @@ -33,15 +33,15 @@ Horizontal - + - layout13 + tqlayout13 unnamed - + kabcLabel @@ -57,7 +57,7 @@ widAddresseeLink - + groupLabel @@ -68,7 +68,7 @@ groupCombo - + groupCombo @@ -77,7 +77,7 @@ - + Kopete::UI::AddressBookLinkWidget diff --git a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp index 5e35c9e2..26a70974 100644 --- a/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp +++ b/kopete/kopete/kconf_update/kopete-account-kconf_update.cpp @@ -46,8 +46,8 @@ TQString cryptStr(const TQString &aStr) { TQString result; for (unsigned int i = 0; i < aStr.length(); i++) - result += (aStr[i].unicode() < 0x20) ? aStr[i] : - TQChar(0x1001F - aStr[i].unicode()); + result += (aStr[i].tqunicode() < 0x20) ? aStr[i] : + TQChar(0x1001F - aStr[i].tqunicode()); return result; } @@ -65,7 +65,7 @@ void parseGroup( const TQString &group, const TQString &rawLine ) else protocol = group + "Protocol"; - password = TQString::null; + password = TQString(); pluginData.clear(); needFlush = true; @@ -153,11 +153,7 @@ void parseKey( const TQString &group, const TQString &key, const TQString &value !ircNick.isEmpty( ) && !ircServer.isEmpty() && !ircPort.isEmpty() ) { -#if QT_VERSION < 0x030200 - accountId = TQString::fromLatin1( "%1@%2:%3" ).arg( ircNick ).arg( ircServer ).arg( ircPort ); -#else - accountId = TQString::fromLatin1( "%1@%2:%3" ).arg( ircNick, ircServer, ircPort ); -#endif + accountId = TQString::tqfromLatin1( "%1@%2:%3" ).tqarg( ircNick, ircServer, ircPort ); } } /* @@ -166,7 +162,7 @@ void parseKey( const TQString &group, const TQString &key, const TQString &value else if ( key == "Modules" ) { TQString newValue = value; - newValue.replace ( ".plugin", ".desktop" ); + newValue.tqreplace ( ".plugin", ".desktop" ); qcout << "Plugins=" << newValue; } else diff --git a/kopete/kopete/kconf_update/kopete-nameTracking.cpp b/kopete/kopete/kconf_update/kopete-nameTracking.cpp index c0a556e7..0a76c371 100644 --- a/kopete/kopete/kconf_update/kopete-nameTracking.cpp +++ b/kopete/kopete/kconf_update/kopete-nameTracking.cpp @@ -25,7 +25,7 @@ static TQTextStream qcerr( stderr, IO_WriteOnly ); int main() { KInstance* inst = new KInstance( "Update script" ); - TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); + TQString filename = locateLocal( "data", TQString::tqfromLatin1( "kopete/contactlist.xml" ) ); // Load contact list & save backup. TQFile contactListFile( filename ); @@ -33,7 +33,7 @@ int main() TQDomDocument contactList; contactList.setContent( &contactListFile ); contactListFile.close(); - TQDir().rename( filename, filename + TQString::fromLatin1( ".bak" ) ); + TQDir().rename( filename, filename + TQString::tqfromLatin1( ".bak" ) ); // parse the XML file TQDomElement list = contactList.documentElement(); @@ -43,7 +43,7 @@ int main() { // update all the MetaContacts - if( mcElement.tagName() == TQString::fromLatin1("meta-contact") ) + if( mcElement.tagName() == TQString::tqfromLatin1("meta-contact") ) { TQDomElement displayName; TQDomElement subcontact; @@ -51,14 +51,14 @@ int main() TQDomElement elem = mcElement.firstChild().toElement(); while( !elem.isNull() ) { - if( elem.tagName() == TQString::fromLatin1( "display-name" ) ) + if( elem.tagName() == TQString::tqfromLatin1( "display-name" ) ) displayName = elem; - if( elem.tagName() == TQString::fromLatin1( "plugin-data" ) ) + if( elem.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) { // check if it's a contact by checking for "protocol" substring in the tag, // and the presence of a contactId child element. - TQString pluginId = elem.attribute( TQString::fromLatin1( "plugin-id" ) ); - bool isProtocol = ( pluginId.contains( "protocol", false ) > 0 ); // case-insensitive search + TQString pluginId = elem.attribute( TQString::tqfromLatin1( "plugin-id" ) ); + bool isProtocol = ( pluginId.tqcontains( "protocol", false ) > 0 ); // case-insensitive search bool hasContactId = false; TQDomNode field = elem.firstChild(); while( !field.isNull() ) @@ -66,8 +66,8 @@ int main() TQDomElement fieldElem = field.toElement(); if( !fieldElem.isNull() && - fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) && - fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) + fieldElem.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) && + fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "contactId" ) ) { hasContactId = true; break; @@ -85,8 +85,8 @@ int main() // check if we're even tracking the subcontact's name // if displayName.isNull(), it simply won't find the attribute; no harm done bool tracking = - ( displayName.attribute( TQString::fromLatin1( "trackChildNameChanges" ), - TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + ( displayName.attribute( TQString::tqfromLatin1( "trackChildNameChanges" ), + TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); if( !displayName.isNull() && !subcontact.isNull() && tracking ) { // collect info @@ -94,26 +94,26 @@ int main() TQString nsPID; TQString nsAID; - nsPID = subcontact.attribute( TQString::fromLatin1( "plugin-id" ) ); + nsPID = subcontact.attribute( TQString::tqfromLatin1( "plugin-id" ) ); TQDomNode field = subcontact.firstChild(); while( !field.isNull() ) { TQDomElement fieldElem = field.toElement(); - if( !fieldElem.isNull() && fieldElem.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) + if( !fieldElem.isNull() && fieldElem.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) ) { - if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "contactId" ) ) + if( fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "contactId" ) ) nsCID = fieldElem.text(); - if( fieldElem.attribute( TQString::fromLatin1( "key" ) ) == TQString::fromLatin1( "accountId" ) ) + if( fieldElem.attribute( TQString::tqfromLatin1( "key" ) ) == TQString::tqfromLatin1( "accountId" ) ) nsAID = fieldElem.text(); } field = field.nextSibling(); } // create the tracking info - displayName.setAttribute( TQString::fromLatin1( "nameSourceContactId" ), nsCID ); - displayName.setAttribute( TQString::fromLatin1( "nameSourcePluginId" ), nsPID ); - displayName.setAttribute( TQString::fromLatin1( "nameSourceAccountId" ), nsAID ); + displayName.setAttribute( TQString::tqfromLatin1( "nameSourceContactId" ), nsCID ); + displayName.setAttribute( TQString::tqfromLatin1( "nameSourcePluginId" ), nsPID ); + displayName.setAttribute( TQString::tqfromLatin1( "nameSourceAccountId" ), nsAID ); } } diff --git a/kopete/kopete/kimiface.h b/kopete/kopete/kimiface.h index 0ae3da9d..6c83c299 100644 --- a/kopete/kopete/kimiface.h +++ b/kopete/kopete/kimiface.h @@ -90,7 +90,7 @@ k_dcop: * @param uid the KABC uid you want the presence for. * @return a numeric representation of presence - currently one of 0 (Unknown), 1 (Offline), 2 (Connecting), 3 (Away), 4 (Online) */ - virtual int presenceStatus( const TQString & uid ) = 0; + virtual int presencetqStatus( const TQString & uid ) = 0; /** * Indicate if a given uid can receive files * @param uid the KABC uid you are interested in. @@ -107,7 +107,7 @@ k_dcop: * Get the KABC uid corresponding to the supplied IM address * Protocols should be * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICQProtocol", + * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICTQProtocol", * @return a KABC uid or null if none found/ */ virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0; @@ -160,14 +160,14 @@ k_dcop: * @param fileSize file size in bytes */ virtual void sendFile(const TQString &uid, const KURL &sourceURL, - const TQString &altFileName = TQString::null, uint fileSize = 0) = 0; + const TQString &altFileName = TQString(), uint fileSize = 0) = 0; // MUTATORS // Contact list /** * Add a contact to the contact list * @param contactId the protocol specific identifier for the contact, eg UIN for ICQ, screenname for AIM, nick for IRC. - * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICQProtocol", ... + * @param protocol the protocol, eg one of "AIMProtocol", "MSNProtocol", "ICTQProtocol", ... * @return whether the add succeeded. False may signal already present, protocol not supported, or add operation not supported. */ virtual bool addContact( const TQString &contactId, const TQString &protocol ) = 0; @@ -177,7 +177,7 @@ k_dcop_signals: * Indicates that a contact's presence has changed * @param uid the contact whose presence changed. * @param appId the dcop application id of the program the signal originates from. - * @param presence the new numeric presence @ref presenceStatus + * @param presence the new numeric presence @ref presencetqStatus */ void contactPresenceChanged( TQString uid, TQCString appId, int presence ); }; diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp index 1b835438..6e621c04 100644 --- a/kopete/kopete/kimifaceimpl.cpp +++ b/kopete/kopete/kimifaceimpl.cpp @@ -58,7 +58,7 @@ TQStringList KIMIfaceImpl::allContacts() TQPtrListIterator it( list ); for( ; it.current(); ++it ) { - if ( !it.current()->metaContactId().contains(':') ) + if ( !it.current()->metaContactId().tqcontains(':') ) result.append( it.current()->metaContactId() ); } @@ -72,7 +72,7 @@ TQStringList KIMIfaceImpl::reachableContacts() TQPtrListIterator it( list ); for( ; it.current(); ++it ) { - if ( it.current()->isReachable() && !it.current()->metaContactId().contains(':') ) + if ( it.current()->isReachable() && !it.current()->metaContactId().tqcontains(':') ) result.append( it.current()->metaContactId() ); } @@ -86,7 +86,7 @@ TQStringList KIMIfaceImpl::onlineContacts() TQPtrListIterator it( list ); for( ; it.current(); ++it ) { - if ( it.current()->isOnline() && !it.current()->metaContactId().contains(':') ) + if ( it.current()->isOnline() && !it.current()->metaContactId().tqcontains(':') ) result.append( it.current()->metaContactId() ); } @@ -100,7 +100,7 @@ TQStringList KIMIfaceImpl::fileTransferContacts() TQPtrListIterator it( list ); for( ; it.current(); ++it ) { - if ( it.current()->canAcceptFiles() && !it.current()->metaContactId().contains(':') ) + if ( it.current()->canAcceptFiles() && !it.current()->metaContactId().tqcontains(':') ) result.append( it.current()->metaContactId() ); } @@ -127,7 +127,7 @@ TQString KIMIfaceImpl::displayName( const TQString & uid ) return name; } -int KIMIfaceImpl::presenceStatus( const TQString & uid ) +int KIMIfaceImpl::presencetqStatus( const TQString & uid ) { //kdDebug( 14000 ) << k_funcinfo << endl; int p = -1; @@ -214,7 +214,7 @@ TQString KIMIfaceImpl::locate( const TQString & contactId, const TQString & prot if ( mc ) return mc->metaContactId(); else - return TQString::null; + return TQString(); } Kopete::MetaContact * KIMIfaceImpl::locateProtocolContact( const TQString & contactId, const TQString & protocolId ) @@ -256,7 +256,7 @@ TQString KIMIfaceImpl::context( const TQString & uid ) // shush warning TQString myUid = uid; - return TQString::null; + return TQString(); } TQStringList KIMIfaceImpl::protocols() @@ -338,7 +338,7 @@ void KIMIfaceImpl::slotMetaContactAdded( Kopete::MetaContact *mc ) void KIMIfaceImpl::slotContactStatusChanged( Kopete::MetaContact *mc ) { - if ( !mc->metaContactId().contains( ':' ) ) + if ( !mc->metaContactId().tqcontains( ':' ) ) { int p = -1; Kopete::OnlineStatus status = mc->status(); @@ -386,7 +386,7 @@ void KIMIfaceImpl::unknown( const TQString &uid ) { TQString apology = i18n( "Translators: %1 is the name of a person taken from the KDE address book, who Kopete doesn't know about. Kopete must either be told that an existing contact in Kopete is this person, or add a new contact for them", "

The KDE Address Book has no instant messaging information for

%1.

If he/she is already present in the Kopete contact list, indicate the correct addressbook entry in their properties.

Otherwise, add a new contact using the Add Contact wizard.

" ); - apology = apology.arg( addr.realName() ); + apology = apology.tqarg( addr.realName() ); KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, apology, i18n( "No Instant Messaging Address" ) ); } } diff --git a/kopete/kopete/kimifaceimpl.h b/kopete/kopete/kimifaceimpl.h index e5635195..d99c6335 100644 --- a/kopete/kopete/kimifaceimpl.h +++ b/kopete/kopete/kimifaceimpl.h @@ -28,6 +28,7 @@ class MetaContact; class KIMIfaceImpl : public TQObject, public KIMIface { Q_OBJECT + TQ_OBJECT public: KIMIfaceImpl(); ~KIMIfaceImpl(); @@ -41,7 +42,7 @@ public: bool isPresent( const TQString &uid ); TQString displayName( const TQString &uid ); TQString presenceString( const TQString &uid ); - int presenceStatus( const TQString &uid ); + int presencetqStatus( const TQString &uid ); bool canReceiveFiles( const TQString &uid ); bool canRespond( const TQString &uid ); TQString locate( const TQString &contactId, const TQString &protocol ); @@ -71,7 +72,7 @@ public: * Send the file to the contact */ void sendFile(const TQString &uid, const KURL &sourceURL, - const TQString &altFileName = TQString::null, uint fileSize = 0); + const TQString &altFileName = TQString(), uint fileSize = 0); // MUTATORS // Contact list diff --git a/kopete/kopete/kopeteaccountstatusbaricon.cpp b/kopete/kopete/kopeteaccountstatusbaricon.cpp index a2a65355..f493755e 100644 --- a/kopete/kopete/kopeteaccountstatusbaricon.cpp +++ b/kopete/kopete/kopeteaccountstatusbaricon.cpp @@ -22,17 +22,17 @@ //#include -KopeteAccountStatusBarIcon::KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *parent, +KopeteAccountStatusBarIcon::KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *tqparent, const char *name ) -: TQLabel( parent, name ) +: TQLabel( tqparent, name ) { // kdDebug(14000) << "[KopeteAccountStatusBarIcon] Setting Initial Protocol Icon" << endl; - //setMask(initialPixmap->mask()); - //setPixmap( Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, proto, 0, "status_unknown", TQString::null, TQString::null ).protocolIcon() ); + //setMask(initialPixmap->tqmask()); + //setPixmap( Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, proto, 0, "status_unknown", TQString(), TQString() ).protocolIcon() ); //setPixmap( proto->status().protocolIcon() ); setFixedSize ( 16, 16 ); - setCursor(TQCursor(Qt::PointingHandCursor)); + setCursor(TQCursor(TQt::PointingHandCursor)); show(); m_account = acc; @@ -44,11 +44,11 @@ KopeteAccountStatusBarIcon::~KopeteAccountStatusBarIcon() void KopeteAccountStatusBarIcon::mousePressEvent( TQMouseEvent *me ) { - if( me->button() == TQEvent::RightButton ) + if( me->button() == Qt::RightButton ) { emit rightClicked( m_account, TQPoint( me->globalX(), me->globalY() ) ); } - else if( me->button() == TQEvent::LeftButton ) + else if( me->button() == Qt::LeftButton ) { emit leftClicked( m_account, TQPoint( me->globalX(), me->globalY() ) ); } diff --git a/kopete/kopete/kopeteaccountstatusbaricon.h b/kopete/kopete/kopeteaccountstatusbaricon.h index 503008ff..a660a63c 100644 --- a/kopete/kopete/kopeteaccountstatusbaricon.h +++ b/kopete/kopete/kopeteaccountstatusbaricon.h @@ -30,15 +30,16 @@ class Account; /** * @author Duncan Mac-Vicar P. */ -class KopeteAccountStatusBarIcon : public QLabel +class KopeteAccountStatusBarIcon : public TQLabel { Q_OBJECT + TQ_OBJECT public: /** * Create a statusbar icon. */ - KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *parent, + KopeteAccountStatusBarIcon( Kopete::Account *acc, TQWidget *tqparent, const char *name = 0 ); ~KopeteAccountStatusBarIcon(); diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index 3db6c51f..d23c74f7 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -104,7 +104,7 @@ KopeteApplication::~KopeteApplication() void KopeteApplication::slotLoadPlugins() { - // we have to load the address book early, because calling this enters the Qt event loop when there are remote resources. + // we have to load the address book early, because calling this enters the TQt event loop when there are remote resources. // The plugin manager is written with the assumption that Kopete will not reenter the event loop during plugin load, // otherwise lots of things break as plugins are loaded, then contacts are added to incompletely initialised MCLVIs Kopete::KABCPersistence::self()->addressBook(); @@ -221,7 +221,7 @@ void KopeteApplication::slotAllPluginsLoaded() for ( QCStringList::ConstIterator it = connectArgsC.begin(); it != connectArgsC.end(); ++it ) { - TQStringList split = TQStringList::split( ',', TQString::fromLatin1( *it ) ); + TQStringList split = TQStringList::split( ',', TQString::tqfromLatin1( *it ) ); for ( TQStringList::ConstIterator it2 = split.begin(); it2 != split.end(); ++it2 ) { @@ -231,7 +231,7 @@ void KopeteApplication::slotAllPluginsLoaded() for ( TQStringList::ConstIterator i = connectArgs.begin(); i != connectArgs.end(); ++i ) { - TQRegExp rx( TQString::fromLatin1( "([^\\|]*)\\|\\|(.*)" ) ); + TQRegExp rx( TQString::tqfromLatin1( "([^\\|]*)\\|\\|(.*)" ) ); rx.search( *i ); TQString protocolId = rx.cap( 1 ); TQString accountId = rx.cap( 2 ); @@ -285,10 +285,10 @@ int KopeteApplication::newInstance() */ setMainWidget( m_mainWindow ); - int kUniqAppReturnCode = KUniqueApplication::newInstance(); + int kUnitqAppReturnCode = KUniqueApplication::newInstance(); setMainWidget( 0L ); - return kUniqAppReturnCode; + return kUnitqAppReturnCode; } void KopeteApplication::handleURLArgs() @@ -328,7 +328,7 @@ void KopeteApplication::quitKopete() } -void KopeteApplication::commitData( QSessionManager &sm ) +void KopeteApplication::commitData( TQSessionManager &sm ) { m_isShuttingDown = true; KUniqueApplication::commitData( sm ); diff --git a/kopete/kopete/kopeteapplication.h b/kopete/kopete/kopeteapplication.h index 201b1ac7..5fa10549 100644 --- a/kopete/kopete/kopeteapplication.h +++ b/kopete/kopete/kopeteapplication.h @@ -29,7 +29,7 @@ #include class KopeteWindow; -class QSessionManager; +class TQSessionManager; class TQMimeSourceFactory; namespace Kopete @@ -43,6 +43,7 @@ namespace Kopete class KopeteApplication : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: KopeteApplication(); @@ -61,11 +62,11 @@ public slots: * Quit Kopete, closing all the windows, which causes application shutdown * This method marks Kopete as 'shutting down' to avoid * showing the message box that Kopete will be left running in the - * system tray before calling qApp->quit(). + * system tray before calling tqApp->quit(). */ void quitKopete(); - virtual void commitData( QSessionManager &sm ); + virtual void commitData( TQSessionManager &sm ); /** * Load all plugins */ diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index 13696da1..3ff73e10 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -39,13 +39,13 @@ #include "systemtray.h" #include "kopeteprefs.h" -KopeteActiveLabel::KopeteActiveLabel( TQWidget *parent, const char *name ) - : KActiveLabel( parent, name ) +KopeteActiveLabel::KopeteActiveLabel( TQWidget *tqparent, const char *name ) + : KActiveLabel( tqparent, name ) { } -KopeteActiveLabel::KopeteActiveLabel( const TQString& text, TQWidget *parent, - const char *name ) : KActiveLabel( text, parent, name ) +KopeteActiveLabel::KopeteActiveLabel( const TQString& text, TQWidget *tqparent, + const char *name ) : KActiveLabel( text, tqparent, name ) { } @@ -78,7 +78,7 @@ KopeteBalloon::KopeteBalloon(const TQString &text, const TQString &pix) //TQLabel *mCaption = new TQLabel(text, this, "mCaption"); KopeteActiveLabel *mCaption = new KopeteActiveLabel(text, this, "mCaption"); mCaption->setPalette(TQToolTip::palette()); - mCaption->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + mCaption->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); if (!pix.isEmpty()) { @@ -136,7 +136,7 @@ void KopeteBalloon::setAnchor(const TQPoint &anchor) void KopeteBalloon::updateMask() { - TQRegion mask(10, 10, width() - 20, height() - 20); + TQRegion tqmask(10, 10, width() - 20, height() - 20); TQPoint corners[8] = { TQPoint(width() - 50, 10), @@ -156,11 +156,11 @@ void KopeteBalloon::updateMask() i * 16 * 90, 16 * 90); corner.resize(corner.size() + 1); corner.setPoint(corner.size() - 1, corners[i + 4]); - mask -= corner; + tqmask -= corner; } - // get screen-geometry for screen our anchor is on - // (geometry can differ from screen to screen! + // get screen-tqgeometry for screen our anchor is on + // (tqgeometry can differ from screen to screen! TQRect deskRect = KGlobalSettings::desktopGeometry(mAnchor); bool bottom = (mAnchor.y() + height()) > ((deskRect.y() + deskRect.height()-48)); @@ -173,8 +173,8 @@ void KopeteBalloon::updateMask() arrow.setPoint(2, TQPoint(right ? width() - 30 : 30, bottom ? height() - 10 : 10)); arrow.setPoint(3, arrow[0]); - mask += arrow; - setMask(mask); + tqmask += arrow; + setMask(tqmask); move( right ? mAnchor.x() - width() : ( mAnchor.x() < 0 ? 0 : mAnchor.x() ), bottom ? mAnchor.y() - height() : ( mAnchor.y() < 0 ? 0 : mAnchor.y() ) ); diff --git a/kopete/kopete/kopeteballoon.h b/kopete/kopete/kopeteballoon.h index fca7fa80..7b02404b 100644 --- a/kopete/kopete/kopeteballoon.h +++ b/kopete/kopete/kopeteballoon.h @@ -31,10 +31,11 @@ class KopeteActiveLabel : public KActiveLabel { Q_OBJECT + TQ_OBJECT public: - KopeteActiveLabel( TQWidget *parent = 0, const char* name = 0 ); - KopeteActiveLabel( const TQString& text, TQWidget *parent = 0, const char* name = 0 ); + KopeteActiveLabel( TQWidget *tqparent = 0, const char* name = 0 ); + KopeteActiveLabel( const TQString& text, TQWidget *tqparent = 0, const char* name = 0 ); public slots: virtual void openLink( const TQString &link ); @@ -48,9 +49,10 @@ public slots: * @author Malte Starostik * @author Duncan Mac-Vicar Prett */ -class KopeteBalloon : public QWidget +class KopeteBalloon : public TQWidget { Q_OBJECT + TQ_OBJECT public: KopeteBalloon(const TQString &text, const TQString &pic); diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index a9cd3c0c..9df7052c 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -17,7 +17,7 @@ #include "kopeteeditglobalidentitywidget.h" -// Qt include +// TQt include #include #include #include @@ -42,10 +42,10 @@ #include "kopetemetacontact.h" -ClickableLabel::ClickableLabel(TQWidget *parent, const char *name) - : TQLabel(parent, name) +ClickableLabel::ClickableLabel(TQWidget *tqparent, const char *name) + : TQLabel(tqparent, name) { - setCursor(TQCursor(Qt::PointingHandCursor)); + setCursor(TQCursor(TQt::PointingHandCursor)); } void ClickableLabel::mouseReleaseEvent(TQMouseEvent *event) @@ -73,8 +73,8 @@ public: TQString lastNickname; }; -KopeteEditGlobalIdentityWidget::KopeteEditGlobalIdentityWidget(TQWidget *parent, const char *name) - : TQWidget(parent, name) +KopeteEditGlobalIdentityWidget::KopeteEditGlobalIdentityWidget(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { d = new Private; @@ -100,7 +100,7 @@ void KopeteEditGlobalIdentityWidget::setIconSize(int size) d->labelPicture->setMinimumSize(TQSize(d->iconSize, d->iconSize)); d->labelPicture->setMaximumSize(TQSize(d->iconSize, d->iconSize)); if( !d->myself->photo().isNull() ) - d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin))); + d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin))); } void KopeteEditGlobalIdentityWidget::iconSizeChanged() @@ -115,7 +115,7 @@ void KopeteEditGlobalIdentityWidget::iconSizeChanged() d->labelPicture->setMinimumSize(TQSize(d->iconSize, d->iconSize)); d->labelPicture->setMaximumSize(TQSize(d->iconSize, d->iconSize)); if( !d->myself->photo().isNull() ) - d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin))); + d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin))); } } @@ -149,7 +149,7 @@ void KopeteEditGlobalIdentityWidget::updateGUI(const TQString &key, const TQVari // Update the picture and the tooltip if( !d->myself->photo().isNull() ) { - d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin))); + d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin))); TQToolTip::add(d->labelPicture, ""); } } @@ -163,7 +163,7 @@ void KopeteEditGlobalIdentityWidget::updateGUI(const TQString &key, const TQVari void KopeteEditGlobalIdentityWidget::photoClicked() { - KURL photoURL = KFileDialog::getImageOpenURL(TQString::null, this, i18n("Global Photo")); + KURL photoURL = KFileDialog::getImageOpenURL(TQString(), this, i18n("Global Photo")); if(photoURL.isEmpty()) return; @@ -183,7 +183,7 @@ void KopeteEditGlobalIdentityWidget::photoClicked() if(photo.width() > 96 || photo.height() > 96) { // Scale and crop the picture. - photo = photo.smoothScale( 96, 96, TQImage::ScaleMin ); + photo = photo.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(photo.width() < photo.height()) photo = photo.copy((photo.width()-photo.height())/2, 0, 96, 96); @@ -194,7 +194,7 @@ void KopeteEditGlobalIdentityWidget::photoClicked() else if (photo.width() < 32 || photo.height() < 32) { // Scale and crop the picture. - photo = photo.smoothScale( 32, 32, TQImage::ScaleMin ); + photo = photo.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(photo.width() < photo.height()) photo = photo.copy((photo.width()-photo.height())/2, 0, 32, 32); @@ -227,7 +227,7 @@ void KopeteEditGlobalIdentityWidget::lineNicknameTextChanged(const TQString &tex // Display the nickname in red if they are any change. if(text != d->lastNickname) { - d->lineNickname->setPaletteForegroundColor(Qt::red); + d->lineNickname->setPaletteForegroundColor(TQt::red); } // The nickname re-become like it was before, reset the palette. else diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.h b/kopete/kopete/kopeteeditglobalidentitywidget.h index 49a4e564..00f1d7fc 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.h +++ b/kopete/kopete/kopeteeditglobalidentitywidget.h @@ -30,16 +30,17 @@ * * @author Michaël Larouche */ -class KopeteEditGlobalIdentityWidget : public QWidget +class KopeteEditGlobalIdentityWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KopeteEditGlobalIdentityWidget(TQWidget *parent = 0, const char *name = 0); + KopeteEditGlobalIdentityWidget(TQWidget *tqparent = 0, const char *name = 0); virtual ~KopeteEditGlobalIdentityWidget(); public slots: /** - * This slot is called when the "parent" toolbar change its icon size. + * This slot is called when the "tqparent" toolbar change its icon size. */ void iconSizeChanged(); /** @@ -83,11 +84,12 @@ class TQMouseEvent; * * @author Michaël Larouche */ -class ClickableLabel : public QLabel +class ClickableLabel : public TQLabel { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - ClickableLabel(TQWidget *parent = 0, const char *name = 0); + ClickableLabel(TQWidget *tqparent = 0, const char *name = 0); signals: void clicked(); diff --git a/kopete/kopete/kopeteiface.cpp b/kopete/kopete/kopeteiface.cpp index 426424ff..2055e002 100644 --- a/kopete/kopete/kopeteiface.cpp +++ b/kopete/kopete/kopeteiface.cpp @@ -74,7 +74,7 @@ TQStringList KopeteIface::onlineContacts() return result; } -TQStringList KopeteIface::contactsStatus() +TQStringList KopeteIface::contactstqStatus() { return Kopete::ContactList::self()->contactStatuses(); } @@ -103,7 +103,7 @@ TQString KopeteIface::messageContact( const TQString &contactId, const TQString return "The contact is not reachable"; //Default return value - return TQString::null; + return TQString(); } /* void KopeteIface::sendFile(const TQString &displayName, const KURL &sourceURL, @@ -114,7 +114,7 @@ void KopeteIface::sendFile(const TQString &displayName, const KURL &sourceURL, */ -TQString KopeteIface::onlineStatus( const TQString &metaContactId ) +TQString KopeteIface::onlinetqStatus( const TQString &metaContactId ) { Kopete::MetaContact *m = Kopete::ContactList::self()->metaContact( metaContactId ); if( m ) @@ -159,7 +159,7 @@ bool KopeteIface::addContact( const TQString &protocolName, const TQString &acco // even be at the computer. We just need to add the contact --Matt if( KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n( "An external application is attempting to add the " " '%1' contact '%2' to your contact list. Do you want to allow this?" ) - .arg( protocolName ).arg( contactName ), i18n( "Allow Contact?" ), i18n("Allow"), i18n("Reject") ) == 3 ) // Yes == 3 + .tqarg( protocolName ).tqarg( contactName ), i18n( "Allow Contact?" ), i18n("Allow"), i18n("Reject") ) == 3 ) // Yes == 3 { //User said Yes myAccount->addContact( contactId, contactName, realGroup, Kopete::Account::DontChangeKABC); @@ -173,7 +173,7 @@ bool KopeteIface::addContact( const TQString &protocolName, const TQString &acco //This protocol is not loaded KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("An external application has attempted to add a contact using " - " the %1 protocol, which either does not exist or is not loaded.").arg( protocolName ), + " the %1 protocol, which either does not exist or is not loaded.").tqarg( protocolName ), i18n("Missing Protocol")); return false; diff --git a/kopete/kopete/kopeteiface.h b/kopete/kopete/kopeteiface.h index 46a52166..a5ce3855 100644 --- a/kopete/kopete/kopeteiface.h +++ b/kopete/kopete/kopeteiface.h @@ -42,23 +42,23 @@ k_dcop: TQStringList contactFileProtocols(const TQString &displayName); /*void sendFile(const TQString &displayName, const KURL &sourceURL, - const TQString &altFileName = TQString::null, uint fileSize = 0);*/ + const TQString &altFileName = TQString(), uint fileSize = 0);*/ // FIXME: Do we *need* this one? Sounds error prone to me, because - // nicknames can contain parentheses too. - // Better add a contactStatus( const TQString id ) I'd say - Martijn - TQStringList contactsStatus(); + // nicknames can contain tqparentheses too. + // Better add a contacttqStatus( const TQString id ) I'd say - Martijn + TQStringList contactstqStatus(); /** * Open a chat to a contact, and optionally set some initial text */ - TQString messageContact( const TQString &contactId, const TQString &messageText = TQString::null ); + TQString messageContact( const TQString &contactId, const TQString &messageText = TQString() ); /** * Describe the status of a contact by their metaContactId, * aka their uid in KABC. */ - TQString onlineStatus( const TQString &metaContactId ); + TQString onlinetqStatus( const TQString &metaContactId ); /** * Message a contact by their metaContactId, aka their uid in KABC. @@ -76,7 +76,7 @@ k_dcop: * @return Weather or not the contact was added successfully */ bool addContact( const TQString &protocolName, const TQString &accountId, const TQString &contactId, - const TQString &displayName, const TQString &groupName = TQString::null ); + const TQString &displayName, const TQString &groupName = TQString() ); /** * return a list of alls accounts. diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 08d3ab5b..8dbb1dad 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -82,8 +82,8 @@ #include "kopeteeditglobalidentitywidget.h" //BEGIN GlobalStatusMessageIconLabel -GlobalStatusMessageIconLabel::GlobalStatusMessageIconLabel(TQWidget *parent, const char *name) - : TQLabel(parent, name) +GlobalStatusMessageIconLabel::GlobalStatusMessageIconLabel(TQWidget *tqparent, const char *name) + : TQLabel(tqparent, name) {} void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) @@ -120,8 +120,8 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event ) * (session) quit. */ -KopeteWindow::KopeteWindow( TQWidget *parent, const char *name ) -: KMainWindow( parent, name, WType_TopLevel ) +KopeteWindow::KopeteWindow( TQWidget *tqparent, const char *name ) +: KMainWindow( tqparent, name, WType_TopLevel ) { // Applications should ensure that their StatusBar exists before calling createGUI() // so that the StatusBar is always correctly positioned when KDE is configured to use @@ -209,7 +209,7 @@ void KopeteWindow::initActions() actionCollection(), "AddContact" ); actionAddContact->setDelayed( false ); // this signal mapper is needed to call slotAddContact with the correct arguments - addContactMapper = new TQSignalMapper( this ); + addContactMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( addContactMapper, TQT_SIGNAL( mapped( const TQString & ) ), this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) ); @@ -220,10 +220,10 @@ void KopeteWindow::initActions() */ actionDisconnect = new KAction( i18n( "O&ffline" ), "connect_no", - 0, this, TQT_SLOT( slotDisconnectAll() ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ), actionCollection(), "DisconnectAll" ); - actionExportContacts = new KAction( i18n( "&Export Contacts..." ), "", 0, this, + actionExportContacts = new KAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" ); /* the connection menu has been replaced by the set status menu @@ -238,16 +238,16 @@ void KopeteWindow::initActions() actionDisconnect->setEnabled(false); selectAway = new KAction( i18n("&Away"), SmallIcon("kopeteaway"), 0, - this, TQT_SLOT( slotGlobalAway() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(), "SetAwayAll" ); selectBusy = new KAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0, - this, TQT_SLOT( slotGlobalBusy() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(), "SetBusyAll" ); actionSetInvisible = new KAction( i18n( "&Invisible" ), "kopeteavailable", 0 , - this, TQT_SLOT( slotSetInvisibleAll() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(), "SetInvisibleAll" ); @@ -258,12 +258,12 @@ void KopeteWindow::initActions() "SetAvailableAll" );*/ actionSetAvailable = new KAction( i18n("&Online"), - SmallIcon("kopeteavailable"), 0, this, + SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAvailable() ), actionCollection(), "SetAvailableAll" ); - actionAwayMenu = new KActionMenu( i18n("&Set Status"), "kopeteavailable", - actionCollection(), "Status" ); + actionAwayMenu = new KActionMenu( i18n("&Set tqStatus"), "kopeteavailable", + actionCollection(), "tqStatus" ); actionAwayMenu->setDelayed( false ); actionAwayMenu->insert(actionSetAvailable); actionAwayMenu->insert(selectAway); @@ -273,25 +273,25 @@ void KopeteWindow::initActions() actionPrefs = KopeteStdAction::preferences( actionCollection(), "settings_prefs" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" ); - statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar"); + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" ); + statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar"); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" ); - new KAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, this, + new KAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" ); - new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, + new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" ); - KStdAction::configureToolbars( this, TQT_SLOT(slotConfToolbar()), actionCollection() ); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" ); + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() ); + KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" ); actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U, - this, TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" ); + TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" ); actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G, - this, TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" ); + TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" ); actionShowOffliners->setCheckedState(i18n("Hide Offline &Users")); actionShowEmptyGroups->setCheckedState(i18n("Hide Empty &Groups")); @@ -306,7 +306,7 @@ void KopeteWindow::initActions() // quick search bar - clear button KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - 0, searchBar, TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" ); + 0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n" "Resets the quick search so that all contacts and groups are shown again." ) ); @@ -317,24 +317,24 @@ void KopeteWindow::initActions() editGlobalAction->setAutoSized( true ); // KActionMenu for selecting the global status message(kopeteonlinestatus_0) - KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" ); + KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set tqStatus Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" ); setStatusMenu->setDelayed( false ); connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) ); connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) ); // sync actions, config and prefs-dialog - connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigChanged()) ); slotConfigChanged(); - globalAccel = new KGlobalAccel( this ); - globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), + globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); + globalAccel->insert( TQString::tqfromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) ); - globalAccel->insert( TQString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"), - CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, TQT_SLOT(slotShowHide()) ); + globalAccel->insert( TQString::tqfromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"), + CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()) ); - globalAccel->insert( TQString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"), - CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, TQT_SLOT(slotToggleAway()) ); + globalAccel->insert( TQString::tqfromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"), + CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAway()) ); globalAccel->readSettings(); globalAccel->updateConnections(); @@ -722,12 +722,12 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account ) TQT_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *, const TQPoint & ) ) ); - m_accountStatusBarIcons.insert( account, sbIcon ); + m_accountStatusBarIcons.insert( account, TQT_TQOBJECT(sbIcon) ); slotAccountStatusIconChanged( account->myself() ); // add an item for this account to the add contact actionmenu TQString s = "actionAdd%1Contact"; - s.arg( account->accountId() ); + s.tqarg( account->accountId() ); KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() ); addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() ); actionAddContact->insert( action ); @@ -744,7 +744,7 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account) } // the (void*) is to remove the const. i don't know why TQPtrList doesn't accept const ptr as key. - KopeteAccountStatusBarIcon *sbIcon = static_cast( m_accountStatusBarIcons[ (void*)account ] ); + KopeteAccountStatusBarIcon *sbIcon = static_cast( TQT_TQWIDGET(m_accountStatusBarIcons[ (void*)account ]) ); if( !sbIcon ) return; @@ -756,7 +756,7 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account) // update add contact actionmenu TQString s = "actionAdd%1Contact"; - s.arg( account->accountId() ); + s.tqarg( account->accountId() ); // KAction * action = actionCollection()->action( account->accountId() ); Kopete::Account * myAccount = const_cast< Kopete::Account * > ( account ); KAction * action = static_cast< KAction *>( myAccount->child( s.latin1() ) ); @@ -779,7 +779,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact ) kdDebug( 14000 ) << k_funcinfo << contact->property( Kopete::Global::Properties::self()->awayMessage() ).value() << endl; // update the global status label if the change doesn't // TQString newAwayMessage = contact->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); - Kopete::OnlineStatus status = contact->onlineStatus(); + Kopete::OnlineStatus status = contact->onlinetqStatus(); /* if ( status.status() != Kopete::OnlineStatus::Connecting ) { TQString globalMessage = m_globalStatusMessage->text(); @@ -816,7 +816,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact ) } } - KopeteAccountStatusBarIcon *i = static_cast( m_accountStatusBarIcons[ contact->account() ] ); + KopeteAccountStatusBarIcon *i = static_cast( TQT_TQWIDGET(m_accountStatusBarIcons[ contact->account() ]) ); if( !i ) return; @@ -861,17 +861,17 @@ void KopeteWindow::makeTrayToolTip() { TQToolTip::remove(m_tray); - TQString tt = TQString::fromLatin1(""); + TQString tt = TQString::tqfromLatin1(""); TQPtrList accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *a = accounts.first(); a; a = accounts.next()) { Kopete::Contact *self = a->myself(); tt += i18n( "Account tooltip information: ICON PROTOCOL: NAME (STATUS)
", " %1: %2 (%5)
" ) - .arg( a->protocol()->displayName() ).arg( a->accountLabel(), KURL::encode_string( a->protocol()->pluginId() ), - KURL::encode_string( a->accountId() ), self->onlineStatus().description() ); + .tqarg( a->protocol()->displayName() ).tqarg( a->accountLabel(), KURL::encode_string( a->protocol()->pluginId() ), + KURL::encode_string( a->accountId() ), self->onlinetqStatus().description() ); } - tt += TQString::fromLatin1(""); + tt += TQString::tqfromLatin1(""); TQToolTip::add(m_tray, tt); } } @@ -931,7 +931,7 @@ void KopeteWindow::showEvent( TQShowEvent * ) void KopeteWindow::slotAutoHide() { - if ( this->geometry().contains( TQCursor::pos() ) == false ) + if ( this->tqgeometry().tqcontains( TQCursor::pos() ) == false ) { /* The autohide-timer doesn't need to emit * timeouts when the window is hidden already. */ @@ -954,11 +954,11 @@ void KopeteWindow::setStatusMessage( const TQString & message ) for ( TQPtrListIterator it( Kopete::AccountManager::self()->accounts() ); it.current(); ++it ) { Kopete::Contact *self = it.current()->myself(); - bool isInvisible = self && self->onlineStatus().status() == Kopete::OnlineStatus::Invisible; + bool isInvisible = self && self->onlinetqStatus().status() == Kopete::OnlineStatus::Invisible; if ( it.current()->isConnected() && !isInvisible ) { changed = true; - it.current()->setOnlineStatus( self->onlineStatus(), message ); + it.current()->setOnlineStatus( self->onlinetqStatus(), message ); } } Kopete::Away::getInstance()->setGlobalAwayMessage( message ); @@ -968,13 +968,13 @@ void KopeteWindow::setStatusMessage( const TQString & message ) void KopeteWindow::slotBuildStatusMessageMenu() { - TQObject * senderObj = const_cast( sender() ); - m_globalStatusMessageMenu = static_cast( senderObj ); + TQObject * senderObj = TQT_TQOBJECT(const_cast( sender() )); + m_globalStatusMessageMenu = static_cast( TQT_TQWIDGET(senderObj) ); m_globalStatusMessageMenu->clear(); // pop up a menu containing the away messages, and a lineedit // see kopeteaway //messageMenu = new KPopupMenu( this ); -// messageMenu->insertTitle( i18n( "Status Message" ) ); +// messageMenu->insertTitle( i18n( "tqStatus Message" ) ); TQHBox * newMessageBox = new TQHBox( 0 ); newMessageBox->setMargin( 1 ); TQLabel * newMessagePix = new TQLabel( newMessageBox ); @@ -985,12 +985,12 @@ void KopeteWindow::slotBuildStatusMessageMenu() m_newMessageEdit->setText(Kopete::Away::message()); newMessageBox->setFocusProxy( m_newMessageEdit ); - newMessageBox->setFocusPolicy( TQWidget::ClickFocus ); + newMessageBox->setFocusPolicy( TQ_ClickFocus ); /* newMessageLabel->setFocusProxy( newMessageEdit ); newMessageLabel->setBuddy( newMessageEdit ); - newMessageLabel->setFocusPolicy( TQWidget::ClickFocus );*/ + newMessageLabel->setFocusPolicy( TQ_ClickFocus );*/ newMessagePix->setFocusProxy( m_newMessageEdit ); - newMessagePix->setFocusPolicy( TQWidget::ClickFocus ); + newMessagePix->setFocusPolicy( TQ_ClickFocus ); connect( m_newMessageEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotNewStatusMessageEntered() ) ); m_globalStatusMessageMenu->insertItem( newMessageBox ); diff --git a/kopete/kopete/kopetewindow.h b/kopete/kopete/kopetewindow.h index 494f6f08..30bd502b 100644 --- a/kopete/kopete/kopetewindow.h +++ b/kopete/kopete/kopetewindow.h @@ -61,9 +61,10 @@ class Protocol; class KopeteWindow : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - KopeteWindow ( TQWidget *parent = 0, const char *name = 0 ); + KopeteWindow ( TQWidget *tqparent = 0, const char *name = 0 ); ~KopeteWindow(); virtual bool eventFilter( TQObject* o, TQEvent* e ); @@ -174,7 +175,7 @@ private slots: void slotAllPluginsLoaded(); /** - * Protected slot to setup the Set Global Status Message menu. + * Protected slot to setup the Set Global tqStatus Message menu. */ void slotBuildStatusMessageMenu(); void slotStatusMessageSelected( int i ); @@ -262,11 +263,12 @@ private: }; -class GlobalStatusMessageIconLabel : public QLabel +class GlobalStatusMessageIconLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - GlobalStatusMessageIconLabel(TQWidget *parent = 0, const char *name = 0); + GlobalStatusMessageIconLabel(TQWidget *tqparent = 0, const char *name = 0); protected: void mouseReleaseEvent(TQMouseEvent *event); diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index d71b3816..82b55015 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -41,16 +41,16 @@ KopeteSystemTray* KopeteSystemTray::s_systemTray = 0L; -KopeteSystemTray* KopeteSystemTray::systemTray( TQWidget *parent, const char* name ) +KopeteSystemTray* KopeteSystemTray::systemTray( TQWidget *tqparent, const char* name ) { if( !s_systemTray ) - s_systemTray = new KopeteSystemTray( parent, name ); + s_systemTray = new KopeteSystemTray( tqparent, name ); return s_systemTray; } -KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name) - : KSystemTray(parent,name) +KopeteSystemTray::KopeteSystemTray(TQWidget* tqparent, const char* name) + : KSystemTray(tqparent,name) { // kdDebug(14010) << "Creating KopeteSystemTray" << endl; TQToolTip::add( this, kapp->aboutData()->shortDescription() ); @@ -72,15 +72,15 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name) this, TQT_SLOT(slotReevaluateAccountStates())); // the slot called by default by the quit action, KSystemTray::maybeQuit(), - // just closes the parent window, which is hard to distinguish in that window's closeEvent() + // just closes the tqparent window, which is hard to distinguish in that window's closeEvent() // from a click on the window's close widget // in the quit case, we want to quit the application - // in the close widget click case, we only want to hide the parent window + // in the close widget click case, we only want to hide the tqparent window // so instead, we make it call our general purpose quit slot on the window, which causes a window close and everything else we need // KDE4 - app will have to listen for quitSelected instead KAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); - KopeteWindow *myParent = static_cast( parent ); + KopeteWindow *myParent = static_cast( tqparent ); connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) ); //setPixmap(mKopeteIcon); @@ -100,8 +100,8 @@ KopeteSystemTray::~KopeteSystemTray() void KopeteSystemTray::mousePressEvent( TQMouseEvent *me ) { if ( - (me->button() == TQEvent::MidButton || - (me->button() == TQEvent::LeftButton && KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) && + (me->button() == Qt::MidButton || + (me->button() == Qt::LeftButton && KopetePrefs::prefs()->trayflashNotifyLeftClickOpensMessage())) && mIsBlinking ) { mouseDoubleClickEvent( me ); @@ -164,7 +164,7 @@ void KopeteSystemTray::startBlink( const TQMovie &movie ) void KopeteSystemTray::startBlink() { if ( mMovie.isNull() ) - mMovie = KGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel ); + mMovie = KGlobal::iconLoader()->loadMovie( TQString::tqfromLatin1( "newmessage" ), KIcon::Panel ); startBlink( mMovie ); } @@ -302,7 +302,7 @@ void KopeteSystemTray::addBalloon() m_balloon = new KopeteBalloon( i18n( "New Message from %1:
\"%2\"" ) - .arg( TQStyleSheet::escape( msgFrom ), msgText ), TQString::null ); + .tqarg( TQStyleSheet::escape( msgFrom ), msgText ), TQString() ); connect(m_balloon, TQT_SIGNAL(signalBalloonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); connect(m_balloon, TQT_SIGNAL(signalButtonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); connect(m_balloon, TQT_SIGNAL(signalIgnoreButtonClicked()), mBalloonEventList.first() , TQT_SLOT(ignore())); @@ -343,12 +343,12 @@ void KopeteSystemTray::slotReevaluateAccountStates() if (!c) continue; - if (c->onlineStatus().status() == Kopete::OnlineStatus::Online) + if (c->onlinetqStatus().status() == Kopete::OnlineStatus::Online) { bOnline = true; // at least one contact is online } - else if (c->onlineStatus().status() == Kopete::OnlineStatus::Away - || c->onlineStatus().status() == Kopete::OnlineStatus::Invisible) + else if (c->onlinetqStatus().status() == Kopete::OnlineStatus::Away + || c->onlinetqStatus().status() == Kopete::OnlineStatus::Invisible) { bAway = true; // at least one contact is away or invisible } @@ -397,7 +397,7 @@ TQString KopeteSystemTray::squashMessage( const Kopete::Message& msg ) // Escape it after snipping it to not snip entities msgText =msg.plainBody() ; if( msgText.length() > 30 ) - msgText = msgText.left( 30 ) + TQString::fromLatin1( " ..." ); + msgText = msgText.left( 30 ) + TQString::tqfromLatin1( " ..." ); msgText=Kopete::Message::escape(msgText); } else @@ -411,20 +411,20 @@ TQString KopeteSystemTray::squashMessage( const Kopete::Message& msg ) { TQString urlWithoutProtocol = rx.cap( 4 ); shorterUrl = urlWithoutProtocol.left( 27 ) - + TQString::fromLatin1( "... " ); + + TQString::tqfromLatin1( "... " ); } else { shorterUrl = fullUrl.left( 27 ) - + TQString::fromLatin1( "... " ); + + TQString::tqfromLatin1( "... " ); } // remove message text - msgText = TQString::fromLatin1( "... " ) + + msgText = TQString::tqfromLatin1( "... " ) + rx.cap( 1 ) + - TQString::fromLatin1( " ..." ); + TQString::tqfromLatin1( " ..." ); // find last occurrence of URL (the one inside the tag) - int revUrlOffset = msgText.findRev( fullUrl ); - msgText.replace( revUrlOffset, + int revUrlOffset = msgText.tqfindRev( fullUrl ); + msgText.tqreplace( revUrlOffset, fullUrl.length(), shorterUrl ); } } diff --git a/kopete/kopete/systemtray.h b/kopete/kopete/systemtray.h index a723ec7d..0eaca276 100644 --- a/kopete/kopete/systemtray.h +++ b/kopete/kopete/systemtray.h @@ -42,12 +42,13 @@ class KopeteBalloon; class KopeteSystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT public: /** * Retrieve the system tray instance */ - static KopeteSystemTray* systemTray( TQWidget* parent = 0, const char* name = 0 ); + static KopeteSystemTray* systemTray( TQWidget* tqparent = 0, const char* name = 0 ); ~KopeteSystemTray(); @@ -79,7 +80,7 @@ private slots: void addBalloon(); private: - KopeteSystemTray( TQWidget* parent, const char* name ); + KopeteSystemTray( TQWidget* tqparent, const char* name ); TQString squashMessage( const Kopete::Message& msgText ); void removeBalloonEvent(Kopete::MessageEvent *); diff --git a/kopete/libkopete/API-TODO b/kopete/libkopete/API-TODO index ea63082b..4914b00c 100644 --- a/kopete/libkopete/API-TODO +++ b/kopete/libkopete/API-TODO @@ -178,7 +178,7 @@ Richard's proposal: (email questions to the list or to kde@metafoo.co.uk) order) by the object creating the filter chain. it either returns a new filter for the chain, or returns NULL (meaning this filter is not needed in this chain). - - the signals in one filter are connected to the slots in the next. any + - the Q_SIGNALS in one filter are connected to the Q_SLOTS in the next. any sent/received message is handed to the first filter in the appropriate chain. - how long does a filter chain live for? diff --git a/kopete/libkopete/avdevice/kxv.cpp b/kopete/libkopete/avdevice/kxv.cpp index f573bd50..33ea9391 100644 --- a/kopete/libkopete/avdevice/kxv.cpp +++ b/kopete/libkopete/avdevice/kxv.cpp @@ -338,7 +338,7 @@ KXvDevice::KXvDevice() xv_attr = NULL; xv_port = -1; xv_encoding = -1; - xv_name = TQString::null; + xv_name = TQString(); xv_type = -1; xv_adaptor = -1; _shm = false; diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index d8d91602..a85589ab 100644 --- a/kopete/libkopete/avdevice/qvideo.cpp +++ b/kopete/libkopete/avdevice/qvideo.cpp @@ -64,7 +64,7 @@ unsigned int QVideo::bytesppForFormat(ImageFormat fmt) bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel) { XVisualInfo *vi_in, vi_out; - long mask = VisualScreenMask; + long tqmask = VisualScreenMask; int nvis = 0; ImageFormat p = FORMAT_NONE; @@ -72,7 +72,7 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b int d = 0; vi_out.screen = TQPaintDevice::x11AppScreen(); - vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); + vi_in = XGetVisualInfo(qt_xdisplay(), tqmask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { diff --git a/kopete/libkopete/avdevice/qvideo.h b/kopete/libkopete/avdevice/qvideo.h index d49fecbf..5b27f31a 100644 --- a/kopete/libkopete/avdevice/qvideo.h +++ b/kopete/libkopete/avdevice/qvideo.h @@ -24,8 +24,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef QVIDEO_H -#define QVIDEO_H +#ifndef TQVIDEO_H +#define TQVIDEO_H class QVideo { @@ -64,5 +64,5 @@ public: static bool findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel); }; -#endif //QVIDEO_H +#endif //TQVIDEO_H diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 05bbf209..7f4c677d 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -40,10 +40,10 @@ extern "C" { #endif #ifdef HAVE_GL -class QVideoStreamGLWidget : public QGLWidget +class QVideoStreamGLWidget : public TQGLWidget { public: - QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0); + QVideoStreamGLWidget(TQWidget* tqparent = 0, const char* name = 0); virtual ~QVideoStreamGLWidget(); void setInputSize(const TQSize& sz); @@ -213,7 +213,7 @@ void QVideoStream::init() d->shmh.shmaddr = (char *)shmat(d->shmh.shmid, 0, 0); d->xim->data = (char*)d->shmh.shmaddr; d->shmh.readOnly = False; - Status s = XShmAttach(_w->x11Display(), &(d->shmh)); + tqStatus s = XShmAttach(_w->x11Display(), &(d->shmh)); if (s) { XSync(_w->x11Display(), False); shmctl(d->shmh.shmid, IPC_RMID, 0); @@ -235,7 +235,7 @@ void QVideoStream::init() } d->xim = XCreateImage(_w->x11Display(), - (Visual*)_w->x11Visual(), + (Visual*)TQT_TQPAINTDEVICE(_w)->x11Visual(), _w->x11Depth(), ZPixmap, 0, 0, _inputSize.width(), @@ -532,10 +532,10 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img) // --------------------------------------------------------------------------------------- #ifdef HAVE_GL -QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) - : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name), +QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* tqparent, const char* name) + : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), tqparent, name), _tex(0), - _w(parent), + _w(tqparent), _glfun(false) { kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl; @@ -543,7 +543,7 @@ QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) connect(_w, TQT_SIGNAL(resized(int, int)), this, TQT_SLOT(resize(int, int))); - topLevelWidget()->installEventFilter(this); + tqtopLevelWidget()->installEventFilter(this); _glfunTimer = new TQTimer(); } @@ -563,10 +563,10 @@ bool QVideoStreamGLWidget::eventFilter(TQObject*, TQEvent* e) // For some reason, KeyPress does not work (yields 2), TQEvent::KeyPress is unknown... What the f...???? // I am too lazy to scan the header files for the reason. if(e->type() == 6) { - TQKeyEvent* ke = static_cast(e); - if(ke->key() == Qt::Key_Pause) { + TQKeyEvent* ke = TQT_TQKEYEVENT(e); + if(ke->key() == TQt::Key_Pause) { _glfunTimer->start(500, true); - } else if (_glfunTimer->isActive() && (ke->key() == Qt::Key_Escape)) { + } else if (_glfunTimer->isActive() && (ke->key() == TQt::Key_Escape)) { _glfun = !_glfun; } } @@ -594,7 +594,7 @@ void QVideoStreamGLWidget::initializeGL() kdDebug() << " Plane: " << f.plane() << endl; kdDebug() << " MAX_TEXTURE_SIZE: " << _maxGL << endl; - qglClearColor(Qt::black); + qglClearColor(TQt::black); glShadeModel(GL_FLAT); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); diff --git a/kopete/libkopete/avdevice/qvideostream.h b/kopete/libkopete/avdevice/qvideostream.h index 24b7fb40..90df7131 100644 --- a/kopete/libkopete/avdevice/qvideostream.h +++ b/kopete/libkopete/avdevice/qvideostream.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef _QVIDEOSTREAM_H -#define _QVIDEOSTREAM_H +#ifndef _TQVIDEOSTREAM_H +#define _TQVIDEOSTREAM_H #ifdef HAVE_CONFIG_H #include @@ -44,6 +44,7 @@ class QVideoStreamPrivate; class QVideoStream : public TQObject, public QVideo { Q_OBJECT + TQ_OBJECT public: QVideoStream(TQWidget *widget, const char* name = 0); diff --git a/kopete/libkopete/avdevice/videodevice.cpp b/kopete/libkopete/avdevice/videodevice.cpp index 00ab8266..ea235441 100644 --- a/kopete/libkopete/avdevice/videodevice.cpp +++ b/kopete/libkopete/avdevice/videodevice.cpp @@ -71,7 +71,7 @@ void VideoDevice::enumerateMenu (void) { if (0 == xioctl (VIDIOC_QUERYMENU, &querymenu)) { - kdDebug(14010) << k_funcinfo << " " << TQString::fromLocal8Bit((const char*)querymenu.name) << endl; + kdDebug(14010) << k_funcinfo << " " << TQString(TQString::fromLocal8Bit((const char*)querymenu.name)) << endl; } else { @@ -301,7 +301,7 @@ for (currentid = V4L2_CID_BASE; currentid < V4L2_CID_LASTP1; currentid++) continue; //kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << endl; -kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; +kdDebug(14010) << k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; /* switch (queryctrl.type) { @@ -332,7 +332,7 @@ for (currentid = V4L2_CID_PRIVATE_BASE;; currentid++) if (queryctrl.flags & V4L2_CTRL_FLAG_DISABLED) continue; -kdDebug(14010) << k_funcinfo << " Control: " << TQString::fromLocal8Bit((const char*)queryctrl.name) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; +kdDebug(14010) << k_funcinfo << " Control: " << TQString(TQString::fromLocal8Bit((const char*)queryctrl.name)) << " Values from " << queryctrl.minimum << " to " << queryctrl.maximum << " with steps of " << queryctrl.step << ". Default: " << queryctrl.default_value << endl; if (queryctrl.type == V4L2_CTRL_TYPE_MENU) enumerateMenu (); @@ -1336,7 +1336,7 @@ int VideoDevice::getImage(TQImage *qimage) if (b<0) b=0; if (b>255) b=255; uint *p = (uint*)qimage->scanLine(y)+x; - *p = qRgba(r,g,b,255); + *p = tqRgba(r,g,b,255); } // Jump to next line diff --git a/kopete/libkopete/avdevice/videodevicepool.cpp b/kopete/libkopete/avdevice/videodevicepool.cpp index 39f6a7c7..1107a54d 100644 --- a/kopete/libkopete/avdevice/videodevicepool.cpp +++ b/kopete/libkopete/avdevice/videodevicepool.cpp @@ -414,7 +414,7 @@ int VideoDevicePool::getFrame() } /*! - \fn VideoDevicePool::getQImage(TQImage *qimage) + \fn VideoDevicePool::getTQImage(TQImage *qimage) */ int VideoDevicePool::getImage(TQImage *qimage) { @@ -623,7 +623,7 @@ int VideoDevicePool::scanDevices() videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; - const QFileInfoList *list = videodevice_dir.entryInfoList(); + const TQFileInfoList *list = videodevice_dir.entryInfoList(); if (!list) { @@ -639,7 +639,7 @@ int VideoDevicePool::scanDevices() videodevice_dir.setSorting( TQDir::Name ); kdDebug(14010) << k_funcinfo << "Looking for devices in " << videodevice_dir_path << endl; - const QFileInfoList *list = videodevice_dir.entryInfoList(); + const TQFileInfoList *list = videodevice_dir.entryInfoList(); if (!list) { @@ -647,7 +647,7 @@ int VideoDevicePool::scanDevices() return EXIT_FAILURE; } - QFileInfoListIterator fileiterator ( *list ); + TQFileInfoListIterator fileiterator ( *list ); TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; @@ -655,7 +655,7 @@ int VideoDevicePool::scanDevices() { videodevice.setFileName(fileinfo->absFilePath()); kdDebug(14010) << k_funcinfo << "Found device " << videodevice.full_filename << endl; - videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile + videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile if(videodevice.isOpen()) { kdDebug(14010) << k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl; @@ -675,7 +675,7 @@ int VideoDevicePool::scanDevices() return EXIT_SUCCESS; } - QFileInfoListIterator fileiterator ( *list ); + TQFileInfoListIterator fileiterator ( *list ); TQFileInfo *fileinfo; kdDebug(14010) << k_funcinfo << "scanning devices in " << videodevice_dir_path << "..." << endl; @@ -683,7 +683,7 @@ int VideoDevicePool::scanDevices() { videodevice.setFileName(fileinfo->absFilePath()); kdDebug(14010) << k_funcinfo << "Found device " << videodevice.full_filename << endl; - videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using QFile + videodevice.open(); // It should be opened with O_NONBLOCK (it's a FIFO) but I dunno how to do it using TQFile if(videodevice.isOpen()) { kdDebug(14010) << k_funcinfo << "File " << videodevice.full_filename << " was opened successfuly" << endl; @@ -760,7 +760,7 @@ void VideoDevicePool::loadConfig() { KConfig *config = KGlobal::config(); config->setGroup("Video Device Settings"); - const TQString currentdevice = config->readEntry("Current Device", TQString::null); + const TQString currentdevice = config->readEntry("Current Device", TQString()); kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl; // m_current_device = 0; // Must check this thing because of the fact that multiple loadConfig in other methodas can do bad things. Watch out! @@ -833,7 +833,7 @@ void VideoDevicePool::saveConfig() } */ // Stores what is the current video device in use - const TQString currentdevice = TQString::fromLocal8Bit ( "Model %1 Device %2" ) .arg(m_videodevice[m_current_device].m_model) .arg(m_videodevice[m_current_device].m_modelindex); + const TQString currentdevice = TQString(TQString::fromLocal8Bit ( "Model %1 Device %2" )) .tqarg(m_videodevice[m_current_device].m_model) .tqarg(m_videodevice[m_current_device].m_modelindex); config->writeEntry( "Current Device", currentdevice); VideoDeviceVector::iterator vditerator; diff --git a/kopete/libkopete/clientiface.h b/kopete/libkopete/clientiface.h index 6a7229b7..ef1ac3f1 100644 --- a/kopete/libkopete/clientiface.h +++ b/kopete/libkopete/clientiface.h @@ -14,14 +14,14 @@ k_dcop: /** * Get the status of the connection to the given host. * @param host - * @return a NetworkStatus::EnumStatus representing the state of the connection to the given host + * @return a NetworktqStatus::EnumtqStatus representing the state of the connection to the given host */ - virtual int status( const TQString & host = TQString::null ) = 0; + virtual int status( const TQString & host = TQString() ) = 0; /** * Request a connection to the named host, registering the application's usage of this connection * @param host The hostname the client wants to connect to. * @param userInitiated Indicates whether the connection is a direct result of a user action or is a background task. Used by the daemon to decide whether to create an on-demand connection. - * @return An NetworkStatus::EnumRequestResult indicating whether the request was accepted + * @return An NetworktqStatus::EnumRequestResult indicating whether the request was accepted */ virtual int request( const TQString & host, bool userInitiated ) = 0; /** diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp index c394af0f..b17da677 100644 --- a/kopete/libkopete/compat/kpixmapregionselectordialog.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectordialog.cpp @@ -24,8 +24,8 @@ #include #include -KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *parent, - const char *name, bool modal ) : KDialogBase(parent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) +KPixmapRegionSelectorDialog::KPixmapRegionSelectorDialog(TQWidget *tqparent, + const char *name, bool modal ) : KDialogBase(tqparent, name, modal, i18n("Select Region of Image"), Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); new TQLabel(i18n("Please click and drag on the image to select the region of interest:"), vbox); @@ -40,9 +40,9 @@ KPixmapRegionSelectorDialog::~KPixmapRegionSelectorDialog() { } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -61,9 +61,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, TQ return rect; } -TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) +TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); @@ -83,9 +83,9 @@ TQRect KPixmapRegionSelectorDialog::getSelectedRegion(const TQPixmap &pixmap, in return rect; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); @@ -103,9 +103,9 @@ TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, TQ return image; } -TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent ) +TQImage KPixmapRegionSelectorDialog::getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent ) { - KPixmapRegionSelectorDialog dialog(parent); + KPixmapRegionSelectorDialog dialog(tqparent); dialog.pixmapRegionSelectorWidget()->setPixmap(pixmap); dialog.pixmapRegionSelectorWidget()->setSelectionAspectRatio(aspectRatioWidth,aspectRatioHeight); diff --git a/kopete/libkopete/compat/kpixmapregionselectordialog.h b/kopete/libkopete/compat/kpixmapregionselectordialog.h index ffc5551e..fbf2db6a 100644 --- a/kopete/libkopete/compat/kpixmapregionselectordialog.h +++ b/kopete/libkopete/compat/kpixmapregionselectordialog.h @@ -47,7 +47,7 @@ public: * later the setPixmap method of the KPixmapRegionSelectorWidget widget of * the new object. */ - KPixmapRegionSelectorDialog(TQWidget *parent=0L, const char *name=0L, + KPixmapRegionSelectorDialog(TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog @@ -68,7 +68,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -78,7 +78,7 @@ public: * @returns the selected rectangle, or an invalid rectangle if the user * pressed the Cancel button. */ - static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); + static TQRect getSelectedRegion(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -87,7 +87,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, TQWidget *tqparent = 0L ); /** * Creates a modal dialog, lets the user to select a region of the @p pixmap @@ -97,7 +97,7 @@ public: * @returns the selected image, or an invalid image if the user * pressed the Cancel button. */ - static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *parent = 0L ); + static TQImage getSelectedImage(const TQPixmap &pixmap, int aspectRatioWidth, int aspectRatioHeight, TQWidget *tqparent = 0L ); protected: KPixmapRegionSelectorWidget *m_pixmapSelectorWidget; diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index ada867bb..0468acdf 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -37,8 +37,8 @@ #include #include -KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, - const char *name) : TQWidget( parent, name) +KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *tqparent, + const char *name) : TQWidget( tqparent, name) { TQHBoxLayout * hboxLayout=new TQHBoxLayout( this ); @@ -47,7 +47,7 @@ KPixmapRegionSelectorWidget::KPixmapRegionSelectorWidget( TQWidget *parent, vboxLayout->addStretch(); m_label = new TQLabel(this, "pixmapHolder"); - m_label->setBackgroundMode( Qt::NoBackground ); + m_label->setBackgroundMode( TQt::NoBackground ); m_label->installEventFilter( this ); vboxLayout->addWidget(m_label); @@ -108,9 +108,9 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_linedPixmap = m_originalPixmap; painter.begin(&m_linedPixmap); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), - TQBrush( TQColor(255,255,255), Qt::BDiagPattern) ); + TQBrush( TQColor(255,255,255), TQt::BDiagPattern) ); painter.end(); TQImage image=m_linedPixmap.convertToImage(); @@ -125,7 +125,7 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_originalPixmap, m_selectedRegion ); painter.setPen( TQColor(255,255,255) ); - painter.setRasterOp( Qt::XorROP ); + painter.setRasterOp( TQt::XorROP ); painter.drawRect( m_selectedRegion ); @@ -211,7 +211,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; + //kdDebug() << TQString("click at %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; if ( mev->button() == RightButton ) { @@ -223,16 +223,16 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQCursor cursor; - if ( m_selectedRegion.contains( mev->pos() ) + if ( m_selectedRegion.tqcontains( mev->pos() ) && m_selectedRegion!=m_originalPixmap.rect() ) { m_state=Moving; - cursor.setShape( Qt::SizeAllCursor ); + cursor.setShape( TQt::SizeAllCursor ); } else { m_state=Resizing; - cursor.setShape( Qt::CrossCursor ); + cursor.setShape( TQt::CrossCursor ); } TQApplication::setOverrideCursor(cursor); @@ -246,7 +246,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) { TQMouseEvent *mev= (TQMouseEvent *)(ev); - //kdDebug() << TQString("move to %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; + //kdDebug() << TQString("move to %1,%2").tqarg( mev->x() ).tqarg( mev->y() ) << endl; if ( m_state == Resizing ) { @@ -418,7 +418,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) if (m_selectedRegion == m_originalPixmap.rect()) m_selectedRegion=TQRect(); // kdDebug() << TQString(" original Pixmap :") << m_originalPixmap.rect() << endl; -// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").arg(m_unzoomedPixmap.width()).arg(m_unzoomedPixmap.height()) << endl; +// kdDebug() << TQString(" unzoomed Pixmap : %1 x %2 ").tqarg(m_unzoomedPixmap.width()).tqarg(m_unzoomedPixmap.height()) << endl; if ( !m_originalPixmap.isNull() && ( m_originalPixmap.width() > m_maxWidth || @@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height) { /* We have to resize the pixmap to get it complete on the screen */ TQImage image=m_originalPixmap.convertToImage(); - m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) ); + m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) ); double oldZoomFactor = m_zoomFactor; m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width(); diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.h b/kopete/libkopete/compat/kpixmapregionselectorwidget.h index 6b0a319b..036b232a 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.h +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.h @@ -41,14 +41,15 @@ class KPopupMenu; * @author Antonio Larrosa * @since 3.4 */ -class KOPETE_EXPORT KPixmapRegionSelectorWidget : public QWidget +class KOPETE_EXPORT KPixmapRegionSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor for a KPixmapRegionSelectorWidget. */ - KPixmapRegionSelectorWidget( TQWidget *parent = 0L, const char *name=0L); + KPixmapRegionSelectorWidget( TQWidget *tqparent = 0L, const char *name=0L); /** * Destructor for a KPixmapRegionSelectorWidget diff --git a/kopete/libkopete/connectionmanager.cpp b/kopete/libkopete/connectionmanager.cpp index dcfa0ee1..b2e547fa 100644 --- a/kopete/libkopete/connectionmanager.cpp +++ b/kopete/libkopete/connectionmanager.cpp @@ -20,7 +20,7 @@ class ConnectionManagerPrivate }; // Connection manager itself -ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( parent, name ) +ConnectionManager::ConnectionManager( TQObject * tqparent, const char * name ) : DCOPObject( "ConnectionManager" ),TQObject( tqparent, name ) { d = new ConnectionManagerPrivate; @@ -45,19 +45,19 @@ void ConnectionManager::initialise() { // determine initial state and set the state object accordingly. d->m_state = Inactive; - updateStatus(); + updatetqStatus(); } -void ConnectionManager::updateStatus() +void ConnectionManager::updatetqStatus() { - NetworkStatus::EnumStatus daemonStatus = (NetworkStatus::EnumStatus)d->m_stub->status( TQString::null ); + NetworktqStatus::EnumtqStatus daemontqStatus = (NetworktqStatus::EnumtqStatus)d->m_stub->status( TQString() ); kdDebug() << k_funcinfo << endl; - switch ( daemonStatus ) + switch ( daemontqStatus ) { - case NetworkStatus::Offline: - case NetworkStatus::OfflineFailed: - case NetworkStatus::OfflineDisconnected: - case NetworkStatus::ShuttingDown: + case NetworktqStatus::Offline: + case NetworktqStatus::OfflineFailed: + case NetworktqStatus::OfflineDisconnected: + case NetworktqStatus::ShuttingDown: if ( d->m_state == Online ) { kdDebug() << "STATE IS PENDING" << endl; @@ -69,13 +69,13 @@ void ConnectionManager::updateStatus() d->m_state = Offline; } break; - case NetworkStatus::Establishing: - case NetworkStatus::Online: + case NetworktqStatus::Establishing: + case NetworktqStatus::Online: kdDebug() << "STATE IS ONLINE" << endl; d->m_state = Online; break; - case NetworkStatus::NoNetworks: - case NetworkStatus::Unreachable: + case NetworktqStatus::NoNetworks: + case NetworktqStatus::Unreachable: kdDebug() << "STATE IS INACTIVE" << endl; d->m_state = Inactive; break; @@ -87,38 +87,38 @@ ConnectionManager::~ConnectionManager() delete d; } -NetworkStatus::EnumStatus ConnectionManager::status( const TQString & host ) +NetworktqStatus::EnumtqStatus ConnectionManager::status( const TQString & host ) { // need also to check that the daemon hasn't died - updateStatus(); + updatetqStatus(); if ( d->m_state == Pending ) - return NetworkStatus::Offline; + return NetworktqStatus::Offline; if ( d->m_state == Online ) - return NetworkStatus::Online; + return NetworktqStatus::Online; if ( d->m_state == Offline ) - return NetworkStatus::Offline; - return NetworkStatus::NoNetworks; + return NetworktqStatus::Offline; + return NetworktqStatus::NoNetworks; } -NetworkStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) +NetworktqStatus::EnumRequestResult ConnectionManager::requestConnection( TQWidget * mainWidget, const TQString & host, bool userInitiated ) { kdDebug() << k_funcinfo << endl; - NetworkStatus::EnumRequestResult result; + NetworktqStatus::EnumRequestResult result; // if offline and the user has previously indicated they didn't want any new connections, suppress it if ( d->m_state == Offline && !userInitiated && d->m_userInitiatedOnly ) - result = NetworkStatus::UserRefused; + result = NetworktqStatus::UserRefused; // if offline, ask the user whether this connection should be allowed if ( d->m_state == Offline ) { if ( askToConnect( mainWidget ) ) - //result = NetworkStatus::Connected; - result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + //result = NetworktqStatus::Connected; + result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); else - result = NetworkStatus::UserRefused; + result = NetworktqStatus::UserRefused; } // otherwise, just ask for the connection else - result = (NetworkStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); + result = (NetworktqStatus::EnumRequestResult)d->m_stub->request( host, userInitiated ); return result; } @@ -131,12 +131,12 @@ void ConnectionManager::relinquishConnection( const TQString & host ) void ConnectionManager::slotStatusChanged( TQString host, int status ) { kdDebug() << k_funcinfo << endl; - updateStatus(); + updatetqStatus(); // reset user initiated only flag if we are now online if ( d->m_state == Online ) d->m_userInitiatedOnly = false; - emit statusChanged( host, (NetworkStatus::EnumStatus)status ); + emit statusChanged( host, (NetworktqStatus::EnumtqStatus)status ); } bool ConnectionManager::askToConnect( TQWidget * mainWidget ) @@ -147,7 +147,7 @@ bool ConnectionManager::askToConnect( TQWidget * mainWidget ) i18n("This application is currently in offline mode. Do you want to connect in order to carry out this operation?"), i18n("Leave Offline Mode?"), i18n("Connect"), i18n("Stay Offline"), - TQString::fromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); + TQString::tqfromLatin1("OfflineModeAlwaysGoOnline") ) == KMessageBox::Yes ); } #include "connectionmanager.moc" diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h index 63217183..b0f1c05b 100644 --- a/kopete/libkopete/connectionmanager.h +++ b/kopete/libkopete/connectionmanager.h @@ -26,30 +26,31 @@ class ConnectionManagerPrivate; class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: static ConnectionManager* self(); enum State { Inactive, Online, Offline, Pending }; virtual ~ConnectionManager(); - NetworkStatus::EnumStatus status( const TQString & host ); + NetworktqStatus::EnumtqStatus status( const TQString & host ); // check if a hostname is available. Ask user if offline. Request host - NetworkStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); + NetworktqStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated ); // method to relinquish a connection void relinquishConnection( const TQString & host ); signals: // signal that the network for a hostname is up/down - void statusChanged( const TQString & host, NetworkStatus::EnumStatus status ); + void statusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); protected: // sets up internal state void initialise(); // reread the desktop status from the daemon and update internal state - void updateStatus(); + void updatetqStatus(); // ask if the user would like to reconnect bool askToConnect( TQWidget * mainWidget ); k_dcop: void slotStatusChanged( TQString host, int status ); private: - ConnectionManager( TQObject *parent, const char * name ); + ConnectionManager( TQObject *tqparent, const char * name ); ConnectionManagerPrivate *d; static ConnectionManager * s_self; }; diff --git a/kopete/libkopete/kabcpersistence.cpp b/kopete/libkopete/kabcpersistence.cpp index 93d55b35..f1acaea1 100644 --- a/kopete/libkopete/kabcpersistence.cpp +++ b/kopete/libkopete/kabcpersistence.cpp @@ -45,7 +45,7 @@ namespace Kopete { /** - * utility function to merge two QStrings containing individual elements separated by 0xE000 + * utility function to merge two TQStrings containing individual elements separated by 0xE000 */ static TQString unionContents( TQString arg1, TQString arg2 ) { @@ -53,13 +53,13 @@ static TQString unionContents( TQString arg1, TQString arg2 ) TQStringList outList = TQStringList::split( separator, arg1 ); TQStringList arg2List = TQStringList::split( separator, arg2 ); for ( TQStringList::iterator it = arg2List.begin(); it != arg2List.end(); ++it ) - if ( !outList.contains( *it ) ) + if ( !outList.tqcontains( *it ) ) outList.append( *it ); TQString out = outList.join( separator ); return out; } -KABCPersistence::KABCPersistence( TQObject * parent, const char * name ) : TQObject( parent, name ) +KABCPersistence::KABCPersistence( TQObject * tqparent, const char * name ) : TQObject( tqparent, name ) { s_pendingResources.setAutoDelete( false ); } @@ -128,13 +128,13 @@ void KABCPersistence::write( MetaContact * mc ) for ( ; it != addressMap.end(); ++it ) { // read existing data for this key - TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); + TQString currentCustomForProtocol = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); // merge without duplicating TQString toWrite = unionContents( currentCustomForProtocol, it.data().join( TQChar( 0xE000 ) ) ); // Note if nothing ends up in the KABC data, this is because insertCustom does nothing if any param is empty. kdDebug( 14010 ) << k_funcinfo << "Writing: " << it.key() << ", " << "All" << ", " << toWrite << endl; - theAddressee.insertCustom( it.key(), TQString::fromLatin1( "All" ), toWrite ); - TQString check = theAddressee.custom( it.key(), TQString::fromLatin1( "All" ) ); + theAddressee.insertCustom( it.key(), TQString::tqfromLatin1( "All" ), toWrite ); + TQString check = theAddressee.custom( it.key(), TQString::tqfromLatin1( "All" ) ); } ab->insertAddressee( theAddressee ); //kdDebug( 14010 ) << k_funcinfo << "dumping addressbook before write " << endl; @@ -173,7 +173,7 @@ void KABCPersistence::write( MetaContact * mc ) void KABCPersistence::writeAddressBook( const KABC::Resource * res) { - if ( !s_pendingResources.containsRef( res ) ) + if ( !s_pendingResources.tqcontainsRef( res ) ) s_pendingResources.append( res ); if ( !s_addrBookWritePending ) { @@ -229,7 +229,7 @@ void KABCPersistence::removeKABC( MetaContact *) { // remove the link //kdDebug( 14010 ) << k_funcinfo << "...not found." << endl; - d->metaContactId=TQString::null; + d->metaContactId=TQString(); } else { @@ -274,24 +274,24 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) splitField( *it, app, name, value ); kdDebug( 14010 ) << "app=" << app << " name=" << name << " value=" << value << endl; - if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) + if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - if ( name == TQString::fromLatin1( "All" ) ) + if ( name == TQString::tqfromLatin1( "All" ) ) { kdDebug( 14010 ) << " syncing \"" << app << ":" << name << " with contactlist " << endl; // Get the protocol name from the custom field // by chopping the 'messaging/' prefix from the custom field app name TQString protocolName = app.right( app.length() - 10 ); // munge Jabber hack - if ( protocolName == TQString::fromLatin1( "xmpp" ) ) - protocolName = TQString::fromLatin1( "jabber" ); + if ( protocolName == TQString::tqfromLatin1( "xmpp" ) ) + protocolName = TQString::tqfromLatin1( "jabber" ); // Check Kopete supports it - Protocol * proto = dynamic_cast( PluginManager::self()->loadPlugin( TQString::fromLatin1( "kopete_" ) + protocolName ) ); + Protocol * proto = dynamic_cast( PluginManager::self()->loadPlugin( TQString::tqfromLatin1( "kopete_" ) + protocolName ) ); if ( !proto ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "\"%1\" is not supported by Kopete." ).arg( protocolName ), + i18n( "\"%1\" is not supported by Kopete." ).tqarg( protocolName ), i18n( "Could Not Sync with KDE Address Book" ) ); continue; } @@ -305,7 +305,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // Is it in the contact list? // First discard anything after an 0xE120, this is used by IRC to separate nick and server group name, but // IRC doesn't support this properly yet, so the user will have to select an appropriate account manually - int separatorPos = (*it).find( TQChar( 0xE120 ) ); + int separatorPos = (*it).tqfind( TQChar( 0xE120 ) ); if ( separatorPos != -1 ) *it = (*it).left( separatorPos ); @@ -332,14 +332,14 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) } kdDebug( 14010 ) << *it << " already exists in OTHER metacontact, move here?" << endl; // find the Kopete::Contact and attempt to move it to this metacontact. - otherMc->findContact( proto->pluginId(), TQString::null, *it )->setMetaContact( mc ); + otherMc->findContact( proto->pluginId(), TQString(), *it )->setMetaContact( mc ); } else { // if not, prompt to add it kdDebug( 14010 ) << proto->pluginId() << "://" << *it << " was not found in the contact list. Prompting to add..." << endl; if ( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), - i18n( "An address was added to this contact by another application.
Would you like to use it in Kopete?
Protocol: %1
Address: %2" ).arg( proto->displayName() ).arg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::fromLatin1( "ImportFromKABC" ) ) ) + i18n( "An address was added to this contact by another application.
Would you like to use it in Kopete?
Protocol: %1
Address: %2" ).tqarg( proto->displayName() ).tqarg( *it ), i18n( "Import Address From Address Book" ), i18n("Use"), i18n("Do Not Use"), TQString::tqfromLatin1( "ImportFromKABC" ) ) ) { // Check the accounts for this protocol are all connected // Most protocols do not allow you to add contacts while offline @@ -353,7 +353,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) if ( !allAccountsConnected ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again." ).arg( protocolName ), + i18n( "One or more of your accounts using %1 are offline. Most systems have to be connected to add contacts. Please connect these accounts and try again." ).tqarg( protocolName ), i18n( "Not Connected" ) ); continue; } @@ -378,7 +378,7 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) else if ( accounts.isEmpty() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, - i18n( "You do not have an account configured for %1 yet. Please create an account, connect it, and try again." ).arg( protocolName ), + i18n( "You do not have an account configured for %1 yet. Please create an account, connect it, and try again." ).tqarg( protocolName ), i18n( "No Account Found" ) ); continue; } @@ -420,12 +420,12 @@ bool KABCPersistence::syncWithKABC( MetaContact * mc ) // FIXME: Remove when IM address API is in KABC (KDE 4) void KABCPersistence::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.find( ':' ); + int colon = str.tqfind( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.find( '-' ); + int dash = tmp.tqfind( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kopete/libkopete/kabcpersistence.h b/kopete/libkopete/kabcpersistence.h index f827270f..c6224627 100644 --- a/kopete/libkopete/kabcpersistence.h +++ b/kopete/libkopete/kabcpersistence.h @@ -39,9 +39,10 @@ namespace Kopete class MetaContact; -class KOPETE_EXPORT KABCPersistence : public QObject +class KOPETE_EXPORT KABCPersistence : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * \brief Retrieve the instance of AccountManager. @@ -54,7 +55,7 @@ class KOPETE_EXPORT KABCPersistence : public QObject */ static KABCPersistence* self(); - KABCPersistence( TQObject * parent = 0, const char * name = 0 ); + KABCPersistence( TQObject * tqparent = 0, const char * name = 0 ); ~KABCPersistence(); /** * @brief Access Kopete's KDE address book instance diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index d54e3123..fd7bb7a8 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -86,11 +86,11 @@ public: TQAsciiDict ignoreTheseWidgets; void init(){ - ignoreTheseWidgets.insert("TQLabel", new int(1)); - ignoreTheseWidgets.insert("TQFrame", new int(2)); - ignoreTheseWidgets.insert("TQGroupBox", new int(3)); - ignoreTheseWidgets.insert("TQButtonGroup", new int(4)); - ignoreTheseWidgets.insert("TQWidget", new int(5)); + ignoreTheseWidgets.insert(TQLABEL_OBJECT_NAME_STRING, new int(1)); + ignoreTheseWidgets.insert(TQFRAME_OBJECT_NAME_STRING, new int(2)); + ignoreTheseWidgets.insert(TQGROUPBOX_OBJECT_NAME_STRING, new int(3)); + ignoreTheseWidgets.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, new int(4)); + ignoreTheseWidgets.insert(TQWIDGET_OBJECT_NAME_STRING, new int(5)); ignoreTheseWidgets.setAutoDelete(true); static bool defaultKDEPropertyMapInstalled = false; @@ -101,13 +101,13 @@ public: } }; -KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent, - const char *name) : TQObject(parent, name), config(kconfig) { +KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *tqparent, + const char *name) : TQObject(tqparent, name), config(kconfig) { d = new KAutoConfigPrivate(); } -KAutoConfig::KAutoConfig(TQObject *parent, const char *name) : - TQObject(parent, name), config(KGlobal::config()) { +KAutoConfig::KAutoConfig(TQObject *tqparent, const char *name) : + TQObject(tqparent, name), config(KGlobal::config()) { d = new KAutoConfigPrivate(); } @@ -141,49 +141,49 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ if(trackChanges){ // QT - changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert(TQString::tqfromLatin1(TQBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQPUSHBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), TQT_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("QDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQString::fromLatin1("QDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("QTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQDATEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert(TQString::tqfromLatin1(TQDATETIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert(TQString::tqfromLatin1(TQDIAL_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged (int))); + changedMap.insert(TQString::tqfromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQSLIDER_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQSPINBOX_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::tqfromLatin1(TQTIMEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert(TQString::tqfromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::tqfromLatin1(TQTEXTBROWSER_OBJECT_NAME_STRING), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert(TQString::tqfromLatin1(TQMULTILINEEDIT_OBJECT_NAME_STRING), TQT_SIGNAL(textChanged())); + changedMap.insert(TQString::tqfromLatin1(TQLISTBOX_OBJECT_NAME_STRING), TQT_SIGNAL(selectionChanged())); + changedMap.insert(TQString::tqfromLatin1(TQTABWIDGET_OBJECT_NAME_STRING), TQT_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); - - changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed())); - changedMap.insert( TQString::fromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert( TQString::fromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( TQString::fromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); + changedMap.insert( TQString::tqfromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::tqfromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); + changedMap.insert( TQString::tqfromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::tqfromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::tqfromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); + + changedMap.insert( TQString::tqfromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); + changedMap.insert( TQString::tqfromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); + changedMap.insert( TQString::tqfromLatin1("KEditListBox"), TQT_SIGNAL(changed())); + changedMap.insert( TQString::tqfromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); + changedMap.insert( TQString::tqfromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( TQString::tqfromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); + changedMap.insert( TQString::tqfromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( TQString::tqfromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::tqfromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::tqfromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); } - // Go through all of the children of the widgets and find all known widgets + // Go through all of the tqchildren of the widgets and find all known widgets TQPtrListIterator it( d->widgets ); TQWidget *widget; bool usingDefaultValues = false; @@ -215,8 +215,8 @@ bool KAutoConfig::saveSettings() { TQVariant defaultValue = d->defaultValues[groupWidget]; TQVariant currentValue = propertyMap->property(groupWidget); #if KDE_IS_VERSION( 3, 1, 90 ) - if(!config->hasDefault(TQString::fromLatin1(groupWidget->name())) && currentValue == defaultValue){ - config->revertToDefault(TQString::fromLatin1(groupWidget->name())); + if(!config->hasDefault(TQString::tqfromLatin1(groupWidget->name())) && currentValue == defaultValue){ + config->revertToDefault(TQString::tqfromLatin1(groupWidget->name())); widgetChanged = true; } else{ @@ -353,12 +353,12 @@ void KAutoConfig::reloadSettings() const { bool KAutoConfig::parseChildren(const TQWidget *widget, TQPtrList& currentGroup, bool trackChanges){ bool valueChanged = false; - const TQPtrList *listOfChildren = widget->children(); - if(!listOfChildren) + const TQObjectList listOfChildren = widget->childrenListObject(); + if(listOfChildren.isEmpty()) return valueChanged; TQSqlPropertyMap *propertyMap = TQSqlPropertyMap::defaultMap(); - TQPtrListIterator it( *listOfChildren ); + TQPtrListIterator it( listOfChildren ); TQObject *object; while ( (object = it.current()) != 0 ) { @@ -367,7 +367,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, continue; } TQWidget *childWidget = (TQWidget *)object; - if(d->ignore.containsRef(childWidget)){ + if(d->ignore.tqcontainsRef(childWidget)){ continue; } @@ -390,7 +390,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, { parseTheChildren = false; // Disable the widget if it is immutable? - if(config->entryIsImmutable( TQString::fromLatin1(childWidget->name()))) + if(config->entryIsImmutable( TQString::tqfromLatin1(childWidget->name()))) childWidget->setEnabled(false); else { @@ -408,15 +408,15 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, propertyMap->setProperty(childWidget, setting); valueChanged = true; } - if(trackChanges && changedMap.find(TQString::fromLatin1(childWidget->className())) != + if(trackChanges && changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) != changedMap.end()) { - connect(childWidget, changedMap[TQString::fromLatin1(childWidget->className())], + connect(childWidget, changedMap[TQString::tqfromLatin1(childWidget->className())], this, TQT_SIGNAL(widgetModified())); } #ifndef NDEBUG else if(trackChanges && - changedMap.find(TQString::fromLatin1(childWidget->className())) == changedMap.end()) + changedMap.tqfind(TQString::tqfromLatin1(childWidget->className())) == changedMap.end()) { // Without a signal kautoconfigdialog could incorectly // enable/disable the buttons @@ -439,7 +439,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, if(parseTheChildren) { // this widget is not known as something we can store. - // Maybe we can store one of its children. + // Maybe we can store one of its tqchildren. valueChanged |= parseChildren(childWidget, currentGroup, trackChanges); } } diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index 3b10a4d0..c63fcd25 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -55,17 +55,17 @@ class TQWidget; * * KAutoConfig uses the TQSqlPropertyMap class to determine if it can do * anything to a widget. Note that KAutoConfig doesn't require a database, - * it simply uses the functionality that is built into the QSqlPropertyMap + * it simply uses the functionality that is built into the TQSqlPropertyMap * class. New widgets can be added to the map using * TQSqlPropertyMap::installDefaultMap(). Note that you can't just add any - * class. The class must have a matching Q_PROPERTY(...) macro defined. + * class. The class must have a matching TQ_PROPERTY(...) macro defined. * * For example (note that KColorButton is already added and it doesn't need to * manually added): * * kcolorbutton.h defines the following property: * \code - * Q_PROPERTY( TQColor color READ color WRITE setColor ) + * TQ_PROPERTY( TQColor color READ color WRITE setColor ) * \endcode * * To add KColorButton the following code would be inserted in the main. @@ -88,6 +88,7 @@ class TQWidget; class KOPETE_EXPORT KAutoConfig : public TQObject { Q_OBJECT + TQ_OBJECT signals: /** @@ -120,19 +121,19 @@ public: * Constructor. * @param kconfig - KConfig to use when retrieving/saving the widgets * that KAutoConfig knows about. - * @param parent - Parent object. + * @param tqparent - Parent object. * @param name - Object name. */ - KAutoConfig( KConfig *kconfig, TQObject *parent=0, const char *name=0 ); + KAutoConfig( KConfig *kconfig, TQObject *tqparent=0, const char *name=0 ); /** * Constructor. * Uses KGlobal::config() when retrieving/saving the widgets that * KAutoConfig knows about. - * @param parent - Parent object. + * @param tqparent - Parent object. * @param name - Object name. */ - KAutoConfig( TQObject *parent=0, const char *name=0 ); + KAutoConfig( TQObject *tqparent=0, const char *name=0 ); /** * Destructor. Deletes private class. @@ -141,7 +142,7 @@ public: /** * Adds a widget to the list of widgets that should be parsed for any - * children that KAutoConfig might know when retrieveSettings() is + * tqchildren that KAutoConfig might know when retrieveSettings() is * called. All calls to this function should be made before calling * retrieveSettings(). * @param widget - Pointer to the widget to add. @@ -154,7 +155,7 @@ public: /** * Ignore the specified child widget when performing an action. Doesn't - * effect widgets that were added with addWidget() only their children. All + * effect widgets that were added with addWidget() only their tqchildren. All * calls to this function should be made before calling retrieveSettings(). * @param widget - Pointer to the widget that should be ignored. * Note: Widgets that don't have a name are ignored automatically. @@ -185,7 +186,7 @@ public: * * Example: * \code - * addWidgetChangedSignal( "QCheckbox", TQT_SIGNAL(stateChanged(int)) ); + * addWidgetChangedSignal( "TQCheckbox", TQT_SIGNAL(stateChanged(int)) ); * \endcode * * This is generally used in conjunction with the addition of a class @@ -251,13 +252,13 @@ protected: TQMap changedMap; /** - * Recursive function that finds all known children. - * Goes through the children of widget and if any are known and not being + * Recursive function that finds all known tqchildren. + * Goes through the tqchildren of widget and if any are known and not being * ignored, stores them in currentGroup. Also checks if the widget * should be disabled because it is set immutable. - * @param widget - Parent of the children to look at. - * @param currentGroup - Place to store known children of widget. - * @param trackChanges - If true then tracks any changes to the children of + * @param widget - Parent of the tqchildren to look at. + * @param currentGroup - Place to store known tqchildren of widget. + * @param trackChanges - If true then tracks any changes to the tqchildren of * widget that are known. * @return bool - If a widget was set to something other then its default. * @see retrieveSettings() diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index 122a3e7b..c15b992f 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -30,39 +30,39 @@ class KCAutoConfigModule::KCAutoConfigModulePrivate }; -KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) +KCAutoConfigModule::KCAutoConfigModule( TQWidget * tqparent, const char * name, const TQStringList & args ) + : KCModule( tqparent, name, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( this ); + d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) +KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * tqparent, const TQStringList & args ) + : KCModule( instance, tqparent, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( this ); + d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const char * name, const TQStringList & args ) - : KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * tqparent, const char * name, const TQStringList & args ) + : KCModule( tqparent, name, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( config, this ); + d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } -KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * parent, const TQStringList & args ) - : KCModule( instance, parent, args ) +KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * tqparent, const TQStringList & args ) + : KCModule( instance, tqparent, args ) , d( new KCAutoConfigModulePrivate ) { - d->kautoconfig = new KAutoConfig( config, this ); + d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) ); connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); } diff --git a/kopete/libkopete/kcautoconfigmodule.h b/kopete/libkopete/kcautoconfigmodule.h index fcca6047..d09173ea 100644 --- a/kopete/libkopete/kcautoconfigmodule.h +++ b/kopete/libkopete/kcautoconfigmodule.h @@ -33,14 +33,14 @@ class KConfig; * * This class makes it very easy to create a configuration page using KAutoConfig. * All you need to do is create a class that is derived from KCAutoConfigModule, create your - * config page with QDesigner, and add it to the module + * config page with TQDesigner, and add it to the module * This can be done using the setMainWidget() method: * \code * typedef KGenericFactory MyPageConfigFactory; * K_EXPORT_COMPONENT_FACTORY( kcm_mypageconfig, MyPageConfigFactory( "kcm_mypageconfig" ) ) * - * MyPageConfig( TQWidget * parent, const char *, const TQStringList & args ) - * : KCAutoConfigModule( MyPageConfigFactory::instance(), parent, args ) + * MyPageConfig( TQWidget * tqparent, const char *, const TQStringList & args ) + * : KCAutoConfigModule( MyPageConfigFactory::instance(), tqparent, args ) * { * setMainWidget( new MyPageConfigBase(this) , "MyGroup" ); * } @@ -53,44 +53,45 @@ class KConfig; class KOPETE_EXPORT KCAutoConfigModule : public KCModule { Q_OBJECT + TQ_OBJECT public: /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( TQWidget * tqparent = 0, const char * name = 0, const TQStringList & args = TQStringList() ); /** * Standard KCModule constructor. Use KGlobal::config() */ - KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule( KInstance * instance, TQWidget * tqparent = 0, const TQStringList & args = TQStringList() ); /** * Constructor. * @param config the KConfig to use * @param instance KInstance object for this KCM - * @param parent parent widget + * @param tqparent tqparent widget * @param args special arguments for this KCM * * @todo document what the args mean (inherited from KCModule?) */ - KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * tqparent = 0, const TQStringList & args = TQStringList() ); /** * Constructor, much like the one above, except with * no instance and with a name. * @param config the KConfig to use - * @param parent parent widget + * @param tqparent tqparent widget * @param name name of the object * @param args special arguments for this KCM */ - KCAutoConfigModule(KConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); + KCAutoConfigModule(KConfig* config, TQWidget * tqparent = 0, const char * name=0 , const TQStringList & args = TQStringList() ); ~KCAutoConfigModule(); /** * Set the main widget. @p widget will be lay out to take all available place in the module. - * @p widget must have this module as parent. + * @p widget must have this module as tqparent. * * This method automatically call KAutoConfig::addWidget() and KAutoConfig::retrieveSettings() * @@ -113,7 +114,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the config from the configfile. * - * You can also reimplement this method, but you should always call the parent KCModule::load() + * You can also reimplement this method, but you should always call the tqparent KCModule::load() * be sure you know what you are doing */ virtual void load(); @@ -121,7 +122,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Save the config to the configfile. * - * You can also reimplement this method, but you should always call the parent KCModule::save() + * You can also reimplement this method, but you should always call the tqparent KCModule::save() * be sure you know what you are doing */ virtual void save(); @@ -129,7 +130,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule /** * Reload the default config * - * You can also reimplement this method, but you should always call the parent KCModule::defaults() + * You can also reimplement this method, but you should always call the tqparent KCModule::defaults() * be sure you know what you are doing */ virtual void defaults(); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index 4b41b48b..ddda9bd7 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -63,8 +63,8 @@ struct KNotification::Private int level; }; -KNotification::KNotification(TQObject *parent) : - TQObject(parent) , d(new Private) +KNotification::KNotification(TQObject *tqparent) : + TQObject(tqparent) , d(new Private) { m_linkClicked = false; } @@ -109,7 +109,7 @@ void KNotification::notifyByMessagebox() return; TQString action=d->actions[0]; - WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; if( action.isEmpty()) { @@ -139,16 +139,16 @@ void KNotification::notifyByMessagebox() { default: case KNotifyClient::Notification: - result = KMessageBox::questionYesNo(d->widget, d->text, i18n( "Notification" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::questionYesNo(d->widget, d->text, i18n( "Notification" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Warning: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Warning" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Warning" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Error: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Error" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Error" ), action, KStdGuiItem::cancel(), TQString(), false ); break; case KNotifyClient::Catastrophe: - result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Fatal" ), action, KStdGuiItem::cancel(), TQString::null, false ); + result = KMessageBox::warningYesNo( d->widget, d->text, i18n( "Fatal" ), action, KStdGuiItem::cancel(), TQString(), false ); break; } if(result==KMessageBox::Yes && _this) @@ -171,12 +171,12 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) TQString title = config.readEntry( "Comment", appName ); //KPassivePopup::message(title, text, icon, senderWinId); - WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; + WId winId=d->widget ? d->widget->tqtopLevelWidget()->winId() : 0; KPassivePopup *pop = new KPassivePopup( checkWinId(appName, winId) ); TQObject::connect(this, TQT_SIGNAL(closed()), pop, TQT_SLOT(deleteLater())); - TQVBox *vb = pop->standardView( title, pix.isNull() ? d->text: TQString::null , icon ); + TQVBox *vb = pop->standardView( title, pix.isNull() ? d->text: TQString() , icon ); TQVBox *vb2=vb; if(!pix.isNull()) @@ -198,22 +198,22 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) } vb=new TQVBox(hb); TQLabel *msg = new TQLabel( d->text, vb, "msg_label" ); - msg->setAlignment( AlignLeft ); + msg->tqsetAlignment( AlignLeft ); } if ( !d->actions.isEmpty() ) { - TQString linkCode=TQString::fromLatin1("

"); + TQString linkCode=TQString::tqfromLatin1("

"); int i=0; for ( TQStringList::ConstIterator it = d->actions.begin() ; it != d->actions.end(); ++it ) { i++; - linkCode+=TQString::fromLatin1(" %2 ").arg( TQString::number(i) , TQStyleSheet::escape(*it) ); + linkCode+=TQString::tqfromLatin1(" %2 ").tqarg( TQString::number(i) , TQStyleSheet::escape(*it) ); } - linkCode+=TQString::fromLatin1("

"); + linkCode+=TQString::tqfromLatin1("

"); KActiveLabel *link = new KActiveLabel(linkCode , vb ); - //link->setAlignment( AlignRight ); + //link->tqsetAlignment( AlignRight ); TQObject::disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), link, TQT_SLOT(openLink(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotPopupLinkClicked(const TQString &))); TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), pop, TQT_SLOT(hide())); @@ -284,7 +284,7 @@ void KNotification::raiseWidget(TQWidget *w) } else { - TQWidget *pw=w->parentWidget(); + TQWidget *pw=w->tqparentWidget(); raiseWidget(pw); if( TQTabWidget *tab_widget=dynamic_cast(pw)) @@ -368,12 +368,12 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p */ - KNotification *notify=new KNotification(widget); + KNotification *notify=new KNotification(TQT_TQOBJECT(widget)); notify->d->widget=widget; notify->d->text=text; notify->d->actions=actions; notify->d->level=level; - WId winId=widget ? widget->topLevelWidget()->winId() : 0; + WId winId=widget ? widget->tqtopLevelWidget()->winId() : 0; //we will catch some event that will not be fired by the old deamon @@ -401,7 +401,7 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p if ( present & KNotifyClient::Execute ) { TQString appname = TQString::fromAscii( KNotifyClient::instance()->instanceName() ); - notify->notifyByExecute(commandline, TQString::null,appname,text, winId, 0 ); + notify->notifyByExecute(commandline, TQString(),appname,text, winId, 0 ); } return notify; @@ -479,7 +479,7 @@ static KNotification *performCustomNotifications( TQWidget *widget, Kopete::Meta evt->firePresentation( Kopete::EventPresentation::Chat ); } // fire the event - n=KNotification::userEvent( text, mc->photo(), widget, TQStringList() , present, 0, sound, TQString::null, TQString::null , KNotification::CloseOnTimeout); + n=KNotification::userEvent( text, mc->photo(), widget, TQStringList() , present, 0, sound, TQString(), TQString() , KNotification::CloseOnTimeout); } } diff --git a/kopete/libkopete/knotification.h b/kopete/libkopete/knotification.h index 1e570541..ece07bf6 100644 --- a/kopete/libkopete/knotification.h +++ b/kopete/libkopete/knotification.h @@ -51,9 +51,10 @@ namespace Kopete { class MetaContact; } * * @author Olivier Goffart */ -class KOPETE_EXPORT KNotification : public QObject +class KOPETE_EXPORT KNotification : public TQObject { Q_OBJECT + TQ_OBJECT public: enum NotificationFlags @@ -139,7 +140,7 @@ public slots: private: struct Private; Private *d; - KNotification(TQObject *parent=0L); + KNotification(TQObject *tqparent=0L); /** * recursive function that raise the widget. @p w * @@ -175,9 +176,9 @@ public: * @param pixmap is a picture which may be shown in the popup. * @param widget is a widget where the notification reports to * @param actions is a list of action texts. - * @param flags is a bitmask of NotificationsFlags + * @param flags is a bittqmask of NotificationsFlags */ - static KNotification *event( const TQString& eventId , const TQString& text=TQString::null, + static KNotification *event( const TQString& eventId , const TQString& text=TQString(), const TQPixmap& pixmap=TQPixmap(), TQWidget *widget=0L, const TQStringList &actions=TQStringList(), unsigned int flags=CloseOnTimeout); @@ -192,8 +193,8 @@ public: * @param present The presentation method of the event * @param level The error message level * @param sound The sound to play if selected with @p present - * @param file The log file to append the message to if selected with @p parent - * @param commandLine the command line to run if selected with @p parent + * @param file The log file to append the message to if selected with @p tqparent + * @param commandLine the command line to run if selected with @p tqparent * @param flags Indicates the way in which the notification should be handled */ static KNotification *userEvent( const TQString& text, const TQPixmap& pixmap, @@ -206,7 +207,7 @@ public: /** * @todo find a proper way to do context-dependent notifications */ - static KNotification *event( Kopete::MetaContact *mc, const TQString& eventId , const TQString& text=TQString::null, + static KNotification *event( Kopete::MetaContact *mc, const TQString& eventId , const TQString& text=TQString(), const TQPixmap& pixmap=TQPixmap(), TQWidget *widget=0L, const TQStringList &actions=TQStringList(),unsigned int flags=CloseOnTimeout); diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index acce1da1..11f668d8 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -79,21 +79,21 @@ public: KConfigGroup *configGroup; uint connectionTry; TQString customIcon; - Kopete::OnlineStatus restoreStatus; + Kopete::OnlineStatus restoretqStatus; TQString restoreMessage; }; -Account::Account( Protocol *parent, const TQString &accountId, const char *name ) - : TQObject( parent, name ), d( new Private( parent, accountId ) ) +Account::Account( Protocol *tqparent, const TQString &accountId, const char *name ) + : TQObject( tqparent, name ), d( new Private( tqparent, accountId ) ) { - d->configGroup=new KConfigGroup(KGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id )); + d->configGroup=new KConfigGroup(KGlobal::config(), TQString::tqfromLatin1( "Account_%1_%2" ).tqarg( d->protocol->pluginId(), d->id )); d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false ); d->color = d->configGroup->readColorEntry( "Color", &d->color ); d->customIcon = d->configGroup->readEntry( "Icon", TQString() ); d->priority = d->configGroup->readNumEntry( "Priority", 0 ); - d->restoreStatus = Kopete::OnlineStatus::Online; + d->restoretqStatus = Kopete::OnlineStatus::Online; d->restoreMessage = ""; TQObject::connect( &d->suppressStatusTimer, TQT_SIGNAL( timeout() ), @@ -118,8 +118,8 @@ Account::~Account() void Account::reconnect() { - kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; - setOnlineStatus( d->restoreStatus, d->restoreMessage ); + kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoretqStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; + setOnlineStatus( d->restoretqStatus, d->restoreMessage ); } void Account::disconnected( DisconnectReason reason ) @@ -139,7 +139,7 @@ void Account::disconnected( DisconnectReason reason ) } if(reason== OtherClient) { - Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).arg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); + Kopete::Utils::notifyConnectionLost(this, i18n("You have been disconnected"), i18n( "You have connected from another client or computer to the account '%1'" ).tqarg(d->id), i18n("Most proprietary Instant Messaging services do not allow you to connect from more than one location. Check that nobody is using your account without your permission. If you need a service that supports connection from various locations at the same time, use the Jabber protocol.")); } } @@ -255,7 +255,7 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr if ( contactId == d->myself->contactId() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") ); return false; } @@ -278,55 +278,55 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr } else { - // should we here add the contact to the parentContact if any? + // should we here add the contact to the tqparentContact if any? kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl; } return c->metaContact(); } - MetaContact *parentContact = new MetaContact(); + MetaContact *tqparentContact = new MetaContact(); if(!displayName.isEmpty()) - parentContact->setDisplayName( displayName ); + tqparentContact->setDisplayName( displayName ); //Set it as a temporary contact if requested if ( isTemporary ) - parentContact->setTemporary( true ); + tqparentContact->setTemporary( true ); else - parentContact->addToGroup( group ); + tqparentContact->addToGroup( group ); if ( c ) { - c->setMetaContact( parentContact ); + c->setMetaContact( tqparentContact ); if ( mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( parentContact ); + KABCPersistence::self()->write( tqparentContact ); } } else { - if ( !createContact( contactId, parentContact ) ) + if ( !createContact( contactId, tqparentContact ) ) { - delete parentContact; + delete tqparentContact; return 0L; } } - ContactList::self()->addMetaContact( parentContact ); - return parentContact; + ContactList::self()->addMetaContact( tqparentContact ); + return tqparentContact; } -bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMode mode ) +bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) { if ( contactId == myself()->contactId() ) { KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").arg(contactId,accountId()), i18n("Error Creating Contact") + i18n("You are not allowed to add yourself to the contact list. The addition of \"%1\" to account \"%2\" will not take place.").tqarg(contactId,accountId()), i18n("Error Creating Contact") ); return 0L; } - bool isTemporary= parent->isTemporary(); + bool isTemporary= tqparent->isTemporary(); Contact *c = d->contacts[ contactId ]; if ( c && c->metaContact() ) { @@ -336,23 +336,23 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod "Account::addContact: You are trying to add an existing temporary contact. Just add it on the list" << endl; //setMetaContact ill take care about the deletion of the old contact - c->setMetaContact(parent); + c->setMetaContact(tqparent); return true; } else { - // should we here add the contact to the parentContact if any? + // should we here add the contact to the tqparentContact if any? kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl; } return false; //(the contact is not in the correct metacontact, so false) } - bool success = createContact(contactId, parent); + bool success = createContact(contactId, tqparent); if ( success && mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( parent ); + KABCPersistence::self()->write( tqparent ); } return success; @@ -361,11 +361,11 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod KActionMenu * Account::actionMenu() { //default implementation - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) + menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); OnlineStatusManager::self()->createAccountStatusActions(this, menu); @@ -383,7 +383,7 @@ bool Account::isConnected() const bool Account::isAway() const { - return d->myself && ( d->myself->onlineStatus().status() == Kopete::OnlineStatus::Away ); + return d->myself && ( d->myself->onlinetqStatus().status() == Kopete::OnlineStatus::Away ); } Contact * Account::myself() const @@ -417,12 +417,12 @@ void Account::setMyself( Contact *myself ) } void Account::slotOnlineStatusChanged( Contact * /* contact */, - const OnlineStatus &newStatus, const OnlineStatus &oldStatus ) + const OnlineStatus &newtqStatus, const OnlineStatus &oldtqStatus ) { - bool wasOffline = !oldStatus.isDefinitelyOnline(); - bool isOffline = !newStatus.isDefinitelyOnline(); + bool wasOffline = !oldtqStatus.isDefinitelyOnline(); + bool isOffline = !newtqStatus.isDefinitelyOnline(); - if ( wasOffline || newStatus.status() == OnlineStatus::Offline ) + if ( wasOffline || newtqStatus.status() == OnlineStatus::Offline ) { // Wait for five seconds until we treat status notifications for contacts // as unrelated to our own status change. @@ -437,19 +437,19 @@ void Account::slotOnlineStatusChanged( Contact * /* contact */, if ( !isOffline ) { - d->restoreStatus = newStatus; + d->restoretqStatus = newtqStatus; d->restoreMessage = myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); -// kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreStatus " << d->restoreStatus.status() << " restoreMessage " << d->restoreMessage << endl; +// kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoretqStatus " << d->restoretqStatus.status() << " restoreMessage " << d->restoreMessage << endl; } /* kdDebug(14010) << k_funcinfo << "account " << d->id << " changed status. was " - << Kopete::OnlineStatus::statusTypeToString(oldStatus.status()) << ", is " - << Kopete::OnlineStatus::statusTypeToString(newStatus.status()) << endl;*/ + << Kopete::OnlineStatus::statusTypeToString(oldtqStatus.status()) << ", is " + << Kopete::OnlineStatus::statusTypeToString(newtqStatus.status()) << endl;*/ if ( wasOffline != isOffline ) emit isConnectedChanged(); } -void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) +void Account::setAllContactstqStatus( const Kopete::OnlineStatus &status ) { d->suppressStatusNotification = true; d->suppressStatusTimer.start( 5000, true ); @@ -462,7 +462,7 @@ void Account::setAllContactsStatus( const Kopete::OnlineStatus &status ) void Account::slotContactPropertyChanged( Contact * /* contact */, const TQString &key, const TQVariant &old, const TQVariant &newVal ) { - if ( key == TQString::fromLatin1("awayMessage") && old != newVal && isConnected() ) + if ( key == TQString::tqfromLatin1("awayMessage") && old != newVal && isConnected() ) { d->restoreMessage = newVal.toString(); // kdDebug( 14010 ) << k_funcinfo << "account " << d->id << " restoreMessage " << d->restoreMessage << endl; @@ -508,9 +508,9 @@ bool Account::isBlocked( const TQString &contactId ) return d->blackList->isBlocked( contactId ); } -void Account::editAccount(TQWidget *parent) +void Account::editAccount(TQWidget *tqparent) { - KDialogBase *editDialog = new KDialogBase( parent, "KopeteAccountConfig::editDialog", true, + KDialogBase *editDialog = new KDialogBase( tqparent, "KopeteAccountConfig::editDialog", true, i18n( "Edit Account" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); @@ -518,7 +518,7 @@ void Account::editAccount(TQWidget *parent) if ( !m_accountWidget ) return; - // FIXME: Why the #### is EditAccountWidget not a QWidget?!? This sideways casting + // FIXME: Why the #### is EditAccountWidget not a TQWidget?!? This sideways casting // is braindead and error-prone. Looking at MSN the only reason I can see is // because it allows direct subclassing of designer widgets. But what is // wrong with embedding the designer widget in an empty TQWidget instead? @@ -550,7 +550,7 @@ TQString Account::pluginData( Plugin* /*plugin*/, const TQString &key ) const void Account::setAway(bool away, const TQString& reason) { - setOnlineStatus( OnlineStatusManager::self()->onlineStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); + setOnlineStatus( OnlineStatusManager::self()->onlinetqStatus(protocol() , away ? OnlineStatusManager::Away : OnlineStatusManager::Online) , reason ); } void Account::setCustomIcon( const TQString & i) diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 8782673c..44f12eb1 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -63,19 +63,20 @@ class BlackLister; * * @author Olivier Goffart */ -class KOPETE_EXPORT Account : public QObject +class KOPETE_EXPORT Account : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( AddMode ) - Q_PROPERTY( TQString accountId READ accountId ) - Q_PROPERTY( bool excludeConnect READ excludeConnect WRITE setExcludeConnect ) - Q_PROPERTY( TQColor color READ color WRITE setColor ) - Q_PROPERTY( TQPixmap accountIcon READ accountIcon ) - Q_PROPERTY( bool isConnected READ isConnected ) - Q_PROPERTY( bool isAway READ isAway ) - Q_PROPERTY( bool suppressStatusNotification READ suppressStatusNotification ) - Q_PROPERTY( uint priority READ priority WRITE setPriority ) + TQ_PROPERTY( TQString accountId READ accountId ) + TQ_PROPERTY( bool excludeConnect READ excludeConnect WRITE setExcludeConnect ) + TQ_PROPERTY( TQColor color READ color WRITE setColor ) + TQ_PROPERTY( TQPixmap accountIcon READ accountIcon ) + TQ_PROPERTY( bool isConnected READ isConnected ) + TQ_PROPERTY( bool isAway READ isAway ) + TQ_PROPERTY( bool suppressStatusNotification READ suppressStatusNotification ) + TQ_PROPERTY( uint priority READ priority WRITE setPriority ) public: /** @@ -97,12 +98,12 @@ public: }; /** - * @param parent the protocol for this account. The account is a child object of the + * @param tqparent the protocol for this account. The account is a child object of the * protocol, so it will be automatically deleted when the protocol is. * @param accountID the unique ID of this account. * @param name the name of this TQObject. */ - Account(Protocol *parent, const TQString &accountID, const char *name=0L); + Account(Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); /** @@ -181,7 +182,7 @@ public: /** * \brief change the account icon. * by default the icon of an account is the protocol one, but it may be overide it. - * Set TQString::null to go back to the default (the protocol icon) + * Set TQString() to go back to the default (the protocol icon) * * this call will emit colorChanged() */ @@ -264,28 +265,28 @@ public: * If @p mode is @c DontChangeKABC, no additional action is carried out. * * @param contactId the @ref Contact::contactId of the contact to create - * @param displayName the displayname (alias) of the new metacontact. Leave as TQString::null if + * @param displayName the displayname (alias) of the new metacontact. Leave as TQString() if * no alias is known, then by default, the nick will be taken as alias and tracked if changed. * @param group the group to add the created metacontact to, or 0 for the top-level group. * @param mode the mode used to add the contact. Use DontChangeKABC when deserializing. * @return the new created metacontact or 0L if the operation failed */ - MetaContact* addContact( const TQString &contactId, const TQString &displayName = TQString::null, Group *group = 0, AddMode mode = DontChangeKABC ) ; + MetaContact* addContact( const TQString &contactId, const TQString &displayName = TQString(), Group *group = 0, AddMode mode = DontChangeKABC ) ; /** * @brief Create a new contact, adding it to an existing metacontact * * If a contact for this account with ID @p contactId is not already on the contact list, - * a new contact with that ID is created, and added to the metacontact @p parent. + * a new contact with that ID is created, and added to the metacontact @p tqparent. * * @param contactId the @ref Contact::contactId of the contact to create - * @param parent the parent metacontact (must not be 0) + * @param tqparent the tqparent metacontact (must not be 0) * @param mode the mode used to add the contact. See addContact(const TQString&,const TQString&,Group*,AddMode) for details. * * @return @c true if creation of the contact succeeded or the contact was already in the list, * @c false otherwise. */ - bool addContact( const TQString &contactId, MetaContact *parent, AddMode mode = DontChangeKABC ); + bool addContact( const TQString &contactId, MetaContact *tqparent, AddMode mode = DontChangeKABC ); /** * @brief Indicate whether the account is connected at all. @@ -300,7 +301,7 @@ public: /** * @brief Indicate whether the account is away. * - * This is a convenience method that queries @ref Contact::onlineStatus() on @ref myself(). + * This is a convenience method that queries @ref Contact::onlinetqStatus() on @ref myself(). * This function is safe to call if @ref setMyself() has not been called yet. */ bool isAway() const; @@ -352,7 +353,7 @@ protected: * contactId should be the accountID. The online status of the myself contact represents * the account's status. * - * The myself should have the @ref ContactList::myself() as parent metacontact + * The myself should have the @ref ContactList::myself() as tqparent metacontact * */ void setMyself( Contact *myself ); @@ -363,16 +364,16 @@ protected: * You shouldn't ever call this method yourself. To add contacts, use @ref addContact(). * * This method is called by @ref addContact(). In this method, you should create the - * new custom @ref Contact, using @p parentContact as the parent. + * new custom @ref Contact, using @p tqparentContact as the tqparent. * * If the metacontact is not temporary and the protocol supports it, you can add the * contact to the server. * * @param contactId the ID of the contact to create - * @param parentContact the metacontact to add this contact to + * @param tqparentContact the metacontact to add this contact to * @return @c true if creating the contact succeeded, @c false on failure. */ - virtual bool createContact( const TQString &contactId, MetaContact *parentContact ) =0; + virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ) =0; /** @@ -408,7 +409,7 @@ protected slots: * * @param status the status to set all contacts of this account except @ref myself() to. */ - void setAllContactsStatus( const Kopete::OnlineStatus &status ); + void setAllContactstqStatus( const Kopete::OnlineStatus &status ); signals: /** @@ -449,10 +450,10 @@ public slots: /** * @brief Go online for this service. * - * @param initialStatus is the status to connect with. If it is an invalid status for this + * @param initialtqStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ) = 0; + virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ) = 0; /** * @brief Go offline for this service. @@ -470,7 +471,7 @@ public slots: * * @todo change ; make use of setOnlineStatus */ - virtual void setAway( bool away, const TQString &reason = TQString::null ); + virtual void setAway( bool away, const TQString &reason = TQString() ); /** * Reimplement this function to set the online status @@ -478,12 +479,12 @@ public slots: * @param reason is the away message to set. * @note If needed, you need to connect. if the offline status is given, you should disconnect */ - virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null ) = 0; + virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ) = 0; /** * Display the edit account widget for the account */ - void editAccount( TQWidget* parent = 0L ); + void editAccount( TQWidget* tqparent = 0L ); /** * Add a user to the blacklist. The default implementation calls @@ -515,7 +516,7 @@ private slots: /** * The @ref myself() contact's online status changed. */ - void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ); + void slotOnlineStatusChanged( Kopete::Contact *contact, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ); /** * The @ref myself() contact's property changed. diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index d12aa7ce..f3671d10 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -75,7 +75,7 @@ AccountManager * AccountManager::self() AccountManager::AccountManager() -: TQObject( qApp, "KopeteAccountManager" ) +: TQObject( tqApp, "KopeteAccountManager" ) { d = new Private; } @@ -138,7 +138,7 @@ void AccountManager::setAwayAll( const TQString &awayReason, bool away ) { // FIXME: ICQ's invisible online should be set to invisible away Contact *self = it.current()->myself(); - bool isInvisible = self && self->onlineStatus().status() == OnlineStatus::Invisible; + bool isInvisible = self && self->onlinetqStatus().status() == OnlineStatus::Invisible; if ( anyConnected ) { if ( it.current()->isConnected() && !isInvisible ) @@ -160,7 +160,7 @@ void AccountManager::setOnlineStatus( uint category , const TQString& awayMessag for ( TQPtrListIterator it( d->accounts ); it.current(); ++it ) { Account *account = it.current(); - Kopete::OnlineStatus status = OnlineStatusManager::self()->onlineStatus(account->protocol() , katgor); + Kopete::OnlineStatus status = OnlineStatusManager::self()->onlinetqStatus(account->protocol() , katgor); if ( anyConnected ) { if ( account->isConnected() || ( (flags & ConnectIfOffline) && !account->excludeConnect() ) ) @@ -196,22 +196,22 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const color = TQColor(); break; case 1: - color = Qt::red; + color = TQt::red; break; case 2: - color = Qt::green; + color = TQt::green; break; case 3: - color = Qt::blue; + color = TQt::blue; break; case 4: - color = Qt::yellow; + color = TQt::yellow; break; case 5: - color = Qt::magenta; + color = TQt::magenta; break; case 6: - color = Qt::cyan; + color = TQt::cyan; break; } @@ -220,7 +220,7 @@ TQColor AccountManager::guessColor( Protocol *protocol ) const Account* AccountManager::registerAccount( Account *account ) { - if( !account || d->accounts.contains( account ) ) + if( !account || d->accounts.tqcontains( account ) ) return account; if( account->accountId().isEmpty() ) @@ -314,7 +314,7 @@ void AccountManager::removeAccount( Account *account ) Group* group = mc->groups().first(); TQPtrList groupMembers = group->members(); ContactList::self()->removeMetaContact( mc ); - if ( groupMembers.count() == 1 && groupMembers.findRef( mc ) != -1 ) + if ( groupMembers.count() == 1 && groupMembers.tqfindRef( mc ) != -1 ) ContactList::self()->removeGroup( group ); } } @@ -332,7 +332,7 @@ void AccountManager::removeAccount( Account *account ) { // FIXME: pluginId() should return the internal name and not the class name, so // we can get rid of this hack - Olivier/Martijn - TQString protocolName = protocol->pluginId().remove( TQString::fromLatin1( "Protocol" ) ).lower(); + TQString protocolName = protocol->pluginId().remove( TQString::tqfromLatin1( "Protocol" ) ).lower(); PluginManager::self()->setPluginEnabled( protocolName, false ); PluginManager::self()->unloadPlugin( protocolName ); @@ -365,14 +365,14 @@ void AccountManager::load() // Don't try to optimize duplicate calls out, the plugin queue is smart enough // (and fast enough) to handle that without adding complexity here KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); TQString protocol = config->readEntry( "Protocol" ); - if ( protocol.endsWith( TQString::fromLatin1( "Protocol" ) ) ) - protocol = TQString::fromLatin1( "kopete_" ) + protocol.lower().remove( TQString::fromLatin1( "protocol" ) ); + if ( protocol.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) + protocol = TQString::tqfromLatin1( "kopete_" ) + protocol.lower().remove( TQString::tqfromLatin1( "protocol" ) ); if ( config->readBoolEntry( "Enabled", true ) ) PluginManager::self()->loadPlugin( protocol, PluginManager::LoadAsync ); @@ -388,7 +388,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) // Iterate over all groups that start with "Account_" as those are accounts // and parse them if they are from this protocol KConfig *config = KGlobal::config(); - TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) ); + TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::tqfromLatin1( "^Account_" ) ) ); for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it ) { config->setGroup( *it ); @@ -423,14 +423,14 @@ void AccountManager::slotPluginLoaded( Plugin *plugin ) } void AccountManager::slotAccountOnlineStatusChanged(Contact *c, - const OnlineStatus &oldStatus, const OnlineStatus &newStatus) + const OnlineStatus &oldtqStatus, const OnlineStatus &newtqStatus) { Account *account = c->account(); if (!account) return; //kdDebug(14010) << k_funcinfo << endl; - emit accountOnlineStatusChanged(account, oldStatus, newStatus); + emit accountOnlineStatusChanged(account, oldtqStatus, newtqStatus); } } //END namespace Kopete diff --git a/kopete/libkopete/kopeteaccountmanager.h b/kopete/libkopete/kopeteaccountmanager.h index 75ebf667..cfca90d3 100644 --- a/kopete/libkopete/kopeteaccountmanager.h +++ b/kopete/libkopete/kopeteaccountmanager.h @@ -43,9 +43,10 @@ class OnlineStatus; * @author Martijn Klingens * @author Olivier Goffart */ -class KOPETE_EXPORT AccountManager : public QObject +class KOPETE_EXPORT AccountManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -139,10 +140,10 @@ public slots: * * @param category is one of the Kopete::OnlineStatusManager::Categories * @param awayMessage is the new away message - * @param flags is a bitmask of SetOnlineStatusFlag + * @param flags is a bittqmask of SetOnlineStatusFlag */ void setOnlineStatus( /*Kopete::OnlineStatusManager::Categories*/ uint category, - const TQString& awayMessage = TQString::null, uint flags=0); + const TQString& awayMessage = TQString(), uint flags=0); /** * \brief Set all accounts to away at once. @@ -152,7 +153,7 @@ public slots: * @param awayReason is the away message that will be set. * @param away decides whether the message is away/non-away */ - void setAwayAll( const TQString &awayReason = TQString::null, bool away=true ); + void setAwayAll( const TQString &awayReason = TQString(), bool away=true ); /** * \brief Connect or make available every account. @@ -162,7 +163,7 @@ public slots: * This is a slot, so you can connect directly to it from e.g. a KAction. * @param awayReason is the away(status) message that will be set. */ - void setAvailableAll( const TQString &awayReason = TQString::null ); + void setAvailableAll( const TQString &awayReason = TQString() ); /** * \internal @@ -195,11 +196,11 @@ signals: * \brief An account has changed its onlinestatus * Technically this monitors Account::myself() onlinestatus changes * \param account Account which changed its onlinestatus - * \param oldStatus The online status before the change - * \param newStatus The new online status + * \param oldtqStatus The online status before the change + * \param newtqStatus The new online status */ void accountOnlineStatusChanged(Kopete::Account *account, - const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); + const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); private: /** @@ -210,7 +211,7 @@ private: private slots: void slotPluginLoaded( Kopete::Plugin *plugin ); void slotAccountOnlineStatusChanged(Kopete::Contact *c, - const Kopete::OnlineStatus &oldStatus, const Kopete::OnlineStatus &newStatus); + const Kopete::OnlineStatus &oldtqStatus, const Kopete::OnlineStatus &newtqStatus); /** * \internal diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 1c920f31..04ac9a03 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -39,7 +39,7 @@ #include #include -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include #include #include @@ -50,7 +50,7 @@ #define HasScreenSaver #include #endif -#endif // Q_WS_X11 +#endif // TQ_WS_X11 // As this is an untested X extension we better leave it off #undef HAVE_XIDLE @@ -74,8 +74,8 @@ struct KopeteAwayPrivate int mouse_x; int mouse_y; - unsigned int mouse_mask; -#ifdef Q_WS_X11 + unsigned int mouse_tqmask; +#ifdef TQ_WS_X11 Window root; /* root window the pointer is on */ Screen* screen; /* screen the pointer is on */ @@ -95,8 +95,8 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") d = new KopeteAwayPrivate; // Set up the away messages - d->awayMessage = TQString::null; - d->autoAwayMessage = TQString::null; + d->awayMessage = TQString(); + d->autoAwayMessage = TQString(); d->useAutoAwayMessage = false; d->globalAway = false; d->autoaway = false; @@ -106,12 +106,12 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") d->awayMessageList.clear(); // set the XAutoLock info -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display *dsp = qt_xdisplay(); #endif d->mouse_x = d->mouse_y=0; - d->mouse_mask = 0; -#ifdef Q_WS_X11 + d->mouse_tqmask = 0; +#ifdef TQ_WS_X11 d->root = DefaultRootWindow (dsp); d->screen = ScreenOfDisplay (dsp, DefaultScreen (dsp)); #endif @@ -124,12 +124,12 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") if(!d->useXidle) d->useMit = XScreenSaverQueryExtension(qt_xdisplay(), &dummy, &dummy); #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 d->xIdleTime = 0; #endif kdDebug(14010) << k_funcinfo << "Idle detection methods:" << endl; kdDebug(14010) << k_funcinfo << "\tKScreensaverIface::isBlanked()" << endl; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 kdDebug(14010) << k_funcinfo << "\tX11 XQueryPointer()" << endl; #endif if (d->useXidle) @@ -293,7 +293,7 @@ TQString Kopete::Away::getMessage( uint messageNumber ) } else { - return TQString::null; + return TQString(); } } @@ -368,11 +368,11 @@ bool Kopete::Away::isActivity() bool activity = false; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 Display *dsp = qt_xdisplay(); Window dummy_w; int dummy_c; - unsigned int mask; /* modifier mask */ + unsigned int tqmask; /* modifier tqmask */ int root_x; int root_y; @@ -388,7 +388,7 @@ bool Kopete::Away::isActivity() * we now call that periodically anyway? */ if (!XQueryPointer (dsp, d->root, &(d->root), &dummy_w, &root_x, &root_y, - &dummy_c, &dummy_c, &mask)) + &dummy_c, &dummy_c, &tqmask)) { /* * Pointer has moved to another screen, so let's find out which one. @@ -432,10 +432,10 @@ bool Kopete::Away::isActivity() // Only check idle time if we have some way of measuring it, otherwise if // we've neither Mit nor Xidle it'll still be zero and we'll always appear active. // FIXME: what problem does the 2000ms fudge solve? - if (root_x != d->mouse_x || root_y != d->mouse_y || mask != d->mouse_mask + if (root_x != d->mouse_x || root_y != d->mouse_y || tqmask != d->mouse_tqmask || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000)) { - // -1 => just gone autoaway, ignore apparent activity this time round + // -1 => just gone autoaway, ignore aptqparent activity this time round // anything else => genuine activity // See setAutoAway(). if (d->mouse_x != -1) @@ -444,10 +444,10 @@ bool Kopete::Away::isActivity() } d->mouse_x = root_x; d->mouse_y = root_y; - d->mouse_mask = mask; + d->mouse_tqmask = tqmask; d->xIdleTime = xIdleTime; } -#endif // Q_WS_X11 +#endif // TQ_WS_X11 // ================================================================================= return activity; @@ -469,7 +469,7 @@ void Kopete::Away::setActive() { if(i->isConnected() && i->isAway()) { - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Online ) ); } @@ -484,7 +484,7 @@ void Kopete::Away::setActive() void Kopete::Away::setAutoAway() { // A value of -1 in mouse_x indicates to checkActivity() that next time it - // fires it should ignore any apparent idle/mouse/keyboard changes. + // fires it should ignore any aptqparent idle/mouse/keyboard changes. // I think the point of this is that if you manually start the screensaver // then there'll unavoidably be some residual mouse/keyboard activity // that should be ignored. @@ -499,21 +499,21 @@ void Kopete::Away::setAutoAway() TQPtrList accounts = Kopete::AccountManager::self()->accounts(); for(Kopete::Account *i=accounts.first() ; i; i=accounts.next() ) { - if(i->myself()->onlineStatus().status() == Kopete::OnlineStatus::Online) + if(i->myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Online) { d->autoAwayAccounts.append(i); if(d->useAutoAwayMessage) { // Display a specific away message - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->autoAwayMessage); } else { // Display the last away message used - i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlineStatus( i->protocol() , + i->setOnlineStatus( Kopete::OnlineStatusManager::self()->onlinetqStatus( i->protocol() , Kopete::OnlineStatusManager::Idle ) , getInstance()->d->awayMessage); } diff --git a/kopete/libkopete/kopeteaway.h b/kopete/libkopete/kopeteaway.h index e6a171b1..90d07469 100644 --- a/kopete/libkopete/kopeteaway.h +++ b/kopete/libkopete/kopeteaway.h @@ -54,9 +54,10 @@ namespace Kopete * @author Olivier Goffart */ -class KOPETE_EXPORT Away : public QObject +class KOPETE_EXPORT Away : public TQObject { Q_OBJECT + TQ_OBJECT friend class ::KopeteAwayDialog; diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index ded2a830..c72d94bc 100644 --- a/kopete/libkopete/kopeteawayaction.cpp +++ b/kopete/libkopete/kopeteawayaction.cpp @@ -37,8 +37,8 @@ public: AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( OnlineStatus() ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -53,8 +53,8 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortc } AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, - const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) - : KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) + const TQObject *receiver, const char *slot, TQObject *tqparent, const char *name ) + : KSelectAction(text, pix, cut, tqparent, name ) , d(new Private( status ) ) { TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), this, TQT_SLOT( slotAwayChanged() ) ); @@ -84,7 +84,7 @@ void AwayAction::slotAwayChanged() TQStringList menu; menu << i18n( "No Message" ); menu << i18n( "New Message..." ); - menu << TQString::null ; //separator + menu << TQString() ; //separator menu += awayMessages ; setItems( menu ); setCurrentItem( -1 ); @@ -106,11 +106,11 @@ void AwayAction::slotSelectAway( int index ) switch(index) { case 0: - awayReason = TQString::null; + awayReason = TQString(); break; case 1: bool ok; - awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString::null , &ok ); + awayReason = KInputDialog::getText( i18n( "New Away Message" ), i18n( "Please enter your away reason:" ) , TQString() , &ok ); if(!ok) //the user canceled return; if( !awayReason.isEmpty() ) diff --git a/kopete/libkopete/kopeteawayaction.h b/kopete/libkopete/kopeteawayaction.h index c787e7e7..6bc64581 100644 --- a/kopete/libkopete/kopeteawayaction.h +++ b/kopete/libkopete/kopeteawayaction.h @@ -40,26 +40,27 @@ class OnlineStatus; class KOPETE_EXPORT AwayAction : public KSelectAction { Q_OBJECT + TQ_OBJECT public: /** * Constructor - * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent and * @p name are all handled by KSelectAction. **/ AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, const TQObject *receiver, const char *slot, - TQObject *parent, const char *name = 0); + TQObject *tqparent, const char *name = 0); /** * Constructor * @param status the OnlineStatus that appears in the signal * @param slot must have the following signature: ( const OnlineStatus &, const TQString & ) - * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and + * @p text, @p pix, @p cut, @p receiver, @p slot, @p tqparent and * @p name are all handled by KSelectAction. **/ AwayAction(const OnlineStatus &status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, const TQObject *receiver, const char *slot, - TQObject *parent, const char *name = 0); + TQObject *tqparent, const char *name = 0); /** * Destructor. diff --git a/kopete/libkopete/kopeteawaydialog.cpp b/kopete/libkopete/kopeteawaydialog.cpp index 19d9fb9c..944e379f 100644 --- a/kopete/libkopete/kopeteawaydialog.cpp +++ b/kopete/libkopete/kopeteawaydialog.cpp @@ -33,8 +33,8 @@ public: KopeteAwayDialog_Base *base; }; -KopeteAwayDialog::KopeteAwayDialog( TQWidget *parent, const char *name ) -: KDialogBase( parent, name, true, i18n( "Global Away Message" ), +KopeteAwayDialog::KopeteAwayDialog( TQWidget *tqparent, const char *name ) +: KDialogBase( tqparent, name, true, i18n( "Global Away Message" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { //kdDebug( 14010 ) << k_funcinfo << "Building KopeteAwayDialog..." << endl; diff --git a/kopete/libkopete/kopeteawaydialog.h b/kopete/libkopete/kopeteawaydialog.h index 517e419c..1c494e60 100644 --- a/kopete/libkopete/kopeteawaydialog.h +++ b/kopete/libkopete/kopeteawaydialog.h @@ -53,14 +53,15 @@ class KopeteAwayDialogPrivate; class KOPETE_EXPORT KopeteAwayDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor for the Away Dialog - * @param parent The object that owns this + * @param tqparent The object that owns this * @param name Name for this object */ - KopeteAwayDialog( TQWidget *parent = 0, const char *name = 0 ); + KopeteAwayDialog( TQWidget *tqparent = 0, const char *name = 0 ); /** * Destructor diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp index 29dbf727..cf6ff95e 100644 --- a/kopete/libkopete/kopeteblacklister.cpp +++ b/kopete/libkopete/kopeteblacklister.cpp @@ -34,15 +34,15 @@ public: }; -BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name) - : TQObject(parent, name), d( new Private ) +BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *tqparent, const char *name) + : TQObject(tqparent, name), d( new Private ) { KConfig *config = KGlobal::config(); d->owner = accountId; d->protocol = protocolId; config->setGroup("BlackLister"); - d->blacklist = config->readListEntry( d->protocol + TQString::fromLatin1("_") + d->owner ); + d->blacklist = config->readListEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner ); } BlackLister::~BlackLister() @@ -53,7 +53,7 @@ BlackLister::~BlackLister() bool BlackLister::isBlocked(const TQString &contactId) { - return (d->blacklist.find( contactId ) != d->blacklist.end() ); + return (d->blacklist.tqfind( contactId ) != d->blacklist.end() ); } bool BlackLister::isBlocked(Contact *contact) @@ -90,7 +90,7 @@ void BlackLister::saveToDisk() KConfig *config = KGlobal::config(); config->setGroup("BlackLister"); - config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist ); + config->writeEntry( d->protocol + TQString::tqfromLatin1("_") + d->owner, d->blacklist ); config->sync(); } diff --git a/kopete/libkopete/kopeteblacklister.h b/kopete/libkopete/kopeteblacklister.h index c2df1bca..d5c946fe 100644 --- a/kopete/libkopete/kopeteblacklister.h +++ b/kopete/libkopete/kopeteblacklister.h @@ -42,19 +42,20 @@ class Contact; * * @author Roie Kerstein */ -class BlackLister : public QObject +class BlackLister : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Create an instance, and read the blacklist from disk if it exists. * @param protocolId is the ID of the protocol owning accountId * @param accountId is the ID of the owning Account. - * @param parent The TQObject parent for this class. + * @param tqparent The TQObject tqparent for this class. * @param name The TQObject name for this class. */ - BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *parent = 0, const char *name = 0 ); + BlackLister( const TQString &protocolId, const TQString &accountId, TQObject *tqparent = 0, const char *name = 0 ); ~BlackLister(); /** diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index 91866cce..f396a659 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -49,7 +49,7 @@ class KMMPrivate public: Kopete::ContactPtrList mContactList; const Kopete::Contact *mUser; - TQMap contactStatus; + TQMap contacttqStatus; Kopete::Protocol *mProtocol; bool isEmpty; bool mCanBeDeleted; @@ -101,27 +101,27 @@ Kopete::ChatSession::~ChatSession() delete d; } -void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ) +void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ) { slotUpdateDisplayName(); - emit onlineStatusChanged((Kopete::Contact*)c, status, oldStatus); + emit onlineStatusChanged((Kopete::Contact*)c, status, oldtqStatus); } void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact, const Kopete::OnlineStatus &status ) { - Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ]; - d->contactStatus[ contact ] = status; + Kopete::OnlineStatus oldtqStatus = d->contacttqStatus[ contact ]; + d->contacttqStatus[ contact ] = status; disconnect( contact, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); - emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldStatus ); + emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldtqStatus ); } const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const { - if ( d->contactStatus.contains( contact ) ) - return d->contactStatus[ contact ]; + if ( d->contacttqStatus.tqcontains( contact ) ) + return d->contacttqStatus[ contact ]; - return contact->onlineStatus(); + return contact->onlinetqStatus(); } const TQString Kopete::ChatSession::displayName() @@ -152,11 +152,11 @@ void Kopete::ChatSession::slotUpdateDisplayName() if ( !c ) return; - d->displayName=TQString::null; + d->displayName=TQString(); do { if(! d->displayName.isNull() ) - d->displayName.append( TQString::fromLatin1( ", " ) ) ; + d->displayName.append( TQString::tqfromLatin1( ", " ) ) ; if ( c->metaContact() ) d->displayName.append( c->metaContact()->displayName() ); @@ -171,7 +171,7 @@ void Kopete::ChatSession::slotUpdateDisplayName() //If we have only 1 contact, add the status of him if ( d->mContactList.count() == 1 ) { - d->displayName.append( TQString::fromLatin1( " (%1)" ).arg( d->mContactList.first()->onlineStatus().description() ) ); + d->displayName.append( TQString::tqfromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlinetqStatus().description() ) ); } emit displayNameChanged(); @@ -248,7 +248,7 @@ void Kopete::ChatSession::sendMessage( Kopete::Message &message ) emit messageSent( sentMessage, this ); if ( !account()->isAway() || KopetePrefs::prefs()->soundIfAway() ) { - KNotification::event(TQString::fromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); + KNotification::event(TQString::tqfromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) ); } } else @@ -264,7 +264,7 @@ void Kopete::ChatSession::messageSucceeded() void Kopete::ChatSession::emitNudgeNotification() { - KNotification::event( TQString::fromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); + KNotification::event( TQString::tqfromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") ); } void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) @@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) { TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString(); if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() && - msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).arg( nick ), false ) ) ) + msg.plainBody().tqcontains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) ) { msg.setImportance( Kopete::Message::Highlight ); } @@ -294,17 +294,17 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg ) // emit messageAppended( msg, this ); } -void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress ) +void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress ) { - if( !d->contactStatus.contains(c) ) - d->contactStatus[ c ] = initialStatus; + if( !d->contacttqStatus.tqcontains(c) ) + d->contacttqStatus[ c ] = initialtqStatus; addContact( c, suppress ); } void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) { //kdDebug( 14010 ) << k_funcinfo << endl; - if ( d->mContactList.contains( c ) ) + if ( d->mContactList.tqcontains( c ) ) { kdDebug( 14010 ) << k_funcinfo << "Contact already exists" <mContactList.contains( c ) ) + if ( !c || !d->mContactList.tqcontains( c ) ) return; if ( d->mContactList.count() == 1 ) @@ -386,7 +386,7 @@ void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQStrin slotUpdateDisplayName(); } - d->contactStatus.remove( c ); + d->contacttqStatus.remove( c ); emit contactRemoved( c, reason, format, suppressNotification ); } @@ -472,14 +472,14 @@ void Kopete::ChatSession::slotContactDestroyed( Kopete::Contact *contact ) if(contact == myself()) deleteLater(); - if( !contact || !d->mContactList.contains( contact ) ) + if( !contact || !d->mContactList.tqcontains( contact ) ) return; //This is a workaround to prevent crash if the contact get deleted. // in the best case, we should ask the protocol to recreate a temporary contact. // (remember: the contact may be deleted when the users removes it from the contactlist, or when closing kopete ) d->mContactList.remove( contact ); - emit contactRemoved( contact, TQString::null ); + emit contactRemoved( contact, TQString() ); if ( d->mContactList.isEmpty() ) deleteLater(); diff --git a/kopete/libkopete/kopetechatsession.h b/kopete/libkopete/kopetechatsession.h index 928ac7d5..802a4e39 100644 --- a/kopete/libkopete/kopetechatsession.h +++ b/kopete/libkopete/kopetechatsession.h @@ -77,6 +77,7 @@ class KOPETE_EXPORT ChatSession : public TQObject , public KXMLGUIClient friend class ChatSessionManager; Q_OBJECT + TQ_OBJECT public: /** @@ -129,7 +130,7 @@ public: * Set a special icon for a contact in this kmm only. * by default, all contact have their own status */ - void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newStatus ); + void setContactOnlineStatus( const Contact *contact, const OnlineStatus &newtqStatus ); /** * @brief get the status of a contact. @@ -148,7 +149,7 @@ public: * @param requestedPlugin Specifies the view plugin to use if we have to create one. */ // FIXME: canCreate should definitely be an enum and not a bool - Martijn - KopeteView* view( bool canCreate = false, const TQString &requestedPlugin = TQString::null ); + KopeteView* view( bool canCreate = false, const TQString &requestedPlugin = TQString() ); /** * says if you may invite contact from the same account to this chat with @ref inviteContact @@ -288,20 +289,20 @@ public slots: * @param c is the contact * @param suppress mean the there will be no automatic notifications in the chatwindow. * (note that i don't like the param suppress at all. it is used in irc to show a different notification (with an info text) - * a QStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) + * a TQStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) */ void addContact( const Kopete::Contact *c, bool suppress = false ); /** * Add a contact to the session with a pre-set initial status * @param c is the contact - * @param initialStatus The initial contactOnlineStatus of the contact + * @param initialtqStatus The initial contactOnlineStatus of the contact * @param suppress mean the there will be no automatic notifications in the chatwindow. * (note that i don't like the param suppress at all. it is used in irc to show a different notification (with an info text) - * a QStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) + * a TQStringinfo would be more interesting, but it is also used to don't show the notification when entering in a channel) * @see contactOnlineStatus */ - void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress = false ); + void addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress = false ); /** * Remove a contact from the session @@ -310,7 +311,7 @@ public slots: * @param format The format of the message * @param suppressNotification prevents a notification of the removal in the chat view. See note in @ref addContact */ - void removeContact( const Kopete::Contact *contact, const TQString& reason = TQString::null, Kopete::Message::MessageFormat format = Message::PlainText, bool suppressNotification = false ); + void removeContact( const Kopete::Contact *contact, const TQString& reason = TQString(), Kopete::Message::MessageFormat format = Message::PlainText, bool suppressNotification = false ); /** * Set if the KMM will be deleted when the chatwindow is deleted. It is useful if you want @@ -370,7 +371,7 @@ public slots: private slots: void slotUpdateDisplayName(); void slotViewDestroyed(); - void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + void slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); void slotContactDestroyed( Kopete::Contact *contact ); protected: diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 4805927b..24029604 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -38,14 +38,14 @@ ChatSessionManager* ChatSessionManager::s_self = 0L; ChatSessionManager* ChatSessionManager::self() { if( !s_self ) - s_self = new ChatSessionManager( kapp ); + s_self = new ChatSessionManager( TQT_TQOBJECT(kapp) ); return s_self; } -ChatSessionManager::ChatSessionManager( TQObject* parent, +ChatSessionManager::ChatSessionManager( TQObject* tqparent, const char* name ) - : TQObject( parent, name ) + : TQObject( tqparent, name ) { d=new Private; s_self = this; @@ -81,7 +81,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, Contact *tmpContact; for (tmpContact = contactlist.first(); tmpContact && halfMatch; tmpContact = contactlist.next()) { - if ( !chatContacts.containsRef( tmpContact ) ) + if ( !chatContacts.tqcontainsRef( tmpContact ) ) halfMatch = false; } @@ -91,7 +91,7 @@ ChatSession* ChatSessionManager::findChatSession(const Contact *user, bool fullMatch = true; for (tmpContact = chatContacts.first(); tmpContact && fullMatch; tmpContact = chatContacts.next()) { - if ( !contactlist.containsRef( tmpContact ) ) + if ( !contactlist.tqcontainsRef( tmpContact ) ) fullMatch = false; } // We have a winner diff --git a/kopete/libkopete/kopetechatsessionmanager.h b/kopete/libkopete/kopetechatsessionmanager.h index efabd604..bc1635d8 100644 --- a/kopete/libkopete/kopetechatsessionmanager.h +++ b/kopete/libkopete/kopetechatsessionmanager.h @@ -46,9 +46,10 @@ typedef TQValueList MessageList; * Kopete::ChatSessionManager is responsible for creating and tracking Kopete::ChatSession * instances for each chat. */ -class KOPETE_EXPORT ChatSessionManager : public QObject +class KOPETE_EXPORT ChatSessionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static ChatSessionManager* self(); @@ -97,7 +98,7 @@ public: * create a new view for the manager. * only the manager should call this function */ - KopeteView *createView( Kopete::ChatSession * , const TQString &requestedPlugin = TQString::null ); + KopeteView *createView( Kopete::ChatSession * , const TQString &requestedPlugin = TQString() ); /** * Post a new event. this will emit the @ref newEvent signal @@ -175,7 +176,7 @@ public slots: void slotReadMessage(); private: - ChatSessionManager( TQObject* parent = 0, const char* name = 0 ); + ChatSessionManager( TQObject* tqparent = 0, const char* name = 0 ); class Private; Private *d; diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index cd4dcd8c..a01d06e4 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -38,14 +38,14 @@ using Kopete::CommandList; typedef TQMap PluginCommandMap; typedef TQMap CommandMap; -typedef QPair ManagerPair; +typedef TQPair ManagerPair; class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient { public: KopeteCommandGUIClient( Kopete::ChatSession *manager ) : TQObject(manager), KXMLGUIClient(manager) { - setXMLFile( TQString::fromLatin1("kopetecommandui.rc") ); + setXMLFile( TQString::tqfromLatin1("kopetecommandui.rc") ); TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild().firstChild(); @@ -57,15 +57,15 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient { KAction *a = static_cast( it.current() ); actionCollection()->insert( a ); - TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") ); - newNode.setAttribute( TQString::fromLatin1("name"), - TQString::fromLatin1( a->name() ) ); + TQDomElement newNode = doc.createElement( TQString::tqfromLatin1("Action") ); + newNode.setAttribute( TQString::tqfromLatin1("name"), + TQString::tqfromLatin1( a->name() ) ); bool added = false; for( TQDomElement n = menu.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if( TQString::fromLatin1(a->name()) < n.attribute(TQString::fromLatin1("name"))) + if( TQString::tqfromLatin1(a->name()) < n.attribute(TQString::tqfromLatin1("name"))) { menu.insertBefore( newNode, n ); added = true; @@ -94,7 +94,7 @@ struct CommandHandlerPrivate CommandHandlerPrivate *Kopete::CommandHandler::p = 0L; -Kopete::CommandHandler::CommandHandler() : TQObject( qApp ) +Kopete::CommandHandler::CommandHandler() : TQObject( tqApp ) { p->s_handler = this; p->inCommand = false; @@ -103,33 +103,33 @@ Kopete::CommandHandler::CommandHandler() : TQObject( qApp ) mCommands.setAutoDelete( true ); p->pluginCommands.insert( this, mCommands ); - registerCommand( this, TQString::fromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /help [] - Used to list available commands, or show help for a specified command." ), 0, 1 ); - registerCommand( this, TQString::fromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /close - Closes the current view." ) ); // FIXME: What's the difference with /close? The help doesn't explain it - Martijn - registerCommand( this, TQString::fromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /part - Closes the current view." ) ); - registerCommand( this, TQString::fromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /clear - Clears the active view's chat buffer." ) ); - //registerCommand( this, TQString::fromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), + //registerCommand( this, TQString::tqfromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), // i18n( "USAGE: /me - Formats message as in ' went to the store'." ) ); - registerCommand( this, TQString::fromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /away [] - Marks you as away/back for the current account only." ) ); - registerCommand( this, TQString::fromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /awayall [] - Marks you as away/back for all accounts." ) ); - registerCommand( this, TQString::fromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /say - Say text in this chat. This is the same as just typing a message, but is very " "useful for scripts." ), 1 ); - registerCommand( this, TQString::fromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::tqfromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /exec [-o] - Executes the specified command and displays the output in the chat buffer. " "If -o is specified, the output is sent to all members of the chat."), 1 ); @@ -156,43 +156,43 @@ Kopete::CommandHandler *Kopete::CommandHandler::commandHandler() return p->s_handler; } -void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, +void Kopete::CommandHandler::registerCommand( TQObject *tqparent, const TQString &command, const char* handlerSlot, const TQString &help, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) { TQString lowerCommand = command.lower(); - Kopete::Command *mCommand = new Kopete::Command( parent, lowerCommand, handlerSlot, help, - Normal, TQString::null, minArgs, maxArgs, cut, pix); - p->pluginCommands[ parent ].insert( lowerCommand, mCommand ); + Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerCommand, handlerSlot, help, + Normal, TQString(), minArgs, maxArgs, cut, pix); + p->pluginCommands[ tqparent ].insert( lowerCommand, mCommand ); } -void Kopete::CommandHandler::unregisterCommand( TQObject *parent, const TQString &command ) +void Kopete::CommandHandler::unregisterCommand( TQObject *tqparent, const TQString &command ) { - if( p->pluginCommands[ parent ].find(command) ) - p->pluginCommands[ parent ].remove( command ); + if( p->pluginCommands[ tqparent ].tqfind(command) ) + p->pluginCommands[ tqparent ].remove( command ); } -void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString, +void Kopete::CommandHandler::registerAlias( TQObject *tqparent, const TQString &alias, const TQString &formatString, const TQString &help, CommandType type, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) { TQString lowerAlias = alias.lower(); - Kopete::Command *mCommand = new Kopete::Command( parent, lowerAlias, 0L, help, type, + Kopete::Command *mCommand = new Kopete::Command( tqparent, lowerAlias, 0L, help, type, formatString, minArgs, maxArgs, cut, pix ); - p->pluginCommands[ parent ].insert( lowerAlias, mCommand ); + p->pluginCommands[ tqparent ].insert( lowerAlias, mCommand ); } -void Kopete::CommandHandler::unregisterAlias( TQObject *parent, const TQString &alias ) +void Kopete::CommandHandler::unregisterAlias( TQObject *tqparent, const TQString &alias ) { - if( p->pluginCommands[ parent ].find(alias) ) - p->pluginCommands[ parent ].remove( alias ); + if( p->pluginCommands[ tqparent ].tqfind(alias) ) + p->pluginCommands[ tqparent ].remove( alias ); } bool Kopete::CommandHandler::processMessage( const TQString &msg, Kopete::ChatSession *manager ) { if( p->inCommand ) return false; - TQRegExp splitRx( TQString::fromLatin1("^/([\\S]+)(.*)") ); + TQRegExp splitRx( TQString::tqfromLatin1("^/([\\S]+)(.*)") ); TQString command; TQString args; if(splitRx.search(msg) != -1) @@ -255,7 +255,7 @@ void Kopete::CommandHandler::slotHelpCommand( const TQString &args, Kopete::Chat if( c && !c->help().isNull() ) output = c->help(); else - output = i18n("There is no help available for '%1'.").arg( command ); + output = i18n("There is no help available for '%1'.").tqarg( command ); } Kopete::Message msg(manager->myself(), manager->members(), output, Kopete::Message::Internal, Kopete::Message::PlainText); @@ -275,18 +275,18 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat if( !args.isEmpty() ) { KProcess *proc = 0L; - if ( kapp->authorize( TQString::fromLatin1( "shell_access" ) ) ) + if ( kapp->authorize( TQString::tqfromLatin1( "shell_access" ) ) ) proc = new KProcess(manager); if( proc ) { - *proc << TQString::fromLatin1("sh") << TQString::fromLatin1("-c"); + *proc << TQString::tqfromLatin1("sh") << TQString::tqfromLatin1("-c"); TQStringList argsList = parseArguments( args ); - if( argsList.front() == TQString::fromLatin1("-o") ) + if( argsList.front() == TQString::tqfromLatin1("-o") ) { p->processMap.insert( proc, ManagerPair(manager, Kopete::Message::Outbound) ); - *proc << args.section(TQRegExp(TQString::fromLatin1("\\s+")), 1); + *proc << args.section(TQRegExp(TQString::tqfromLatin1("\\s+")), 1); } else { @@ -371,7 +371,7 @@ void Kopete::CommandHandler::slotExecFinished(KProcess *proc) TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) { TQStringList arguments; - TQRegExp quotedArgs( TQString::fromLatin1("\"(.*)\"") ); + TQRegExp quotedArgs( TQString::tqfromLatin1("\"(.*)\"") ); quotedArgs.setMinimal( true ); if ( quotedArgs.search( args ) != -1 ) @@ -380,7 +380,7 @@ TQStringList Kopete::CommandHandler::parseArguments( const TQString &args ) arguments.append( quotedArgs.cap(i) ); } - TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::fromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); + TQStringList otherArgs = TQStringList::split( TQRegExp(TQString::tqfromLatin1("\\s+")), args.section( quotedArgs, 0 ) ); for( TQStringList::Iterator it = otherArgs.begin(); it != otherArgs.end(); ++it ) arguments.append( *it ); @@ -470,7 +470,7 @@ void Kopete::CommandHandler::slotViewCreated( KopeteView *view ) void Kopete::CommandHandler::slotPluginLoaded( Kopete::Plugin *plugin ) { connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); - if( !p->pluginCommands.contains( plugin ) ) + if( !p->pluginCommands.tqcontains( plugin ) ) { //Create a TQDict optomized for a larger # of commands, and case insensitive CommandList mCommands(31, false); diff --git a/kopete/libkopete/kopetecommandhandler.h b/kopete/libkopete/kopetecommandhandler.h index 9632f872..aeb93529 100644 --- a/kopete/libkopete/kopetecommandhandler.h +++ b/kopete/libkopete/kopetecommandhandler.h @@ -45,11 +45,12 @@ typedef TQDict CommandList; * * The Kopete::CommandHandler can handle /action like messages */ -class KOPETE_EXPORT CommandHandler : public QObject +class KOPETE_EXPORT CommandHandler : public TQObject { friend class ::KopeteCommandGUIClient; Q_OBJECT + TQ_OBJECT public: /** @@ -73,7 +74,7 @@ class KOPETE_EXPORT CommandHandler : public QObject * Kopete::CommandHandler). These commands can also be overridden by * registering a new duplicate command. * - * @param parent The plugin who owns this command + * @param tqparent The plugin who owns this command * @param command The command we want to handle, not including the '/' * @param handlerSlot The slot used to handle the command. This slot must * accept two parameters, a TQString of arguments, and a Kopete::ChatSession @@ -85,14 +86,14 @@ class KOPETE_EXPORT CommandHandler : public QObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, - const TQString &help = TQString::null, uint minArgs = 0, int maxArgs = -1, - const KShortcut &cut = 0, const TQString &pix = TQString::null ); + void registerCommand( TQObject *tqparent, const TQString &command, const char* handlerSlot, + const TQString &help = TQString(), uint minArgs = 0, int maxArgs = -1, + const KShortcut &cut = 0, const TQString &pix = TQString() ); /** * \brief Register a command alias. * - * @param parent The plugin who owns this alias + * @param tqparent The plugin who owns this alias * @param alias The command for the alias * @param formatString This is the string that will be transformed into another * command. The formatString should begin with an already existing command, @@ -106,15 +107,15 @@ class KOPETE_EXPORT CommandHandler : public QObject * @param cut a default keyboard shortcut * @param pix icon name, the icon will be shown in menus */ - void registerAlias( TQObject *parent, + void registerAlias( TQObject *tqparent, const TQString &alias, const TQString &formatString, - const TQString &help = TQString::null, + const TQString &help = TQString(), CommandType = SystemAlias, uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, - const TQString &pix = TQString::null ); + const TQString &pix = TQString() ); /** * \brief Unregister a command. @@ -123,19 +124,19 @@ class KOPETE_EXPORT CommandHandler : public QObject * This function should only be called in the case of a plugin which loads and * unloads commands dynamically. * - * @param parent The plugin who owns this command + * @param tqparent The plugin who owns this command * @param command The command to unload */ - void unregisterCommand( TQObject *parent, const TQString &command ); + void unregisterCommand( TQObject *tqparent, const TQString &command ); /** * \brief Unregister an alias. * - * \see unregisterCommand( TQObject *parent, const TQString &command ) - * @param parent The plugin who owns this alias + * \see unregisterCommand( TQObject *tqparent, const TQString &command ) + * @param tqparent The plugin who owns this alias * @param alias The alais to unload */ - void unregisterAlias( TQObject *parent, const TQString &alias ); + void unregisterAlias( TQObject *tqparent, const TQString &alias ); /** * \brief Process a message to see if any commands should be handled diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 546958ef..5dc2871d 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -63,7 +63,7 @@ struct Contact::Private public: bool fileCapable; - OnlineStatus onlineStatus; + OnlineStatus onlinetqStatus; Account *account; MetaContact *metaContact; @@ -79,15 +79,15 @@ public: }; Contact::Contact( Account *account, const TQString &contactId, - MetaContact *parent, const TQString &icon ) - : TQObject( parent ) + MetaContact *tqparent, const TQString &icon ) + : TQObject( tqparent ) { d = new Private; //kdDebug( 14010 ) << k_funcinfo << "Creating contact with id " << contactId << endl; d->contactId = contactId; - d->metaContact = parent; + d->metaContact = tqparent; d->fileCapable = false; d->account = account; d->idleTime = 0; @@ -101,15 +101,15 @@ Contact::Contact( Account *account, const TQString &contactId, connect( account, TQT_SIGNAL( isConnectedChanged() ), TQT_SLOT( slotAccountIsConnectedChanged() ) ); } - // Need to check this because myself() may have no parent + // Need to check this because myself() may have no tqparent // Maybe too the metaContact doesn't have a valid protocol() // (ex: for unit tests or chat window style preview) - if( parent && protocol() ) + if( tqparent && protocol() ) { - connect( parent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + connect( tqparent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); - parent->addContact( this ); + tqparent->addContact( this ); } @@ -124,45 +124,45 @@ Contact::~Contact() -OnlineStatus Contact::onlineStatus() const +OnlineStatus Contact::onlinetqStatus() const { if ( this == account()->myself() || account()->isConnected() ) - return d->onlineStatus; + return d->onlinetqStatus; else - return protocol()->accountOfflineStatus(); + return protocol()->accountOfflinetqStatus(); } void Contact::setOnlineStatus( const OnlineStatus &status ) { - if( status == d->onlineStatus ) + if( status == d->onlinetqStatus ) return; - OnlineStatus oldStatus = d->onlineStatus; - d->onlineStatus = status; + OnlineStatus oldtqStatus = d->onlinetqStatus; + d->onlinetqStatus = status; Kopete::Global::Properties *globalProps = Kopete::Global::Properties::self(); // Contact changed from Offline to another status - if( oldStatus.status() == OnlineStatus::Offline && + if( oldtqStatus.status() == OnlineStatus::Offline && status.status() != OnlineStatus::Offline ) { - setProperty( globalProps->onlineSince(), TQDateTime::currentDateTime() ); + setProperty( globalProps->onlineSince(), TQDateTime::tqcurrentDateTime() ); /*kdDebug(14010) << k_funcinfo << "REMOVING lastSeen property for " << d->displayName << endl;*/ removeProperty( globalProps->lastSeen() ); } - else if( oldStatus.status() != OnlineStatus::Offline && - oldStatus.status() != OnlineStatus::Unknown && + else if( oldtqStatus.status() != OnlineStatus::Offline && + oldtqStatus.status() != OnlineStatus::Unknown && status.status() == OnlineStatus::Offline ) // Contact went back offline { removeProperty( globalProps->onlineSince() ); /*kdDebug(14010) << k_funcinfo << "SETTING lastSeen property for " << d->displayName << endl;*/ - setProperty( globalProps->lastSeen(), TQDateTime::currentDateTime() ); + setProperty( globalProps->lastSeen(), TQDateTime::tqcurrentDateTime() ); } if ( this == account()->myself() || account()->isConnected() ) - emit onlineStatusChanged( this, status, oldStatus ); + emit onlineStatusChanged( this, status, oldtqStatus ); } void Contact::slotAccountIsConnectedChanged() @@ -171,9 +171,9 @@ void Contact::slotAccountIsConnectedChanged() return; if ( account()->isConnected() ) - emit onlineStatusChanged( this, d->onlineStatus, protocol()->accountOfflineStatus() ); + emit onlineStatusChanged( this, d->onlinetqStatus, protocol()->accountOfflinetqStatus() ); else - emit onlineStatusChanged( this, protocol()->accountOfflineStatus(), d->onlineStatus ); + emit onlineStatusChanged( this, protocol()->accountOfflinetqStatus(), d->onlinetqStatus ); } @@ -202,15 +202,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) TQString titleText; TQString nick = property( Kopete::Global::Properties::self()->nickName() ).value().toString(); if( nick.isEmpty() ) - titleText = TQString::fromLatin1( "%1 (%2)" ).arg( contactId(), onlineStatus().description() ); + titleText = TQString::tqfromLatin1( "%1 (%2)" ).tqarg( contactId(), onlinetqStatus().description() ); else - titleText = TQString::fromLatin1( "%1 <%2> (%3)" ).arg( nick, contactId(), onlineStatus().description() ); + titleText = TQString::tqfromLatin1( "%1 <%2> (%3)" ).tqarg( nick, contactId(), onlinetqStatus().description() ); menu->insertTitle( titleText ); if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) { - KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ), - 0, this, TQT_SLOT( slotAddContact() ), menu, "actionAddContact" ); + KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::tqfromLatin1( "add_user" ), + 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" ); actionAddContact->plug( menu ); menu->insertSeparator(); } @@ -219,15 +219,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) bool reach = account()->isConnected() && isReachable(); bool myself = (this == account()->myself()); - KAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQT_SLOT( sendMessage() ), menu, "actionSendMessage" ); + KAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" ); actionSendMessage->setEnabled( reach && !myself ); actionSendMessage->plug( menu ); - KAction *actionChat = KopeteStdAction::chat( this, TQT_SLOT( startChat() ), menu, "actionChat" ); + KAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" ); actionChat->setEnabled( reach && !myself ); actionChat->plug( menu ); - KAction *actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( sendFile() ), menu, "actionSendFile" ); + KAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" ); actionSendFile->setEnabled( reach && d->fileCapable && !myself ); actionSendFile->plug( menu ); @@ -248,9 +248,9 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) menu->insertSeparator(); if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::changeMetaContact( this, TQT_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu ); + KopeteStdAction::changeMetaContact( TQT_TQOBJECT(this), TQT_SLOT( changeMetaContact() ), TQT_TQOBJECT(menu), "actionChangeMetaContact" )->plug( menu ); - KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu ); + KopeteStdAction::contactInfo( TQT_TQOBJECT(this), TQT_SLOT( slotUserInfo() ), TQT_TQOBJECT(menu), "actionUserInfo" )->plug( menu ); #if 0 //this is not fully implemented yet (and doesn't work). disable for now - Olivier 2005-01-11 if ( account()->isBlocked( d->contactId ) ) @@ -260,7 +260,7 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager ) #endif if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::deleteContact( this, TQT_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu ); + KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), TQT_TQOBJECT(menu), "actionDeleteContact" )->plug( menu ); return menu; } @@ -314,8 +314,8 @@ void Contact::setMetaContact( MetaContact *m ) { //only one contact, including this one, that mean the contact will be empty efter the move result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), i18n( "You are moving the contact `%1' to the meta contact `%2'.\n" "`%3' will be empty afterwards. Do you want to delete this contact?" ) - .arg(contactId(), m ? m->displayName() : TQString::null, old->displayName()) - , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::fromLatin1("delete_old_contact_when_move") ); + .tqarg(contactId(), m ? m->displayName() : TQString(), old->displayName()) + , i18n( "Move Contact" ), KStdGuiItem::del(), i18n( "&Keep" ) , TQString::tqfromLatin1("delete_old_contact_when_move") ); if(result==KMessageBox::Cancel) return; } @@ -368,7 +368,7 @@ void Contact::serializeProperties(TQMap &serializedData) continue; TQVariant val = it.data().value(); - TQString key = TQString::fromLatin1("prop_%1_%2").arg(TQString::fromLatin1(val.typeName()), it.key()); + TQString key = TQString::tqfromLatin1("prop_%1_%2").tqarg(TQString::tqfromLatin1(val.typeName()), it.key()); serializedData[key] = val.toString(); @@ -383,7 +383,7 @@ void Contact::deserializeProperties( { TQString key = it.key(); - if ( !key.startsWith( TQString::fromLatin1("prop_") ) ) // avoid parsing other serialized data + if ( !key.startsWith( TQString::tqfromLatin1("prop_") ) ) // avoid parsing other serialized data continue; TQStringList keyList = TQStringList::split( TQChar('_'), key, false ); @@ -419,20 +419,20 @@ bool Contact::isReachable() { // The default implementation returns false when offline and true // otherwise. Subclass if you need more control over the process. - return onlineStatus().status() != OnlineStatus::Offline; + return onlinetqStatus().status() != OnlineStatus::Offline; } void Contact::startChat() { - KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_chatwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_chatwindow") ); if(v) v->raise(true); } void Contact::sendMessage() { - KopeteView *v=manager( CanCreate )->view(true, TQString::fromLatin1("kopete_emailwindow") ); + KopeteView *v=manager( CanCreate )->view(true, TQString::tqfromLatin1("kopete_emailwindow") ); if(v) v->raise(true); } @@ -458,8 +458,8 @@ void Contact::slotDelete() { if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n( "Are you sure you want to remove the contact '%1' from your contact list?" ). - arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::fromLatin1("delete_user") ), - TQString::fromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) + arg( d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), TQString::tqfromLatin1("delete_user") ), + TQString::tqfromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue ) { deleteContact(); @@ -524,7 +524,7 @@ TQPtrList *Contact::customContextMenuActions( ChatSession * /* manager bool Contact::isOnline() const { - return onlineStatus().isDefinitelyOnline(); + return onlinetqStatus().isDefinitelyOnline(); } @@ -575,7 +575,7 @@ TQStringList Contact::properties() const bool Contact::hasProperty(const TQString &key) const { - return d->properties.contains(key); + return d->properties.tqcontains(key); } const ContactProperty &Contact::property(const TQString &key) const @@ -645,8 +645,8 @@ TQString Contact::toolTip() const // -------------------------------------------------------------------------- // Fixed part of tooltip - TQString iconName = TQString::fromLatin1("kopete-contact-icon:%1:%2:%3") - .arg( KURL::encode_string( protocol()->pluginId() ), + TQString iconName = TQString::tqfromLatin1("kopete-contact-icon:%1:%2:%3") + .tqarg( KURL::encode_string( protocol()->pluginId() ), KURL::encode_string( account()->accountId() ), KURL::encode_string( contactId() ) ); @@ -656,14 +656,14 @@ TQString Contact::toolTip() const { tip = i18n( "DISPLAY NAME
 CONTACT STATUS", "%3
 %1" ). - arg( Kopete::Message::escape( onlineStatus().description() ), iconName, + arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, Kopete::Message::escape( d->contactId ) ); } else { tip = i18n( "DISPLAY NAME (CONTACT ID)
 CONTACT STATUS", "%4 (%3)
 %1" ). - arg( Kopete::Message::escape( onlineStatus().description() ), iconName, + arg( Kopete::Message::escape( onlinetqStatus().description() ), iconName, Kopete::Message::escape( contactId() ), Kopete::Emoticons::parseEmoticons( Kopete::Message::escape( nick ) ) ); } @@ -673,25 +673,25 @@ TQString Contact::toolTip() const for(TQStringList::Iterator it=shownProps.begin(); it!=shownProps.end(); ++it) { - if((*it) == TQString::fromLatin1("FormattedName")) + if((*it) == TQString::tqfromLatin1("FormattedName")) { TQString name = formattedName(); if(!name.isEmpty()) { tip += i18n("
Full Name: FORMATTED NAME", - "
Full Name: %1").arg(TQStyleSheet::escape(name)); + "
Full Name: %1").tqarg(TQStyleSheet::escape(name)); } } - else if ((*it) == TQString::fromLatin1("FormattedIdleTime")) + else if ((*it) == TQString::tqfromLatin1("FormattedIdleTime")) { TQString time = formattedIdleTime(); if(!time.isEmpty()) { tip += i18n("
Idle: FORMATTED IDLE TIME", - "
Idle: %1").arg(time); + "
Idle: %1").tqarg(time); } } - else if ((*it) == TQString::fromLatin1("homePage")) + else if ((*it) == TQString::tqfromLatin1("homePage")) { TQString url = property(*it).value().toString(); if(!url.isEmpty()) @@ -701,7 +701,7 @@ TQString Contact::toolTip() const arg( KURL::encode_string( url ), Kopete::Message::escape( TQStyleSheet::escape(url) ) ); } } - else if ((*it) == TQString::fromLatin1("awayMessage")) + else if ((*it) == TQString::tqfromLatin1("awayMessage")) { TQString awaymsg = property(*it).value().toString(); if(!awaymsg.isEmpty()) @@ -755,21 +755,21 @@ TQString Contact::toolTip() const TQString Kopete::Contact::formattedName() const { - if( hasProperty(TQString::fromLatin1("FormattedName")) ) - return property(TQString::fromLatin1("FormattedName")).value().toString(); + if( hasProperty(TQString::tqfromLatin1("FormattedName")) ) + return property(TQString::tqfromLatin1("FormattedName")).value().toString(); TQString ret; Kopete::ContactProperty first, last; - first = property(TQString::fromLatin1("firstName")); - last = property(TQString::fromLatin1("lastName")); + first = property(TQString::tqfromLatin1("firstName")); + last = property(TQString::tqfromLatin1("lastName")); if(!first.isNull()) { if(!last.isNull()) // contact has both first and last name { ret = i18n("firstName lastName", "%2 %1") - .arg(last.value().toString()) - .arg(first.value().toString()); + .tqarg(last.value().toString()) + .tqarg(first.value().toString()); } else // only first name set { @@ -804,23 +804,23 @@ TQString Kopete::Contact::formattedIdleTime() const { ret = i18n( "d h m s", "%4d %3h %2m %1s" ) - .arg( secs ) - .arg( mins ) - .arg( hours ) - .arg( days ); + .tqarg( secs ) + .tqarg( mins ) + .tqarg( hours ) + .tqarg( days ); } else if ( hours != 0 ) { ret = i18n( "h m s", "%3h %2m %1s" ) - .arg( secs ) - .arg( mins ) - .arg( hours ); + .tqarg( secs ) + .tqarg( mins ) + .tqarg( hours ); } else { ret = i18n( "m s", "%2m %1s" ) - .arg( secs ) - .arg( mins ); + .tqarg( secs ) + .tqarg( mins ); } } return ret; diff --git a/kopete/libkopete/kopetecontact.h b/kopete/libkopete/kopetecontact.h index 3cefbb2a..4f8454fc 100644 --- a/kopete/libkopete/kopetecontact.h +++ b/kopete/libkopete/kopetecontact.h @@ -51,28 +51,29 @@ typedef TQPtrList GroupList; * This class abstracts a generic contact * Use it for inserting contacts in the contact list for example. */ -class KOPETE_EXPORT Contact : public QObject +class KOPETE_EXPORT Contact : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( CanCreateFlags ) - Q_PROPERTY( TQString formattedName READ formattedName ) - Q_PROPERTY( TQString formattedIdleTime READ formattedIdleTime ) - Q_PROPERTY( bool isOnline READ isOnline ) - Q_PROPERTY( bool fileCapable READ isFileCapable WRITE setFileCapable ) - Q_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) - //Q_PROPERTY( bool isReachable READ isReachable ) - Q_PROPERTY( TQString contactId READ contactId ) - Q_PROPERTY( TQString icon READ icon WRITE setIcon ) - Q_PROPERTY( TQString toolTip READ toolTip ) - Q_PROPERTY( TQString nickName READ nickName WRITE setNickName ) - //Q_PROPERTY( unsigned long idleTime READ idleTime WRITE setIdleTime ) + TQ_PROPERTY( TQString formattedName READ formattedName ) + TQ_PROPERTY( TQString formattedIdleTime READ formattedIdleTime ) + TQ_PROPERTY( bool isOnline READ isOnline ) + TQ_PROPERTY( bool fileCapable READ isFileCapable WRITE setFileCapable ) + TQ_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) + //TQ_PROPERTY( bool isReachable READ isReachable ) + TQ_PROPERTY( TQString contactId READ contactId ) + TQ_PROPERTY( TQString icon READ icon WRITE setIcon ) + TQ_PROPERTY( TQString toolTip READ toolTip ) + TQ_PROPERTY( TQString nickName READ nickName WRITE setNickName ) + //TQ_PROPERTY( unsigned long idleTime READ idleTime WRITE setIdleTime ) public: /** * \brief Create new contact. * - * The parent MetaContact must not be NULL + * The tqparent MetaContact must not be NULL * * \note id is required to be unique per protocol and per account. * Across those boundaries ids may occur multiple times. @@ -81,13 +82,13 @@ public: * value! Even if it may look like an ICQ UIN or an MSN passport, * this is undefined and may change at any time! * - * @param account is the parent account. this constructor automatically register the contact to the account + * @param account is the tqparent account. this constructor automatically register the contact to the account * @param id is the Contact's unique Id (mostly the user's login) - * @param parent is the parent @ref MetaContact this Contact is part of + * @param tqparent is the tqparent @ref MetaContact this Contact is part of * @param icon is an optional icon */ - Contact( Account *account, const TQString &id, MetaContact *parent, - const TQString &icon = TQString::null ); + Contact( Account *account, const TQString &id, MetaContact *tqparent, + const TQString &icon = TQString() ); ~Contact(); @@ -203,7 +204,7 @@ public: * @brief Get the online status of the contact * @return the online status of the contact */ - OnlineStatus onlineStatus() const; + OnlineStatus onlinetqStatus() const; /** * \brief Set the contact's online status @@ -217,7 +218,7 @@ public: * which is displayed in showContextMenu (private). Protocols * should use this to add protocol-specific actions to the * popup menu. Kopete take care of the deletion of the action collection. - * Actions should have the collection as parent. + * Actions should have the collection as tqparent. * * @return Collection of menu items to be show on the context menu * @todo if possible, try to use KXMLGUI @@ -448,7 +449,7 @@ public slots: * * default implementation does nothing * - * @param changed is a bitmask of the @ref Changed enum which say why the call to this funtion is done. + * @param changed is a bittqmask of the @ref Changed enum which say why the call to this funtion is done. */ virtual void sync(unsigned int changed = 0xFF); @@ -475,7 +476,7 @@ public slots: * file size (such as over asocket */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: @@ -509,7 +510,7 @@ signals: * The contact's online status changed */ void onlineStatusChanged( Kopete::Contact *contact, - const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); /** * The contact is about to be destroyed. diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index 6e33f257..65960dcf 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -85,7 +85,7 @@ ContactList::ContactList() d=new Private; //the myself metacontact can't be created now, because it will use - //ContactList::self() as parent which will call this constructor -> infinite loop + //ContactList::self() as tqparent which will call this constructor -> infinite loop d->myself=0L; //no contactlist loaded yet, don't save them @@ -218,7 +218,7 @@ TQPtrList ContactList::selectedGroups() const void ContactList::addMetaContact( MetaContact *mc ) { - if ( d->contacts.contains( mc ) ) + if ( d->contacts.tqcontains( mc ) ) return; d->contacts.append( mc ); @@ -232,13 +232,13 @@ void ContactList::addMetaContact( MetaContact *mc ) void ContactList::removeMetaContact(MetaContact *m) { - if ( !d->contacts.contains(m) ) + if ( !d->contacts.tqcontains(m) ) { kdDebug(14010) << k_funcinfo << "Trying to remove a not listed MetaContact." << endl; return; } - if ( d->selectedMetaContacts.contains( m ) ) + if ( d->selectedMetaContacts.tqcontains( m ) ) { d->selectedMetaContacts.remove( m ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -259,7 +259,7 @@ void ContactList::removeMetaContact(MetaContact *m) void ContactList::addGroup( Group * g ) { - if(!d->groups.contains(g) ) + if(!d->groups.tqcontains(g) ) { d->groups.append( g ); emit groupAdded( g ); @@ -269,7 +269,7 @@ void ContactList::addGroup( Group * g ) void ContactList::removeGroup( Group *g ) { - if ( d->selectedGroups.contains( g ) ) + if ( d->selectedGroups.tqcontains( g ) ) { d->selectedGroups.remove( g ); setSelectedItems( d->selectedMetaContacts, d->selectedGroups ); @@ -378,14 +378,14 @@ void ContactList::loadXML() // don't save when we're in the middle of this... d->loaded = false; - TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); if( filename.isEmpty() ) { d->loaded=true; return ; } - TQDomDocument contactList( TQString::fromLatin1( "kopete-contact-list" ) ); + TQDomDocument contactList( TQString::tqfromLatin1( "kopete-contact-list" ) ); TQFile contactListFile( filename ); contactListFile.open( IO_ReadOnly ); @@ -393,10 +393,10 @@ void ContactList::loadXML() TQDomElement list = contactList.documentElement(); - TQString versionString = list.attribute( TQString::fromLatin1( "version" ), TQString::null ); + TQString versionString = list.attribute( TQString::tqfromLatin1( "version" ), TQString() ); uint version = 0; - if( TQRegExp( TQString::fromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) - version = versionString.replace( TQString::fromLatin1( "." ), TQString::null ).toUInt(); + if( TQRegExp( TQString::tqfromLatin1( "[0-9]+\\.[0-9]" ) ).exactMatch( versionString ) ) + version = versionString.tqreplace( TQString::tqfromLatin1( "." ), TQString() ).toUInt(); if( version < Private::ContactListVersion ) { @@ -410,7 +410,7 @@ void ContactList::loadXML() convertContactList( filename, version, Private::ContactListVersion ); - contactList = TQDomDocument ( TQString::fromLatin1( "kopete-contact-list" ) ); + contactList = TQDomDocument ( TQString::tqfromLatin1( "kopete-contact-list" ) ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); @@ -423,10 +423,10 @@ void ContactList::loadXML() TQDomElement element = list.firstChild().toElement(); while( !element.isNull() ) { - if( element.tagName() == TQString::fromLatin1("meta-contact") ) + if( element.tagName() == TQString::tqfromLatin1("meta-contact") ) { //TODO: id isn't used - //TQString id = element.attribute( "id", TQString::null ); + //TQString id = element.attribute( "id", TQString() ); Kopete::MetaContact *metaContact = new Kopete::MetaContact(); if ( !metaContact->fromXML( element ) ) { @@ -439,7 +439,7 @@ void ContactList::loadXML() metaContact ); } } - else if( element.tagName() == TQString::fromLatin1("kopete-group") ) + else if( element.tagName() == TQString::tqfromLatin1("kopete-group") ) { Kopete::Group *group = new Kopete::Group(); if( !group->fromXML( element ) ) @@ -453,7 +453,7 @@ void ContactList::loadXML() } } // Only load myself metacontact information when Global Identity is enabled. - else if( element.tagName() == TQString::fromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) + else if( element.tagName() == TQString::tqfromLatin1("myself-meta-contact") && Kopete::Config::enableGlobalIdentity() ) { if( !myself()->fromXML( element ) ) { @@ -479,19 +479,19 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // changes to allow incremental (multi-pass) conversion so we don't have // to rewrite the whole conversion code for each change. - TQDomDocument contactList( TQString::fromLatin1( "messaging-contact-list" ) ); + TQDomDocument contactList( TQString::tqfromLatin1( "messaging-contact-list" ) ); TQFile contactListFile( fileName ); contactListFile.open( IO_ReadOnly ); contactList.setContent( &contactListFile ); TQDomElement oldList = contactList.documentElement(); - TQDomDocument newList( TQString::fromLatin1( "kopete-contact-list" ) ); - newList.appendChild( newList.createProcessingInstruction( TQString::fromLatin1( "xml" ), TQString::fromLatin1( "version=\"1.0\"" ) ) ); + TQDomDocument newList( TQString::tqfromLatin1( "kopete-contact-list" ) ); + newList.appendChild( newList.createProcessingInstruction( TQString::tqfromLatin1( "xml" ), TQString::tqfromLatin1( "version=\"1.0\"" ) ) ); - TQDomElement newRoot = newList.createElement( TQString::fromLatin1( "kopete-contact-list" ) ); + TQDomElement newRoot = newList.createElement( TQString::tqfromLatin1( "kopete-contact-list" ) ); newList.appendChild( newRoot ); - newRoot.setAttribute( TQString::fromLatin1( "version" ), TQString::fromLatin1( "1.0" ) ); + newRoot.setAttribute( TQString::tqfromLatin1( "version" ), TQString::tqfromLatin1( "1.0" ) ); TQDomNode oldNode = oldList.firstChild(); while( !oldNode.isNull() ) @@ -499,10 +499,10 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldElement = oldNode.toElement(); if( !oldElement.isNull() ) { - if( oldElement.tagName() == TQString::fromLatin1("meta-contact") ) + if( oldElement.tagName() == TQString::tqfromLatin1("meta-contact") ) { // Ignore ID, it is not used in the current list anyway - TQDomElement newMetaContact = newList.createElement( TQString::fromLatin1( "meta-contact" ) ); + TQDomElement newMetaContact = newList.createElement( TQString::tqfromLatin1( "meta-contact" ) ); newRoot.appendChild( newMetaContact ); // Plugin data is stored completely different, and requires @@ -518,48 +518,48 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers while( !oldContactNode.isNull() ) { TQDomElement oldContactElement = oldContactNode.toElement(); - if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::fromLatin1("address-book-field") ) + if( !oldContactElement.isNull() && oldContactElement.tagName() == TQString::tqfromLatin1("address-book-field") ) { // Convert address book fields. // Jabber will be called "xmpp", Aim/Toc and Aim/Oscar both will // be called "aim". MSN, AIM, IRC, Oscar and SMS don't use address // book fields yet; Gadu and ICQ can be converted as-is. // As Yahoo is unfinished we won't try to convert at all. - TQString id = oldContactElement.attribute( TQString::fromLatin1( "id" ), TQString::null ); + TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "id" ), TQString() ); TQString data = oldContactElement.text(); TQString app, key, val; - TQString separator = TQString::fromLatin1( "," ); - if( id == TQString::fromLatin1( "messaging/gadu" ) ) - separator = TQString::fromLatin1( "\n" ); - else if( id == TQString::fromLatin1( "messaging/icq" ) ) - separator = TQString::fromLatin1( ";" ); - else if( id == TQString::fromLatin1( "messaging/jabber" ) ) - id = TQString::fromLatin1( "messaging/xmpp" ); - - if( id == TQString::fromLatin1( "messaging/gadu" ) || id == TQString::fromLatin1( "messaging/icq" ) || - id == TQString::fromLatin1( "messaging/winpopup" ) || id == TQString::fromLatin1( "messaging/xmpp" ) ) + TQString separator = TQString::tqfromLatin1( "," ); + if( id == TQString::tqfromLatin1( "messaging/gadu" ) ) + separator = TQString::tqfromLatin1( "\n" ); + else if( id == TQString::tqfromLatin1( "messaging/icq" ) ) + separator = TQString::tqfromLatin1( ";" ); + else if( id == TQString::tqfromLatin1( "messaging/jabber" ) ) + id = TQString::tqfromLatin1( "messaging/xmpp" ); + + if( id == TQString::tqfromLatin1( "messaging/gadu" ) || id == TQString::tqfromLatin1( "messaging/icq" ) || + id == TQString::tqfromLatin1( "messaging/winpopup" ) || id == TQString::tqfromLatin1( "messaging/xmpp" ) ) { app = id; - key = TQString::fromLatin1( "All" ); - val = data.replace( separator, TQChar( 0xE000 ) ); + key = TQString::tqfromLatin1( "All" ); + val = data.tqreplace( separator, TQChar( 0xE000 ) ); } if( !app.isEmpty() ) { - TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::fromLatin1( "app" ), app ); - addressBookField.setAttribute( TQString::fromLatin1( "key" ), key ); + addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), app ); + addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), key ); addressBookField.appendChild( newList.createTextNode( val ) ); // ICQ didn't store the contactId locally, only in the address // book fields, so we need to be able to access it later - if( id == TQString::fromLatin1( "messaging/icq" ) ) + if( id == TQString::tqfromLatin1( "messaging/icq" ) ) icqData = TQStringList::split( TQChar( 0xE000 ), val ); - else if( id == TQString::fromLatin1("messaging/gadu") ) + else if( id == TQString::tqfromLatin1("messaging/gadu") ) gaduData = TQStringList::split( TQChar( 0xE000 ), val ); } } @@ -573,103 +573,103 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers TQDomElement oldContactElement = oldContactNode.toElement(); if( !oldContactElement.isNull() ) { - if( oldContactElement.tagName() == TQString::fromLatin1("display-name") ) + if( oldContactElement.tagName() == TQString::tqfromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldContactElement.text() ) ); newMetaContact.appendChild( displayName ); } - else if( oldContactElement.tagName() == TQString::fromLatin1("groups") ) + else if( oldContactElement.tagName() == TQString::tqfromLatin1("groups") ) { - TQDomElement groups = newList.createElement( TQString::fromLatin1( "groups" ) ); + TQDomElement groups = newList.createElement( TQString::tqfromLatin1( "groups" ) ); newMetaContact.appendChild( groups ); TQDomNode oldGroup = oldContactElement.firstChild(); while( !oldGroup.isNull() ) { TQDomElement oldGroupElement = oldGroup.toElement(); - if ( oldGroupElement.tagName() == TQString::fromLatin1("group") ) + if ( oldGroupElement.tagName() == TQString::tqfromLatin1("group") ) { - TQDomElement group = newList.createElement( TQString::fromLatin1( "group" ) ); + TQDomElement group = newList.createElement( TQString::tqfromLatin1( "group" ) ); group.appendChild( newList.createTextNode( oldGroupElement.text() ) ); groups.appendChild( group ); } - else if ( oldGroupElement.tagName() == TQString::fromLatin1("top-level") ) + else if ( oldGroupElement.tagName() == TQString::tqfromLatin1("top-level") ) { - TQDomElement group = newList.createElement( TQString::fromLatin1( "top-level" ) ); + TQDomElement group = newList.createElement( TQString::tqfromLatin1( "top-level" ) ); groups.appendChild( group ); } oldGroup = oldGroup.nextSibling(); } } - else if( oldContactElement.tagName() == TQString::fromLatin1( "plugin-data" ) ) + else if( oldContactElement.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) { // Convert the plugin data - TQString id = oldContactElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ); + TQString id = oldContactElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); TQString data = oldContactElement.text(); bool convertOldAim = false; uint fieldCount = 1; TQString addressBookLabel; - if( id == TQString::fromLatin1("MSNProtocol") ) + if( id == TQString::tqfromLatin1("MSNProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::fromLatin1("msn"); + addressBookLabel = TQString::tqfromLatin1("msn"); } - else if( id == TQString::fromLatin1("IRCProtocol") ) + else if( id == TQString::tqfromLatin1("IRCProtocol") ) { fieldCount = 3; - addressBookLabel = TQString::fromLatin1("irc"); + addressBookLabel = TQString::tqfromLatin1("irc"); } - else if( id == TQString::fromLatin1("OscarProtocol") ) + else if( id == TQString::tqfromLatin1("OscarProtocol") ) { fieldCount = 2; - addressBookLabel = TQString::fromLatin1("aim"); + addressBookLabel = TQString::tqfromLatin1("aim"); } - else if( id == TQString::fromLatin1("AIMProtocol") ) + else if( id == TQString::tqfromLatin1("AIMProtocol") ) { - id = TQString::fromLatin1("OscarProtocol"); + id = TQString::tqfromLatin1("OscarProtocol"); convertOldAim = true; - addressBookLabel = TQString::fromLatin1("aim"); + addressBookLabel = TQString::tqfromLatin1("aim"); } - else if( id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) + else if( id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) { fieldCount = 1; } - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) { fieldCount = 4; } - else if( id == TQString::fromLatin1("SMSProtocol") ) + else if( id == TQString::tqfromLatin1("SMSProtocol") ) { // SMS used a variable serializing using a dot as delimiter. // The minimal count is three though (id, name, delimiter). fieldCount = 2; - addressBookLabel = TQString::fromLatin1("sms"); + addressBookLabel = TQString::tqfromLatin1("sms"); } if( pluginData[ id ].isNull() ) { - pluginData[ id ] = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); - pluginData[ id ].setAttribute( TQString::fromLatin1( "plugin-id" ), id ); + pluginData[ id ] = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); + pluginData[ id ].setAttribute( TQString::tqfromLatin1( "plugin-id" ), id ); newMetaContact.appendChild( pluginData[ id ] ); } // Do the actual conversion - if( id == TQString::fromLatin1( "MSNProtocol" ) || id == TQString::fromLatin1( "OscarProtocol" ) || - id == TQString::fromLatin1( "AIMProtocol" ) || id == TQString::fromLatin1( "IRCProtocol" ) || - id == TQString::fromLatin1( "ICQProtocol" ) || id == TQString::fromLatin1( "JabberProtocol" ) || - id == TQString::fromLatin1( "SMSProtocol" ) || id == TQString::fromLatin1( "WPProtocol" ) || - id == TQString::fromLatin1( "GaduProtocol" ) ) + if( id == TQString::tqfromLatin1( "MSNProtocol" ) || id == TQString::tqfromLatin1( "OscarProtocol" ) || + id == TQString::tqfromLatin1( "AIMProtocol" ) || id == TQString::tqfromLatin1( "IRCProtocol" ) || + id == TQString::tqfromLatin1( "ICTQProtocol" ) || id == TQString::tqfromLatin1( "JabberProtocol" ) || + id == TQString::tqfromLatin1( "SMSProtocol" ) || id == TQString::tqfromLatin1( "WPProtocol" ) || + id == TQString::tqfromLatin1( "GaduProtocol" ) ) { - TQStringList strList = TQStringList::split( TQString::fromLatin1( "||" ), data ); + TQStringList strList = TQStringList::split( TQString::tqfromLatin1( "||" ), data ); // Unescape '||' for( TQStringList::iterator it = strList.begin(); it != strList.end(); ++it ) { - ( *it ).replace( TQString::fromLatin1( "\\|;" ), TQString::fromLatin1( "|" ) ). - replace( TQString::fromLatin1( "\\\\" ), TQString::fromLatin1( "\\" ) ); + ( *it ).tqreplace( TQString::tqfromLatin1( "\\|;" ), TQString::tqfromLatin1( "|" ) ). + tqreplace( TQString::tqfromLatin1( "\\\\" ), TQString::tqfromLatin1( "\\" ) ); } uint idx = 0; @@ -677,65 +677,65 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement dataField; - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "contactId" ) ); - if( id == TQString::fromLatin1("ICQProtocol") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "contactId" ) ); + if( id == TQString::tqfromLatin1("ICTQProtocol") ) dataField.appendChild( newList.createTextNode( icqData[ idx ] ) ); - else if( id == TQString::fromLatin1("GaduProtocol") ) + else if( id == TQString::tqfromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( gaduData[ idx ] ) ); - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "displayName" ) ); - if( convertOldAim || id == TQString::fromLatin1("ICQProtocol") || id == TQString::fromLatin1("WPProtocol") || id == TQString::fromLatin1("GaduProtocol") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "displayName" ) ); + if( convertOldAim || id == TQString::tqfromLatin1("ICTQProtocol") || id == TQString::tqfromLatin1("WPProtocol") || id == TQString::tqfromLatin1("GaduProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); else dataField.appendChild( newList.createTextNode( strList[ idx + 1 ] ) ); - if( id == TQString::fromLatin1("MSNProtocol") ) + if( id == TQString::tqfromLatin1("MSNProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::fromLatin1("IRCProtocol") ) + else if( id == TQString::tqfromLatin1("IRCProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serverName" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serverName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); } - else if( id == TQString::fromLatin1("JabberProtocol") ) + else if( id == TQString::tqfromLatin1("JabberProtocol") ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "accountId" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "accountId" ) ); dataField.appendChild( newList.createTextNode( strList[ idx ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "groups" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "groups" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); } - else if( id == TQString::fromLatin1( "SMSProtocol" ) && - ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::fromLatin1( "." ) ) + else if( id == TQString::tqfromLatin1( "SMSProtocol" ) && + ( idx + 2 < strList.size() ) && strList[ idx + 2 ] != TQString::tqfromLatin1( "." ) ) { - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "serviceName" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "serviceName" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 2 ] ) ); - dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "servicePrefs" ) ); + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "servicePrefs" ) ); dataField.appendChild( newList.createTextNode( strList[ idx + 3 ] ) ); // Add extra fields @@ -744,30 +744,30 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // MSN, AIM, IRC, Oscar and SMS didn't store address book fields up // to now, so create one - if( id != TQString::fromLatin1("ICQProtocol") && id != TQString::fromLatin1("JabberProtocol") && id != TQString::fromLatin1("WPProtocol") && id != TQString::fromLatin1("GaduProtocol") ) + if( id != TQString::tqfromLatin1("ICTQProtocol") && id != TQString::tqfromLatin1("JabberProtocol") && id != TQString::tqfromLatin1("WPProtocol") && id != TQString::tqfromLatin1("GaduProtocol") ) { - TQDomElement addressBookField = newList.createElement( TQString::fromLatin1( "address-book-field" ) ); + TQDomElement addressBookField = newList.createElement( TQString::tqfromLatin1( "address-book-field" ) ); newMetaContact.appendChild( addressBookField ); - addressBookField.setAttribute( TQString::fromLatin1( "app" ), - TQString::fromLatin1( "messaging/" ) + addressBookLabel ); - addressBookField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "All" ) ); + addressBookField.setAttribute( TQString::tqfromLatin1( "app" ), + TQString::tqfromLatin1( "messaging/" ) + addressBookLabel ); + addressBookField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "All" ) ); addressBookField.appendChild( newList.createTextNode( strList[ idx ] ) ); } idx += fieldCount; } } - else if( id == TQString::fromLatin1("ContactNotesPlugin") || id == TQString::fromLatin1("CryptographyPlugin") || id == TQString::fromLatin1("TranslatorPlugin") ) + else if( id == TQString::tqfromLatin1("ContactNotesPlugin") || id == TQString::tqfromLatin1("CryptographyPlugin") || id == TQString::tqfromLatin1("TranslatorPlugin") ) { - TQDomElement dataField = newList.createElement( TQString::fromLatin1( "plugin-data-field" ) ); + TQDomElement dataField = newList.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); pluginData[ id ].appendChild( dataField ); - if( id == TQString::fromLatin1("ContactNotesPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "notes" ) ); - else if( id == TQString::fromLatin1("CryptographyPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "gpgKey" ) ); - else if( id == TQString::fromLatin1("TranslatorPlugin") ) - dataField.setAttribute( TQString::fromLatin1( "key" ), TQString::fromLatin1( "languageKey" ) ); + if( id == TQString::tqfromLatin1("ContactNotesPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "notes" ) ); + else if( id == TQString::tqfromLatin1("CryptographyPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "gpgKey" ) ); + else if( id == TQString::tqfromLatin1("TranslatorPlugin") ) + dataField.setAttribute( TQString::tqfromLatin1( "key" ), TQString::tqfromLatin1( "languageKey" ) ); dataField.appendChild( newList.createTextNode( data ) ); } @@ -776,9 +776,9 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers oldContactNode = oldContactNode.nextSibling(); } } - else if( oldElement.tagName() == TQString::fromLatin1("kopete-group") ) + else if( oldElement.tagName() == TQString::tqfromLatin1("kopete-group") ) { - TQDomElement newGroup = newList.createElement( TQString::fromLatin1( "kopete-group" ) ); + TQDomElement newGroup = newList.createElement( TQString::tqfromLatin1( "kopete-group" ) ); newRoot.appendChild( newGroup ); TQDomNode oldGroupNode = oldNode.firstChild(); @@ -786,38 +786,38 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers { TQDomElement oldGroupElement = oldGroupNode.toElement(); - if( oldGroupElement.tagName() == TQString::fromLatin1("display-name") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("display-name") ) { - TQDomElement displayName = newList.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = newList.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( newList.createTextNode( oldGroupElement.text() ) ); newGroup.appendChild( displayName ); } - if( oldGroupElement.tagName() == TQString::fromLatin1("type") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("type") ) { - if( oldGroupElement.text() == TQString::fromLatin1("Temporary") ) - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "temporary" ) ); - else if( oldGroupElement.text() == TQString::fromLatin1( "TopLevel" ) ) - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "top-level" ) ); + if( oldGroupElement.text() == TQString::tqfromLatin1("Temporary") ) + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "temporary" ) ); + else if( oldGroupElement.text() == TQString::tqfromLatin1( "TopLevel" ) ) + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "top-level" ) ); else - newGroup.setAttribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); + newGroup.setAttribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); } - if( oldGroupElement.tagName() == TQString::fromLatin1("view") ) + if( oldGroupElement.tagName() == TQString::tqfromLatin1("view") ) { - if( oldGroupElement.text() == TQString::fromLatin1("collapsed") ) - newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "collapsed" ) ); + if( oldGroupElement.text() == TQString::tqfromLatin1("collapsed") ) + newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "collapsed" ) ); else - newGroup.setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); + newGroup.setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); } - else if( oldGroupElement.tagName() == TQString::fromLatin1("plugin-data") ) + else if( oldGroupElement.tagName() == TQString::tqfromLatin1("plugin-data") ) { // Per-group plugin data // FIXME: This needs updating too, ideally, convert this in a later // contactlist.xml version - TQDomElement groupPluginData = newList.createElement( TQString::fromLatin1( "plugin-data" ) ); + TQDomElement groupPluginData = newList.createElement( TQString::tqfromLatin1( "plugin-data" ) ); newGroup.appendChild( groupPluginData ); - groupPluginData.setAttribute( TQString::fromLatin1( "plugin-id" ), - oldGroupElement.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ) ); + groupPluginData.setAttribute( TQString::tqfromLatin1( "plugin-id" ), + oldGroupElement.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ) ); groupPluginData.appendChild( newList.createTextNode( oldGroupElement.text() ) ); } @@ -836,7 +836,7 @@ void ContactList::convertContactList( const TQString &fileName, uint /* fromVers // Close the file, and save the new file contactListFile.close(); - TQDir().rename( fileName, fileName + TQString::fromLatin1( ".bak" ) ); + TQDir().rename( fileName, fileName + TQString::tqfromLatin1( ".bak" ) ); // kdDebug( 14010 ) << k_funcinfo << "XML output:\n" << newList.toString( 2 ) << endl; @@ -862,7 +862,7 @@ void Kopete::ContactList::saveXML() return; } - TQString contactListFileName = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString contactListFileName = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); KSaveFile contactListFile( contactListFileName ); if( contactListFile.status() == 0 ) { @@ -894,8 +894,8 @@ void Kopete::ContactList::saveXML() const TQDomDocument ContactList::toXML() { TQDomDocument doc; - doc.appendChild( doc.createElement( TQString::fromLatin1("kopete-contact-list") ) ); - doc.documentElement().setAttribute( TQString::fromLatin1("version"), TQString::fromLatin1("1.0")); + doc.appendChild( doc.createElement( TQString::tqfromLatin1("kopete-contact-list") ) ); + doc.documentElement().setAttribute( TQString::tqfromLatin1("version"), TQString::tqfromLatin1("1.0")); // Save group information. ie: Open/Closed, pehaps later icons? Who knows. for( Kopete::Group *g = d->groups.first(); g; g = d->groups.next() ) @@ -910,7 +910,7 @@ const TQDomDocument ContactList::toXML() if( Kopete::Config::enableGlobalIdentity() ) { TQDomElement myselfElement = myself()->toXML(true); // Save minimal information. - myselfElement.setTagName( TQString::fromLatin1("myself-meta-contact") ); + myselfElement.setTagName( TQString::tqfromLatin1("myself-meta-contact") ); doc.documentElement().appendChild( doc.importNode( myselfElement, true ) ); } @@ -934,7 +934,7 @@ TQStringList ContactList::contactStatuses() const TQPtrListIterator it( d->contacts ); for( ; it.current(); ++it ) { - meta_contacts.append( TQString::fromLatin1( "%1 (%2)" ). + meta_contacts.append( TQString::tqfromLatin1( "%1 (%2)" ). arg( it.current()->displayName(), it.current()->statusString() )); } return meta_contacts; diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index ff653d34..a0b27ded 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -47,9 +47,10 @@ class Contact; * @author Martijn Klingens * @author Olivier Goffart */ -class KOPETE_EXPORT ContactList : public QObject +class KOPETE_EXPORT ContactList : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -131,7 +132,7 @@ public: /** * return the metacontact that represent the user itself. - * This metacontact should be the parent of every Kopete::Account::myself() contacts. + * This metacontact should be the tqparent of every Kopete::Account::myself() contacts. * * This metacontact is not in the contactlist. */ @@ -345,7 +346,7 @@ public: //TODO I think all theses method should be moved to the decop interface. * Return all meta contacts with their current status * * FIXME: Do we *need* this one? Sounds error prone to me, because - * nicknames can contain parentheses too. - Martijn + * nicknames can contain tqparentheses too. - Martijn */ TQStringList contactStatuses() const; @@ -362,12 +363,12 @@ public: //TODO I think all theses method should be moved to the decop interface. * @param fileSize (Optional) The size of the file */ void sendFile(const TQString &displayName, const KURL &sourceURL, - const TQString &altFileName = TQString::null, const long unsigned int fileSize = 0L); + const TQString &altFileName = TQString(), const long unsigned int fileSize = 0L); /** * Open a chat to a contact, and optionally set some initial text */ - void messageContact( const TQString &displayName, const TQString &messageText = TQString::null ); + void messageContact( const TQString &displayName, const TQString &messageText = TQString() ); public slots: /** diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index 5a51da80..b876c791 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -34,8 +34,8 @@ public: bool useCustomIcon; }; -ContactListElement::ContactListElement( TQObject *parent, const char *name ) -: TQObject( parent, name ) +ContactListElement::ContactListElement( TQObject *tqparent, const char *name ) +: TQObject( tqparent, name ) { d = new Private; @@ -72,7 +72,7 @@ void ContactListElement::setPluginData( Plugin *p, const TQString &key, const TQ TQMap ContactListElement::pluginData( Plugin *plugin ) const { - if ( !d->pluginData.contains( plugin->pluginId() ) ) + if ( !d->pluginData.tqcontains( plugin->pluginId() ) ) return TQMap(); return d->pluginData[ plugin->pluginId() ]; @@ -80,8 +80,8 @@ TQMap ContactListElement::pluginData( Plugin *plugin ) const TQString ContactListElement::pluginData( Plugin *plugin, const TQString &key ) const { - if ( !d->pluginData.contains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].contains( key ) ) - return TQString::null; + if ( !d->pluginData.tqcontains( plugin->pluginId() ) || !d->pluginData[ plugin->pluginId() ].tqcontains( key ) ) + return TQString(); return d->pluginData[ plugin->pluginId() ][ key ]; } @@ -90,21 +90,21 @@ const TQValueList ContactListElement::toXML() { TQDomDocument pluginData; TQValueList pluginNodes; - pluginData.appendChild( pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ) ); + pluginData.appendChild( pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ) ); if ( !d->pluginData.isEmpty() ) { TQMap >::ConstIterator pluginIt; for ( pluginIt = d->pluginData.begin(); pluginIt != d->pluginData.end(); ++pluginIt ) { - TQDomElement pluginElement = pluginData.createElement( TQString::fromLatin1( "plugin-data" ) ); - pluginElement.setAttribute( TQString::fromLatin1( "plugin-id" ), pluginIt.key() ); + TQDomElement pluginElement = pluginData.createElement( TQString::tqfromLatin1( "plugin-data" ) ); + pluginElement.setAttribute( TQString::tqfromLatin1( "plugin-id" ), pluginIt.key() ); TQMap::ConstIterator it; for ( it = pluginIt.data().begin(); it != pluginIt.data().end(); ++it ) { - TQDomElement pluginDataField = pluginData.createElement( TQString::fromLatin1( "plugin-data-field" ) ); - pluginDataField.setAttribute( TQString::fromLatin1( "key" ), it.key() ); + TQDomElement pluginDataField = pluginData.createElement( TQString::tqfromLatin1( "plugin-data-field" ) ); + pluginDataField.setAttribute( TQString::tqfromLatin1( "key" ), it.key() ); pluginDataField.appendChild( pluginData.createTextNode( it.data() ) ); pluginElement.appendChild( pluginDataField ); } @@ -115,39 +115,39 @@ const TQValueList ContactListElement::toXML() } if ( !d->icons.isEmpty() ) { - TQDomElement iconsElement = pluginData.createElement( TQString::fromLatin1( "custom-icons" ) ); - iconsElement.setAttribute( TQString::fromLatin1( "use" ), d->useCustomIcon ? TQString::fromLatin1( "1" ) : TQString::fromLatin1( "0" ) ); + TQDomElement iconsElement = pluginData.createElement( TQString::tqfromLatin1( "custom-icons" ) ); + iconsElement.setAttribute( TQString::tqfromLatin1( "use" ), d->useCustomIcon ? TQString::tqfromLatin1( "1" ) : TQString::tqfromLatin1( "0" ) ); for ( TQMap::ConstIterator it = d->icons.begin(); it != d->icons.end(); ++it ) { - TQDomElement iconElement = pluginData.createElement( TQString::fromLatin1( "icon" ) ); + TQDomElement iconElement = pluginData.createElement( TQString::tqfromLatin1( "icon" ) ); TQString stateStr; switch ( it.key() ) { case Open: - stateStr = TQString::fromLatin1( "open" ); + stateStr = TQString::tqfromLatin1( "open" ); break; case Closed: - stateStr = TQString::fromLatin1( "closed" ); + stateStr = TQString::tqfromLatin1( "closed" ); break; case Online: - stateStr = TQString::fromLatin1( "online" ); + stateStr = TQString::tqfromLatin1( "online" ); break; case Away: - stateStr = TQString::fromLatin1( "away" ); + stateStr = TQString::tqfromLatin1( "away" ); break; case Offline: - stateStr = TQString::fromLatin1( "offline" ); + stateStr = TQString::tqfromLatin1( "offline" ); break; case Unknown: - stateStr = TQString::fromLatin1( "unknown" ); + stateStr = TQString::tqfromLatin1( "unknown" ); break; case None: default: - stateStr = TQString::fromLatin1( "none" ); + stateStr = TQString::tqfromLatin1( "none" ); break; } - iconElement.setAttribute( TQString::fromLatin1( "state" ), stateStr ); + iconElement.setAttribute( TQString::tqfromLatin1( "state" ), stateStr ); iconElement.appendChild( pluginData.createTextNode( it.data() ) ); iconsElement.appendChild( iconElement ); } @@ -159,52 +159,52 @@ const TQValueList ContactListElement::toXML() bool ContactListElement::fromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::fromLatin1( "plugin-data" ) ) + if ( element.tagName() == TQString::tqfromLatin1( "plugin-data" ) ) { TQMap pluginData; - TQString pluginId = element.attribute( TQString::fromLatin1( "plugin-id" ), TQString::null ); + TQString pluginId = element.attribute( TQString::tqfromLatin1( "plugin-id" ), TQString() ); //in kopete 0.6 the AIM protocol was called OSCAR - if ( pluginId == TQString::fromLatin1( "OscarProtocol" ) ) - pluginId = TQString::fromLatin1( "AIMProtocol" ); + if ( pluginId == TQString::tqfromLatin1( "OscarProtocol" ) ) + pluginId = TQString::tqfromLatin1( "AIMProtocol" ); TQDomNode field = element.firstChild(); while( !field.isNull() ) { TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::fromLatin1( "plugin-data-field" ) ) + if ( fieldElement.tagName() == TQString::tqfromLatin1( "plugin-data-field" ) ) { - pluginData.insert( fieldElement.attribute( TQString::fromLatin1( "key" ), - TQString::fromLatin1( "undefined-key" ) ), fieldElement.text() ); + pluginData.insert( fieldElement.attribute( TQString::tqfromLatin1( "key" ), + TQString::tqfromLatin1( "undefined-key" ) ), fieldElement.text() ); } field = field.nextSibling(); } d->pluginData.insert( pluginId, pluginData ); } - else if ( element.tagName() == TQString::fromLatin1( "custom-icons" ) ) + else if ( element.tagName() == TQString::tqfromLatin1( "custom-icons" ) ) { - d->useCustomIcon= element.attribute( TQString::fromLatin1( "use" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ); + d->useCustomIcon= element.attribute( TQString::tqfromLatin1( "use" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ); TQDomNode ic = element.firstChild(); while( !ic.isNull() ) { TQDomElement iconElement = ic.toElement(); - if ( iconElement.tagName() == TQString::fromLatin1( "icon" ) ) + if ( iconElement.tagName() == TQString::tqfromLatin1( "icon" ) ) { - TQString stateStr = iconElement.attribute( TQString::fromLatin1( "state" ), TQString::null ); + TQString stateStr = iconElement.attribute( TQString::tqfromLatin1( "state" ), TQString() ); TQString icon = iconElement.text(); IconState state = None; - if ( stateStr == TQString::fromLatin1( "open" ) ) + if ( stateStr == TQString::tqfromLatin1( "open" ) ) state = Open; - if ( stateStr == TQString::fromLatin1( "closed" ) ) + if ( stateStr == TQString::tqfromLatin1( "closed" ) ) state = Closed; - if ( stateStr == TQString::fromLatin1( "online" ) ) + if ( stateStr == TQString::tqfromLatin1( "online" ) ) state = Online; - if ( stateStr == TQString::fromLatin1( "offline" ) ) + if ( stateStr == TQString::tqfromLatin1( "offline" ) ) state = Offline; - if ( stateStr == TQString::fromLatin1( "away" ) ) + if ( stateStr == TQString::tqfromLatin1( "away" ) ) state = Away; - if ( stateStr == TQString::fromLatin1( "unknown" ) ) + if ( stateStr == TQString::tqfromLatin1( "unknown" ) ) state = Unknown; d->icons[ state ] = icon; @@ -222,7 +222,7 @@ bool ContactListElement::fromXML( const TQDomElement& element ) TQString ContactListElement::icon( ContactListElement::IconState state ) const { - if ( d->icons.contains( state ) ) + if ( d->icons.tqcontains( state ) ) return d->icons[state]; return d->icons[ None ]; diff --git a/kopete/libkopete/kopetecontactlistelement.h b/kopete/libkopete/kopetecontactlistelement.h index 6e9d1816..808b36b2 100644 --- a/kopete/libkopete/kopetecontactlistelement.h +++ b/kopete/libkopete/kopetecontactlistelement.h @@ -44,9 +44,10 @@ class Plugin; class KOPETE_EXPORT ContactListElement : public TQObject /* public KopeteNotifyDataObject */ { Q_OBJECT + TQ_OBJECT protected: - ContactListElement( TQObject *parent = 0L, const char *name = 0L ); + ContactListElement( TQObject *tqparent = 0L, const char *name = 0L ); ~ContactListElement(); @@ -109,7 +110,7 @@ public: /** * Set the icon in the given state - * To clear an entry, set a TQString::null + * To clear an entry, set a TQString() */ void setIcon( const TQString &icon, IconState = None ); diff --git a/kopete/libkopete/kopetecontactproperty.h b/kopete/libkopete/kopetecontactproperty.h index f7213faa..92d60c49 100644 --- a/kopete/libkopete/kopetecontactproperty.h +++ b/kopete/libkopete/kopetecontactproperty.h @@ -58,7 +58,7 @@ class KOPETE_EXPORT ContactPropertyTmpl **/ ContactPropertyTmpl( const TQString &key, const TQString &label, - const TQString &icon = TQString::null, + const TQString &icon = TQString(), bool persistent = false, bool richText = false, bool privateProp = false ); @@ -119,7 +119,7 @@ class KOPETE_EXPORT ContactPropertyTmpl bool isNull() const; /** - * A Map of TQString and ContactPropertyTmpl objects, based on QMap + * A Map of TQString and ContactPropertyTmpl objects, based on TQMap **/ typedef TQMap Map; diff --git a/kopete/libkopete/kopeteeventpresentation.cpp b/kopete/libkopete/kopeteeventpresentation.cpp index 659b1b41..9314df14 100644 --- a/kopete/libkopete/kopeteeventpresentation.cpp +++ b/kopete/libkopete/kopeteeventpresentation.cpp @@ -76,15 +76,15 @@ TQString Kopete::EventPresentation::toString() switch ( m_type ) { case Sound: - type= TQString::fromLatin1("sound"); + type= TQString::tqfromLatin1("sound"); break; case Message: - type= TQString::fromLatin1("message"); + type= TQString::tqfromLatin1("message"); break; case Chat: - type= TQString::fromLatin1("chat"); + type= TQString::tqfromLatin1("chat"); break; } - TQString stringRep = TQString::fromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).arg(type).arg(m_content).arg(m_enabled).arg(m_singleShot); + TQString stringRep = TQString::tqfromLatin1( "Presentation; type=%1; content=%2; enabled=%3; single shot=%4\n" ).tqarg(type).tqarg(m_content).tqarg(m_enabled).tqarg(m_singleShot); return stringRep; } diff --git a/kopete/libkopete/kopeteeventpresentation.h b/kopete/libkopete/kopeteeventpresentation.h index 0576a9b1..07ea1213 100644 --- a/kopete/libkopete/kopeteeventpresentation.h +++ b/kopete/libkopete/kopeteeventpresentation.h @@ -31,7 +31,7 @@ public: enum PresentationType { Sound, Message, Chat }; EventPresentation( const PresentationType type ); EventPresentation( const PresentationType type, - const TQString &content = TQString::null, + const TQString &content = TQString(), const bool singleShot = false, const bool enabled = false ); ~EventPresentation(); diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp index 093be4df..2dae6117 100644 --- a/kopete/libkopete/kopeteglobal.cpp +++ b/kopete/libkopete/kopeteglobal.cpp @@ -69,7 +69,7 @@ Properties::~Properties() const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { /*kdDebug(14000) << k_funcinfo << "Found template for key = '" << key << "'" << endl;*/ @@ -82,7 +82,7 @@ const ContactPropertyTmpl &Properties::tmpl(const TQString &key) const bool Properties::registerTemplate(const TQString &key, const ContactPropertyTmpl &tmpl) { - if(d->mTemplates.contains(key)) + if(d->mTemplates.tqcontains(key)) { kdDebug(14000) << k_funcinfo << "Called for EXISTING key = '" << key << "'" << endl; @@ -103,91 +103,91 @@ void Properties::unregisterTemplate(const TQString &key) bool Properties::isRegistered(const TQString &key) { - return d->mTemplates.contains(key); + return d->mTemplates.tqcontains(key); } const ContactPropertyTmpl &Properties::fullName() const { - return createProp(TQString::fromLatin1("FormattedName"), + return createProp(TQString::tqfromLatin1("FormattedName"), i18n("Full Name")); } const ContactPropertyTmpl &Properties::idleTime() const { - return createProp(TQString::fromLatin1("idleTime"), + return createProp(TQString::tqfromLatin1("idleTime"), i18n("Idle Time")); } const ContactPropertyTmpl &Properties::onlineSince() const { - return createProp(TQString::fromLatin1("onlineSince"), + return createProp(TQString::tqfromLatin1("onlineSince"), i18n("Online Since")); } const ContactPropertyTmpl &Properties::lastSeen() const { - return createProp(TQString::fromLatin1("lastSeen"), - i18n("Last Seen"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastSeen"), + i18n("Last Seen"), TQString(), true); } const ContactPropertyTmpl &Properties::awayMessage() const { - return createProp(TQString::fromLatin1("awayMessage"), + return createProp(TQString::tqfromLatin1("awayMessage"), i18n("Away Message")); } const ContactPropertyTmpl &Properties::firstName() const { - return createProp(TQString::fromLatin1("firstName"), - i18n("First Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("firstName"), + i18n("First Name"), TQString(), true); } const ContactPropertyTmpl &Properties::lastName() const { - return createProp(TQString::fromLatin1("lastName"), - i18n("Last Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("lastName"), + i18n("Last Name"), TQString(), true); } const ContactPropertyTmpl &Properties::privatePhone() const { - return createProp(TQString::fromLatin1("privatePhoneNumber"), - i18n("Private Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privatePhoneNumber"), + i18n("Private Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::privateMobilePhone() const { - return createProp(TQString::fromLatin1("privateMobilePhoneNumber"), - i18n("Private Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("privateMobilePhoneNumber"), + i18n("Private Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workPhone() const { - return createProp(TQString::fromLatin1("workPhoneNumber"), - i18n("Work Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workPhoneNumber"), + i18n("Work Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::workMobilePhone() const { - return createProp(TQString::fromLatin1("workMobilePhoneNumber"), - i18n("Work Mobile Phone"), TQString::null, true); + return createProp(TQString::tqfromLatin1("workMobilePhoneNumber"), + i18n("Work Mobile Phone"), TQString(), true); } const ContactPropertyTmpl &Properties::emailAddress() const { - return createProp(TQString::fromLatin1("emailAddress"), - i18n("Email Address"), TQString::fromLatin1("mail_generic"), true); + return createProp(TQString::tqfromLatin1("emailAddress"), + i18n("Email Address"), TQString::tqfromLatin1("mail_generic"), true); } const ContactPropertyTmpl &Properties::nickName() const { - return createProp(TQString::fromLatin1("nickName"), - i18n("Nick Name"), TQString::null, true); + return createProp(TQString::tqfromLatin1("nickName"), + i18n("Nick Name"), TQString(), true); } const ContactPropertyTmpl &Properties::photo() const { - return createProp(TQString::fromLatin1("photo"), - i18n("Photo"), TQString::null, true); + return createProp(TQString::tqfromLatin1("photo"), + i18n("Photo"), TQString(), true); } @@ -197,7 +197,7 @@ const ContactPropertyTmpl &Properties::createProp(const TQString &key, /*kdDebug(14000) << k_funcinfo << "key = " << key << ", label = " << label << endl;*/ - if(!d->mTemplates.contains(key)) + if(!d->mTemplates.tqcontains(key)) { /* kdDebug(14000) << k_funcinfo << "CREATING NEW ContactPropertyTmpl WITH key = " << key << @@ -224,7 +224,7 @@ void installEmoticonTheme(const TQString &archiveName) KProgressDialog *progressDlg = 0L; KArchive *archive = 0L; - TQString localThemesDir(locateLocal("emoticons", TQString::null) ); + TQString localThemesDir(locateLocal("emoticons", TQString()) ); if(localThemesDir.isEmpty()) { @@ -235,20 +235,20 @@ void installEmoticonTheme(const TQString &archiveName) } progressDlg = new KProgressDialog(0 , "emoticonInstProgress", - i18n("Installing Emoticon Themes..."), TQString::null, true); + i18n("Installing Emoticon Themes..."), TQString(), true); progressDlg->progressBar()->setTotalSteps(foundThemes.count()); progressDlg->show(); kapp->processEvents(); TQString currentBundleMimeType = KMimeType::findByPath(archiveName, 0, false)->name(); - if( currentBundleMimeType == TQString::fromLatin1("application/x-zip") ) + if( currentBundleMimeType == TQString::tqfromLatin1("application/x-zip") ) archive = new KZip(archiveName); - else if( currentBundleMimeType == TQString::fromLatin1("application/x-tgz") || - currentBundleMimeType == TQString::fromLatin1("application/x-tbz") || - currentBundleMimeType == TQString::fromLatin1("application/x-gzip") || - currentBundleMimeType == TQString::fromLatin1("application/x-bzip2") ) + else if( currentBundleMimeType == TQString::tqfromLatin1("application/x-tgz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-tbz") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-gzip") || + currentBundleMimeType == TQString::tqfromLatin1("application/x-bzip2") ) archive = new KTar(archiveName); - else if(archiveName.endsWith(TQString::fromLatin1("jisp")) || archiveName.endsWith(TQString::fromLatin1("zip")) ) + else if(archiveName.endsWith(TQString::tqfromLatin1("jisp")) || archiveName.endsWith(TQString::tqfromLatin1("zip")) ) archive = new KZip(archiveName); else archive = new KTar(archiveName); @@ -257,7 +257,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Could not open \"%1\" for unpacking.").arg(archiveName)); + i18n("Could not open \"%1\" for unpacking.").tqarg(archiveName)); delete archive; delete progressDlg; return; @@ -273,8 +273,8 @@ void installEmoticonTheme(const TQString &archiveName) if (currentEntry->isDirectory()) { currentDir = dynamic_cast( currentEntry ); - if (currentDir && ( currentDir->entry(TQString::fromLatin1("emoticons.xml")) != NULL || - currentDir->entry(TQString::fromLatin1("icondef.xml")) != NULL ) ) + if (currentDir && ( currentDir->entry(TQString::tqfromLatin1("emoticons.xml")) != NULL || + currentDir->entry(TQString::tqfromLatin1("icondef.xml")) != NULL ) ) foundThemes.append(currentDir->name()); } } @@ -283,7 +283,7 @@ void installEmoticonTheme(const TQString &archiveName) { KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, i18n("The file \"%1\" is not a valid" \ - " emoticon theme archive.").arg(archiveName)); + " emoticon theme archive.").tqarg(archiveName)); archive->close(); delete archive; delete progressDlg; @@ -294,8 +294,8 @@ void installEmoticonTheme(const TQString &archiveName) { progressDlg->setLabel( i18n("Installing %1 emoticon theme") - .arg(*it)); - progressDlg->resize(progressDlg->sizeHint()); + .tqarg(*it)); + progressDlg->resize(progressDlg->tqsizeHint()); kapp->processEvents(); if (progressDlg->wasCancelled()) diff --git a/kopete/libkopete/kopeteglobal.h b/kopete/libkopete/kopeteglobal.h index 395d0eae..7ecc6f5b 100644 --- a/kopete/libkopete/kopeteglobal.h +++ b/kopete/libkopete/kopeteglobal.h @@ -160,7 +160,7 @@ namespace Global void unregisterTemplate(const TQString &key); const ContactPropertyTmpl &createProp(const TQString &key, - const TQString &label, const TQString &icon=TQString::null, + const TQString &label, const TQString &icon=TQString(), bool persistent = false) const; private: diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index 6206545a..ac221223 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -93,7 +93,7 @@ TQPtrList Group::members() const // members is a *copy* of the meta contacts, so using first(), next() and remove() is fine. for( members.first(); members.current(); ) { - if ( members.current()->groups().contains( this ) ) + if ( members.current()->groups().tqcontains( this ) ) members.next(); else members.remove(); @@ -104,27 +104,27 @@ TQPtrList Group::members() const const TQDomElement Group::toXML() { TQDomDocument group; - group.appendChild( group.createElement( TQString::fromLatin1( "kopete-group" ) ) ); - group.documentElement().setAttribute( TQString::fromLatin1( "groupId" ), TQString::number( groupId() ) ); + group.appendChild( group.createElement( TQString::tqfromLatin1( "kopete-group" ) ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "groupId" ), TQString::number( groupId() ) ); TQString type; switch ( d->type ) { case Temporary: - type = TQString::fromLatin1( "temporary" ); + type = TQString::tqfromLatin1( "temporary" ); break; case TopLevel: - type = TQString::fromLatin1( "top-level" ); + type = TQString::tqfromLatin1( "top-level" ); break; default: - type = TQString::fromLatin1( "standard" ); // == Normal + type = TQString::tqfromLatin1( "standard" ); // == Normal break; } - group.documentElement().setAttribute( TQString::fromLatin1( "type" ), type ); - group.documentElement().setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( d->expanded ? "expanded" : "collapsed" ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "type" ), type ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( d->expanded ? "expanded" : "collapsed" ) ); - TQDomElement displayName = group.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = group.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( group.createTextNode( d->displayName ) ); group.documentElement().appendChild( displayName ); @@ -143,7 +143,7 @@ const TQDomElement Group::toXML() bool Group::fromXML( const TQDomElement &data ) { - TQString strGroupId = data.attribute( TQString::fromLatin1( "groupId" ) ); + TQString strGroupId = data.attribute( TQString::tqfromLatin1( "groupId" ) ); if ( !strGroupId.isEmpty() ) { d->groupId = strGroupId.toUInt(); @@ -154,8 +154,8 @@ bool Group::fromXML( const TQDomElement &data ) // Don't overwrite type for Temporary and TopLevel groups if ( d->type != Temporary && d->type != TopLevel ) { - TQString type = data.attribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); - if ( type == TQString::fromLatin1( "temporary" ) ) + TQString type = data.attribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); + if ( type == TQString::tqfromLatin1( "temporary" ) ) { if ( d->type != Temporary ) { @@ -163,7 +163,7 @@ bool Group::fromXML( const TQDomElement &data ) return false; } } - else if ( type == TQString::fromLatin1( "top-level" ) ) + else if ( type == TQString::tqfromLatin1( "top-level" ) ) { if ( d->type != TopLevel ) { @@ -177,20 +177,20 @@ bool Group::fromXML( const TQDomElement &data ) } } - TQString view = data.attribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); - d->expanded = ( view != TQString::fromLatin1( "collapsed" ) ); + TQString view = data.attribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); + d->expanded = ( view != TQString::tqfromLatin1( "collapsed" ) ); TQDomNode groupData = data.firstChild(); while ( !groupData.isNull() ) { TQDomElement groupElement = groupData.toElement(); - if ( groupElement.tagName() == TQString::fromLatin1( "display-name" ) ) + if ( groupElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) { // Don't set display name for temporary or top-level items if ( d->type == Normal ) d->displayName = groupElement.text(); } - else if( groupElement.tagName() == TQString::fromLatin1( "custom-notifications" ) ) + else if( groupElement.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) { Kopete::NotifyDataObject::notifyDataFromXML( groupElement ); } @@ -208,10 +208,10 @@ bool Group::fromXML( const TQDomElement &data ) switch ( d->type ) { case Temporary: - d->displayName = TQString::fromLatin1( "Temporary" ); + d->displayName = TQString::tqfromLatin1( "Temporary" ); break; case TopLevel: - d->displayName = TQString::fromLatin1( "Top-Level" ); + d->displayName = TQString::tqfromLatin1( "Top-Level" ); break; default: d->displayName = i18n( "(Unnamed Group)" ); diff --git a/kopete/libkopete/kopetegroup.h b/kopete/libkopete/kopetegroup.h index af1f828a..3f430eda 100644 --- a/kopete/libkopete/kopetegroup.h +++ b/kopete/libkopete/kopetegroup.h @@ -46,11 +46,12 @@ class Message; */ class KOPETE_EXPORT Group : public ContactListElement, public NotifyDataObject { - Q_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) - Q_PROPERTY( uint groupId READ groupId ) - Q_PROPERTY( bool expanded READ isExpanded WRITE setExpanded ) + TQ_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) + TQ_PROPERTY( uint groupId READ groupId ) + TQ_PROPERTY( bool expanded READ isExpanded WRITE setExpanded ) Q_OBJECT + TQ_OBJECT public: /** Kinds of groups. */ diff --git a/kopete/libkopete/kopetemessage.cpp b/kopete/libkopete/kopetemessage.cpp index 6f223748..db3b24ef 100644 --- a/kopete/libkopete/kopetemessage.cpp +++ b/kopete/libkopete/kopetemessage.cpp @@ -78,19 +78,19 @@ Message::Private::Private( const TQDateTime &timeStamp, const Contact *from, : from( from ), to( to ), manager( 0 ), direction( direction ), format( PlainText ), type( type ), requestedPlugin( requestedPlugin ), importance( (to.count() <= 1) ? Normal : Low ), bgOverride( false ), fgOverride( false ), rtfOverride( false ), isRightToLeft( false ), - timeStamp( timeStamp ), body( TQString::null ), subject( subject ) + timeStamp( timeStamp ), body( TQString() ), subject( subject ) { } Message::Message() -: d( new Private( TQDateTime::currentDateTime(), 0L, TQPtrList(), TQString::null, Internal, - TQString::null, TypeNormal ) ) +: d( new Private( TQDateTime::tqcurrentDateTime(), 0L, TQPtrList(), TQString(), Internal, + TQString(), TypeNormal ) ) { } Message::Message( const Contact *fromKC, const TQPtrList &toKC, const TQString &body, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) -: d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, TQString::null, direction, requestedPlugin, type ) ) +: d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -100,20 +100,20 @@ Message::Message( const Contact *fromKC, const Contact *toKC, const TQString &bo { TQPtrList to; to.append(toKC); - d = new Private( TQDateTime::currentDateTime(), fromKC, to, TQString::null, direction, requestedPlugin, type ); + d = new Private( TQDateTime::tqcurrentDateTime(), fromKC, to, TQString(), direction, requestedPlugin, type ); doSetBody( body, f ); } Message::Message( const Contact *fromKC, const TQPtrList &toKC, const TQString &body, const TQString &subject, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) - : d( new Private( TQDateTime::currentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) + : d( new Private( TQDateTime::tqcurrentDateTime(), fromKC, toKC, subject, direction, requestedPlugin, type ) ) { doSetBody( body, f ); } Message::Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList &toKC, const TQString &body, MessageDirection direction, MessageFormat f, const TQString &requestedPlugin, MessageType type ) - : d( new Private( timeStamp, fromKC, toKC, TQString::null, direction, requestedPlugin, type ) ) + : d( new Private( timeStamp, fromKC, toKC, TQString(), direction, requestedPlugin, type ) ) { doSetBody( body, f ); } @@ -199,20 +199,20 @@ void Message::doSetBody( const TQString &_body, Message::MessageFormat f ) { //This is coming from the RichTextEditor component. //Strip off the containing HTML document - body.replace( TQRegExp( TQString::fromLatin1(".*]*>(.*).*") ), TQString::fromLatin1("\\1") ); + body.tqreplace( TQRegExp( TQString::tqfromLatin1(".*]*>(.*).*") ), TQString::tqfromLatin1("\\1") ); //Strip

tags - body.replace( TQString::fromLatin1("

"), TQString::null ); + body.tqreplace( TQString::tqfromLatin1("

"), TQString() ); //Replace

with a
- body.replace( TQString::fromLatin1("

"), TQString::fromLatin1("
") ); + body.tqreplace( TQString::tqfromLatin1("

"), TQString::tqfromLatin1("
") ); //Remove trailing
- if ( body.endsWith( TQString::fromLatin1("
") ) ) + if ( body.endsWith( TQString::tqfromLatin1("
") ) ) body.truncate( body.length() - 5 ); - body.remove( TQString::fromLatin1("\n") ); - body.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "  " ) ); + body.remove( TQString::tqfromLatin1("\n") ); + body.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); } /* else if( f == ParsedHTML ) @@ -255,23 +255,23 @@ TQString Message::unescape( const TQString &xml ) data.simplifyWhiteSpace(); int pos; - while ( ( pos = data.find( '<' ) ) != -1 ) + while ( ( pos = data.tqfind( '<' ) ) != -1 ) { - int endPos = data.find( '>', pos + 1 ); + int endPos = data.tqfind( '>', pos + 1 ); if( endPos == -1 ) break; // No more complete elements left // Take the part between < and >, and extract the element name from that int matchWidth = endPos - pos + 1; TQString match = data.mid( pos + 1, matchWidth - 2 ).simplifyWhiteSpace(); - int elemEndPos = match.find( ' ' ); + int elemEndPos = match.tqfind( ' ' ); TQString elem = ( elemEndPos == -1 ? match.lower() : match.left( elemEndPos ).lower() ); - if ( elem == TQString::fromLatin1( "img" ) ) + if ( elem == TQString::tqfromLatin1( "img" ) ) { // Replace smileys with their original text' - const TQString attrTitle = TQString::fromLatin1( "title=\"" ); - int titlePos = match.find( attrTitle, elemEndPos ); - int titleEndPos = match.find( '"', titlePos + attrTitle.length() ); + const TQString attrTitle = TQString::tqfromLatin1( "title=\"" ); + int titlePos = match.tqfind( attrTitle, elemEndPos ); + int titleEndPos = match.tqfind( '"', titlePos + attrTitle.length() ); if( titlePos == -1 || titleEndPos == -1 ) { // Not a smiley but a normal @@ -282,15 +282,15 @@ TQString Message::unescape( const TQString &xml ) { TQString orig = match.mid( titlePos + attrTitle.length(), titleEndPos - titlePos - attrTitle.length() ); - data.replace( pos, matchWidth, orig ); + data.tqreplace( pos, matchWidth, orig ); pos += orig.length(); } } - else if ( elem == TQString::fromLatin1( "/p" ) || elem == TQString::fromLatin1( "/div" ) || - elem == TQString::fromLatin1( "br" ) ) + else if ( elem == TQString::tqfromLatin1( "/p" ) || elem == TQString::tqfromLatin1( "/div" ) || + elem == TQString::tqfromLatin1( "br" ) ) { // Replace paragraph, div and line breaks with a newline - data.replace( pos, matchWidth, '\n' ); + data.tqreplace( pos, matchWidth, '\n' ); pos++; } else @@ -302,12 +302,12 @@ TQString Message::unescape( const TQString &xml ) } // Replace stuff starting with '&' - data.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); - data.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); - data.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); - data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); - data.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); - data.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; + data.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + data.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + data.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + data.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + data.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); //this one is used in jabber: note, we should escape all &#xx; return data; } @@ -316,13 +316,13 @@ TQString Message::escape( const TQString &text ) { TQString html = TQStyleSheet::escape( text ); //Replace carriage returns inside the text - html.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "
" ) ); + html.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "
" ) ); //Replace a tab with 4 spaces - html.replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( "    " ) ); + html.tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "    " ) ); //Replace multiple spaces with   //do not replace every space so we break the linebreak - html.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "  " ) ); + html.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); return html; } @@ -373,11 +373,11 @@ TQString Message::parsedBody() const static TQString makeRegExp( const char *pattern ) { - const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString boundaryStart = TQString::fromLatin1( "(^|[^%1])(" ).arg( urlChar ); - const TQString boundaryEnd = TQString::fromLatin1( ")([^%1]|$)" ).arg( urlChar ); + const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString boundaryStart = TQString::tqfromLatin1( "(^|[^%1])(" ).tqarg( urlChar ); + const TQString boundaryEnd = TQString::tqfromLatin1( ")([^%1]|$)" ).tqarg( urlChar ); - return boundaryStart + TQString::fromLatin1(pattern) + boundaryEnd; + return boundaryStart + TQString::tqfromLatin1(pattern) + boundaryEnd; } TQString Message::parseLinks( const TQString &message, MessageFormat format ) @@ -403,7 +403,7 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) { TQString curr = *it; // > in HTML means start-of-tag if and only if it's the first one after a < - int tagclose = curr.find( TQChar('>') ); + int tagclose = curr.tqfind( TQChar('>') ); // no >: the HTML is broken, but we can cope if ( tagclose == -1 ) continue; @@ -411,38 +411,38 @@ TQString Message::parseLinks( const TQString &message, MessageFormat format ) TQString body = curr.mid( tagclose + 1 ); *it = tag + parseLinks( body, PlainText ); } - return entries.join(TQString::fromLatin1("<")); + return entries.join(TQString::tqfromLatin1("<")); } TQString result = message; // common subpatterns - may not contain matching parens! - const TQString name = TQString::fromLatin1( "[\\w\\+\\-=_\\.]+" ); - const TQString userAndPassword = TQString::fromLatin1( "(?:%1(?::%1)?\\@)" ).arg( name ); - const TQString urlChar = TQString::fromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); - const TQString urlSection = TQString::fromLatin1( "[%1]+" ).arg( urlChar ); - const TQString domain = TQString::fromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); + const TQString name = TQString::tqfromLatin1( "[\\w\\+\\-=_\\.]+" ); + const TQString userAndPassword = TQString::tqfromLatin1( "(?:%1(?::%1)?\\@)" ).tqarg( name ); + const TQString urlChar = TQString::tqfromLatin1( "\\+\\-\\w\\./#@&;:=\\?~%_,\\!\\$\\*\\(\\)" ); + const TQString urlSection = TQString::tqfromLatin1( "[%1]+" ).tqarg( urlChar ); + const TQString domain = TQString::tqfromLatin1( "[\\-\\w_]+(?:\\.[\\-\\w_]+)+" ); //Replace http/https/ftp links: // Replace (stuff)://[user:password@](linkstuff) with a link - result.replace( - TQRegExp( makeRegExp("\\w+://%1?\\w%2").arg( userAndPassword, urlSection ) ), - TQString::fromLatin1("\\1\\2\\3" ) ); + result.tqreplace( + TQRegExp( makeRegExp("\\w+://%1?\\w%2").tqarg( userAndPassword, urlSection ) ), + TQString::tqfromLatin1("\\1\\2\\3" ) ); // Replace www.X.Y(linkstuff) with a http: link - result.replace( - TQRegExp( makeRegExp("%1?www\\.%2%3").arg( userAndPassword, domain, urlSection ) ), - TQString::fromLatin1("\\1\\2\\3" ) ); + result.tqreplace( + TQRegExp( makeRegExp("%1?www\\.%2%3").tqarg( userAndPassword, domain, urlSection ) ), + TQString::tqfromLatin1("\\1\\2\\3" ) ); //Replace Email Links // Replace user@domain with a mailto: link - result.replace( - TQRegExp( makeRegExp("%1@%2").arg( name, domain ) ), - TQString::fromLatin1("\\1\\2\\3") ); + result.tqreplace( + TQRegExp( makeRegExp("%1@%2").tqarg( name, domain ) ), + TQString::tqfromLatin1("\\1\\2\\3") ); //Workaround for Bug 85061: Highlighted URLs adds a ' ' after the URL itself // the trailing   is included in the url. - result.replace( TQRegExp( TQString::fromLatin1("(xmlDoc.elementsByTagName( TQString::fromLatin1("body") ).item(0).toElement(); - //return TQFont( bodyNode.attribute( TQString::fromLatin1("font") ), bodyNode.attribute( TQString::fromLatin1("fontsize") ).toInt() ); + //TQDomElement bodyNode = d->xmlDoc.elementsByTagName( TQString::tqfromLatin1("body") ).item(0).toElement(); + //return TQFont( bodyNode.attribute( TQString::tqfromLatin1("font") ), bodyNode.attribute( TQString::tqfromLatin1("fontsize") ).toInt() ); return d->font; } @@ -531,11 +531,11 @@ TQString Message::getHtmlStyleAttribute() const // Affect foreground(color) and background color to message. if( !d->fgOverride && d->fgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("color: %1; ").arg(d->fgColor.name()); + styleAttribute += TQString::fromUtf8("color: %1; ").tqarg(d->fgColor.name()); } if( !d->bgOverride && d->bgColor.isValid() ) { - styleAttribute += TQString::fromUtf8("background-color: %1; ").arg(d->bgColor.name()); + styleAttribute += TQString::fromUtf8("background-color: %1; ").tqarg(d->bgColor.name()); } // Affect font parameters. @@ -543,15 +543,15 @@ TQString Message::getHtmlStyleAttribute() const { TQString fontstr; if(!d->font.family().isNull()) - fontstr+=TQString::fromLatin1("font-family: ")+d->font.family()+TQString::fromLatin1("; "); + fontstr+=TQString::tqfromLatin1("font-family: ")+d->font.family()+TQString::tqfromLatin1("; "); if(d->font.italic()) - fontstr+=TQString::fromLatin1("font-style: italic; "); + fontstr+=TQString::tqfromLatin1("font-style: italic; "); if(d->font.strikeOut()) - fontstr+=TQString::fromLatin1("text-decoration: line-through; "); + fontstr+=TQString::tqfromLatin1("text-decoration: line-through; "); if(d->font.underline()) - fontstr+=TQString::fromLatin1("text-decoration: underline; "); + fontstr+=TQString::tqfromLatin1("text-decoration: underline; "); if(d->font.bold()) - fontstr+=TQString::fromLatin1("font-weight: bold;"); + fontstr+=TQString::tqfromLatin1("font-weight: bold;"); styleAttribute += fontstr; } @@ -629,7 +629,7 @@ TQString Message::decodeString( const TQCString &message, const TQTextCodec *pro kdDebug(14000) << k_funcinfo << "Using latin1 and cleaning string" << endl; //No codec decoded. Just decode latin1, and clean out any junk. - TQString result = TQString::fromLatin1( message ); + TQString result = TQString::tqfromLatin1( message ); const uint length = message.length(); for( uint i = 0; i < length; ++i ) { diff --git a/kopete/libkopete/kopetemessage.h b/kopete/libkopete/kopetemessage.h index df546c38..366a0204 100644 --- a/kopete/libkopete/kopetemessage.h +++ b/kopete/libkopete/kopetemessage.h @@ -119,7 +119,7 @@ public: */ Message( const Contact *fromKC, const TQPtrList &toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -133,7 +133,7 @@ public: */ Message( const Contact *fromKC, const Contact *toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -148,7 +148,7 @@ public: */ Message( const Contact *fromKC, const TQPtrList &toKC, const TQString &body, const TQString &subject, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -163,7 +163,7 @@ public: */ Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList &toKC, const TQString &body, MessageDirection direction, MessageFormat format = PlainText, - const TQString &requestedPlugin = TQString::null, MessageType type = TypeNormal ); + const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** * Constructs a new message. See @ref setBody() to more information about the format @@ -179,7 +179,7 @@ public: */ Message( const TQDateTime &timeStamp, const Contact *fromKC, const TQPtrList &toKC, const TQString &body, const TQString &subject, MessageDirection direction, - MessageFormat format = PlainText, const TQString &requestedPlugin = TQString::null, + MessageFormat format = PlainText, const TQString &requestedPlugin = TQString(), MessageType type = TypeNormal ); /** diff --git a/kopete/libkopete/kopetemessageevent.cpp b/kopete/libkopete/kopetemessageevent.cpp index d50c85e9..09e61605 100644 --- a/kopete/libkopete/kopetemessageevent.cpp +++ b/kopete/libkopete/kopetemessageevent.cpp @@ -37,8 +37,8 @@ public: EventState state; }; -MessageEvent::MessageEvent( const Message& m, TQObject *parent, const char *name ) - : TQObject(parent,name), d( new Private ) +MessageEvent::MessageEvent( const Message& m, TQObject *tqparent, const char *name ) + : TQObject(tqparent,name), d( new Private ) { d->message = m; d->state = Nothing; diff --git a/kopete/libkopete/kopetemessageevent.h b/kopete/libkopete/kopetemessageevent.h index 9cfa1ea5..daf38e04 100644 --- a/kopete/libkopete/kopetemessageevent.h +++ b/kopete/libkopete/kopetemessageevent.h @@ -39,12 +39,13 @@ namespace Kopete * the message, and a signal when it is terminated (i.e. * the message is read **/ -class KOPETE_EXPORT MessageEvent : public QObject +class KOPETE_EXPORT MessageEvent : public TQObject { Q_OBJECT + TQ_OBJECT public: - MessageEvent(const Kopete::Message& , TQObject* parent=0L, const char *name=0L); + MessageEvent(const Kopete::Message& , TQObject* tqparent=0L, const char *name=0L); ~MessageEvent(); /** diff --git a/kopete/libkopete/kopetemessagehandler.h b/kopete/libkopete/kopetemessagehandler.h index fa9c1f31..67858e4d 100644 --- a/kopete/libkopete/kopetemessagehandler.h +++ b/kopete/libkopete/kopetemessagehandler.h @@ -42,9 +42,10 @@ class ChatSession; * This class implements Handler role in the Chain of Responsibility pattern. * The Client role will be filled by the Kopete::MessageHandlerChain class. */ -class KOPETE_EXPORT MessageHandler : public QObject +class KOPETE_EXPORT MessageHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: MessageHandler(); virtual ~MessageHandler() = 0; diff --git a/kopete/libkopete/kopetemessagehandlerchain.h b/kopete/libkopete/kopetemessagehandlerchain.h index a53e0600..cfdf3271 100644 --- a/kopete/libkopete/kopetemessagehandlerchain.h +++ b/kopete/libkopete/kopetemessagehandlerchain.h @@ -44,6 +44,7 @@ class ProcessMessageTask; class MessageHandlerChain : public TQObject, private KShared { Q_OBJECT + TQ_OBJECT public: friend class KSharedPtr; typedef KSharedPtr Ptr; @@ -73,6 +74,7 @@ private: class ProcessMessageTask : public Task { Q_OBJECT + TQ_OBJECT public: MessageEvent *event(); diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 9a908f32..a031f5bd 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -58,7 +58,7 @@ class MetaContact::Private Private() : photoSource(MetaContact::SourceCustom), displayNameSource(MetaContact::SourceCustom), displayNameSourceContact(0L), photoSourceContact(0L), temporary(false), - onlineStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) + onlinetqStatus(Kopete::OnlineStatus::Offline), photoSyncedWithKABC(false) {} ~Private() @@ -85,7 +85,7 @@ class MetaContact::Private TQMap > addressBook; bool temporary; - OnlineStatus::StatusType onlineStatus; + OnlineStatus::StatusType onlinetqStatus; bool photoSyncedWithKABC; // Used to set contact source at load. @@ -127,7 +127,7 @@ MetaContact::~MetaContact() void MetaContact::addContact( Contact *c ) { - if( d->contacts.contains( c ) ) + if( d->contacts.tqcontains( c ) ) { kdWarning(14010) << "Ignoring attempt to add duplicate contact " << c->contactId() << "!" << endl; } @@ -171,29 +171,29 @@ void MetaContact::addContact( Contact *c ) void MetaContact::updateOnlineStatus() { - Kopete::OnlineStatus::StatusType newStatus = Kopete::OnlineStatus::Unknown; - Kopete::OnlineStatus mostSignificantStatus; + Kopete::OnlineStatus::StatusType newtqStatus = Kopete::OnlineStatus::Unknown; + Kopete::OnlineStatus mostSignificanttqStatus; for ( TQPtrListIterator it( d->contacts ); it.current(); ++it ) { // find most significant status - if ( it.current()->onlineStatus() > mostSignificantStatus ) - mostSignificantStatus = it.current()->onlineStatus(); + if ( it.current()->onlinetqStatus() > mostSignificanttqStatus ) + mostSignificanttqStatus = it.current()->onlinetqStatus(); } - newStatus = mostSignificantStatus.status(); + newtqStatus = mostSignificanttqStatus.status(); - if( newStatus != d->onlineStatus ) + if( newtqStatus != d->onlinetqStatus ) { - d->onlineStatus = newStatus; - emit onlineStatusChanged( this, d->onlineStatus ); + d->onlinetqStatus = newtqStatus; + emit onlineStatusChanged( this, d->onlinetqStatus ); } } void MetaContact::removeContact(Contact *c, bool deleted) { - if( !d->contacts.contains( c ) ) + if( !d->contacts.tqcontains( c ) ) { kdDebug(14010) << k_funcinfo << " Contact is not in this metaContact " << endl; } @@ -257,7 +257,7 @@ void MetaContact::removeContact(Contact *c, bool deleted) } if(!deleted) - { //If this function is tell by slotContactRemoved, c is maybe just a QObject + { //If this function is tell by slotContactRemoved, c is maybe just a TQObject disconnect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); disconnect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), @@ -272,7 +272,7 @@ void MetaContact::removeContact(Contact *c, bool deleted) KABCPersistence::self()->write( this ); } - // Reparent the contact + // Retqparent the contact removeChild( c ); emit contactRemoved( c ); @@ -415,14 +415,14 @@ Contact *MetaContact::preferredContact() continue; } - if( c->onlineStatus().status() > contact->onlineStatus().status() ) + if( c->onlinetqStatus().status() > contact->onlinetqStatus().status() ) contact=c; //this contact has a better status - else if ( c->onlineStatus().status() == contact->onlineStatus().status() ) + else if ( c->onlinetqStatus().status() == contact->onlinetqStatus().status() ) { if( c->account()->priority() > contact->account()->priority() ) contact=c; else if( c->account()->priority() == contact->account()->priority() - && c->onlineStatus().weight() > contact->onlineStatus().weight() ) + && c->onlinetqStatus().weight() > contact->onlinetqStatus().weight() ) contact = c; //the weight is not supposed to follow the same scale for each protocol } } @@ -507,13 +507,13 @@ TQString MetaContact::statusString() const return i18n( "Offline" ); case OnlineStatus::Unknown: default: - return i18n( "Status not available" ); + return i18n( "tqStatus not available" ); } } OnlineStatus::StatusType MetaContact::status() const { - return d->onlineStatus; + return d->onlinetqStatus; } bool MetaContact::isOnline() const @@ -566,7 +566,7 @@ void MetaContact::sendFile( const KURL &sourceURL, const TQString &altFileName, Contact *contact = d->contacts.first(); for( TQPtrListIterator it( d->contacts ) ; it.current(); ++it ) { - if( ( *it )->onlineStatus() > contact->onlineStatus() && ( *it )->canAcceptFiles() ) + if( ( *it )->onlinetqStatus() > contact->onlinetqStatus() && ( *it )->canAcceptFiles() ) contact = *it; } @@ -640,7 +640,7 @@ TQString MetaContact::displayName() const TQString nameFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.contains(':') ) + if ( ! id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -653,20 +653,20 @@ TQString nameFromKABC( const TQString &id ) /*const*/ } } // no kabc association, return null image - return TQString::null; + return TQString(); } TQString nameFromContact( Kopete::Contact *c) /*const*/ { if ( !c ) - return TQString::null; + return TQString(); TQString contactName; if ( c->hasProperty( Kopete::Global::Properties::self()->nickName().key() ) ) contactName = c->property( Global::Properties::self()->nickName()).value().toString(); //the replace is there to workaround the Bug 95444 - return contactName.isEmpty() ? c->contactId() : contactName.replace('\n',TQString::fromUtf8("")); + return contactName.isEmpty() ? c->contactId() : contactName.tqreplace('\n',TQString::fromUtf8("")); } KURL MetaContact::customPhoto() const @@ -690,7 +690,7 @@ TQImage MetaContact::photo() const if( picture().image().width() > 96 && picture().image().height() > 96 ) { kdDebug( 14010 ) << k_funcinfo << "Resizing image from " << picture().image().width() << " x " << picture().image().height() << endl; - return picture().image().smoothScale(96,96,TQImage::ScaleMin); + return picture().image().smoothScale(96,96,TQ_ScaleMin); } else return picture().image(); @@ -739,7 +739,7 @@ TQImage photoFromContact( Kopete::Contact *contact) /*const*/ TQImage photoFromKABC( const TQString &id ) /*const*/ { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); - if ( ! id.isEmpty() && !id.contains(':') ) + if ( ! id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -859,14 +859,14 @@ void MetaContact::slotPropertyChanged( Contact* subcontact, const TQString &key, void MetaContact::moveToGroup( Group *from, Group *to ) { - if ( !from || !groups().contains( from ) ) + if ( !from || !groups().tqcontains( from ) ) { // We're adding, not moving, because 'from' is illegal addToGroup( to ); return; } - if ( !to || groups().contains( to ) ) + if ( !to || groups().tqcontains( to ) ) { // We're removing, not moving, because 'to' is illegal removeFromGroup( from ); @@ -890,7 +890,7 @@ void MetaContact::moveToGroup( Group *from, Group *to ) void MetaContact::removeFromGroup( Group *group ) { - if ( !group || !groups().contains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) + if ( !group || !groups().tqcontains( group ) || ( isTemporary() && group->type() == Group::Temporary ) ) { return; } @@ -912,13 +912,13 @@ void MetaContact::removeFromGroup( Group *group ) void MetaContact::addToGroup( Group *to ) { - if ( !to || groups().contains( to ) ) + if ( !to || groups().tqcontains( to ) ) return; if ( d->temporary && to->type() != Group::Temporary ) return; - if ( d->groups.contains( Group::topLevel() ) ) + if ( d->groups.tqcontains( Group::topLevel() ) ) { d->groups.remove( Group::topLevel() ); emit removedFromGroup( this, Group::topLevel() ); @@ -1058,7 +1058,7 @@ bool MetaContact::fromXML( const TQDomElement& element ) // return false; //the replace is there to workaround the Bug 95444 - d->displayName = contactElement.text().replace('\n',TQString::fromUtf8("")); + d->displayName = contactElement.text().tqreplace('\n',TQString::fromUtf8("")); if ( contactElement.hasAttribute(NSCID_ELEM) && contactElement.hasAttribute(NSPID_ELEM) && contactElement.hasAttribute(NSAID_ELEM)) { @@ -1162,8 +1162,8 @@ bool MetaContact::fromXML( const TQDomElement& element ) } else if( contactElement.tagName() == TQString::fromUtf8( "address-book-field" ) ) { - TQString app = contactElement.attribute( TQString::fromUtf8( "app" ), TQString::null ); - TQString key = contactElement.attribute( TQString::fromUtf8( "key" ), TQString::null ); + TQString app = contactElement.attribute( TQString::fromUtf8( "app" ), TQString() ); + TQString key = contactElement.attribute( TQString::fromUtf8( "key" ), TQString() ); TQString val = contactElement.text(); d->addressBook[ app ][ key ] = val; } @@ -1291,7 +1291,7 @@ void MetaContact::slotUpdateAddressBookPicture() { KABC::AddressBook* ab = KABCPersistence::self()->addressBook(); TQString id = metaContactId(); - if ( !id.isEmpty() && !id.contains(':') ) + if ( !id.isEmpty() && !id.tqcontains(':') ) { KABC::Addressee theAddressee = ab->findByUid(id); if ( theAddressee.isEmpty() ) @@ -1338,7 +1338,7 @@ TQString MetaContact::metaContactId() const { Contact *c=d->contacts.first(); if(!c) - return TQString::null; + return TQString(); return c->protocol()->pluginId()+TQString::fromUtf8(":")+c->account()->accountId()+TQString::fromUtf8(":") + c->contactId() ; } return d->metaContactId; @@ -1360,7 +1360,7 @@ void MetaContact::setMetaContactId( const TQString& newMetaContactId ) // other programs may have written that data and depend on it d->metaContactId = newMetaContactId; KABCPersistence::self()->write( this ); - emit onlineStatusChanged( this, d->onlineStatus ); + emit onlineStatusChanged( this, d->onlinetqStatus ); emit persistentDataChanged(); } diff --git a/kopete/libkopete/kopetemetacontact.h b/kopete/libkopete/kopetemetacontact.h index d3c95cd7..168fbaa2 100644 --- a/kopete/libkopete/kopetemetacontact.h +++ b/kopete/libkopete/kopetemetacontact.h @@ -57,17 +57,18 @@ class Picture; class KOPETE_EXPORT MetaContact : public ContactListElement, public NotifyDataObject { Q_OBJECT - - Q_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) - Q_PROPERTY( TQString statusString READ statusString ) - Q_PROPERTY( TQString statusIcon READ statusIcon ) - Q_PROPERTY( bool isOnline READ isOnline ) - Q_PROPERTY( bool isReachable READ isReachable ) - Q_PROPERTY( bool isTemporary READ isTemporary ) - Q_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) - //Q_PROPERTY( ulong idleTime READ idleTime ) - Q_PROPERTY( TQString metaContactId READ metaContactId WRITE setMetaContactId ) - Q_PROPERTY( bool photoSyncedWithKABC READ isPhotoSyncedWithKABC WRITE setPhotoSyncedWithKABC ) + TQ_OBJECT + + TQ_PROPERTY( TQString displayName READ displayName WRITE setDisplayName ) + TQ_PROPERTY( TQString statusString READ statusString ) + TQ_PROPERTY( TQString statusIcon READ statusIcon ) + TQ_PROPERTY( bool isOnline READ isOnline ) + TQ_PROPERTY( bool isReachable READ isReachable ) + TQ_PROPERTY( bool isTemporary READ isTemporary ) + TQ_PROPERTY( bool canAcceptFiles READ canAcceptFiles ) + //TQ_PROPERTY( ulong idleTime READ idleTime ) + TQ_PROPERTY( TQString metaContactId READ metaContactId WRITE setMetaContactId ) + TQ_PROPERTY( bool photoSyncedWithKABC READ isPhotoSyncedWithKABC WRITE setPhotoSyncedWithKABC ) public: /** @@ -414,7 +415,7 @@ public slots: * file size (such as over a socket) * */ - void sendFile( const KURL &sourceURL, const TQString &altFileName = TQString::null, + void sendFile( const KURL &sourceURL, const TQString &altFileName = TQString(), unsigned long fileSize = 0L ); signals: /** @@ -558,7 +559,7 @@ private slots: /** * One of the child contact's online status changed */ - void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus ); + void slotContactStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus ); /** * One of the child contact's property changed diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp index f21d875a..ca50d514 100644 --- a/kopete/libkopete/kopetemimesourcefactory.cpp +++ b/kopete/libkopete/kopetemimesourcefactory.cpp @@ -61,7 +61,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const *it = KURL::decode_string( *it ); TQPixmap img; - if ( parts[0] == TQString::fromLatin1("kopete-contact-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-contact-icon") ) { if ( parts.size() >= 4 ) { @@ -71,7 +71,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const Contact *contact = account->contacts()[ parts[3] ]; if ( contact ) { - img = contact->onlineStatus().iconFor( contact ); + img = contact->onlinetqStatus().iconFor( contact ); completed = true; } else @@ -84,14 +84,14 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-contact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-account-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-account-icon") ) { if ( parts.size() >= 3 ) { Account *account = AccountManager::self()->findAccount( parts[1], parts[2] ); if ( account ) { - img = account->myself()->onlineStatus().iconFor( account->myself() ); + img = account->myself()->onlinetqStatus().iconFor( account->myself() ); completed = true; } else @@ -101,7 +101,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-account-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-metacontact-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-icon") ) { if ( parts.size() >= 2 ) { @@ -116,7 +116,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-icon: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-metacontact-photo") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-metacontact-photo") ) { if ( parts.size() >= 2 ) { @@ -133,7 +133,7 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const kdDebug( 14010 ) << k_funcinfo << "kopete-metacontact-photo: insufficient information in abs_name: " << parts << endl; } - if ( parts[0] == TQString::fromLatin1("kopete-onlinestatus-icon") ) + if ( parts[0] == TQString::tqfromLatin1("kopete-onlinestatus-icon") ) { if ( parts.size() >= 2 ) { @@ -146,13 +146,13 @@ const TQMimeSource *MimeSourceFactory::data( const TQString &abs_name ) const * To find a valid KOS, we ask Kopete's account manager to locate an existing * account. We'll use the myself() instance of that account to reference its * current KOS object, which in turn has access to the global KOS icon cache. - * Note that if the cache has been invalidated in the meantime, we'll just + * Note that if the cache has been tqinvalidated in the meantime, we'll just * get an empty pixmap back. */ Account *account = AccountManager::self()->accounts().getFirst(); if ( account ) { - img = account->myself()->onlineStatus().iconFor( parts[1] ); + img = account->myself()->onlinetqStatus().iconFor( parts[1] ); completed = true; } else diff --git a/kopete/libkopete/kopetemimesourcefactory.h b/kopete/libkopete/kopetemimesourcefactory.h index e9df5994..cf5e586b 100644 --- a/kopete/libkopete/kopetemimesourcefactory.h +++ b/kopete/libkopete/kopetemimesourcefactory.h @@ -36,7 +36,7 @@ namespace Kopete * Note that the various id strings should be URL-encoded (with, for instance, * KURL::encode_string) if they might contain colons. */ -class KOPETE_EXPORT MimeSourceFactory : public QMimeSourceFactory +class KOPETE_EXPORT MimeSourceFactory : public TQMimeSourceFactory { public: MimeSourceFactory(); diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp index 5f336a6b..89282b62 100644 --- a/kopete/libkopete/kopetemimetypehandler.cpp +++ b/kopete/libkopete/kopetemimetypehandler.cpp @@ -159,7 +159,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy } KMessageBox::sorry( Kopete::UI::Global::mainWidget(), - sorryText.arg( url.prettyURL() ) ); + sorryText.tqarg( url.prettyURL() ) ); return false; } @@ -200,9 +200,9 @@ void MimeTypeHandler::handleURL( const TQString &mimeType, const KURL &url ) con EmoticonMimeTypeHandler::EmoticonMimeTypeHandler() : MimeTypeHandler( false ) { - registerAsMimeHandler( TQString::fromLatin1("application/x-kopete-emoticons") ); - registerAsMimeHandler( TQString::fromLatin1("application/x-tgz") ); - registerAsMimeHandler( TQString::fromLatin1("application/x-tbz") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-kopete-emoticons") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-tgz") ); + registerAsMimeHandler( TQString::tqfromLatin1("application/x-tbz") ); } void EmoticonMimeTypeHandler::handleURL( const TQString &, const KURL &url ) const diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 7ba7ab80..9cde4133 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -39,13 +39,13 @@ Kopete::NotifyDataObject::~NotifyDataObject() Kopete::NotifyEvent * Kopete::NotifyDataObject::notifyEvent( const TQString &event ) const { - Kopete::NotifyEvent *evt = d->events.find( event ); + Kopete::NotifyEvent *evt = d->events.tqfind( event ); return evt; } void Kopete::NotifyDataObject::setNotifyEvent( const TQString& event, Kopete::NotifyEvent *notifyEvent ) { - d->events.replace( event, notifyEvent ); + d->events.tqreplace( event, notifyEvent ); } bool Kopete::NotifyDataObject::removeNotifyEvent( const TQString &event ) @@ -60,14 +60,14 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() if ( !d->events.isEmpty() ) { // - notifications = notify.createElement( TQString::fromLatin1( "custom-notifications" ) ); + notifications = notify.createElement( TQString::tqfromLatin1( "custom-notifications" ) ); TQDictIterator it( d->events ); for ( ; it.current(); ++it ) { // - TQDomElement event = notify.createElement( TQString::fromLatin1( "event" ) ); - event.setAttribute( TQString::fromLatin1( "name" ), it.currentKey() ); - event.setAttribute( TQString::fromLatin1( "suppress-common" ), TQString::fromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); + TQDomElement event = notify.createElement( TQString::tqfromLatin1( "event" ) ); + event.setAttribute( TQString::tqfromLatin1( "name" ), it.currentKey() ); + event.setAttribute( TQString::tqfromLatin1( "suppress-common" ), TQString::tqfromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); TQValueList presentations = it.current()->toXML(); // for ( TQValueList::Iterator it = presentations.begin(); it != presentations.end(); ++it ) @@ -80,57 +80,57 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() bool Kopete::NotifyDataObject::notifyDataFromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::fromLatin1( "custom-notifications" ) ) + if ( element.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) { TQDomNode field = element.firstChild(); while( !field.isNull() ) { //read an event TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::fromLatin1( "event" ) ) + if ( fieldElement.tagName() == TQString::tqfromLatin1( "event" ) ) { // get its attributes - TQString name = fieldElement.attribute( TQString::fromLatin1( "name" ), TQString::null ); - TQString suppress = fieldElement.attribute( TQString::fromLatin1( "suppress-common" ), TQString::null ); - Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::fromLatin1( "true" ) ); + TQString name = fieldElement.attribute( TQString::tqfromLatin1( "name" ), TQString() ); + TQString suppress = fieldElement.attribute( TQString::tqfromLatin1( "suppress-common" ), TQString() ); + Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::tqfromLatin1( "true" ) ); - // get its children + // get its tqchildren TQDomNode child = fieldElement.firstChild(); while( !child.isNull() ) { TQDomElement childElement = child.toElement(); - if ( childElement.tagName() == TQString::fromLatin1( "sound-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "sound-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: sound" << endl; - TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Sound, src, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Sound, pres ); // kdDebug(14010) << k_funcinfo << "after sound: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::fromLatin1( "message-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "message-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: msg" << endl; - TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Message, src, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Message, pres ); // kdDebug(14010) << k_funcinfo << "after message: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::fromLatin1( "chat-presentation" ) ) + if ( childElement.tagName() == TQString::tqfromLatin1( "chat-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: chat" << endl; - TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); - Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString::null, - ( singleShot == TQString::fromLatin1( "true" ) ), - ( enabled == TQString::fromLatin1( "true" ) ) ); + TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString(), + ( singleShot == TQString::tqfromLatin1( "true" ) ), + ( enabled == TQString::tqfromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Chat, pres ); // kdDebug(14010) << k_funcinfo << "after chat: " << evt->toString() << endl; } diff --git a/kopete/libkopete/kopetenotifyevent.cpp b/kopete/libkopete/kopetenotifyevent.cpp index 4bd9fad7..b233774b 100644 --- a/kopete/libkopete/kopetenotifyevent.cpp +++ b/kopete/libkopete/kopetenotifyevent.cpp @@ -144,25 +144,25 @@ const TQValueList Kopete::NotifyEvent::toXML() const TQValueList eventNodes; if ( m_sound && !m_sound->content().isEmpty() ) { - TQDomElement soundElmt = eventData.createElement( TQString::fromLatin1( "sound-presentation" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_sound->enabled() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_sound->singleShot() ? "true" : "false" ) ); - soundElmt.setAttribute( TQString::fromLatin1( "src" ), m_sound->content() ); + TQDomElement soundElmt = eventData.createElement( TQString::tqfromLatin1( "sound-presentation" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_sound->enabled() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_sound->singleShot() ? "true" : "false" ) ); + soundElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_sound->content() ); eventNodes.append( soundElmt ); } if ( m_message && !m_message->content().isEmpty() ) { - TQDomElement msgElmt = eventData.createElement( TQString::fromLatin1( "message-presentation" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( m_message->enabled() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_message->singleShot() ? "true" : "false" ) ); - msgElmt.setAttribute( TQString::fromLatin1( "src" ), m_message->content() ); + TQDomElement msgElmt = eventData.createElement( TQString::tqfromLatin1( "message-presentation" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( m_message->enabled() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_message->singleShot() ? "true" : "false" ) ); + msgElmt.setAttribute( TQString::tqfromLatin1( "src" ), m_message->content() ); eventNodes.append( msgElmt ); } if ( m_chat && m_chat->enabled() ) { - TQDomElement chatElmt = eventData.createElement( TQString::fromLatin1( "chat-presentation" ) ); - chatElmt.setAttribute( TQString::fromLatin1( "enabled" ), TQString::fromLatin1( "true" ) ); - chatElmt.setAttribute( TQString::fromLatin1( "single-shot" ), TQString::fromLatin1( m_chat->singleShot() ? "true" : "false" ) ); + TQDomElement chatElmt = eventData.createElement( TQString::tqfromLatin1( "chat-presentation" ) ); + chatElmt.setAttribute( TQString::tqfromLatin1( "enabled" ), TQString::tqfromLatin1( "true" ) ); + chatElmt.setAttribute( TQString::tqfromLatin1( "single-shot" ), TQString::tqfromLatin1( m_chat->singleShot() ? "true" : "false" ) ); eventNodes.append( chatElmt ); } return eventNodes; @@ -170,7 +170,7 @@ const TQValueList Kopete::NotifyEvent::toXML() const TQString Kopete::NotifyEvent::toString() { - TQString stringRep = TQString::fromLatin1("Event; Suppress common=%1").arg( TQString::fromLatin1( suppressCommon() ? "true" : "false" ) ); + TQString stringRep = TQString::tqfromLatin1("Event; Suppress common=%1").tqarg( TQString::tqfromLatin1( suppressCommon() ? "true" : "false" ) ); if ( m_sound) stringRep += m_sound->toString(); if ( m_message) diff --git a/kopete/libkopete/kopeteonlinestatus.cpp b/kopete/libkopete/kopeteonlinestatus.cpp index da9bb5d5..b888c246 100644 --- a/kopete/libkopete/kopeteonlinestatus.cpp +++ b/kopete/libkopete/kopeteonlinestatus.cpp @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.cpp - Kopete Online Status + kopeteonlinestatus.cpp - Kopete Online tqStatus Copyright (c) 2003 by Martijn Klingens Copyright (c) 2003 by Duncan Mac-Vicar Prett @@ -49,7 +49,7 @@ public: TQString protocolIcon() const { - return protocol ? protocol->pluginIcon() : TQString::fromLatin1( "unknown" ); + return protocol ? protocol->pluginIcon() : TQString::tqfromLatin1( "unknown" ); } }; @@ -124,7 +124,7 @@ OnlineStatus::OnlineStatus( StatusType status ) case Unknown: default: d->description = i18n( "Unknown" ); - d->overlayIcons = TQString::fromLatin1("status_unknown"); + d->overlayIcons = TQString::tqfromLatin1("status_unknown"); break; } @@ -137,7 +137,7 @@ OnlineStatus::OnlineStatus() d->internalStatus = 0; d->weight = 0; d->protocol = 0L; - d->overlayIcons = TQString::fromLatin1( "status_unknown" ); + d->overlayIcons = TQString::tqfromLatin1( "status_unknown" ); } OnlineStatus::OnlineStatus( const OnlineStatus &other ) @@ -283,9 +283,9 @@ TQString OnlineStatus::statusTypeToString(OnlineStatus::StatusType statusType) for (int i=0; i< size; i++) if (statusNames[i].status == statusType) - return TQString::fromLatin1(statusNames[i].name); + return TQString::tqfromLatin1(statusNames[i].name); - return TQString::fromLatin1(statusNames[0].name); // Unknown + return TQString::tqfromLatin1(statusNames[0].name); // Unknown } OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) @@ -293,7 +293,7 @@ OnlineStatus::StatusType OnlineStatus::statusStringToType(TQString& string) int size = sizeof(statusNames) / sizeof(statusNames[0]); for (int i=0; i< size; i++) - if (TQString::fromLatin1(statusNames[i].name) == string) + if (TQString::tqfromLatin1(statusNames[i].name) == string) return statusNames[i].status; return OnlineStatus::Unknown; diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h index dfdb39df..a1296f17 100644 --- a/kopete/libkopete/kopeteonlinestatus.h +++ b/kopete/libkopete/kopeteonlinestatus.h @@ -1,5 +1,5 @@ /* - kopeteonlinestatus.h - Kopete Online Status + kopeteonlinestatus.h - Kopete Online tqStatus Copyright (c) 2003 by Martijn Klingens Copyright (c) 2003 by Duncan Mac-Vicar Prett @@ -128,7 +128,7 @@ public: * Any internal status value > 0x80000000 is reserved for internal * libkopete use. This enumeration lists the currently known values. */ - enum ReservedInternalStatus + enum ReservedInternaltqStatus { /** * The account this contact belongs to is offline. Used with @@ -167,9 +167,9 @@ public: * @param internalStatus is the status as used internally by the protocol. * This status is usually a lot more fine-grained than the status as used * by libkopete and should be unique per protocol. - * @param overlayIcons is a list of QStrings which are the name of status + * @param overlayIcons is a list of TQStrings which are the name of status * icons to be used by the KDE icon loader. (Statuses which don't have icons - * to overlay like Online and Offline should use TQString::null as icon + * to overlay like Online and Offline should use TQString() as icon * name ). NOTE if the string is a movie ( *.mng ) it must be the first string in the list. * TODO: KDE4 sort out movies and overlay icons. * @param description is a description in e.g. tooltips. @@ -202,8 +202,8 @@ public: * This status is usually a lot more fine-grained than the status as used * by libkopete and should be unique per protocol. * @param overlayIcon is a string returning the name of the status icon to be - * used by the KDE icon loader. (Status whiwh doesn't have icon to overlay like - * Online and Offline should use TQString::null as icon string) + * used by the KDE icon loader. (tqStatus whiwh doesn't have icon to overlay like + * Online and Offline should use TQString() as icon string) * @param description is a description in e.g. tooltips. * @param caption is the text of the action in the menu * @param categories the categories this online status is in @@ -332,7 +332,7 @@ public: * * You can access icons with this method that have previously been rendered * using mimeSourceFor(). Note that only a cache lookup will be done, so - * if the cache has been invalidated due to a change of icon sets between + * if the cache has been tqinvalidated due to a change of icon sets between * requesting the key (thus rendering the icon) and trying to access the * icon by key, an invalid pixmap will be returned. */ @@ -389,7 +389,7 @@ public: static TQString statusTypeToString(OnlineStatus::StatusType status); /** - * \brief returns a StatusType from a QString + * \brief returns a StatusType from a TQString * * Static method to convert a TQString representing a StatusType to a StatusType to avoid * many issues when saving StatusType to disk diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 27fa0db1..c0cef12f 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -49,7 +49,7 @@ class OnlineStatusManager::Private typedef TQMap< OnlineStatus , RegisteredStatusStruct > ProtocolMap ; TQPixmap *nullPixmap; - TQMap registeredStatus; + TQMap registeredtqStatus; TQDict< TQPixmap > iconCache; }; @@ -89,10 +89,10 @@ void OnlineStatusManager::registerOnlineStatus( const OnlineStatus &status, cons s.caption=caption; s.categories=categories; s.options=options; - d->registeredStatus[status.protocol()].insert(status, s ); + d->registeredtqStatus[status.protocol()].insert(status, s ); } -OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories category) const +OnlineStatus OnlineStatusManager::onlinetqStatus(Protocol * protocol, Categories category) const { /* Each category has a number which is a power of two, so it is possible to have several categories per online status * the logaritm in base two if this number, which represent the bit which is equal to 1 in the number is chosen to be in a tree @@ -103,10 +103,10 @@ OnlineStatus OnlineStatusManager::onlineStatus(Protocol * protocol, Categories c * 4 5 6 7 * /\ / \ / \ / \ * 8 9 10 11 12 13 14 15 - * To get the parent of a key, one just divide per two the number + * To get the tqparent of a key, one just divide per two the number */ - Private::ProtocolMap protocolMap=d->registeredStatus[protocol]; + Private::ProtocolMap protocolMap=d->registeredtqStatus[protocol]; int categ_nb=-1; //the logaritm of category uint category_=category; @@ -137,13 +137,13 @@ TQString OnlineStatusManager::fingerprint( const OnlineStatus &statusFor, const { // create a 'fingerprint' to use as a hash key // fingerprint consists of description/icon name/color/overlay name/size/idle state - return TQString::fromLatin1("%1/%2/%3/%4/%5/%6") - .arg( statusFor.description() ) - .arg( icon ) - .arg( color.name() ) - .arg( statusFor.overlayIcons().join( TQString::fromLatin1( "," ) ) ) - .arg( size ) - .arg( idle ? 'i' : 'a' ); + return TQString::tqfromLatin1("%1/%2/%3/%4/%5/%6") + .tqarg( statusFor.description() ) + .tqarg( icon ) + .tqarg( color.name() ) + .tqarg( statusFor.overlayIcons().join( TQString::tqfromLatin1( "," ) ) ) + .tqarg( size ) + .tqarg( idle ? 'i' : 'a' ); } TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor, const TQString& icon, int size, TQColor color, bool idle) @@ -151,7 +151,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQString fp = fingerprint( statusFor, icon, size, color, idle ); // look it up in the cache - TQPixmap *theIcon= d->iconCache.find( fp ); + TQPixmap *theIcon= d->iconCache.tqfind( fp ); if ( !theIcon ) { // cache miss @@ -165,7 +165,7 @@ TQPixmap OnlineStatusManager::cacheLookupByObject( const OnlineStatus &statusFor TQPixmap OnlineStatusManager::cacheLookupByMimeSource( const TQString &mimeSource ) { // look it up in the cache - const TQPixmap *theIcon= d->iconCache.find( mimeSource ); + const TQPixmap *theIcon= d->iconCache.tqfind( mimeSource ); if ( !theIcon ) { // need to return an invalid pixmap @@ -201,23 +201,23 @@ static void blendOnLower( const TQImage &upper_, TQImage &lower, const TQPoint & for ( int j = cy; j < ch; ++j ) { - QRgb *u = (QRgb*)upper.scanLine(j - cy); - QRgb *l = (QRgb*)lower.scanLine(j) + cx; + TQRgb *u = (TQRgb*)upper.scanLine(j - cy); + TQRgb *l = (TQRgb*)lower.scanLine(j) + cx; for( int k = cx; k < cw; ++u, ++l, ++k ) { - int ua = qAlpha(*u); + int ua = tqAlpha(*u); if ( !ua ) continue; - int la = qAlpha(*l); + int la = tqAlpha(*l); int d = ua * m + la * (m - ua); - uchar r = uchar( ( qRed(*u) * ua * m + qRed(*l) * la * (m - ua) ) / d ); - uchar g = uchar( ( qGreen(*u) * ua * m + qGreen(*l) * la * (m - ua) ) / d ); - uchar b = uchar( ( qBlue(*u) * ua * m + qBlue(*l) * la * (m - ua) ) / d ); + uchar r = uchar( ( tqRed(*u) * ua * m + tqRed(*l) * la * (m - ua) ) / d ); + uchar g = uchar( ( tqGreen(*u) * ua * m + tqGreen(*l) * la * (m - ua) ) / d ); + uchar b = uchar( ( tqBlue(*u) * ua * m + tqBlue(*l) * la * (m - ua) ) / d ); uchar a = uchar( ( ua * ua * m + la * la * (m - ua) ) / d ); - *l = qRgba( r, g, b, a ); + *l = tqRgba( r, g, b, a ); } } } @@ -236,11 +236,11 @@ static TQRect getBoundingBox( const TQImage& image ) int y1 = height - 1; for ( int j = 0; j < height; ++j ) { - QRgb *i = (QRgb*)image.scanLine(j); + TQRgb *i = (TQRgb*)image.scanLine(j); for( int k = 0; k < width; ++i, ++k ) { - if ( qAlpha(*i) ) + if ( tqAlpha(*i) ) { x1 = std::min( x1, k ); y1 = std::min( y1, j ); @@ -255,11 +255,11 @@ static TQRect getBoundingBox( const TQImage& image ) int y2 = 0; for ( int j = height-1; j >= 0; --j ) { - QRgb *i = (QRgb*)image.scanLine(j) + width-1; + TQRgb *i = (TQRgb*)image.scanLine(j) + width-1; for( int k = width-1; k >= 0; --i, --k ) { - if ( qAlpha(*i) ) + if ( tqAlpha(*i) ) { x2 = std::max( x2, k ); y2 = std::max( y2, j ); @@ -335,12 +335,12 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const if ( !overlay.isNull() ) { // we want to preserve the alpha channels of both basis and overlay. - // there's no way to do this in Qt. In fact, there's no way to do this + // there's no way to do this in TQt. In fact, there's no way to do this // in KDE since KImageEffect is so badly broken. TQImage basisImage = basis->convertToImage(); TQImage overlayImage = overlay.convertToImage(); TQPoint offset; - if ( (*it).endsWith( TQString::fromLatin1( "_overlay" ) ) ) + if ( (*it).endsWith( TQString::tqfromLatin1( "_overlay" ) ) ) { // it is possible to have more than one overlay icon // to avoid overlapping we place them in different corners @@ -368,9 +368,9 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const return basis; } -void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent) +void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *tqparent) { - Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()]; + Private::ProtocolMap protocolMap=d->registeredtqStatus[account->protocol()]; Private::ProtocolMap::Iterator it; for ( it = --protocolMap.end(); it != protocolMap.end(); --it ) { @@ -383,7 +383,7 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction KAction *action; // Any existing actions owned by the account are reused by recovering them - // from the parent's child list. + // from the tqparent's child list. // The description of the onlinestatus is used as the qobject name // This is safe as long as OnlineStatus are immutable TQCString actionName = status.description().ascii(); @@ -409,15 +409,15 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction action->setEnabled(false); #endif - if(parent) - parent->insert(action); + if(tqparent) + tqparent->insert(action); } } -OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name) - : KAction( text, pix, KShortcut() , parent, name) , m_status(status) +OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *tqparent, const char *name) + : KAction( text, pix, KShortcut() , tqparent, name) , m_status(status) { connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated())); } diff --git a/kopete/libkopete/kopeteonlinestatusmanager.h b/kopete/libkopete/kopeteonlinestatusmanager.h index 7a52d8c2..0ce2f983 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.h +++ b/kopete/libkopete/kopeteonlinestatusmanager.h @@ -39,9 +39,10 @@ namespace Kopete * * @author Olivier Goffart */ -class KOPETE_EXPORT OnlineStatusManager : public QObject +class KOPETE_EXPORT OnlineStatusManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static OnlineStatusManager* self(); ~OnlineStatusManager(); @@ -53,9 +54,9 @@ public: * * Idle is the status used for auto-away * - * Status number are organised so that make a tree. + * tqStatus number are organised so that make a tree. */ - //please be carrefull when modifying values of status. read comment in onlineStatus() + //please be carrefull when modifying values of status. read comment in onlinetqStatus() enum Categories { Idle=1<<8, ExtendedAway=1<<9 , Invisible=1<<10, @@ -105,23 +106,23 @@ public: void registerOnlineStatus(const OnlineStatus& status, const TQString &caption, unsigned int categories=0x00 , unsigned int options=0x0); /** - * insert "setStatus" actions from the given account to the specified actionMenu. - * (actions have that menu as parent TQObject) + * insert "settqStatus" actions from the given account to the specified actionMenu. + * (actions have that menu as tqparent TQObject) * they are connected to the Account::setOnlineStatus signal * * Items are stored by status height. * * @param account the account - * @param parent the ActionMenu where action are inserted + * @param tqparent the ActionMenu where action are inserted */ - void createAccountStatusActions( Account *account , KActionMenu *parent); + void createAccountStatusActions( Account *account , KActionMenu *tqparent); /** * return the status of the @p protocol which is in the category @p category * * If no status has been registered in this category, return the one in the category which is the most similair */ - OnlineStatus onlineStatus(Protocol *protocol, Categories category) const; + OnlineStatus onlinetqStatus(Protocol *protocol, Categories category) const; private: friend class OnlineStatus; @@ -151,8 +152,9 @@ private: class OnlineStatusAction : public KAction { Q_OBJECT + TQ_OBJECT public: - OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent=0, const char *name=0); + OnlineStatusAction ( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0); signals: void activated( const Kopete::OnlineStatus& status ); private slots: diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 5edc1b27..329ba8e8 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -61,7 +61,7 @@ public: const TQString configGroup; /** Is the password being remembered? */ bool remembered; - /** The current password in the KConfig file, or TQString::null if no password there */ + /** The current password in the KConfig file, or TQString() if no password there */ TQString passwordFromKConfig; /** The maximum length allowed for this password, or -1 if there is no limit */ uint maximumLength; @@ -146,7 +146,7 @@ public: if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() ) return mPassword.d->passwordFromKConfig; - return TQString::null; + return TQString(); } void finished( const TQString &result ) @@ -215,7 +215,7 @@ public: void slotCancelPressed() { - finished( TQString::null ); + finished( TQString() ); } private: @@ -276,7 +276,7 @@ public: if ( mWallet && mWallet->writePassword( mPassword.d->configGroup, mNewPass ) == 0 ) { mPassword.d->remembered = true; - mPassword.d->passwordFromKConfig = TQString::null; + mPassword.d->passwordFromKConfig = TQString(); mPassword.writeConfig(); return true; } @@ -288,13 +288,13 @@ public: //NOTE: This will start a nested event loop. However, this is fine; the only code we // call after this point is in Kopete::Password, so as long as we've not been deleted - // everything should work out OK. We have no parent TQObject, so we should survive. + // everything should work out OK. We have no tqparent TQObject, so we should survive. if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n( "Kopete is unable to save your password securely in your wallet;
" "do you want to save the password in the unsafe configuration file instead?" ), i18n( "Unable to Store Secure Password" ), - KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ), - TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) + KGuiItem( i18n( "Store &Unsafe" ), TQString::tqfromLatin1( "unlock" ) ), + TQString::tqfromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue ) { return false; } @@ -329,7 +329,7 @@ public: if ( clearPassword() ) { mPassword.setWrong( true ); - mPassword.d->cachedValue = TQString::null; + mPassword.d->cachedValue = TQString(); } delete this; @@ -339,7 +339,7 @@ public: kdDebug( 14010 ) << k_funcinfo << " clearing password" << endl; mPassword.d->remembered = false; - mPassword.d->passwordFromKConfig = TQString::null; + mPassword.d->passwordFromKConfig = TQString(); mPassword.writeConfig(); if ( mWallet ) mWallet->removeEntry( mPassword.d->configGroup ); @@ -385,7 +385,7 @@ void Kopete::Password::readConfig() TQString passwordCrypted = config->readEntry( "Password" ); if ( passwordCrypted.isNull() ) - d->passwordFromKConfig = TQString::null; + d->passwordFromKConfig = TQString(); else d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted ); @@ -448,7 +448,7 @@ void Kopete::Password::setWrong( bool bWrong ) d->isWrong = bWrong; writeConfig(); - if ( bWrong ) d->cachedValue = TQString::null; + if ( bWrong ) d->cachedValue = TQString(); } void Kopete::Password::requestWithoutPrompt( TQObject *returnObj, const char *slot ) diff --git a/kopete/libkopete/kopetepassword.h b/kopete/libkopete/kopetepassword.h index f2629234..3846d6d1 100644 --- a/kopete/libkopete/kopetepassword.h +++ b/kopete/libkopete/kopetepassword.h @@ -43,9 +43,10 @@ namespace Kopete * If the KWallet is active, passwords will be stored in it, otherwise, they * will be stored in the KConfig, in a slightly mangled form. */ -class KOPETE_EXPORT Password : public QObject +class KOPETE_EXPORT Password : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -127,10 +128,10 @@ public: * @param receiver The object to notify when the password request finishes * @param slot The slot on receiver to call at the end of the request. The signature * of this function should be slot( const TQString &password ). password will - * be the password if successful, or TQString::null if failed. + * be the password if successful, or TQString() if failed. * @param image The icon to display in the dialog when asking for the password * @param prompt The message to display to the user, asking for a - * password. Can be any Qt RichText string. + * password. Can be any TQt RichText string. * @param source The source the password is taken from if a wrong or * invalid password is entered or the password could not be found in the wallet */ @@ -163,7 +164,7 @@ public: /** * When a password request succeeds, the password is cached. This function - * returns the cached password, if there is one, or TQString::null if there + * returns the cached password, if there is one, or TQString() if there * is not. */ TQString cachedValue(); @@ -171,13 +172,13 @@ public: public slots: /** * Set the password for this account. - * @param pass If set to TQString::null, the password is forgotten unless you + * @param pass If set to TQString(), the password is forgotten unless you * specified to allow blank passwords. Otherwise, sets the password to * this value. * * Note: this function is asynchronous; changes will not be instant. */ - void set( const TQString &pass = TQString::null ); + void set( const TQString &pass = TQString() ); /** * Unconditionally clears the stored password @@ -204,9 +205,10 @@ private: * @internal * @see KopetePassword */ -class KopetePasswordRequestBase : public virtual QObject +class KopetePasswordRequestBase : public virtual TQObject { Q_OBJECT + TQ_OBJECT signals: void requestFinished( const TQString &password ); public slots: diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index cf0e2932..f1323f45 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -28,17 +28,17 @@ struct Kopete::PasswordedAccount::Private Private( const TQString &group, uint maxLen, bool allowBlankPassword ) : password( group, maxLen, allowBlankPassword, "mPassword" ) {} Kopete::Password password; - Kopete::OnlineStatus initialStatus; + Kopete::OnlineStatus initialtqStatus; }; -Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, false ) ) +Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, const char *name ) + : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, false ) ) { } -Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *parent, const TQString &acctId, uint maxLen, +Kopete::PasswordedAccount::PasswordedAccount( Kopete::Protocol *tqparent, const TQString &acctId, uint maxLen, bool allowBlankPassword, const char *name ) - : Kopete::Account( parent, acctId, name ), d( new Private( TQString::fromLatin1("Account_")+ parent->pluginId() + TQString::fromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) + : Kopete::Account( tqparent, acctId, name ), d( new Private( TQString::tqfromLatin1("Account_")+ tqparent->pluginId() + TQString::tqfromLatin1("_") + acctId , maxLen, allowBlankPassword ) ) { } @@ -58,12 +58,12 @@ void Kopete::PasswordedAccount::connect( ) connect( s ); } -void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStatus ) +void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialtqStatus ) { // check that the networkstatus is up // warn user somewhere - d->initialStatus = initialStatus; + d->initialtqStatus = initialtqStatus; TQString cached = password().cachedValue(); if( !cached.isNull() || d->password.allowBlankPassword() ) { @@ -80,19 +80,19 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStat TQString Kopete::PasswordedAccount::passwordPrompt() { if ( password().isWrong() ) - return i18n( "The password was wrong; please re-enter your password for %1 account %2" ).arg( protocol()->displayName(), accountId() ); + return i18n( "The password was wrong; please re-enter your password for %1 account %2" ).tqarg( protocol()->displayName(), accountId() ); else - return i18n( "Please enter your password for %1 account %2" ).arg( protocol()->displayName(), accountId() ); + return i18n( "Please enter your password for %1 account %2" ).tqarg( protocol()->displayName(), accountId() ); } -Kopete::OnlineStatus Kopete::PasswordedAccount::initialStatus() +Kopete::OnlineStatus Kopete::PasswordedAccount::initialtqStatus() { - return d->initialStatus; + return d->initialtqStatus; } bool Kopete::PasswordedAccount::removeAccount() { - password().set(TQString::null); + password().set(TQString()); return Kopete::Account::removeAccount(); } diff --git a/kopete/libkopete/kopetepasswordedaccount.h b/kopete/libkopete/kopetepasswordedaccount.h index dbec92db..a9fa2f54 100644 --- a/kopete/libkopete/kopetepasswordedaccount.h +++ b/kopete/libkopete/kopetepasswordedaccount.h @@ -35,30 +35,31 @@ class Password; class KOPETE_EXPORT PasswordedAccount : public Account { Q_OBJECT + TQ_OBJECT public: /** * KopetePasswordedAccount constructor - * @param parent The protocol this account connects via + * @param tqparent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit - * @param name The name for this QObject + * @param name The name for this TQObject * * @deprecated Use the constructor that specifies if a blank password is allowed */ - PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); /** * KopetePasswordedAccount constructor - * @param parent The protocol this account connects via + * @param tqparent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit * @param allowBlankPassword If this protocol allows blank passwords. Note that this will mean that * - * @param name The name for this QObject + * @param name The name for this TQObject */ - PasswordedAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, + PasswordedAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, bool allowBlankPassword = false, const char *name = 0 ); virtual ~PasswordedAccount(); @@ -73,15 +74,15 @@ public: /** * @brief Go online for this service. * - * @param initialStatus is the status to connect with. If it is an invalid status for this + * @param initialtqStatus is the status to connect with. If it is an invalid status for this * account, the default online for the account should be used. */ - void connect( const OnlineStatus& initialStatus ); + void connect( const OnlineStatus& initialtqStatus ); /** * \brief Get the initial status */ - OnlineStatus initialStatus(); + OnlineStatus initialtqStatus(); /** * @brief Remove the account from the server. @@ -97,7 +98,7 @@ public: public slots: /** * Called when your account should attempt to connect. - * @param password The password to connect with, or TQString::null + * @param password The password to connect with, or TQString() * if the user wished to cancel the connection attempt. */ virtual void connectWithPassword( const TQString &password ) = 0; diff --git a/kopete/libkopete/kopetepicture.cpp b/kopete/libkopete/kopetepicture.cpp index 05468c21..809923d2 100644 --- a/kopete/libkopete/kopetepicture.cpp +++ b/kopete/libkopete/kopetepicture.cpp @@ -120,7 +120,7 @@ TQString Picture::path() KMD5 context(tempArray); // Save the image to a file. localPhotoPath = context.hexDigest() + ".png"; - localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").arg( localPhotoPath) ); + localPhotoPath = locateLocal( "appdata", TQString::fromUtf8("metacontactpicturecache/%1").tqarg( localPhotoPath) ); if( image().save(localPhotoPath, "PNG") ) { d->picturePath = localPhotoPath; @@ -145,8 +145,8 @@ bool Picture::isNull() void Picture::clear() { detach(); - d->pictureBase64 = TQString::null; - d->picturePath = TQString::null; + d->pictureBase64 = TQString(); + d->picturePath = TQString(); d->pictureImage = TQImage(); } @@ -157,8 +157,8 @@ void Picture::setPicture(const TQImage &image) d->pictureImage = image; // Clear the path and base64, it will call the update of then when "getted" - d->picturePath= TQString::null; - d->pictureBase64 = TQString::null; + d->picturePath= TQString(); + d->pictureBase64 = TQString(); } void Picture::setPicture(const TQString &path) @@ -168,7 +168,7 @@ void Picture::setPicture(const TQString &path) // Clear the image and base64, it will call the update of then when "getted" d->pictureImage = TQImage(); - d->pictureBase64 = TQString::null; + d->pictureBase64 = TQString(); } void Picture::setPicture(const KABC::Picture &picture) diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 3c31545a..13afd9ca 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -32,8 +32,8 @@ public: TQString indexField; }; -Plugin::Plugin( KInstance *instance, TQObject *parent, const char *name ) -: TQObject( parent, name ), KXMLGUIClient(), d(new Private) +Plugin::Plugin( KInstance *instance, TQObject *tqparent, const char *name ) +: TQObject( tqparent, name ), KXMLGUIClient(), d(new Private) { setInstance( instance ); KSettings::Dispatcher::self()->registerInstance( instance, this, TQT_SIGNAL( settingsChanged() ) ); @@ -46,18 +46,18 @@ Plugin::~Plugin() TQString Plugin::pluginId() const { - return TQString::fromLatin1( className() ); + return TQString::tqfromLatin1( className() ); } TQString Plugin::displayName() const { - return pluginInfo() ? pluginInfo()->name() : TQString::null; + return pluginInfo() ? pluginInfo()->name() : TQString(); } TQString Plugin::pluginIcon() const { - return pluginInfo() ? pluginInfo()->icon() : TQString::null; + return pluginInfo() ? pluginInfo()->icon() : TQString(); } diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index eebad0d2..311c796f 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -71,8 +71,8 @@ Comment=Plugin that do some nice stuff static const KAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) ) - MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args ) - : Kopete::Plugin( MyPluginFactory::instance(), parent, name ) + MyPlugin::MyPlugin( TQObject *tqparent, const char *name, const TQStringList & args ) + : Kopete::Plugin( MyPluginFactory::instance(), tqparent, name ) { //... } @@ -90,9 +90,10 @@ Comment=Plugin that do some nice stuff class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - Plugin( KInstance *instance, TQObject *parent, const char *name ); + Plugin( KInstance *instance, TQObject *tqparent, const char *name ); virtual ~Plugin(); /** diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 1aff9e9f..d11e413b 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -89,10 +89,10 @@ PluginManager* PluginManager::self() return s_self; } -PluginManager::PluginManager() : TQObject( qApp ), d( new Private ) +PluginManager::PluginManager() : TQObject( tqApp ), d( new Private ) { - d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "Kopete/Plugin" ), - TQString::fromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); + d->plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "Kopete/Plugin" ), + TQString::tqfromLatin1( "[X-Kopete-Version] == 1000900" ) ) ); // We want to add a reference to the application's event loop so we // can remain in control when all windows are removed. @@ -188,7 +188,7 @@ void PluginManager::shutdown() it != d->loadedPlugins.end(); /* EMPTY */ ) { // Plugins could emit their ready for unload signal directly in response to this, - // which would invalidate the current iterator. Therefore, we copy the iterator + // which would tqinvalidate the current iterator. Therefore, we copy the iterator // and increment it beforehand. Private::InfoToPluginMap::ConstIterator current( it ); ++it; @@ -215,7 +215,7 @@ void PluginManager::slotPluginReadyForUnload() // less clean for plugin authors // FIXME: I don't buy the above argument. Add a Kopete::Plugin::emitReadyForUnload(void), // and make readyForUnload be passed a plugin. - Richard - Plugin *plugin = dynamic_cast( const_cast( sender() ) ); + Plugin *plugin = dynamic_cast( TQT_TQOBJECT(const_cast( sender() ) ) ); kdDebug( 14010 ) << k_funcinfo << plugin->pluginId() << "ready for unload" << endl; if ( !plugin ) { @@ -239,7 +239,7 @@ void PluginManager::slotShutdownTimeout() remaining.append( it.data()->pluginId() ); kdWarning( 14010 ) << k_funcinfo << "Some plugins didn't shutdown in time!" << endl - << "Remaining plugins: " << remaining.join( TQString::fromLatin1( ", " ) ) << endl + << "Remaining plugins: " << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl << "Forcing Kopete shutdown now." << endl; slotShutdownDone(); @@ -259,30 +259,30 @@ void PluginManager::loadAllPlugins() // FIXME: We need session management here - Martijn KConfig *config = KGlobal::config(); - if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) ) + if ( config->hasGroup( TQString::tqfromLatin1( "Plugins" ) ) ) { TQMap pluginsMap; - TQMap entries = config->entryMap( TQString::fromLatin1( "Plugins" ) ); + TQMap entries = config->entryMap( TQString::tqfromLatin1( "Plugins" ) ); TQMap::Iterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { TQString key = it.key(); - if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) ) - pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::fromLatin1( "true" )) ); + if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) ) + pluginsMap.insert( key.left( key.length() - 7 ), (it.data() == TQString::tqfromLatin1( "true" )) ); } - TQValueList plugins = availablePlugins( TQString::null ); + TQValueList plugins = availablePlugins( TQString() ); TQValueList::ConstIterator it2 = plugins.begin(); TQValueList::ConstIterator end = plugins.end(); for ( ; it2 != end; ++it2 ) { // Protocols are loaded automatically so they aren't always in Plugins group. (fixes bug 167113) - if ( (*it2)->category() == TQString::fromLatin1( "Protocols" ) ) + if ( (*it2)->category() == TQString::tqfromLatin1( "Protocols" ) ) continue; TQString pluginName = (*it2)->pluginName(); - bool inMap = pluginsMap.contains( pluginName ); + bool inMap = pluginsMap.tqcontains( pluginName ); if ( (inMap && pluginsMap[pluginName]) || (!inMap && (*it2)->isPluginEnabledByDefault()) ) { if ( !plugin( pluginName ) ) @@ -301,7 +301,7 @@ void PluginManager::loadAllPlugins() else { // we had no config, so we load any plugins that should be loaded by default. - TQValueList plugins = availablePlugins( TQString::null ); + TQValueList plugins = availablePlugins( TQString() ); TQValueList::ConstIterator it = plugins.begin(); TQValueList::ConstIterator end = plugins.end(); for ( ; it != end; ++it ) @@ -343,10 +343,10 @@ Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mo // Try to find legacy code // FIXME: Find any cases causing this, remove them, and remove this too - Richard - if ( pluginId.endsWith( TQString::fromLatin1( ".desktop" ) ) ) + if ( pluginId.endsWith( TQString::tqfromLatin1( ".desktop" ) ) ) { kdWarning( 14010 ) << "Trying to use old-style API!" << endl << kdBacktrace() << endl; - pluginId = pluginId.remove( TQRegExp( TQString::fromLatin1( ".desktop$" ) ) ); + pluginId = pluginId.remove( TQRegExp( TQString::tqfromLatin1( ".desktop$" ) ) ); } if ( mode == LoadSync ) @@ -372,12 +372,12 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) return 0L; } - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; int error = 0; - Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( TQString::fromLatin1( "Kopete/Plugin" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); + Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery( TQString::tqfromLatin1( "Kopete/Plugin" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ), this, 0, TQStringList(), &error ); if ( plugin ) { @@ -465,21 +465,21 @@ Plugin* PluginManager::plugin( const TQString &_pluginId ) const { // Hack for compatibility with Plugin::pluginId(), which returns // classname() instead of the internal name. Changing that is not easy - // as it invalidates the config file, the contact list, and most likely + // as it tqinvalidates the config file, the contact list, and most likely // other code as well. // For now, just transform FooProtocol to kopete_foo. // FIXME: In the future we'll need to change this nevertheless to unify // the handling - Martijn TQString pluginId = _pluginId; - if ( pluginId.endsWith( TQString::fromLatin1( "Protocol" ) ) ) - pluginId = TQString::fromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::fromLatin1( "protocol" ) ); + if ( pluginId.endsWith( TQString::tqfromLatin1( "Protocol" ) ) ) + pluginId = TQString::tqfromLatin1( "kopete_" ) + _pluginId.lower().remove( TQString::tqfromLatin1( "protocol" ) ); // End hack KPluginInfo *info = infoForPluginId( pluginId ); if ( !info ) return 0L; - if ( d->loadedPlugins.contains( info ) ) + if ( d->loadedPlugins.tqcontains( info ) ) return d->loadedPlugins[ info ]; else return 0L; @@ -506,13 +506,13 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /* config->setGroup( "Plugins" ); // FIXME: What is this for? This sort of thing is kconf_update's job - Richard - if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) ) - pluginId.prepend( TQString::fromLatin1( "kopete_" ) ); + if ( !pluginId.startsWith( TQString::tqfromLatin1( "kopete_" ) ) ) + pluginId.prepend( TQString::tqfromLatin1( "kopete_" ) ); if ( !infoForPluginId( pluginId ) ) return false; - config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled ); + config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled ); config->sync(); return true; diff --git a/kopete/libkopete/kopetepluginmanager.h b/kopete/libkopete/kopetepluginmanager.h index a250b091..7cf69a48 100644 --- a/kopete/libkopete/kopetepluginmanager.h +++ b/kopete/libkopete/kopetepluginmanager.h @@ -40,9 +40,10 @@ typedef TQValueList PluginList; * @author Duncan Mac-Vicar Prett * @author Martijn Klingens */ -class KOPETE_EXPORT PluginManager : public QObject +class KOPETE_EXPORT PluginManager : public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( PluginLoadMode ) public: @@ -63,14 +64,14 @@ public: * You can query all information on the plugins through the KPluginInfo * interface. */ - TQValueList availablePlugins( const TQString &category = TQString::null ) const; + TQValueList availablePlugins( const TQString &category = TQString() ) const; /** * Returns a list of all plugins that are actually loaded. * If you omit the category you get all, otherwise it's a filtered list. * See also @ref availablePlugins(). */ - PluginList loadedPlugins( const TQString &category = TQString::null ) const; + PluginList loadedPlugins( const TQString &category = TQString() ) const; /** * @brief Search by plugin name. This is the key used as X-KDE-PluginInfo-Name in diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp index 6e9072d0..c9805f9a 100644 --- a/kopete/libkopete/kopeteprefs.cpp +++ b/kopete/libkopete/kopeteprefs.cpp @@ -90,7 +90,7 @@ void KopetePrefs::load() mBgOverride = config->readBoolEntry("ChatView Override Background", false); mFgOverride = config->readBoolEntry("ChatView Override Foreground", false); mRtfOverride = config->readBoolEntry("ChatView Override RTF", false); - mInterfacePreference = config->readEntry("View Plugin", TQString::fromLatin1("kopete_chatwindow") ); + mInterfacePreference = config->readEntry("View Plugin", TQString::tqfromLatin1("kopete_chatwindow") ); tmpColor = KGlobalSettings::textColor(); mTextColor = config->readColorEntry("Text Color", &tmpColor ); tmpColor = KGlobalSettings::baseColor(); @@ -112,29 +112,29 @@ void KopetePrefs::load() if(mToolTipContents.empty()) { mToolTipContents - << TQString::fromLatin1("FormattedName") - << TQString::fromLatin1("userInfo") - << TQString::fromLatin1("server") - << TQString::fromLatin1("channels") - << TQString::fromLatin1("FormattedIdleTime") - << TQString::fromLatin1("channelMembers") - << TQString::fromLatin1("channelTopic") - << TQString::fromLatin1("emailAddress") - << TQString::fromLatin1("homePage") - << TQString::fromLatin1("onlineSince") - << TQString::fromLatin1("lastOnline") - << TQString::fromLatin1("awayMessage"); + << TQString::tqfromLatin1("FormattedName") + << TQString::tqfromLatin1("userInfo") + << TQString::tqfromLatin1("server") + << TQString::tqfromLatin1("channels") + << TQString::tqfromLatin1("FormattedIdleTime") + << TQString::tqfromLatin1("channelMembers") + << TQString::tqfromLatin1("channelTopic") + << TQString::tqfromLatin1("emailAddress") + << TQString::tqfromLatin1("homePage") + << TQString::tqfromLatin1("onlineSince") + << TQString::tqfromLatin1("lastOnline") + << TQString::tqfromLatin1("awayMessage"); } config->setGroup("ContactList"); setThemeURL(config->readEntry("ThemeURL")); - int n = metaObject()->findProperty( "contactListDisplayMode" ); - TQString value = config->readEntry("DisplayMode",TQString::fromLatin1("Default")); - mContactListDisplayMode = (ContactDisplayMode)metaObject()->property( n )->keyToValue( value.latin1() ); - n = metaObject()->findProperty( "contactListIconMode" ); + int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + TQString value = config->readEntry("DisplayMode",TQString::tqfromLatin1("Default")); + mContactListDisplayMode = (ContactDisplayMode)tqmetaObject()->property( n )->keyToValue( value.latin1() ); + n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); value = config->readEntry("IconMode", - TQString::fromLatin1("IconDefault")); - mContactListIconMode = (IconDisplayMode) metaObject()->property( n )->keyToValue( value.latin1() ); + TQString::tqfromLatin1("IconDefault")); + mContactListIconMode = (IconDisplayMode) tqmetaObject()->property( n )->keyToValue( value.latin1() ); mContactListIndentContacts = config->readBoolEntry("IndentContacts", false); mContactListUseCustomFonts = config->readBoolEntry("UseCustomFonts", false); TQFont font = KGlobalSettings::generalFont(); @@ -229,10 +229,10 @@ void KopetePrefs::save() config->setGroup("ContactList"); config->writeEntry("ThemeURL", mThemeURL); - int n = metaObject()->findProperty( "contactListDisplayMode" ); - config->writeEntry("DisplayMode", metaObject()->property( n )->valueToKey( mContactListDisplayMode )); - n = metaObject()->findProperty( "contactListIconMode" ); - config->writeEntry("IconMode", metaObject()->property( n )->valueToKey( mContactListIconMode )); + int n = tqmetaObject()->tqfindProperty( "contactListDisplayMode" ); + config->writeEntry("DisplayMode", tqmetaObject()->property( n )->valueToKey( mContactListDisplayMode )); + n = tqmetaObject()->tqfindProperty( "contactListIconMode" ); + config->writeEntry("IconMode", tqmetaObject()->property( n )->valueToKey( mContactListIconMode )); config->writeEntry("IndentContacts", mContactListIndentContacts); config->writeEntry("UseCustomFonts", mContactListUseCustomFonts); config->writeEntry("GroupFont", mContactListGroupFont); @@ -439,7 +439,7 @@ void KopetePrefs::_setStylePath(const TQString &stylePath) if( !TQFile::exists(stylePath) || stylePath.isEmpty() ) { TQString fallback; - fallback = TQString(TQString::fromLatin1("styles/%1/")).arg(TQString::fromLatin1(KOPETE_DEFAULT_CHATSTYLE)); + fallback = TQString(TQString::tqfromLatin1("styles/%1/")).tqarg(TQString::tqfromLatin1(KOPETE_DEFAULT_CHATSTYLE)); mStylePath = locate("appdata", fallback); } } diff --git a/kopete/libkopete/kopeteprefs.h b/kopete/libkopete/kopeteprefs.h index dede4664..c2d6e291 100644 --- a/kopete/libkopete/kopeteprefs.h +++ b/kopete/libkopete/kopeteprefs.h @@ -26,12 +26,13 @@ class KConfig; -class KOPETE_EXPORT KopetePrefs : public QObject +class KOPETE_EXPORT KopetePrefs : public TQObject { Q_OBJECT - // here so we can use Qt to translate enums<-->strings - Q_PROPERTY( ContactDisplayMode contactListDisplayMode READ contactListDisplayMode WRITE setContactListDisplayMode ) - Q_PROPERTY( IconDisplayMode contactListIconMode READ contactListIconMode WRITE setContactListIconMode ) + TQ_OBJECT + // here so we can use TQt to translate enums<-->strings + TQ_PROPERTY( ContactDisplayMode contactListDisplayMode READ contactListDisplayMode WRITE setContactListDisplayMode ) + TQ_PROPERTY( IconDisplayMode contactListIconMode READ contactListIconMode WRITE setContactListIconMode ) Q_ENUMS( ContactDisplayMode IconDisplayMode ) public: @@ -100,7 +101,7 @@ public: int chatWindowPolicy() const { return mChatWindowPolicy; } //Styles - TQString defaultTheme() const { return TQString::fromLatin1("Default"); } + TQString defaultTheme() const { return TQString::tqfromLatin1("Default"); } //for Adium (xhtml+css) TQString stylePath() const { return mStylePath; } TQString styleVariant() const { return mStyleVariant; } diff --git a/kopete/libkopete/kopeteproperties.h b/kopete/libkopete/kopeteproperties.h index e40a9280..a73a10c7 100644 --- a/kopete/libkopete/kopeteproperties.h +++ b/kopete/libkopete/kopeteproperties.h @@ -89,11 +89,11 @@ class Property : public PropertyBase { public: /** - * Returns the value of this property in the object @p parent. + * Returns the value of this property in the object @p tqparent. */ - virtual Type get( const Parent *parent ) const = 0; + virtual Type get( const Parent *tqparent ) const = 0; /** - * Sets the value of this property in the object @p parent. + * Sets the value of this property in the object @p tqparent. */ virtual void set( Parent *, const Type & ) const = 0; }; @@ -101,7 +101,7 @@ public: /** * @brief Base class for property data objects * - * Some property objects want to store property-specific data in their parent objects. + * Some property objects want to store property-specific data in their tqparent objects. * To support that, subclasses of this class are permitted to be stored. Once passed * to the @ref PropertyStorage object via @ref PropertyStorage::setCustomPropertyData, * the @ref PropertyStorage object owns the PropertyData, and will delete it when it @@ -137,7 +137,7 @@ public: * name their custom data differently. Names are bound by the same rules as are laid out * for naming properties in PropertyBase::name. */ - void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.replace( name, data ); } + void setCustomPropertyData( const char *name, PropertyData *data ) const { _storage.tqreplace( name, data ); } /** * Gets the stored property data with name @p name. Returns a null @@ -309,7 +309,7 @@ void variantToXML(TQVariant v, TQDomElement &); */ /** - * @brief Convenience implementation of XMLSerializable in terms of QVariants + * @brief Convenience implementation of XMLSerializable in terms of TQVariants * * This class provides XML serialization for data that can be stored in a TQVariant. You * will need to multiply-inherit from this class and (usually indirectly) from @ref Property. diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index e361abf6..3677cbe3 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -47,18 +47,18 @@ public: ContactPropertyTmpl mStickLastSeen; ContactPropertyTmpl mStickFullName; - Kopete::OnlineStatus accountNotConnectedStatus; + Kopete::OnlineStatus accountNotConnectedtqStatus; }; -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) -: Plugin( instance, parent, name ) +Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) +: Plugin( instance, tqparent, name ) { d = new Private; d->mStickLastSeen = Global::Properties::self()->lastSeen(); d->mStickFullName = Global::Properties::self()->fullName(); d->unloading = false; d->capabilities = 0; - d->accountNotConnectedStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::fromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); + d->accountNotConnectedtqStatus = Kopete::OnlineStatus( Kopete::OnlineStatus::Unknown, 0, this, Kopete::OnlineStatus::AccountOffline, TQString::tqfromLatin1( "account_offline_overlay" ), i18n( "Account Offline" ) ); } Protocol::~Protocol() @@ -87,9 +87,9 @@ void Protocol::setCapabilities( unsigned int capabilities ) } -Kopete::OnlineStatus Protocol::accountOfflineStatus() const +Kopete::OnlineStatus Protocol::accountOfflinetqStatus() const { - return d->accountNotConnectedStatus; + return d->accountNotConnectedtqStatus; } void Protocol::slotAccountOnlineStatusChanged( Contact *self ) @@ -174,11 +174,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // Preset the contactId and displayName, if the plugin doesn't want to save // them, or use its own format, it can call clear() on the provided list - sd[ TQString::fromLatin1( "contactId" ) ] = c->contactId(); + sd[ TQString::tqfromLatin1( "contactId" ) ] = c->contactId(); //TODO(nick) remove - sd[ TQString::fromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); + sd[ TQString::tqfromLatin1( "displayName" ) ] = c->property(Global::Properties::self()->nickName()).value().toString(); if(c->account()) - sd[ TQString::fromLatin1( "accountId" ) ] = c->account()->accountId(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = c->account()->accountId(); // If there's an index field preset it too TQString index = c->protocol()->addressBookIndexField(); @@ -193,11 +193,11 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) { // The Unicode chars E000-F800 are non-printable and reserved for // private use in applications. For more details, see also - // http://www.unicode.org/charts/PDF/UE000.pdf. + // http://www.tqunicode.org/charts/PDF/UE000.pdf. // Inside libkabc the use of TQChar( 0xE000 ) has been standardized // as separator for the string lists, use this also for the 'normal' // serialized data. - if( serializedData.contains( it.key() ) ) + if( serializedData.tqcontains( it.key() ) ) serializedData[ it.key() ] = serializedData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else serializedData[ it.key() ] = it.data(); @@ -205,7 +205,7 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) for( it = ad.begin(); it != ad.end(); ++it ) { - if( addressBookData.contains( it.key() ) ) + if( addressBookData.tqcontains( it.key() ) ) addressBookData[ it.key() ] = addressBookData[ it.key() ] + TQChar( 0xE000 ) + it.data(); else addressBookData[ it.key() ] = it.data(); @@ -226,13 +226,13 @@ void Protocol::slotMetaContactAboutToSave( MetaContact *metaContact ) // we can devise a better API, but with the constantly changing // requirements every time I learn more about kabc I'd better no touch // the API yet - Martijn - if( it.key().startsWith( TQString::fromLatin1( "messaging/" ) ) ) + if( it.key().startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) { - metaContact->setAddressBookField( this, it.key(), TQString::fromLatin1( "All" ), it.data() ); + metaContact->setAddressBookField( this, it.key(), TQString::tqfromLatin1( "All" ), it.data() ); // kdDebug(14010) << k_funcinfo << "metaContact->setAddressBookField( " << this << ", " << it.key() << ", \"All\", " << it.data() << " );" << endl; } else - metaContact->setAddressBookField( this, TQString::fromLatin1( "kopete" ), it.key(), it.data() ); + metaContact->setAddressBookField( this, TQString::tqfromLatin1( "kopete" ), it.key(), it.data() ); } } @@ -250,7 +250,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMapaddressBookField( this, *fieldIt, TQString::fromLatin1( "All" ) ); + if( ( *fieldIt ).startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) + ad[ *fieldIt ] = metaContact->addressBookField( this, *fieldIt, TQString::tqfromLatin1( "All" ) ); else - ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::fromLatin1( "kopete" ), *fieldIt ); + ad[ *fieldIt ] = metaContact->addressBookField( this, TQString::tqfromLatin1( "kopete" ), *fieldIt ); } // Check if we have an account id. If not we're deserializing a Kopete 0.6 contact @@ -305,7 +305,7 @@ void Protocol::deserialize( MetaContact *metaContact, const TQMap accounts = AccountManager::self()->accounts( this ); if ( accounts.count() > 0 ) { - sd[ TQString::fromLatin1( "accountId" ) ] = TQDictIterator( accounts ).currentKey(); + sd[ TQString::tqfromLatin1( "accountId" ) ] = TQDictIterator( accounts ).currentKey(); } else { diff --git a/kopete/libkopete/kopeteprotocol.h b/kopete/libkopete/kopeteprotocol.h index 546247cf..64cab27c 100644 --- a/kopete/libkopete/kopeteprotocol.h +++ b/kopete/libkopete/kopeteprotocol.h @@ -58,6 +58,7 @@ class Account; class KOPETE_EXPORT Protocol : public Plugin { Q_OBJECT + TQ_OBJECT public: @@ -85,7 +86,7 @@ public: * * @return A new AddContactPage to be shown in the Add Contact Wizard */ - virtual AddContactPage *createAddContactWidget( TQWidget *parent, Account *account ) = 0; + virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Account *account ) = 0; /** * @brief Create a new KopeteEditAccountWidget @@ -93,13 +94,13 @@ public: * @return A new KopeteEditAccountWidget to be shown in the account part of the configurations. * * @param account is the KopeteAccount to edit. If it's 0L, then we create a new account - * @param parent The parent of the 'to be returned' widget + * @param tqparent The tqparent of the 'to be returned' widget */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *parent ) = 0; + virtual KopeteEditAccountWidget * createEditAccountWidget( Account *account, TQWidget *tqparent ) = 0; /** - * @brief a bitmask of the capabilities of this protocol + * @brief a bittqmask of the capabilities of this protocol * @sa @ref setCapabilities */ unsigned int capabilities() const ; @@ -131,7 +132,7 @@ public: RichIFormatting = 0x400, RichBFormatting = 0x800, - Alignment = 0x1000, ///< Setting the alignment of text portions + Alignment = 0x1000, ///< Setting the tqalignment of text portions /// Setting the formatting of the whole edit widget / message BaseFormatting = BaseIFormatting | BaseUFormatting | BaseBFormatting, @@ -152,7 +153,7 @@ public: /** * @brief Returns the status used for contacts when accounts of this protocol are offline */ - Kopete::OnlineStatus accountOfflineStatus() const; + Kopete::OnlineStatus accountOfflinetqStatus() const; protected: @@ -160,10 +161,10 @@ protected: * @brief Constructor for Protocol * * @param instance The protocol's instance, every plugin needs to have a KInstance of its own - * @param parent The protocol's parent object + * @param tqparent The protocol's tqparent object * @param name The protocol's name */ - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( KInstance *instance, TQObject *tqparent, const char *name ); /** * @brief Sets the capabilities of this protcol. diff --git a/kopete/libkopete/kopetesimplemessagehandler.h b/kopete/libkopete/kopetesimplemessagehandler.h index 9a5fd296..b165dbb0 100644 --- a/kopete/libkopete/kopetesimplemessagehandler.h +++ b/kopete/libkopete/kopetesimplemessagehandler.h @@ -69,6 +69,7 @@ private: class SimpleMessageHandler : public MessageHandler { Q_OBJECT + TQ_OBJECT public: SimpleMessageHandler(); ~SimpleMessageHandler(); diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h index 5457e1ba..d669d68b 100644 --- a/kopete/libkopete/kopetetask.h +++ b/kopete/libkopete/kopetetask.h @@ -45,9 +45,10 @@ namespace Kopete * class come from KIO::Job. * @author Richard Smith */ -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT protected: Task(); @@ -135,7 +136,7 @@ protected: * Sets the stored result and error message to @p result and @p errorMessage. * You should call this instead of emitting the result() signal yourself. */ - void emitResult( Result result = ResultSucceeded, const TQString &errorMessage = TQString::null ); + void emitResult( Result result = ResultSucceeded, const TQString &errorMessage = TQString() ); protected slots: /** diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 67f2d04f..91ca9b27 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -84,11 +84,11 @@ Kopete::Transfer::~Transfer() KURL Kopete::Transfer::displayURL( const Kopete::Contact *contact, const TQString &file ) { KURL url; - url.setProtocol( TQString::fromLatin1("kopete") ); + url.setProtocol( TQString::tqfromLatin1("kopete") ); TQString host; if( !contact ) - host = TQString::fromLatin1("unknown origin"); + host = TQString::tqfromLatin1("unknown origin"); else if( contact->metaContact() ) host = contact->metaContact()->displayName(); else @@ -158,7 +158,7 @@ Kopete::TransferManager* Kopete::TransferManager::transferManager() return s_transferManager; } -Kopete::TransferManager::TransferManager( TQObject *parent ) : TQObject( parent ) +Kopete::TransferManager::TransferManager( TQObject *tqparent ) : TQObject( tqparent ) { nextID = 0; } @@ -234,7 +234,7 @@ void Kopete::TransferManager::sendFile( const KURL &file, const TQString &fname, //If the file location is null, then get it from a file open dialog if( !url.isValid() ) - url = KFileDialog::getOpenURL( TQString::null, TQString::fromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); + url = KFileDialog::getOpenURL( TQString(), TQString::tqfromLatin1("*"), 0l, i18n( "Kopete File Transfer" )); else { filename = fname; diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h index 53b2711f..30906b97 100644 --- a/kopete/libkopete/kopetetransfermanager.h +++ b/kopete/libkopete/kopetetransfermanager.h @@ -40,7 +40,7 @@ class KOPETE_EXPORT FileTransferInfo public: enum KopeteTransferDirection { Incoming, Outgoing }; - FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString::null); + FileTransferInfo( Contact *, const TQString&, const unsigned long size, const TQString &, KopeteTransferDirection di, const unsigned int id, TQString internalId=TQString()); ~FileTransferInfo() {} unsigned int transferId() const { return mId; } const Contact* contact() const { return mContact; } @@ -63,9 +63,10 @@ private: /** * Creates and manages kopete file transfers */ -class KOPETE_EXPORT TransferManager : public QObject +class KOPETE_EXPORT TransferManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -78,7 +79,7 @@ public: * @brief Adds a file transfer to the Kopete::TransferManager */ Transfer *addTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString &recipient , FileTransferInfo::KopeteTransferDirection di); - int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString::null, TQString internalId=TQString::null); + int askIncomingTransfer( Contact *contact, const TQString& file, const unsigned long size, const TQString& description=TQString(), TQString internalId=TQString()); void removeTransfer( unsigned int id ); /** @@ -120,7 +121,7 @@ private slots: void slotComplete(KIO::Job*); private: - TransferManager( TQObject *parent ); + TransferManager( TQObject *tqparent ); static TransferManager *s_transferManager; int nextID; @@ -134,6 +135,7 @@ private: class KOPETE_EXPORT Transfer : public KIO::Job { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/libkopete/kopeteuiglobal.h b/kopete/libkopete/kopeteuiglobal.h index 7db34189..c23bc99b 100644 --- a/kopete/libkopete/kopeteuiglobal.h +++ b/kopete/libkopete/kopeteuiglobal.h @@ -39,7 +39,7 @@ namespace Global KOPETE_EXPORT void setMainWidget( TQWidget *widget ); /** * Returns the main widget - this is the widget that message boxes - * and KNotify stuff should use as a parent. + * and KNotify stuff should use as a tqparent. */ KOPETE_EXPORT TQWidget *mainWidget(); diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp index 6fe46529..b06082ee 100644 --- a/kopete/libkopete/kopeteutils.cpp +++ b/kopete/libkopete/kopeteutils.cpp @@ -69,7 +69,7 @@ void notifyConnectionLost( const Account *account, const TQString &caption, cons if (!account) return; - notify( account->accountIcon(32), TQString::fromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("connection_lost"), caption.isEmpty() ? notifyConnectionLost_DefaultCaption : caption, message.isEmpty() ? notifyConnectionLost_DefaultMessage : message, explanation.isEmpty() ? notifyConnectionLost_DefaultExplanation : explanation, debugInfo); } bool isHostReachable(const TQString &host) @@ -98,7 +98,7 @@ void notifyCannotConnect( const Account *account, const TQString &explanation, c if (!account) return; - notify( account->accountIcon(), TQString::fromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); + notify( account->accountIcon(), TQString::tqfromLatin1("cannot_connect"), notifyCannotConnect_DefaultCaption, notifyCannotConnect_DefaultMessage, notifyCannotConnect_DefaultExplanation, debugInfo); } void notifyConnectionError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -107,7 +107,7 @@ void notifyConnectionError( const Account *account, const TQString &caption, con return; // TODO: Display a specific default connection error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::fromLatin1("connection_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("connection_error"), caption, message, explanation, debugInfo); } void notifyServerError( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) @@ -116,7 +116,7 @@ void notifyServerError( const Account *account, const TQString &caption, const T return; // TODO: Display a specific default server error message, I don't want to introducte too many new strings - notify( account->accountIcon(32), TQString::fromLatin1("server_error"), caption, message, explanation, debugInfo); + notify( account->accountIcon(32), TQString::tqfromLatin1("server_error"), caption, message, explanation, debugInfo); } } // end ns ErrorNotifier diff --git a/kopete/libkopete/kopeteutils.h b/kopete/libkopete/kopeteutils.h index c90ba054..3221827b 100644 --- a/kopete/libkopete/kopeteutils.h +++ b/kopete/libkopete/kopeteutils.h @@ -53,10 +53,10 @@ bool isHostReachable( const TQString &host ); * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyConnectionLost( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); /** @@ -70,8 +70,8 @@ void KOPETE_EXPORT notifyConnectionLost( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyCannotConnect( const Account *account, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null); + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString()); /** * Notifies the user that an error on a connection occcured without coupling plugins with GUI code. @@ -86,10 +86,10 @@ void KOPETE_EXPORT notifyCannotConnect( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyConnectionError( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); /** * Notifies the user that an error on the server occcured without coupling plugins with GUI code. @@ -104,10 +104,10 @@ void KOPETE_EXPORT notifyConnectionError( const Account *account, * explanation, Kopete will use a default explanation. */ void KOPETE_EXPORT notifyServerError( const Account *account, - const TQString &caption = TQString::null, - const TQString &message = TQString::null, - const TQString &explanation = TQString::null, - const TQString &debugInfo = TQString::null ); + const TQString &caption = TQString(), + const TQString &message = TQString(), + const TQString &explanation = TQString(), + const TQString &debugInfo = TQString() ); } // end ns Utils } // end ns Kopete diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index f17c73b8..b7796abc 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -87,7 +87,7 @@ void Kopete::WalletManager::openWalletInner() // do we already have a wallet? if ( d->wallet ) { - // if the wallet isn't open yet, we're pending a slotWalletChangedStatus + // if the wallet isn't open yet, we're pending a slotWalletChangedtqStatus // anyway, so we don't set up a single shot. if ( d->wallet->isOpen() ) { @@ -107,19 +107,19 @@ void Kopete::WalletManager::openWalletInner() d->wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), mainWindowID(), KWallet::Wallet::Asynchronous ); - connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedStatus() ) ); + connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedtqStatus() ) ); } -void Kopete::WalletManager::slotWalletChangedStatus() +void Kopete::WalletManager::slotWalletChangedtqStatus() { kdDebug(14010) << k_funcinfo << " isOpen: " << d->wallet->isOpen() << endl; if( d->wallet->isOpen() ) { - if ( !d->wallet->hasFolder( TQString::fromLatin1( "Kopete" ) ) ) - d->wallet->createFolder( TQString::fromLatin1( "Kopete" ) ); + if ( !d->wallet->hasFolder( TQString::tqfromLatin1( "Kopete" ) ) ) + d->wallet->createFolder( TQString::tqfromLatin1( "Kopete" ) ); - if ( d->wallet->setFolder( TQString::fromLatin1( "Kopete" ) ) ) + if ( d->wallet->setFolder( TQString::tqfromLatin1( "Kopete" ) ) ) { // success! TQObject::connect( d->wallet, TQT_SIGNAL( walletClosed() ), this, TQT_SLOT( closeWallet() ) ); diff --git a/kopete/libkopete/kopetewalletmanager.h b/kopete/libkopete/kopetewalletmanager.h index a9ed0971..05680b17 100644 --- a/kopete/libkopete/kopetewalletmanager.h +++ b/kopete/libkopete/kopetewalletmanager.h @@ -34,9 +34,10 @@ namespace Kopete * The Kopete::WalletManager class is a singleton, which looks after Kopete's * KWallet connection. */ -class KOPETE_EXPORT WalletManager : public QObject +class KOPETE_EXPORT WalletManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -79,7 +80,7 @@ private slots: * * Causes walletOpened to be emitted. */ - void slotWalletChangedStatus(); + void slotWalletChangedtqStatus(); /** * Called by a singleShot timer in the event that we are asked for a @@ -102,9 +103,10 @@ private: /** * @internal */ -class KopeteWalletSignal : public QObject +class KopeteWalletSignal : public TQObject { Q_OBJECT + TQ_OBJECT friend class Kopete::WalletManager; signals: void walletOpened( KWallet::Wallet *wallet ); diff --git a/kopete/libkopete/managedconnectionaccount.cpp b/kopete/libkopete/managedconnectionaccount.cpp index cf14ed2f..05dbf9cf 100644 --- a/kopete/libkopete/managedconnectionaccount.cpp +++ b/kopete/libkopete/managedconnectionaccount.cpp @@ -24,48 +24,48 @@ namespace Kopete { -ManagedConnectionAccount::ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength, const char *name ) - : PasswordedAccount( parent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) +ManagedConnectionAccount::ManagedConnectionAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength, const char *name ) + : PasswordedAccount( tqparent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) { - TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus ) ), - TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworkStatus::EnumStatus ) ) ); + TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ), + TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworktqStatus::EnumtqStatus ) ) ); } void ManagedConnectionAccount::connectWithPassword( const TQString &password ) { m_password = password; - NetworkStatus::EnumStatus status = ConnectionManager::self()->status( TQString::null ); - if ( status == NetworkStatus::NoNetworks ) + NetworktqStatus::EnumtqStatus status = ConnectionManager::self()->status( TQString() ); + if ( status == NetworktqStatus::NoNetworks ) performConnectWithPassword( password ); else { m_waitingForConnection = true; // need to adapt libkopete so we know the hostname in this class and whether the connection was user initiated // for now, these are the default parameters to always bring up a connection to "the internet". - NetworkStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString::null, true ); - if ( response == NetworkStatus::Connected ) + NetworktqStatus::EnumRequestResult response = ConnectionManager::self()->requestConnection( Kopete::UI::Global::mainWidget(), TQString(), true ); + if ( response == NetworktqStatus::Connected ) { m_waitingForConnection = false; performConnectWithPassword( password ); } - else if ( response == NetworkStatus::UserRefused || response == NetworkStatus::Unavailable ) + else if ( response == NetworktqStatus::UserRefused || response == NetworktqStatus::Unavailable ) disconnect(); } } -void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ) +void ManagedConnectionAccount::slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ) { Q_UNUSED(host); // as above, we didn't register a hostname, so treat any connection as our own. - if ( m_waitingForConnection && ( status == NetworkStatus::Online || status == NetworkStatus::NoNetworks ) ) + if ( m_waitingForConnection && ( status == NetworktqStatus::Online || status == NetworktqStatus::NoNetworks ) ) { m_waitingForConnection = false; performConnectWithPassword( m_password ); } - else if ( isConnected() && ( status == NetworkStatus::Offline - || status == NetworkStatus::ShuttingDown - || status == NetworkStatus::OfflineDisconnected - || status == NetworkStatus::OfflineFailed ) ) + else if ( isConnected() && ( status == NetworktqStatus::Offline + || status == NetworktqStatus::ShuttingDown + || status == NetworktqStatus::OfflineDisconnected + || status == NetworktqStatus::OfflineFailed ) ) disconnect(); } diff --git a/kopete/libkopete/managedconnectionaccount.h b/kopete/libkopete/managedconnectionaccount.h index 7d864dfc..1de3a7ad 100644 --- a/kopete/libkopete/managedconnectionaccount.h +++ b/kopete/libkopete/managedconnectionaccount.h @@ -27,7 +27,7 @@ namespace Kopete class Protocol; /** - * A ManagedConnectionAccount queries the NetworkStatus KDED Module before trying to connect using + * A ManagedConnectionAccount queries the NetworktqStatus KDED Module before trying to connect using * connectwithPassword, starting a network connection if needed. If the network is not available, * it delays calling performConnectWithPassword until it receives notification from the daemon * that the network is up. The account receiveds notifications from the daemon of network failures @@ -36,15 +36,16 @@ class Protocol; class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount { Q_OBJECT + TQ_OBJECT public: /** * @brief ManagedConnectionAccount constructor. - * @param parent The protocol this account connects via + * @param tqparent The protocol this account connects via * @param acctId The ID of this account - should be unique within this protocol * @param maxPasswordLength The maximum length for passwords for this account, or 0 for no limit - * @param name The name for this QObject + * @param name The name for this TQObject */ - ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); + ManagedConnectionAccount( Protocol *tqparent, const TQString &acctId, uint maxPasswordLength = 0, const char *name = 0 ); public slots: /** * @brief Begin the connection process, by checking if the connection is available with the ConnectionManager. @@ -68,7 +69,7 @@ class KOPETE_EXPORT ManagedConnectionAccount : public PasswordedAccount * @param host For future expansion. * @param status the new status of the network */ - virtual void slotConnectionStatusChanged( const TQString & host, NetworkStatus::EnumStatus status ); + virtual void slotConnectionStatusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status ); private: TQString m_password; bool m_waitingForConnection; diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index 87c18a14..acf53f96 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -1,32 +1,32 @@ #include "networkstatuscommon.h" #include -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ) +TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ) { kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl; s << (int)p.status; s << (int)p.onDemandPolicy; s << p.service; s << ( p.internet ? 1 : 0 ); - s << p.netmasks; + s << p.nettqmasks; return s; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ) +TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) { int status, onDemandPolicy, internet; s >> status; kdDebug() << k_funcinfo << "status is: " << status << endl; - p.status = ( NetworkStatus::EnumStatus )status; + p.status = ( NetworktqStatus::EnumtqStatus )status; s >> onDemandPolicy; - p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy; + p.onDemandPolicy = ( NetworktqStatus::EnumOnDemandPolicy )onDemandPolicy; s >> p.service; s >> internet; if ( internet ) p.internet = true; else p.internet = false; - s >> p.netmasks; + s >> p.nettqmasks; kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl; return s; } diff --git a/kopete/libkopete/networkstatuscommon.h b/kopete/libkopete/networkstatuscommon.h index a243be43..81ac8350 100644 --- a/kopete/libkopete/networkstatuscommon.h +++ b/kopete/libkopete/networkstatuscommon.h @@ -3,31 +3,31 @@ #include -namespace NetworkStatus +namespace NetworktqStatus { - enum EnumStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; + enum EnumtqStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online }; enum EnumRequestResult { RequestAccepted = 1, Connected, UserRefused, Unavailable }; enum EnumOnDemandPolicy { All, User, None, Permanent }; struct Properties { TQString name; // status of the network - EnumStatus status; + EnumtqStatus status; // policy for on-demand usage as defined by the service EnumOnDemandPolicy onDemandPolicy; // identifier for the service TQCString service; // indicate that the connection is to 'the internet' - similar to default gateway in routing bool internet; - // list of netmasks that the network connects to - overridden by above internet - TQStringList netmasks; + // list of nettqmasks that the network connects to - overridden by above internet + TQStringList nettqmasks; // for future expansion consider // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged - // EnumLinkStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT + // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT }; } -TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p ); -TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p ); +TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ); +TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties p ); #endif diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 1f8969f6..f9fef1b6 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -25,11 +25,11 @@ #include "kopetecommand.h" #include "kopeteuiglobal.h" -Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot, +Kopete::Command::Command( TQObject *tqparent, const TQString &command, const char* handlerSlot, const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) - : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent, - ( command.lower() + TQString::fromLatin1("_command") ).latin1() ) + : KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, tqparent, + ( command.lower() + TQString::tqfromLatin1("_command") ).latin1() ) { init( command, handlerSlot, help, type, formatString, minArgs, maxArgs ); } @@ -48,7 +48,7 @@ void Kopete::Command::init( const TQString &command, const char* slot, const TQS if( m_type == Kopete::CommandHandler::Normal ) { TQObject::connect( this, TQT_SIGNAL( handleCommand( const TQString &, Kopete::ChatSession *) ), - parent(), slot ); + tqparent(), slot ); } TQObject::connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotAction() ) ); @@ -61,7 +61,7 @@ void Kopete::Command::slotAction() TQString args; if( m_minArgs > 0 ) { - args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").arg(m_command) ); + args = KInputDialog::getText( i18n("Enter Arguments"), i18n("Enter the arguments to %1:").tqarg(m_command) ); if( args.isNull() ) return; } @@ -74,23 +74,23 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession TQStringList mArgs = Kopete::CommandHandler::parseArguments( args ); if( m_processing ) { - printError( i18n("Alias \"%1\" expands to itself.").arg( text() ), manager, gui ); + printError( i18n("Alias \"%1\" expands to itself.").tqarg( text() ), manager, gui ); } else if( mArgs.count() < m_minArgs ) { printError( i18n("\"%1\" requires at least %n argument.", "\"%1\" requires at least %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( m_maxArgs > -1 && (int)mArgs.count() > m_maxArgs ) { printError( i18n("\"%1\" has a maximum of %n argument.", "\"%1\" has a maximum of %n arguments.", m_minArgs) - .arg( text() ), manager, gui ); + .tqarg( text() ), manager, gui ); } else if( !KApplication::kApplication()->authorizeKAction( name() ) ) { - printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui ); + printError( i18n("You are not authorized to perform the command \"%1\".").tqarg(text()), manager, gui ); } else { @@ -102,20 +102,20 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession // Translate %s to the whole string and %n to current nickname - formatString.replace( TQString::fromLatin1("%n"), manager->myself()->nickName() ); - formatString.replace( TQString::fromLatin1("%s"), args ); + formatString.tqreplace( TQString::tqfromLatin1("%n"), manager->myself()->nickName() ); + formatString.tqreplace( TQString::tqfromLatin1("%s"), args ); // Translate %1..%N to word1..wordN while( mArgs.count() > 0 ) { - formatString = formatString.arg( mArgs.front() ); + formatString = formatString.tqarg( mArgs.front() ); mArgs.pop_front(); } kdDebug(14010) << "New Command after processing alias: " << formatString << endl; - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/") + formatString, manager ); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/") + formatString, manager ); } else { diff --git a/kopete/libkopete/private/kopetecommand.h b/kopete/libkopete/private/kopetecommand.h index 6a686f1e..d49de208 100644 --- a/kopete/libkopete/private/kopetecommand.h +++ b/kopete/libkopete/private/kopetecommand.h @@ -30,12 +30,13 @@ class ChatSession; class Command : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Creates a Kopete::Command object * - * @param parent The plugin who owns this command + * @param tqparent The plugin who owns this command * @param command The command we want to handle, not including the '/' * @param handlerSlot The slot used to handle the command. This slot must * accept two parameters, a TQString of arguments, and a Kopete::ChatSession @@ -49,10 +50,10 @@ class Command : public KAction * @param cut The shortcut for the command * @param pix The icon to use for the command */ - Command( TQObject *parent, const TQString &command, const char* handlerSlot, - const TQString &help = TQString::null, CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString::null, + Command( TQObject *tqparent, const TQString &command, const char* handlerSlot, + const TQString &help = TQString(), CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString(), uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, - const TQString &pix = TQString::null ); + const TQString &pix = TQString() ); /** * Process this command diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index a2d33341..1edede5d 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -52,7 +52,7 @@ struct Emoticons::Emoticon bool operator< (const Emoticon &e){ return matchText.length() > e.matchText.length(); } TQString matchText; TQString matchTextEscaped; - QString picPath; + TQString picPath; TQString picHTMLCode; }; @@ -183,7 +183,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint p = c; continue; } /* strict requires space before the emoticon */ - if ( d->emoticonMap.contains( c ) ) + if ( d->emoticonMap.tqcontains( c ) ) { emoticonList = d->emoticonMap[ c ]; bool found = false; @@ -192,7 +192,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint // If this is an HTML, then search for the HTML form of the emoticon. // For instance >o) needle = ( mode & SkipHTML ) ? (*it).matchTextEscaped : (*it).matchText; - if ( ( pos == (size_t)message.find( needle, pos ) ) ) + if ( ( pos == (size_t)message.tqfind( needle, pos ) ) ) { if( mode & StrictParse ) { @@ -214,11 +214,11 @@ TQValueList Emoticons::tokenize( const TQString& message, uint { if( inHTMLEntity ){ // If we are in an HTML entitiy such as > - int htmlEnd = message.find( ';', pos ); + int htmlEnd = message.tqfind( ';', pos ); // Search for where it ends if( htmlEnd == -1 ) { - // Apparently this HTML entity isn't ended, something is wrong, try skip the '&' + // Aptqparently this HTML entity isn't ended, something is wrong, try skip the '&' // and continue kdDebug( 14000 ) << k_funcinfo << "Broken HTML entity, trying to recover." << endl; inHTMLEntity = false; @@ -300,14 +300,14 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList TQString pic; //maybe an extension was given, so try to find the exact file - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt ); if( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".mng" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".mng" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".png" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".png" ) ); if ( pic.isNull() ) - pic = dir->findResource( "emoticons", d->theme + TQString::fromLatin1( "/" ) + filenameNoExt + TQString::fromLatin1( ".gif" ) ); + pic = dir->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/" ) + filenameNoExt + TQString::tqfromLatin1( ".gif" ) ); if( !pic.isNull() ) // only add if we found one file { @@ -328,15 +328,15 @@ void Emoticons::addIfPossible( const TQString& filenameNoExt, const TQStringList // Unless we do so, ChatMessagePart::slotScrollView does not work properly and causing // HTMLPart not to be scrolled to the very last message. p.load( e.picPath ); - result = TQString::fromLatin1( "" ); + TQString::tqfromLatin1( "\" />" ); e.picHTMLCode = result; e.matchTextEscaped = matchEscaped; @@ -365,10 +365,10 @@ void Emoticons::initEmoticons( const TQString &theme ) d->emoticonAndPicList.clear(); d->emoticonMap.clear(); - TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/emoticons.xml" ) ); + TQString filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/emoticons.xml" ) ); if(!filename.isEmpty()) return initEmoticon_emoticonsxml( filename ); - filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::fromLatin1( "/icondef.xml" ) ); + filename= KGlobal::dirs()->findResource( "emoticons", d->theme + TQString::tqfromLatin1( "/icondef.xml" ) ); if(!filename.isEmpty()) return initEmoticon_JEP0038( filename ); kdWarning(14010) << k_funcinfo << "emotiucon XML theme description not found" < * @since 23-03-05 @@ -180,7 +181,7 @@ private slots: * Fills the map with paths and emoticons * This needs to be done on every emoticon-theme change **/ - void initEmoticons ( const TQString &theme = TQString::null ); + void initEmoticons ( const TQString &theme = TQString() ); }; diff --git a/kopete/libkopete/private/kopeteutils_private.h b/kopete/libkopete/private/kopeteutils_private.h index 8c780c2f..4114e65f 100644 --- a/kopete/libkopete/private/kopeteutils_private.h +++ b/kopete/libkopete/private/kopeteutils_private.h @@ -37,9 +37,10 @@ typedef struct TQString debugInfo; } ErrorNotificationInfo; -class NotifyHelper : public QObject +class NotifyHelper : public TQObject { Q_OBJECT + TQ_OBJECT public: static NotifyHelper* self(); void registerNotification(const KNotification* event, ErrorNotificationInfo error); diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 2a6ccb84..4650ffb9 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -110,7 +110,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin { // kdDebug(14000) << k_funcinfo << endl; - if( d->managerMap.contains( session ) && d->managerMap[ session ] ) + if( d->managerMap.tqcontains( session ) && d->managerMap[ session ] ) { return d->managerMap[ session ]; } @@ -132,7 +132,7 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin } if( !viewPlugin ) - viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::fromLatin1("kopete_chatwindow") ); + viewPlugin = (Kopete::ViewPlugin*)pluginManager->loadPlugin( TQString::tqfromLatin1("kopete_chatwindow") ); if( viewPlugin ) { @@ -161,7 +161,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi bool outgoingMessage = ( msg.direction() == Kopete::Message::Outbound ); - if( !outgoingMessage || d->managerMap.contains( manager ) ) + if( !outgoingMessage || d->managerMap.tqcontains( manager ) ) { d->foreignMessage=!outgoingMessage; //let know for the view we are about to create manager->view(true,msg.requestedPlugin())->appendMessage( msg ); @@ -175,7 +175,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi // append msg event to queue if chat window is active but not the chat view in it... appendMessageEvent = appendMessageEvent && !(w->isActiveWindow() && manager->view() == d->activeView); // ...and chat window is on another desktop - appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->topLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); + appendMessageEvent = appendMessageEvent && (!d->queueOnlyMessagesOnAnotherDesktop || !KWin::windowInfo( w->tqtopLevelWidget()->winId(), NET::WMDesktop ).isOnCurrentDesktop()); } else { @@ -211,7 +211,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow()) && msg.from()) { - TQString msgFrom = TQString::null; + TQString msgFrom = TQString(); if( msg.from()->metaContact() ) msgFrom = msg.from()->metaContact()->displayName(); else @@ -219,7 +219,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi TQString msgText = msg.plainBody(); if( msgText.length() > 90 ) - msgText = msgText.left(88) + TQString::fromLatin1("..."); + msgText = msgText.left(88) + TQString::tqfromLatin1("..."); TQString event; TQString body =i18n( "Incoming message from %1
\"%2\"" ); @@ -227,16 +227,16 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi switch( msg.importance() ) { case Kopete::Message::Low: - event = TQString::fromLatin1( "kopete_contact_lowpriority" ); + event = TQString::tqfromLatin1( "kopete_contact_lowpriority" ); break; case Kopete::Message::Highlight: - event = TQString::fromLatin1( "kopete_contact_highlight" ); + event = TQString::tqfromLatin1( "kopete_contact_highlight" ); body = i18n( "A highlighted message arrived from %1
\"%2\"" ); break; default: - event = TQString::fromLatin1( "kopete_contact_incoming" ); + event = TQString::tqfromLatin1( "kopete_contact_incoming" ); } - KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.arg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ + KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.tqarg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); connect(notify,TQT_SIGNAL(activated(unsigned int )), manager , TQT_SLOT(raiseView()) ); @@ -329,7 +329,7 @@ void KopeteViewManager::slotViewDestroyed( KopeteView *closingView ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.contains( closingView->msgManager() ) ) + if( d->managerMap.tqcontains( closingView->msgManager() ) ) { d->managerMap.remove( closingView->msgManager() ); // closingView->msgManager()->setCanBeDeleted( true ); @@ -343,7 +343,7 @@ void KopeteViewManager::slotChatSessionDestroyed( Kopete::ChatSession *manager ) { // kdDebug( 14000 ) << k_funcinfo << endl; - if( d->managerMap.contains( manager ) ) + if( d->managerMap.tqcontains( manager ) ) { KopeteView *v=d->managerMap[ manager ]; v->closeView( true ); diff --git a/kopete/libkopete/private/kopeteviewmanager.h b/kopete/libkopete/private/kopeteviewmanager.h index f2302f6d..c1de7730 100644 --- a/kopete/libkopete/private/kopeteviewmanager.h +++ b/kopete/libkopete/private/kopeteviewmanager.h @@ -36,9 +36,10 @@ struct KopeteViewManagerPrivate; /** * Relates an actual chat to the means used to view it. */ -class KOPETE_EXPORT KopeteViewManager : public QObject +class KOPETE_EXPORT KopeteViewManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** This is a singleton class. Call this method to get a pointer to * a KopeteViewManager. @@ -54,7 +55,7 @@ class KOPETE_EXPORT KopeteViewManager : public QObject * @param session The Kopete::ChatSession we are viewing. * @param requestedPlugin Specifies the view plugin to use. */ - KopeteView *view( Kopete::ChatSession *session, const TQString &requestedPlugin = TQString::null ); + KopeteView *view( Kopete::ChatSession *session, const TQString &requestedPlugin = TQString() ); /** * Provide access to the list of KopeteChatWindow the class maintains. diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb index 7951bf35..ba6e0c2e 100755 --- a/kopete/libkopete/tests/create_test.rb +++ b/kopete/libkopete/tests/create_test.rb @@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,"")) fileCpp.gsub!(/Template/, className.gsub(/::/,"")) fileCpp.gsub!(/some requirement/, className + " class.") -makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" +makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../tqmock/libkopete_tqmock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" makefileAm.gsub!(/template/, className.downcase.gsub(/::/,"")) hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,"")) diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 7b21d407..933a67bb 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -36,7 +36,7 @@ void KopeteContactList_Test::testSomething() // change user data dir to avoid messing with user's .kde dir setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); - TQString filename = locateLocal( "appdata", TQString::fromLatin1( "contactlist.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); if( ! filename.isEmpty() ) { // previous test run, delete the previous contact list diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index a64aee99..ab0ee31a 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -62,7 +62,7 @@ void KopeteEmoticonTest::allTests() void KopeteEmoticonTest::testEmoticonParser() { Kopete::Emoticons emo("Default"); - TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/emoticon-parser-testcases"); + TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/emoticon-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -71,10 +71,10 @@ void KopeteEmoticonTest::testEmoticonParser() TQString fileName = *it; kdDebug() << "testcase: " << fileName << endl; TQString outputFileName = fileName; - outputFileName.replace("input","output"); + outputFileName.tqreplace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -94,19 +94,19 @@ void KopeteEmoticonTest::testEmoticonParser() inputFile.close(); expectedFile.close(); - TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).replace( "smile.png", TQString::null ); + TQString path = KGlobal::dirs()->findResource( "emoticons", "Default/smile.png" ).tqreplace( "smile.png", TQString() ); Kopete::Emoticons::self(); - TQString result = emo.parse( inputData ).replace( path, TQString::null ); + TQString result = emo.parse( inputData ).tqreplace( path, TQString() ); // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::fromLatin1(": ") + result; - expectedData = fileName + TQString::fromLatin1(": ") + expectedData; + result = fileName + TQString::tqfromLatin1(": ") + result; + expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) { kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 3e4a85b3..55a44f87 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -29,11 +29,11 @@ #include #include "kopetemessage_test.h" -#include "kopeteaccount_mock.h" -#include "kopeteprotocol_mock.h" -#include "kopetecontact_mock.h" -#include "kopetemetacontact_mock.h" -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" +#include "kopeteprotocol_tqmock.h" +#include "kopetecontact_tqmock.h" +#include "kopetemetacontact_tqmock.h" +#include "kopeteaccount_tqmock.h" using namespace KUnitTest; @@ -57,9 +57,9 @@ KopeteMessage_Test::KopeteMessage_Test() m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount"); m_metaContactMyself = new Kopete::Test::Mock::MetaContact(); m_metaContactOther = new Kopete::Test::Mock::MetaContact(); - m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-myself"), m_metaContactMyself, TQString::null); - m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::fromLatin1("test-dest"), m_metaContactOther, TQString::null); - m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString::null, Kopete::Message::Outbound, Kopete::Message::PlainText); + m_contactFrom = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-myself"), m_metaContactMyself, TQString()); + m_contactTo = new Kopete::Test::Mock::Contact(m_account, TQString::tqfromLatin1("test-dest"), m_metaContactOther, TQString()); + m_message = new Kopete::Message( m_contactFrom, m_contactTo, TQString(), Kopete::Message::Outbound, Kopete::Message::PlainText); } void KopeteMessage_Test::allTests() @@ -67,7 +67,7 @@ void KopeteMessage_Test::allTests() KApplication::disableAutoDcopRegistration(); //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); - // At least Kopete::Message::asXML() seems to require that a QApplication + // At least Kopete::Message::asXML() seems to require that a TQApplication // is created. Running the console version doesn't create it, but the GUI // version does. @@ -227,7 +227,7 @@ void KopeteMessage_Test::testPrimitives() { Kopete::Message msg2; - CHECK(msg2.plainBody(), TQString::null); + CHECK(msg2.plainBody(), TQString()); msg2 = msg1; @@ -251,7 +251,7 @@ void KopeteMessage_Test::setup() void KopeteMessage_Test::testLinkParser() { - TQString basePath = TQString::fromLatin1( SRCDIR ) + TQString::fromLatin1("/link-parser-testcases"); + TQString basePath = TQString::tqfromLatin1( SRCDIR ) + TQString::tqfromLatin1("/link-parser-testcases"); TQDir testCasesDir(basePath); TQStringList inputFileNames = testCasesDir.entryList("*.input"); @@ -259,10 +259,10 @@ void KopeteMessage_Test::testLinkParser() { TQString fileName = *it; TQString outputFileName = fileName; - outputFileName.replace("input","output"); + outputFileName.tqreplace("input","output"); // open the input file - TQFile inputFile(basePath + TQString::fromLatin1("/") + fileName); - TQFile expectedFile(basePath + TQString::fromLatin1("/") + outputFileName); + TQFile inputFile(basePath + TQString::tqfromLatin1("/") + fileName); + TQFile expectedFile(basePath + TQString::tqfromLatin1("/") + outputFileName); // check if the expected output file exists // if it doesn't, skip the testcase if ( ! expectedFile.exists() ) @@ -283,12 +283,12 @@ void KopeteMessage_Test::testLinkParser() expectedFile.close(); // use a concrete url - inputData.replace( "$URL","http://www.kde.org" ); - expectedData.replace( "$URL","http://www.kde.org" ); + inputData.tqreplace( "$URL","http://www.kde.org" ); + expectedData.tqreplace( "$URL","http://www.kde.org" ); // set message format for parsing according to textcase filename convention Kopete::Message::MessageFormat format; - if ( fileName.section("-", 1, 1) == TQString::fromLatin1("plaintext") ) + if ( fileName.section("-", 1, 1) == TQString::tqfromLatin1("plaintext") ) format = Kopete::Message::PlainText; else format = Kopete::Message::RichText; @@ -298,11 +298,11 @@ void KopeteMessage_Test::testLinkParser() // HACK to know the test case we applied, concatenate testcase name to both // input and expected string. WIll remove when I can add some sort of metadata // to a CHECK so debug its origin testcase - result = fileName + TQString::fromLatin1(": ") + result; - expectedData = fileName + TQString::fromLatin1(": ") + expectedData; + result = fileName + TQString::tqfromLatin1(": ") + result; + expectedData = fileName + TQString::tqfromLatin1(": ") + expectedData; // if the test case begins with broken, we expect it to fail, then use XFAIL // otherwise use CHECK - if ( fileName.section("-", 0, 0) == TQString::fromLatin1("broken") ) + if ( fileName.section("-", 0, 0) == TQString::tqfromLatin1("broken") ) { //kdDebug() << "checking known-broken testcase: " << fileName << endl; XFAIL(result, expectedData); diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp index 51b8908a..ea298395 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp +++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp @@ -49,14 +49,14 @@ TQString retrieve( Password &pwd, const TQPixmap &image, const TQString &prompt TQTimer tmr; r.connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( timer() ) ); tmr.start( 1000 ); - qApp->exec(); + tqApp->exec(); return r.password; } void PasswordRetriever::gotPassword( const TQString &pass ) { password = pass; - qApp->quit(); + tqApp->quit(); } void PasswordRetriever::timer() @@ -101,7 +101,7 @@ int main( int argc, char *argv[] ) if ( newPwd.isEmpty() ) { _out << "Clearing password" << endl; - newPwd = TQString::null; + newPwd = TQString(); } else { diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.h b/kopete/libkopete/tests/kopetepasswordtest_program.h index 47c17172..776374c1 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.h +++ b/kopete/libkopete/tests/kopetepasswordtest_program.h @@ -3,9 +3,10 @@ #include -class PasswordRetriever : public QObject +class PasswordRetriever : public TQObject { Q_OBJECT + TQ_OBJECT public: TQString password; public slots: diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp index 76b8ae79..736bd2f8 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.cpp +++ b/kopete/libkopete/tests/kopetepropertiestest.cpp @@ -51,8 +51,8 @@ void KopetePropertiesTest::allTests() { PropertyHost myPropertyHost; CHECK( myPropertyHost.property(fooProperty).isNull(), true); - myPropertyHost.setProperty( fooProperty, TQString::fromLatin1("Foo!") ); - CHECK( myPropertyHost.property(fooProperty), TQString::fromLatin1("Foo!") ); + myPropertyHost.setProperty( fooProperty, TQString::tqfromLatin1("Foo!") ); + CHECK( myPropertyHost.property(fooProperty), TQString::tqfromLatin1("Foo!") ); } diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index cfc8b6e9..b6eaf635 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -38,8 +38,8 @@ void closeWallet() void delay() { - TQTimer::singleShot( 3000, qApp, TQT_SLOT( quit() ) ); - qApp->exec(); + TQTimer::singleShot( 3000, tqApp, TQT_SLOT( quit() ) ); + tqApp->exec(); } void openWalletAsync() @@ -76,9 +76,9 @@ int main( int argc, char *argv[] ) { TQString arg = args->arg( i ); _out << "Processing " << arg << endl; - if( arg == TQString::fromLatin1( "open" ) ) openWalletAsync(); - if( arg == TQString::fromLatin1( "close" ) ) closeWallet(); - if( arg == TQString::fromLatin1( "delay" ) ) delay(); + if( arg == TQString::tqfromLatin1( "open" ) ) openWalletAsync(); + if( arg == TQString::tqfromLatin1( "close" ) ) closeWallet(); + if( arg == TQString::tqfromLatin1( "delay" ) ) delay(); _out << "Done." << endl; } @@ -89,8 +89,8 @@ int main( int argc, char *argv[] ) timer.start( 1000 ); _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, qApp, TQT_SLOT( quit() ) ); - return qApp->exec(); + TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + return tqApp->exec(); } #include "kopetewallettest_program.moc" diff --git a/kopete/libkopete/tests/kopetewallettest_program.h b/kopete/libkopete/tests/kopetewallettest_program.h index b2e5d2fb..225fa6ad 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.h +++ b/kopete/libkopete/tests/kopetewallettest_program.h @@ -5,9 +5,10 @@ namespace KWallet { class Wallet; } -class WalletReciever : public QObject +class WalletReciever : public TQObject { Q_OBJECT + TQ_OBJECT public slots: void timer(); private slots: diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index 7d46fc34..35dde6b8 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -1,5 +1,5 @@ /* - Account mock object class + Account tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,9 +15,9 @@ ************************************************************************* */ -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" #include "kopetemetacontact.h" -#include "kopeteaccount_mock.h" +#include "kopeteaccount_tqmock.h" namespace Kopete { @@ -26,7 +26,7 @@ namespace Test namespace Mock { -Account::Account(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name) +Account::Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name) { } @@ -36,12 +36,12 @@ Account::~Account() } -bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) +bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) { return true; } -void Account::connect( const Kopete::OnlineStatus& initialStatus) +void Account::connect( const Kopete::OnlineStatus& initialtqStatus) { // do nothing } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index ac5a7253..93b1acdf 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -1,5 +1,5 @@ /* - Account mock object class + Account tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEACCOUNT_MOCK_H_ -#define _KOPETEACCOUNT_MOCK_H_ +#ifndef _KOPETEACCOUNT_TQMOCK_H_ +#define _KOPETEACCOUNT_TQMOCK_H_ #include "kopeteaccount.h" @@ -36,13 +36,13 @@ namespace Mock class Account : public Kopete::Account { public: - Account(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L); + Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); // pure virtual functions implementation - virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); - virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() ); + virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ); + virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); virtual void disconnect(); - virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null ); + virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); }; } // end ns Kopete::Test::Mock diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp index ea90bee0..04f38727 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp @@ -1,5 +1,5 @@ /* - Contact mock object class + Contact tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,7 +15,7 @@ ************************************************************************* */ -#include "kopetecontact_mock.h" +#include "kopetecontact_tqmock.h" namespace Kopete { @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon) : Kopete::Contact( account, id, parent, icon) +Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon) : Kopete::Contact( account, id, tqparent, icon) { } diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h index faa78e3b..437887d9 100644 --- a/kopete/libkopete/tests/mock/kopetecontact_mock.h +++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h @@ -1,5 +1,5 @@ /* - Contact mock object class + Contact tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETECONTACT_MOCK_H_ -#define _KOPETECONTACT_MOCK_H_ +#ifndef _KOPETECONTACT_TQMOCK_H_ +#define _KOPETECONTACT_TQMOCK_H_ #include "kopetecontact.h" @@ -35,7 +35,7 @@ namespace Mock class Contact : public Kopete::Contact { public: - Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon = TQString::null ); + Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon = TQString() ); ~Contact(); virtual Kopete::ChatSession* manager( CanCreateFlags canCreate = CannotCreate ); }; diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp index a3e543e3..66f325e3 100644 --- a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp @@ -1,5 +1,5 @@ /* - Message mock object class + Message tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,6 +15,6 @@ ************************************************************************* */ -#include "kopetemessage_mock.h" +#include "kopetemessage_tqmock.h" diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h index 13c92574..f8677ee6 100644 --- a/kopete/libkopete/tests/mock/kopetemessage_mock.h +++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h @@ -1,5 +1,5 @@ /* - Message mock object class + Message tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEMESSAGE_MOCK_H_ -#define _KOPETEMESSAGE_MOCK_H_ +#ifndef _KOPETEMESSAGE_TQMOCK_H_ +#define _KOPETEMESSAGE_TQMOCK_H_ #include "kopetemessage.h" diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp index 32f0fe1c..e9cc95a1 100644 --- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp +++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp @@ -15,6 +15,6 @@ ************************************************************************* */ -#include "kopetemetacontact_mock.h" +#include "kopetemetacontact_tqmock.h" diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h index f3311713..2fa6d8c6 100644 --- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h +++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEMETACONTACT_MOCK_H_ -#define _KOPETEMETACONTACT_MOCK_H_ +#ifndef _KOPETEMETACONTACT_TQMOCK_H_ +#define _KOPETEMETACONTACT_TQMOCK_H_ #include "kopetemetacontact.h" diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp index d9ae1d3a..03a65808 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp @@ -1,5 +1,5 @@ /* - Protocol mock object class + Protocol tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,7 +15,7 @@ ************************************************************************* */ -#include "kopeteprotocol_mock.h" +#include "kopeteprotocol_tqmock.h" namespace Kopete { @@ -24,7 +24,7 @@ namespace Test namespace Mock { -Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) +Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name) { } @@ -34,16 +34,16 @@ Account* Protocol::createNewAccount( const TQString &accountId ) return 0L; } -AddContactPage* Protocol::createAddContactWidget( TQWidget *parent, Kopete::Account *account ) +AddContactPage* Protocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ) { return 0L; } -KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { return 0L; } -} // end ns mock +} // end ns tqmock } // end ns test } // end ns kopete diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h index d2502790..86b551d5 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h @@ -1,5 +1,5 @@ /* - Protocol mock object class + Protocol tqmock object class Copyright (c) 2005 by Duncan Mac-Vicar Prett @@ -15,8 +15,8 @@ ************************************************************************* */ -#ifndef _KOPETEPROTOCOL_MOCK_H_ -#define _KOPETEPROTOCOL_MOCK_H_ +#ifndef _KOPETEPROTOCOL_TQMOCK_H_ +#define _KOPETEPROTOCOL_TQMOCK_H_ #include "kopeteprotocol.h" @@ -37,11 +37,11 @@ namespace Mock class Protocol : public Kopete::Protocol { public: - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( KInstance *instance, TQObject *tqparent, const char *name ); // pure virtual functions implemented virtual Account *createNewAccount( const TQString &accountId ); - virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); }; } // end ns Kopete::Test::Mock diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index 345e9ab4..e1f31900 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -32,8 +32,8 @@ class AccountListViewItem : public KListViewItem Kopete::Account *mAccount; public: - AccountListViewItem(TQListView *parent, Kopete::Account *acc) - : KListViewItem(parent) + AccountListViewItem(TQListView *tqparent, Kopete::Account *acc) + : KListViewItem(tqparent) { if (acc==0) return; @@ -62,8 +62,8 @@ class AccountSelectorPrivate }; -AccountSelector::AccountSelector(TQWidget *parent, const char *name) - : TQWidget(parent, name) +AccountSelector::AccountSelector(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << "for no special protocol" << endl; d = new AccountSelectorPrivate; @@ -72,8 +72,8 @@ AccountSelector::AccountSelector(TQWidget *parent, const char *name) } -AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *parent, - const char *name) : TQWidget(parent, name) +AccountSelector::AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent, + const char *name) : TQWidget(tqparent, name) { //kdDebug(14010) << k_funcinfo << " for protocol " << proto->pluginId() << endl; d = new AccountSelectorPrivate; @@ -95,7 +95,7 @@ void AccountSelector::initUI() (new TQVBoxLayout(this))->setAutoAdd(true); d->lv = new KListView(this); d->lv->setFullWidth(true); - d->lv->addColumn(TQString::fromLatin1("")); + d->lv->addColumn(TQString::tqfromLatin1("")); d->lv->header()->hide(); if(d->proto != 0) diff --git a/kopete/libkopete/ui/accountselector.h b/kopete/libkopete/ui/accountselector.h index c812453d..bdb4c888 100644 --- a/kopete/libkopete/ui/accountselector.h +++ b/kopete/libkopete/ui/accountselector.h @@ -28,27 +28,28 @@ class TQListViewItem; * \brief widget to select an account, based on KListView * @author Stefan Gehn */ -class KOPETE_EXPORT AccountSelector : public QWidget +class KOPETE_EXPORT AccountSelector : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. */ - AccountSelector(TQWidget *parent=0, const char *name=0); + AccountSelector(TQWidget *tqparent=0, const char *name=0); /** * Constructor for a list of accounts for one protocol only * - * The parameters @p parent and @p name are handled by + * The parameters @p tqparent and @p name are handled by * KListView. @p proto defines the protocol whose accounts are * shown in the list */ - AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0); + AccountSelector(Kopete::Protocol *proto, TQWidget *tqparent=0, const char *name=0); /** * Destructor. diff --git a/kopete/libkopete/ui/addcontactpage.cpp b/kopete/libkopete/ui/addcontactpage.cpp index 846815f2..4916b955 100644 --- a/kopete/libkopete/ui/addcontactpage.cpp +++ b/kopete/libkopete/ui/addcontactpage.cpp @@ -17,7 +17,7 @@ #include "addcontactpage.h" -AddContactPage::AddContactPage(TQWidget *parent, const char *name ) : TQWidget(parent,name) +AddContactPage::AddContactPage(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) { } diff --git a/kopete/libkopete/ui/addcontactpage.h b/kopete/libkopete/ui/addcontactpage.h index d72e2fd1..f215f3b0 100644 --- a/kopete/libkopete/ui/addcontactpage.h +++ b/kopete/libkopete/ui/addcontactpage.h @@ -29,12 +29,13 @@ * (in the case of jabber, i need to translate the legacy id to a JID) * this could also be usefull in the case of MLSN to check if no error (and also jabber) */ -class KOPETE_EXPORT AddContactPage : public QWidget +class KOPETE_EXPORT AddContactPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddContactPage(TQWidget *parent=0, const char *name=0); + AddContactPage(TQWidget *tqparent=0, const char *name=0); virtual ~AddContactPage(); //Kopete::Protocol *protocol; diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index 0d544d27..e34518b7 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -38,9 +38,9 @@ namespace Kopete { namespace UI { -AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) +AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * tqparent, const char * name ) : AddressBookLinkWidgetBase( tqparent, name ), mMetaContact( 0 ) { - btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) ); + btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::tqfromLatin1( "locationbar_erase" ) : TQString::tqfromLatin1( "clear_left") ) ); connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) ); } @@ -66,7 +66,7 @@ void AddressBookLinkWidget::slotClearAddressee() edtAddressee->clear(); btnClear->setEnabled( false ); KABC::Addressee mrEmpty; - mSelectedUid = TQString::null; + mSelectedUid = TQString(); emit addresseeChanged( mrEmpty ); } @@ -74,11 +74,11 @@ void AddressBookLinkWidget::slotSelectAddressee() { TQString message; if ( mMetaContact ) - message = i18n("Choose the corresponding entry for '%1'" ).arg( mMetaContact->displayName() ); + message = i18n("Choose the corresponding entry for '%1'" ).tqarg( mMetaContact->displayName() ); else message = i18n("Choose the corresponding entry in the address book" ); - Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString::null ), this ); + Kopete::UI::AddressBookSelectorDialog dialog( i18n("Addressbook Association"), message, ( mMetaContact ? mMetaContact->metaContactId() : TQString() ), this ); int result = dialog.exec(); KABC::Addressee addr; @@ -88,7 +88,7 @@ void AddressBookLinkWidget::slotSelectAddressee() edtAddressee->setText( addr.realName() ); btnClear->setEnabled( !addr.isEmpty() ); - mSelectedUid = ( addr.isEmpty() ? TQString::null : addr.uid() ); + mSelectedUid = ( addr.isEmpty() ? TQString() : addr.uid() ); emit addresseeChanged( addr ); } } diff --git a/kopete/libkopete/ui/addressbooklinkwidget.h b/kopete/libkopete/ui/addressbooklinkwidget.h index fa44d530..31d90a8c 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.h +++ b/kopete/libkopete/ui/addressbooklinkwidget.h @@ -43,8 +43,9 @@ namespace UI { class AddressBookLinkWidget : public AddressBookLinkWidgetBase { Q_OBJECT + TQ_OBJECT public: - AddressBookLinkWidget( TQWidget * parent, const char * name ); + AddressBookLinkWidget( TQWidget * tqparent, const char * name ); ~AddressBookLinkWidget() {} /** * Set the currently selected addressee diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 4656459c..652e292a 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -1,6 +1,6 @@ AddressBookLinkWidgetBase - + AddressBookLinkWidgetBase @@ -19,9 +19,9 @@ 0 - + - layout9 + tqlayout9 @@ -52,7 +52,7 @@ Clear - + btnSelectAddressee @@ -70,7 +70,7 @@ - + klineedit.h kpushbutton.h diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp index 44f42e2a..5133b4ee 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.cpp +++ b/kopete/libkopete/ui/addressbookselectordialog.cpp @@ -30,7 +30,7 @@ namespace Kopete namespace UI { -AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent, const char *name, bool modal ) : KDialogBase(parent, name, modal, title, Help|Ok|Cancel, Ok, true ) +AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent, const char *name, bool modal ) : KDialogBase(tqparent, name, modal, title, Help|Ok|Cancel, Ok, true ) { TQVBox *vbox=new TQVBox(this); m_addressBookSelectorWidget= new AddressBookSelectorWidget(vbox); @@ -52,9 +52,9 @@ AddressBookSelectorDialog::~AddressBookSelectorDialog() { } -KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent) +KABC::Addressee AddressBookSelectorDialog::getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent) { - AddressBookSelectorDialog dialog(title, message, preSelectUid, parent); + AddressBookSelectorDialog dialog(title, message, preSelectUid, tqparent); int result = dialog.exec(); KABC::Addressee adr; diff --git a/kopete/libkopete/ui/addressbookselectordialog.h b/kopete/libkopete/ui/addressbookselectordialog.h index 470f3407..db676a3c 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.h +++ b/kopete/libkopete/ui/addressbookselectordialog.h @@ -47,11 +47,12 @@ class AddressBookSelectorWidget; class KOPETE_EXPORT AddressBookSelectorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * The constructor of an empty AddressBookSelectorWidget */ - AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent=0L, const char *name=0L, bool modal = false ); + AddressBookSelectorDialog( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent=0L, const char *name=0L, bool modal = false ); /** * The destructor of the dialog */ @@ -71,7 +72,7 @@ public: * @returns the selected contact, or a null addressee if the user * pressed the Cancel button. Optionally */ - static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *parent = 0L ); + static KABC::Addressee getAddressee( const TQString &title, const TQString &message, const TQString &preSelectUid, TQWidget *tqparent = 0L ); protected slots: virtual void accept(); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index 4b106315..d67c3671 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -54,8 +54,8 @@ namespace Kopete namespace UI { -AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const char *name ) - : AddressBookSelectorWidget_Base( parent, name ) +AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *tqparent, const char *name ) + : AddressBookSelectorWidget_Base( tqparent, name ) { m_addressBook = Kopete::KABCPersistence::self()->addressBook(); @@ -74,7 +74,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch //We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks - addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email")); + addresseeListView->setColumnText(2, SmallIconSet(TQString::tqfromLatin1("email")), i18n("Email")); kListViewSearchLine->setListView(addresseeListView); slotLoadAddressees(); @@ -144,7 +144,7 @@ void AddressBookSelectorWidget::setLabelMessage( const TQString &msg ) void AddressBookSelectorWidget::slotAddAddresseeClicked() { // Pop up add addressee dialog - TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString::null, 0, this ); + TQString addresseeName = KInputDialog::getText( i18n( "New Address Book Entry" ), i18n( "Name the new entry:" ), TQString(), 0, this ); if ( !addresseeName.isEmpty() ) { @@ -154,7 +154,7 @@ void AddressBookSelectorWidget::slotAddAddresseeClicked() Kopete::KABCPersistence::self()->writeAddressBook( 0 ); slotLoadAddressees(); // select the addressee we just added - TQListViewItem * added = addresseeListView->findItem( addresseeName, 1 ); + TQListViewItem * added = addresseeListView->tqfindItem( addresseeName, 1 ); kListViewSearchLine->clear(); kListViewSearchLine->updateSearch(); addresseeListView->setSelected( added, true ); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.h b/kopete/libkopete/ui/addressbookselectorwidget.h index 3b26cece..028e6d6c 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.h +++ b/kopete/libkopete/ui/addressbookselectorwidget.h @@ -48,8 +48,9 @@ namespace UI class KOPETE_EXPORT AddressBookSelectorWidget : public AddressBookSelectorWidget_Base { Q_OBJECT + TQ_OBJECT public: - AddressBookSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + AddressBookSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~AddressBookSelectorWidget(); KABC::Addressee addressee(); /** diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index d5e2e6f2..f67300df 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -1,6 +1,6 @@ AddressBookSelectorWidget_Base - + AddressBookSelectorWidget_Base @@ -40,14 +40,14 @@ Expanding - + 405 20 - + addAddresseeButton @@ -126,15 +126,15 @@ Select the contact you want to communicate with via Instant Messaging - + - layout1 + tqlayout1 unnamed - + lblSearch @@ -165,8 +165,8 @@ klistviewsearchline.h - - + + kactivelabel.h klistview.h diff --git a/kopete/libkopete/ui/addresseeitem.cpp b/kopete/libkopete/ui/addresseeitem.cpp index 9fa9f023..382693ea 100644 --- a/kopete/libkopete/ui/addresseeitem.cpp +++ b/kopete/libkopete/ui/addresseeitem.cpp @@ -27,8 +27,8 @@ #include "addresseeitem.h" -AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : - KListViewItem( parent ), +AddresseeItem::AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee) : + KListViewItem( tqparent ), mAddressee( addressee ) { //We can't save showphoto because we don't have a d pointer @@ -49,7 +49,7 @@ TQString AddresseeItem::key( int column, bool ) const { if (column == Email) { TQString value = text(Email); - TQRegExp emailRe(TQString::fromLatin1("<\\S*>")); + TQRegExp emailRe(TQString::tqfromLatin1("<\\S*>")); int match = emailRe.search(value); if (match > -1) value = value.mid(match + 1, emailRe.matchedLength() - 2); diff --git a/kopete/libkopete/ui/addresseeitem.h b/kopete/libkopete/ui/addresseeitem.h index 36d1d284..695ea6c2 100644 --- a/kopete/libkopete/ui/addresseeitem.h +++ b/kopete/libkopete/ui/addresseeitem.h @@ -46,10 +46,10 @@ class AddresseeItem : public KListViewItem /** Constructor. - @param parent The parent listview. + @param tqparent The tqparent listview. @param addressee The associated addressee. */ - AddresseeItem( TQListView *parent, const KABC::Addressee &addressee ); + AddresseeItem( TQListView *tqparent, const KABC::Addressee &addressee ); /** Returns the addressee. diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 9084bd39..e5fd81b4 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -71,9 +71,9 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->account=account; d->contactId=contactId; d->widget->m_label->setText(i18n(" The contact %2 has added you to his/her contactlist. (Account %3)") - .arg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::fromLatin1(":") + .tqarg( KURL::encode_string( account->protocol()->pluginId() ) + TQString::tqfromLatin1(":") + KURL::encode_string( account->accountId() ) , - contactNick.isEmpty() ? contactId : contactNick + TQString::fromLatin1(" < ") + contactId + TQString::fromLatin1(" >") , + contactNick.isEmpty() ? contactId : contactNick + TQString::tqfromLatin1(" < ") + contactId + TQString::tqfromLatin1(" >") , account->accountLabel() ) ); if( hide & InfoButton) d->widget->m_infoButton->hide() ; @@ -100,7 +100,7 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, d->widget->m_groupList->insertItem(groupname); } } - d->widget->m_groupList->setCurrentText(TQString::null); //default to top-level + d->widget->m_groupList->setCurrentText(TQString()); //default to top-level connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const KABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const KABC::Addressee& ) ) ); connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) ); diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h index be5349a4..e4fe5a61 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.h +++ b/kopete/libkopete/ui/contactaddednotifydialog.h @@ -43,7 +43,7 @@ namespace UI { * @code Kopete::UI::ContactAddedNotifyDialog *dialog = - new ContactAddedNotifyDialog(contactId, TQString::null,account); + new ContactAddedNotifyDialog(contactId, TQString(),account); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogApplied())); TQObject::connect(dialog,TQT_SIGNAL(infoClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogInfo())); dialog->show(); @@ -70,6 +70,7 @@ namespace UI { class KOPETE_EXPORT ContactAddedNotifyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * All widget in the dialog that may be hidden. @@ -90,10 +91,10 @@ public: * @param contactId the contactId of the contact which just added the user * @param contactNick the nickname of the contact if available. * @param account is used to display the account icon and informaiton about the account - * @param hide a bitmask of HideWidget used to hide some widget. By default, everything is shown. + * @param hide a bittqmask of HideWidget used to hide some widget. By default, everything is shown. * */ - ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString::null, + ContactAddedNotifyDialog(const TQString& contactId, const TQString& contactNick=TQString(), Kopete::Account *account=0L, uint hide=0x00); /** @@ -152,7 +153,7 @@ signals: * signal to a slot which show a dialog with more info about the * contact. * - * hint: you can use sender() as parent of the new dialog + * hint: you can use sender() as tqparent of the new dialog * @param contactId is the id of the contact passed in the constructor. */ void infoClicked(const TQString &contactId); diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 47d3f070..6517c1e0 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -1,7 +1,7 @@ ContactAddedNotifyWidget Olivier Goffart - + Form2 @@ -17,20 +17,20 @@ unnamed - + m_label The contact XXX added you in his contactlist - + WordBreak|AlignVCenter - + - layout2 + tqlayout2 @@ -46,7 +46,7 @@ Expanding - + 151 20 @@ -63,7 +63,7 @@ - + m_authorizeCb @@ -74,7 +74,7 @@ true - + m_addCb @@ -85,7 +85,7 @@ true - + m_contactInfoBox @@ -96,15 +96,15 @@ unnamed - + - layout19 + tqlayout19 unnamed - + textLabel7 @@ -133,15 +133,15 @@ Leave it empty if you want to see the contact nickname as display name. - + - layout6 + tqlayout6 unnamed - + textLabel5 @@ -173,7 +173,7 @@ Leave it empty if you want to see the contact nickname as display name. - + textLabel6 @@ -181,9 +181,9 @@ Leave it empty if you want to see the contact nickname as display name. Addressbook link: - + - layout11 + tqlayout11 @@ -199,7 +199,7 @@ Leave it empty if you want to see the contact nickname as display name. Expanding - + 51 20 @@ -225,7 +225,7 @@ Leave it empty if you want to see the contact nickname as display name. Expanding - + 21 40 @@ -248,7 +248,7 @@ Leave it empty if you want to see the contact nickname as display name.
addressbooklinkwidget.h
 - + kpushbutton.h klineedit.h diff --git a/kopete/libkopete/ui/fileconfirmbase.ui b/kopete/libkopete/ui/fileconfirmbase.ui index 3d697b0f..412ea20e 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -1,6 +1,6 @@ FileConfirmBase - + FileConfirmBase @@ -25,18 +25,18 @@ 6 - + TextLabel1 A user is trying to send you a file. The file will only be downloaded if you accept this dialog. If you do not wish to receive it, please click 'Refuse'. This file will never be executed by Kopete at any point during or after the transfer. - + WordBreak|AlignVCenter - + TextLabel1_2 @@ -44,7 +44,7 @@ From: - + TextLabel7 @@ -65,7 +65,7 @@ &Browse... - + TextLabel11 @@ -73,7 +73,7 @@ Size: - + TextLabel8 @@ -81,7 +81,7 @@ Description: - + m_description @@ -99,14 +99,14 @@ Expanding - + 20 20 - + TextLabel13 @@ -140,7 +140,7 @@ - + klineedit.h kpushbutton.h diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 7c441d0f..14a6b4e6 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -13,12 +13,12 @@ Group=Views (Kopete) ToolTip=List View Search Line (Kopete) WhatsThis=Search line able to use Kopete custom list View. IncludeFile=kopetelistviewsearchline.h -ConstructorArgs=(parent, 0, name) +ConstructorArgs=(tqparent, 0, name) Group=Input (Kopete) [Kopete::UI::AddressBookLinkWidget] ToolTip=Address Book Link Widget (Kopete) WhatsThis=KABC::Addressee display/selector IncludeFile=addressbooklinkwidget.h -ConstructorArgs=(parent, name) +ConstructorArgs=(tqparent, name) Group=Input (Kopete) diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 783fe4da..26eb3590 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -1,6 +1,6 @@ KopeteAwayDialog_Base - + KopeteAwayDialog_Base @@ -19,14 +19,14 @@ 0 - + TextLabel1 Please specify an away message, or choose a predefined one. - + WordBreak|AlignVCenter|AlignLeft @@ -44,7 +44,7 @@ 0 - + 300 0 @@ -72,7 +72,7 @@ Expanding - + 20 40 @@ -81,5 +81,5 @@ - + diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index cc6754d2..c3938aff 100644 --- a/kopete/libkopete/ui/kopetecontactaction.cpp +++ b/kopete/libkopete/ui/kopetecontactaction.cpp @@ -22,9 +22,9 @@ #include "kopeteonlinestatus.h" KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver, - const char *slot, KAction *parent ) -: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(), - parent, contact->contactId().latin1() ) + const char *slot, KAction *tqparent ) +: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlinetqStatus().iconFor( contact ) ), KShortcut(), + tqparent, contact->contactId().latin1() ) { m_contact = contact; diff --git a/kopete/libkopete/ui/kopetecontactaction.h b/kopete/libkopete/ui/kopetecontactaction.h index ba170ebb..73c39bb7 100644 --- a/kopete/libkopete/ui/kopetecontactaction.h +++ b/kopete/libkopete/ui/kopetecontactaction.h @@ -32,12 +32,13 @@ class Contact; class KOPETE_EXPORT KopeteContactAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** * Create a new KopeteContactAction */ - KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent ); + KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* tqparent ); ~KopeteContactAction(); Kopete::Contact * contact() const; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index fffeec66..bf456663 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -31,8 +31,8 @@ #include "kopetemetacontact.h" #include "kopetecontact.h" -KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *parent, const char *name ) -: KDialogBase( parent, name, false, i18n( "A User Would Like to Send You a File" ), +KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description,TQWidget *tqparent, const char *name ) +: KDialogBase( tqparent, name, false, i18n( "A User Would Like to Send You a File" ), KDialogBase::User1 | KDialogBase::User2, KDialogBase::User1, true, i18n( "&Refuse" ), i18n( "&Accept" ) ), m_info( info ) { @@ -40,15 +40,15 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo m_emited=false; m_view=new FileConfirmBase(this, "FileConfirmView"); - m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::fromLatin1( " <" ) + - info.contact()->contactId() + TQString::fromLatin1( "> " ) ); + m_view->m_from->setText( info.contact()->metaContact()->displayName() + TQString::tqfromLatin1( " <" ) + + info.contact()->contactId() + TQString::tqfromLatin1( "> " ) ); m_view->m_size->setText( KGlobal::locale()->formatNumber( long( info.size() ), 0 ) ); m_view->m_description->setText( description ); m_view->m_filename->setText( info.file() ); KGlobal::config()->setGroup("File Transfer"); const TQString defaultPath=KGlobal::config()->readEntry("defaultPath" , TQDir::homeDirPath() ); - m_view->m_saveto->setText(defaultPath + TQString::fromLatin1( "/" ) + info.file() ); + m_view->m_saveto->setText(defaultPath + TQString::tqfromLatin1( "/" ) + info.file() ); setMainWidget(m_view); @@ -61,7 +61,7 @@ KopeteFileConfirmDialog::~KopeteFileConfirmDialog() void KopeteFileConfirmDialog::slotBrowsePressed() { - TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::fromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); + TQString saveFileName = KFileDialog::getSaveFileName( m_view->m_saveto->text(), TQString::tqfromLatin1( "*" ), 0L , i18n( "File Transfer" ) ); if ( !saveFileName.isNull()) { m_view->m_saveto->setText(saveFileName); @@ -83,7 +83,7 @@ void KopeteFileConfirmDialog::slotUser2() if(TQFile(m_view->m_saveto->text()).exists()) { - int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").arg(m_view->m_saveto->text()) , + int ret=KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists.\nDo you want to overwrite it ?").tqarg(m_view->m_saveto->text()) , i18n("Overwrite File") , KStdGuiItem::save()); if(ret==KMessageBox::Cancel) return; diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.h b/kopete/libkopete/ui/kopetefileconfirmdialog.h index ac5d19a4..0292f4d7 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.h +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.h @@ -31,9 +31,10 @@ class FileConfirmBase; class KopeteFileConfirmDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString::null, TQWidget *parent=0, const char* name=0); + KopeteFileConfirmDialog(const Kopete::FileTransferInfo &info,const TQString& description=TQString(), TQWidget *tqparent=0, const char* name=0); ~KopeteFileConfirmDialog(); private: diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 9630592c..eb755f29 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -41,13 +41,13 @@ namespace ListView { /* Custom TQToolTip for the list view. The decision whether or not to show tooltips is taken in - maybeTip(). See also the TQListView sources from Qt itself. + maybeTip(). See also the TQListView sources from TQt itself. Delegates to the list view items. */ -class ToolTip : public QToolTip +class ToolTip : public TQToolTip { public: - ToolTip( TQWidget *parent, ListView *lv ); + ToolTip( TQWidget *tqparent, ListView *lv ); virtual ~ToolTip(); void maybeTip( const TQPoint &pos ); @@ -56,8 +56,8 @@ private: ListView *m_listView; }; -ToolTip::ToolTip( TQWidget *parent, ListView *lv ) - : TQToolTip( parent ) +ToolTip::ToolTip( TQWidget *tqparent, ListView *lv ) + : TQToolTip( tqparent ) { m_listView = lv; } @@ -68,19 +68,19 @@ ToolTip::~ToolTip() void ToolTip::maybeTip( const TQPoint &pos ) { - if( !parentWidget() || !m_listView ) + if( !tqparentWidget() || !m_listView ) return; if( Item *item = dynamic_cast( m_listView->itemAt( pos ) ) ) { - TQRect itemRect = m_listView->itemRect( item ); + TQRect tqitemRect = m_listView->tqitemRect( item ); uint leftMargin = m_listView->treeStepSize() * ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + m_listView->itemMargin(); - uint xAdjust = itemRect.left() + leftMargin; - uint yAdjust = itemRect.top(); + uint xAdjust = tqitemRect.left() + leftMargin; + uint yAdjust = tqitemRect.top(); TQPoint relativePos( pos.x() - xAdjust, pos.y() - yAdjust ); std::pair toolTip = item->toolTip( relativePos ); @@ -88,7 +88,7 @@ void ToolTip::maybeTip( const TQPoint &pos ) return; toolTip.second.moveBy( xAdjust, yAdjust ); -// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: itemRect: " +// kdDebug( 14000 ) << k_funcinfo << "Adding tooltip: tqitemRect: " // << toolTip.second << ", tooltip: " << toolTip.first << endl; tip( toolTip.second, toolTip.first ); } @@ -102,8 +102,8 @@ struct ListView::Private Private() {} }; -ListView::ListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), d( new Private ) +ListView::ListView( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), d( new Private ) { connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); @@ -120,9 +120,9 @@ ListView::ListView( TQWidget *parent, const char *name ) clearWFlags( WStaticContents ); setWFlags( WNoAutoErase ); - // clear the appropriate flags from the viewport - qt docs say we have to mask + // clear the appropriate flags from the viewport - qt docs say we have to tqmask // these flags out of the TQListView to make weirdly painted list items work, but - // that doesn't do the job. masking them out of the viewport does. + // that doesn't do the job. tqmasking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // static_cast( viewport() )->clearWFlags( WStaticContents ); // static_cast( viewport() )->setWFlags( WNoAutoErase ); @@ -174,7 +174,7 @@ void ListView::setShowTreeLines( bool bShowAsTree ) setRootIsDecorated( false ); setTreeStepSize( 0 ); } - // TODO: relayout all items. their width may have changed, but they won't know about it. + // TODO: retqlayout all items. their width may have changed, but they won't know about it. } /* This is a small hack ensuring that only F2 triggers inline @@ -188,12 +188,12 @@ void ListView::setShowTreeLines( bool bShowAsTree ) void ListView::keyPressEvent( TQKeyEvent *e ) { TQListViewItem *item = currentItem(); - if ( (e->key() == Qt::Key_F2) && item && item->isVisible() ) + if ( (e->key() == TQt::Key_F2) && item && item->isVisible() ) rename( item, 0 ); - else if ( (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && item && item->isVisible() ) + else if ( (e->key() == TQt::Key_Enter || e->key() == TQt::Key_Return) && item && item->isVisible() ) { // must provide a point within the item; emitExecute checks for this - TQPoint p = viewport()->mapToGlobal(itemRect(item).center()); + TQPoint p = viewport()->mapToGlobal(tqitemRect(item).center()); emitExecute( currentItem(), p, 0 ); } else diff --git a/kopete/libkopete/ui/kopetelistview.h b/kopete/libkopete/ui/kopetelistview.h index 2e065212..05102e53 100644 --- a/kopete/libkopete/ui/kopetelistview.h +++ b/kopete/libkopete/ui/kopetelistview.h @@ -32,9 +32,10 @@ namespace ListView { class ListView : public KListView { Q_OBJECT + TQ_OBJECT public: - ListView( TQWidget *parent = 0, const char *name = 0 ); + ListView( TQWidget *tqparent = 0, const char *name = 0 ); ~ListView(); /** diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index e02b14b3..1b1f7b6c 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1,5 +1,5 @@ /* - kopetelistviewitem.cpp - Kopete's modular QListViewItems + kopetelistviewitem.cpp - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN Copyright (c) 2004 by Richard Smith @@ -76,7 +76,7 @@ Component *ComponentBase::componentAt( const TQPoint &pt ) { for ( uint n = 0; n < components(); ++n ) { - if ( component( n )->rect().contains( pt ) ) + if ( component( n )->rect().tqcontains( pt ) ) { if ( Component *comp = component( n )->componentAt( pt ) ) return comp; @@ -117,10 +117,10 @@ void ComponentBase::componentResized( Component * ) std::pair ComponentBase::toolTip( const TQPoint &relativePos ) { for ( uint n = 0; n < components(); ++n ) - if ( component( n )->rect().contains( relativePos ) ) + if ( component( n )->rect().tqcontains( relativePos ) ) return component( n )->toolTip( relativePos ); - return std::make_pair( TQString::null, TQRect() ); + return std::make_pair( TQString(), TQRect() ); } void ComponentBase::updateAnimationPosition( int p, int s ) @@ -144,13 +144,13 @@ void ComponentBase::updateAnimationPosition( int p, int s ) class Component::Private { public: - Private( ComponentBase *parent ) - : parent( parent ), minWidth( 0 ), minHeight( 0 ) + Private( ComponentBase *tqparent ) + : tqparent( tqparent ), minWidth( 0 ), minHeight( 0 ) , growHoriz( false ), growVert( false ) , tipSource( 0 ) { } - ComponentBase *parent; + ComponentBase *tqparent; TQRect rect; TQRect startRect, targetRect; int minWidth, minHeight; @@ -159,10 +159,10 @@ public: ToolTipSource *tipSource; }; -Component::Component( ComponentBase *parent ) - : d( new Private( parent ) ) +Component::Component( ComponentBase *tqparent ) + : d( new Private( tqparent ) ) { - d->parent->componentAdded( this ); + d->tqparent->componentAdded( this ); d->show = true; } @@ -170,7 +170,7 @@ int Component::RTTI = Rtti_Component; Component::~Component() { - d->parent->componentRemoved( this ); + d->tqparent->componentRemoved( this ); delete d; } @@ -224,7 +224,7 @@ bool Component::setMinWidth( int width ) if ( d->minWidth == width ) return false; d->minWidth = width; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } bool Component::setMinHeight( int height ) @@ -232,11 +232,11 @@ bool Component::setMinHeight( int height ) if ( d->minHeight == height ) return false; d->minHeight = height; - d->parent->componentResized( this ); + d->tqparent->componentResized( this ); return true; } -void Component::layout( const TQRect &newRect ) +void Component::tqlayout( const TQRect &newRect ) { if ( rect().isNull() ) d->startRect = TQRect( newRect.topLeft(), newRect.topLeft() ); @@ -253,7 +253,7 @@ void Component::setRect( const TQRect &rect ) void Component::paint( TQPainter *painter, const TQColorGroup &cg ) { - /*painter->setPen( Qt::red ); + /*painter->setPen( TQt::red ); painter->drawRect( rect() );*/ for ( uint n = 0; n < components(); ++n ) { @@ -262,26 +262,26 @@ void Component::paint( TQPainter *painter, const TQColorGroup &cg ) } } -void Component::repaint() +void Component::tqrepaint() { - d->parent->repaint(); + d->tqparent->tqrepaint(); } -void Component::relayout() +void Component::retqlayout() { - d->parent->relayout(); + d->tqparent->retqlayout(); } void Component::componentAdded( Component *component ) { ComponentBase::componentAdded( component ); - //update( Relayout ); + //update( Retqlayout ); } void Component::componentRemoved( Component *component ) { ComponentBase::componentRemoved( component ); - //update( Relayout ); + //update( Retqlayout ); } // BoxComponent -------- @@ -295,8 +295,8 @@ public: static const int padding = 0; }; -BoxComponent::BoxComponent( ComponentBase *parent, Direction dir ) - : Component( parent ), d( new Private( dir ) ) +BoxComponent::BoxComponent( ComponentBase *tqparent, Direction dir ) + : Component( tqparent ), d( new Private( dir ) ) { } @@ -309,11 +309,11 @@ BoxComponent::~BoxComponent() int BoxComponent::widthForHeight( int height ) { - if ( d->direction != Horizontal ) + if ( d->direction !=Qt::Horizontal ) { int width = 0; for ( uint n = 0; n < components(); ++n ) - width = QMAX( width, component( n )->widthForHeight( height ) ); + width = TQMAX( width, component( n )->widthForHeight( height ) ); return width; } else @@ -327,11 +327,11 @@ int BoxComponent::widthForHeight( int height ) int BoxComponent::heightForWidth( int width ) { - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { int height = 0; for ( uint n = 0; n < components(); ++n ) - height = QMAX( height, component( n )->heightForWidth( width ) ); + height = TQMAX( height, component( n )->heightForWidth( width ) ); return height; } else @@ -349,20 +349,20 @@ void BoxComponent::calcMinSize() for ( uint n = 0; n < components(); ++n ) { Component *comp = component( n ); - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { - max = QMAX( max, comp->minHeight() ); + max = TQMAX( max, comp->minHeight() ); sum += comp->minWidth(); } else { - max = QMAX( max, comp->minWidth() ); + max = TQMAX( max, comp->minWidth() ); sum += comp->minHeight(); } } bool sizeChanged = false; - if ( d->direction == Horizontal ) + if ( d->direction ==Qt::Horizontal ) { if ( setMinWidth( sum ) ) sizeChanged = true; if ( setMinHeight( max ) ) sizeChanged = true; @@ -374,16 +374,16 @@ void BoxComponent::calcMinSize() } if ( sizeChanged ) - repaint(); + tqrepaint(); else - relayout(); + retqlayout(); } -void BoxComponent::layout( const TQRect &rect ) +void BoxComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); - bool horiz = (d->direction == Horizontal); + bool horiz = (d->direction ==Qt::Horizontal); int fixedSize = 0; for ( uint n = 0; n < components(); ++n ) { @@ -402,9 +402,9 @@ void BoxComponent::layout( const TQRect &rect ) // that cases we should pretend that we're wide/high enough. int total; if ( horiz ) - total = QMAX( rect.width(), minWidth() ); + total = TQMAX( rect.width(), minWidth() ); else - total = QMAX( rect.height(), minHeight() ); + total = TQMAX( rect.height(), minHeight() ); int remaining = total - fixedSize - padding * (components() - 1); @@ -422,7 +422,7 @@ void BoxComponent::layout( const TQRect &rect ) rc.setHeight( rect.height() ); int minWidth = comp->minWidth(); int desiredWidth = comp->widthForHeight( rect.height() ); - rc.setWidth( QMIN( remaining + minWidth, desiredWidth ) ); + rc.setWidth( TQMIN( remaining + minWidth, desiredWidth ) ); pos += rc.width(); remaining -= rc.width() - minWidth; } @@ -433,11 +433,11 @@ void BoxComponent::layout( const TQRect &rect ) rc.setWidth( rect.width() ); int minHeight = comp->minHeight(); int desiredHeight = comp->heightForWidth( rect.width() ); - rc.setHeight( QMIN( remaining + minHeight, desiredHeight ) ); + rc.setHeight( TQMIN( remaining + minHeight, desiredHeight ) ); pos += rc.height(); remaining -= rc.height() - minHeight; } - comp->layout( rc & rect ); + comp->tqlayout( rc & rect ); pos += padding; } } @@ -482,8 +482,8 @@ public: TQPixmap bottom_pixmap; }; -ContactBoxComponent::ContactBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +ContactBoxComponent::ContactBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} ContactBoxComponent::~ContactBoxComponent() @@ -518,7 +518,7 @@ void ContactBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void ContactBoxComponent::layout(const TQRect &rect) +void ContactBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -529,8 +529,8 @@ void ContactBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int ContactBoxComponent::widthForHeight(int height) @@ -620,8 +620,8 @@ public: TQPixmap bottom_pixmap; }; -GroupBoxComponent::GroupBoxComponent(ComponentBase *parent, Direction dir) - : BoxComponent(parent, dir), d(new Private()) +GroupBoxComponent::GroupBoxComponent(ComponentBase *tqparent, Direction dir) + : BoxComponent(tqparent, dir), d(new Private()) {} GroupBoxComponent::~GroupBoxComponent() @@ -661,7 +661,7 @@ void GroupBoxComponent::reloadTheme() d->bottom_pixmap.load(str); } -void GroupBoxComponent::layout(const TQRect &rect) +void GroupBoxComponent::tqlayout(const TQRect &rect) { d->sub.setLeft(rect.left() + d->left_pixmap.width()); @@ -672,8 +672,8 @@ void GroupBoxComponent::layout(const TQRect &rect) d->sub.setBottom(rect.bottom() - d->bottom_pixmap.height()); - BoxComponent::layout(d->sub); - Component::layout(rect); + BoxComponent::tqlayout(d->sub); + Component::tqlayout(rect); } int GroupBoxComponent::widthForHeight(int height) @@ -746,19 +746,19 @@ public: TQPixmap image; }; -ImageComponent::ImageComponent( ComponentBase *parent ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent ) + : Component( tqparent ), d( new Private ) { } int ImageComponent::RTTI = Rtti_ImageComponent; -ImageComponent::ImageComponent( ComponentBase *parent, int minW, int minH ) - : Component( parent ), d( new Private ) +ImageComponent::ImageComponent( ComponentBase *tqparent, int minW, int minH ) + : Component( tqparent ), d( new Private ) { setMinWidth( minW ); setMinHeight( minH ); - repaint(); + tqrepaint(); } ImageComponent::~ImageComponent() @@ -777,7 +777,7 @@ void ImageComponent::setPixmap( const TQPixmap &img, bool) setMinWidth(d->image.width()); setMinHeight(d->image.height()); - repaint(); + tqrepaint(); } void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) @@ -790,7 +790,7 @@ void ImageComponent::paint( TQPainter *painter, const TQColorGroup & ) painter->drawPixmap( rc & ourRc, d->image ); } -void ImageComponent::scale( int w, int h, TQImage::ScaleMode mode ) +void ImageComponent::scale( int w, int h, TQ_ScaleMode mode ) { TQImage im = d->image.convertToImage(); setPixmap( TQPixmap( im.smoothScale( w, h, mode ) ) ); @@ -814,7 +814,7 @@ void FaceComponent::setPixmap(const TQPixmap &img, bool) setMinHeight(d->image.height() + 4); } - repaint(); + tqrepaint(); } static TQPoint operator+(const TQPoint &pt, const TQSize &sz) @@ -858,8 +858,8 @@ public: TQFont font; }; -TextComponent::TextComponent( ComponentBase *parent, const TQFont &font, const TQString &text ) - : Component( parent ), d( new Private ) +TextComponent::TextComponent( ComponentBase *tqparent, const TQFont &font, const TQString &text ) + : Component( tqparent ), d( new Private ) { setFont( font ); setText( text ); @@ -881,7 +881,7 @@ void TextComponent::setText( const TQString &text ) { if ( text == d->text ) return; d->text = text; - relayout(); + retqlayout(); calcMinSize(); } @@ -906,7 +906,7 @@ void TextComponent::calcMinSize() else setMinHeight( 0 ); - repaint(); + tqrepaint(); } int TextComponent::widthForHeight( int ) @@ -927,13 +927,13 @@ void TextComponent::setColor( const TQColor &color ) { d->color = color; d->customColor = true; - repaint(); + tqrepaint(); } void TextComponent::setDefaultColor() { d->customColor = false; - repaint(); + tqrepaint(); } void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) @@ -944,7 +944,7 @@ void TextComponent::paint( TQPainter *painter, const TQColorGroup &cg ) painter->setPen( cg.text() ); TQString dispStr = KStringHandler::rPixelSqueeze( d->text, TQFontMetrics( font() ), rect().width() ); painter->setFont( font() ); - painter->drawText( rect(), Qt::SingleLine, dispStr ); + painter->drawText( rect(), TQt::SingleLine, dispStr ); } // DisplayNameComponent @@ -956,8 +956,8 @@ public: TQFont font; }; -DisplayNameComponent::DisplayNameComponent( ComponentBase *parent ) - : BoxComponent( parent ), d( new Private ) +DisplayNameComponent::DisplayNameComponent( ComponentBase *tqparent ) + : BoxComponent( tqparent ), d( new Private ) { } @@ -968,9 +968,9 @@ DisplayNameComponent::~DisplayNameComponent() delete d; } -void DisplayNameComponent::layout( const TQRect &rect ) +void DisplayNameComponent::tqlayout( const TQRect &rect ) { - Component::layout( rect ); + Component::tqlayout( rect ); // finally, lay everything out TQRect rc; @@ -989,7 +989,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) if ( comp->rtti() == Rtti_TextComponent ) { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), totalWidth - usedWidth, comp->heightForWidth( totalWidth - usedWidth ) ) ); } else { @@ -999,7 +999,7 @@ void DisplayNameComponent::layout( const TQRect &rect ) else { comp->show(); - comp->layout( TQRect( usedWidth+ rect.left(), rect.top(), + comp->tqlayout( TQRect( usedWidth+ rect.left(), rect.top(), comp->widthForHeight( rect.height() ), comp->heightForWidth( rect.width() ) ) ); } @@ -1052,7 +1052,7 @@ void DisplayNameComponent::redraw() case Kopete::Emoticons::Image: ic = new ImageComponent( this ); ic->setPixmap( TQPixmap( (*token).picPath ) ); - ic->scale( INT_MAX, fontHeight, TQImage::ScaleMin ); + ic->scale( INT_MAX, fontHeight, TQ_ScaleMin ); break; default: kdDebug( 14010 ) << k_funcinfo << "This should have not happened!" << endl; @@ -1092,8 +1092,8 @@ TQString DisplayNameComponent::text() // HSpacerComponent -------- -HSpacerComponent::HSpacerComponent( ComponentBase *parent ) - : Component( parent ) +HSpacerComponent::HSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1108,8 +1108,8 @@ int HSpacerComponent::widthForHeight( int ) // VSpacerComponent -------- -VSpacerComponent::VSpacerComponent( ComponentBase *parent ) - : Component( parent ) +VSpacerComponent::VSpacerComponent( ComponentBase *tqparent ) + : Component( tqparent ) { setMinWidth( 0 ); setMinHeight( 0 ); @@ -1131,7 +1131,7 @@ public: int iconSize; }; -ContactComponent::ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int) : ImageComponent( parent ) , d( new Private ) +ContactComponent::ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int) : ImageComponent( tqparent ) , d( new Private ) { d->contact = contact; d->iconSize = 12; // size of the image is fixed to 12 pixels @@ -1145,7 +1145,7 @@ ContactComponent::~ContactComponent() void ContactComponent::updatePixmap() { - setPixmap( contact()->onlineStatus().iconFor( contact(), d->iconSize ) ); + setPixmap( contact()->onlinetqStatus().iconFor( contact(), d->iconSize ) ); } Kopete::Contact *ContactComponent::contact() { @@ -1160,7 +1160,7 @@ std::pair ContactComponent::toolTip( const TQPoint &/*relativeP ////////////////// SpacerComponent ///////////////////////// -SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Component( parent ) +SpacerComponent::SpacerComponent( ComponentBase *tqparent, int w, int h ) : Component( tqparent ) { setMinWidth(w); setMinHeight(h); @@ -1172,7 +1172,7 @@ SpacerComponent::SpacerComponent( ComponentBase *parent, int w, int h ) : Compon * A periodic timer intended to be shared amongst multiple objects. Will run only * if an object is attached to it. */ -class SharedTimer : private QTimer +class SharedTimer : private TQTimer { int period; int users; @@ -1227,17 +1227,17 @@ class Item::Private { public: Private( Item *item ) - : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } - TQTimer layoutTimer; + TQTimer tqlayoutTimer; - //TQTimer layoutAnimateTimer; - SharedTimerRef layoutAnimateTimer; + //TQTimer tqlayoutAnimateTimer; + SharedTimerRef tqlayoutAnimateTimer; SharedTimer &theLayoutAnimateTimer() { static SharedTimer timer( 10 ); @@ -1245,8 +1245,8 @@ public: } bool animateLayout; - int layoutAnimateSteps; - static const int layoutAnimateStepsTotal = 10; + int tqlayoutAnimateSteps; + static const int tqlayoutAnimateStepsTotal = 10; float opacity; @@ -1279,14 +1279,14 @@ bool Item::Private::animateChanges = true; bool Item::Private::fadeVisibility = true; bool Item::Private::foldVisibility = true; -Item::Item( TQListViewItem *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListViewItem *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } -Item::Item( TQListView *parent, TQObject *owner, const char *name ) - : TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) +Item::Item( TQListView *tqparent, TQObject *owner, const char *name ) + : TQObject( owner, name ), KListViewItem( tqparent ), d( new Private(this) ) { initLVI(); } @@ -1306,8 +1306,8 @@ void Item::setEffects( bool animation, bool fading, bool folding ) void Item::initLVI() { connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); - connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); + connect( &d->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); + //connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); @@ -1316,20 +1316,20 @@ void Item::initLVI() void Item::slotColumnResized() { scheduleLayout(); - // if we've been resized, don't animate the layout + // if we've been resized, don't animate the tqlayout d->animateLayout = false; } void Item::scheduleLayout() { - // perform a delayed layout in order to speed it all up - if ( ! d->layoutTimer.isActive() ) - d->layoutTimer.start( 30, true ); + // perform a delayed tqlayout in order to speed it all up + if ( ! d->tqlayoutTimer.isActive() ) + d->tqlayoutTimer.start( 30, true ); } void Item::slotLayoutItems() { - d->layoutTimer.stop(); + d->tqlayoutTimer.stop(); for ( uint n = 0; n < components(); ++n ) { @@ -1341,20 +1341,20 @@ void Item::slotLayoutItems() } int height = component( n )->heightForWidth( width ); - component( n )->layout( TQRect( 0, 0, width, height ) ); + component( n )->tqlayout( TQRect( 0, 0, width, height ) ); //kdDebug(14000) << k_funcinfo << "Component " << n << " is " << width << " x " << height << endl; } if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) { - d->layoutAnimateTimer.start(); - //if ( !d->layoutAnimateTimer.isActive() ) - // d->layoutAnimateTimer.start( 10 ); - d->layoutAnimateSteps = 0; + d->tqlayoutAnimateTimer.start(); + //if ( !d->tqlayoutAnimateTimer.isActive() ) + // d->tqlayoutAnimateTimer.start( 10 ); + d->tqlayoutAnimateSteps = 0; } else { - d->layoutAnimateSteps = Private::layoutAnimateStepsTotal; + d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; d->animateLayout = true; } slotLayoutAnimateItems(); @@ -1362,15 +1362,15 @@ void Item::slotLayoutItems() void Item::slotLayoutAnimateItems() { - if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal ) - d->layoutAnimateTimer.stop(); + if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) + d->tqlayoutAnimateTimer.stop(); - const int s = Private::layoutAnimateStepsTotal; - const int p = QMIN( d->layoutAnimateSteps, s ); + const int s = Private::tqlayoutAnimateStepsTotal; + const int p = TQMIN( d->tqlayoutAnimateSteps, s ); updateAnimationPosition( p, s ); setHeight(0); - repaint(); + tqrepaint(); } float Item::opacity() @@ -1382,7 +1382,7 @@ void Item::setOpacity( float opacity ) { if ( d->opacity == opacity ) return; d->opacity = opacity; - repaint(); + tqrepaint(); } void Item::setSearchMatch( bool match ) @@ -1411,7 +1411,7 @@ void Item::setTargetVisibility( bool vis ) { if ( d->visibilityTarget == vis ) { - // in case we're getting called because our parent was shown and + // in case we're getting called because our tqparent was shown and // we need to be rehidden if ( !d->visibilityTimer.isActive() ) setVisible( vis && d->searchMatch ); @@ -1451,18 +1451,18 @@ void Item::slotUpdateVisibility() setVisible( false ); } setHeight( 0 ); - repaint(); + tqrepaint(); } -void Item::repaint() +void Item::tqrepaint() { - // if we're about to relayout, don't bother painting yet. - if ( d->layoutTimer.isActive() ) + // if we're about to retqlayout, don't bother painting yet. + if ( d->tqlayoutTimer.isActive() ) return; - listView()->repaintItem( this ); + listView()->tqrepaintItem( this ); } -void Item::relayout() +void Item::retqlayout() { scheduleLayout(); } @@ -1477,11 +1477,11 @@ void Item::setHeight( int ) { int minHeight = 0; for ( uint n = 0; n < components(); ++n ) - minHeight = QMAX( minHeight, component( n )->rect().height() ); + minHeight = TQMAX( minHeight, component( n )->rect().height() ); //kdDebug(14000) << k_funcinfo << "Height is " << minHeight << endl; if ( Private::foldVisibility && d->visibilityTimer.isActive() ) { - int vis = QMIN( d->visibilityLevel, Private::visibilityFoldSteps ); + int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps ); minHeight = (minHeight * vis) / Private::visibilityFoldSteps; } KListViewItem::setHeight( minHeight ); @@ -1489,7 +1489,7 @@ void Item::setHeight( int ) int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const { - // Qt computes the itemRect from this. we want the whole item to be + // TQt computes the tqitemRect from this. we want the whole item to be // clickable, so we return the widest we could possibly be. return lv->header()->sectionSize( c ); } @@ -1503,11 +1503,11 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // set the alternate cell background colour if necessary TQColorGroup _cg = cg; if (isAlternate()) - if (listView()->viewport()->backgroundMode()==Qt::FixedColor) + if (listView()->viewport()->backgroundMode()==TQt::FixedColor) _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); else _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); - // PASTED FROM QLISTVIEWITEM + // PASTED FROM TQLISTVIEWITEM { TQPainter *p = &paint; @@ -1519,7 +1519,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt // any text we render is done by the Components, not by this class, so make sure we've nothing to write TQString t; - // removed text truncating code from Qt - we do that differently, further on + // removed text truncating code from TQt - we do that differently, further on int marg = lv->itemMargin(); int r = marg; @@ -1528,20 +1528,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( _cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { // all copied from TQListView::paintEmptyArea //lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); - TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and QHeader + TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and TQHeader TQStyle::SFlags how = TQStyle::Style_Default; if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->style().drawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -1552,20 +1552,20 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt (column == 0 || lv->allColumnsShowFocus()) ) { p->fillRect( r - marg, 0, width - r + marg, height(), _cg.brush( TQColorGroup::Highlight ) ); - // removed text pen setting code from Qt + // removed text pen setting code from TQt } - // removed icon drawing code from Qt + // removed icon drawing code from TQt // draw the tree gubbins if ( multiLinesEnabled() && column == 0 && isOpen() && childCount() ) { int textheight = fm.size( align, t ).height() + 2 * lv->itemMargin(); - textheight = QMAX( textheight, TQApplication::globalStrut().height() ); + textheight = TQMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().tqdrawComplexControl( 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, @@ -1589,7 +1589,7 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt float opac = 1.0; if ( d->visibilityTimer.isActive() && Private::fadeVisibility ) { - int vis = QMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); + int vis = TQMAX( d->visibilityLevel - Private::visibilityFoldSteps, 0 ); opac = float(vis) / Private::visibilityFadeSteps; } opac *= opacity(); diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h index 77d06540..ac19c4b8 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.h +++ b/kopete/libkopete/ui/kopetelistviewitem.h @@ -1,5 +1,5 @@ /* - kopetelistviewitem.h - Kopete's modular QListViewItems + kopetelistviewitem.h - Kopete's modular TQListViewItems Copyright (c) 2005 by Engin AYDOGAN Copyright (c) 2004 by Richard Smith @@ -44,9 +44,9 @@ public: Component *componentAt( const TQPoint &pt ); /** Repaint this item */ - virtual void repaint() = 0; - /** Relayout this item */ - virtual void relayout() = 0; + virtual void tqrepaint() = 0; + /** Retqlayout this item */ + virtual void retqlayout() = 0; /** * Get the tool tip string and rectangle for a tip request at position @@ -64,7 +64,7 @@ protected: virtual void componentRemoved( Component *component ); /** A child item has been resized */ virtual void componentResized( Component *component ); - /** Remove all children */ + /** Remove all tqchildren */ virtual void clear(); /** @internal animate items */ @@ -102,7 +102,7 @@ public: class Component : public ComponentBase { protected: - Component( ComponentBase *parent ); + Component( ComponentBase *tqparent ); public: virtual ~Component() = 0; @@ -110,18 +110,18 @@ public: * Set the size and position of this item relative to the list view item. Should * only be called by the containing item. * @param rect the new rectangle this component will paint in, relative to the painter - * passed to the paint() function by the parent item. + * passed to the paint() function by the tqparent item. */ - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); /** * Paint this item, inside the rectangle returned by rect(). - * The default implementation calls paint on all children. + * The default implementation calls paint on all tqchildren. */ virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); /** * @return the rect this component was allocated last time it was laid out @@ -181,8 +181,8 @@ public: /** * RTTI: Runtime Type Information - * Exactly the same as Qt's approach to identify types of - * QCanvasItems. + * Exactly the same as TQt's approach to identify types of + * TQCanvasItems. */ enum RttiValues { @@ -196,20 +196,20 @@ public: protected: /** * Change the minimum width, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @param width the minimum width * @return true if the size has actually changed, false if it's been set to - * the existing values. if it returns true, you do not need to relayout, - * since the parent component will do that for you. + * the existing values. if it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinWidth( int width ); /** * Change the minimum height, in pixels, this component requires in order - * to be at all useful. Note: do not call this from your layout() function. + * to be at all useful. Note: do not call this from your tqlayout() function. * @param height the minimum height * @return true if the size has actually changed, false if it's been set to - * the existing values. If it returns true, you do not need to relayout, - * since the parent component will do that for you. + * the existing values. If it returns true, you do not need to retqlayout, + * since the tqparent component will do that for you. */ bool setMinHeight( int height ); @@ -232,11 +232,11 @@ private: class BoxComponent : public Component { public: - enum Direction { Horizontal, Vertical }; - BoxComponent( ComponentBase *parent, Direction dir = Horizontal ); + enum Direction {Horizontal,Vertical }; + BoxComponent( ComponentBase *tqparent, Direction dir =Horizontal ); ~BoxComponent(); - virtual void layout( const TQRect &rect ); + virtual void tqlayout( const TQRect &rect ); virtual int widthForHeight( int height ); virtual int heightForWidth( int width ); @@ -262,12 +262,12 @@ private: class ContactBoxComponent : public BoxComponent { public: - ContactBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + ContactBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~ContactBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -285,12 +285,12 @@ private: class GroupBoxComponent : public BoxComponent { public: - GroupBoxComponent(ComponentBase *parent, Direction dir = Horizontal); + GroupBoxComponent(ComponentBase *tqparent, Direction dir =Horizontal); ~GroupBoxComponent(); virtual void reloadTheme(); - virtual void layout(const TQRect &rect); + virtual void tqlayout(const TQRect &rect); virtual int widthForHeight(int height); virtual int heightForWidth(int width); @@ -305,7 +305,7 @@ private: class TextComponent : public Component { public: - TextComponent( ComponentBase *parent, const TQFont &font = TQFont(), const TQString &text = TQString::null ); + TextComponent( ComponentBase *tqparent, const TQFont &font = TQFont(), const TQString &text = TQString() ); ~TextComponent(); TQString text(); @@ -335,8 +335,8 @@ private: class ImageComponent : public Component { public: - ImageComponent( ComponentBase *parent ); - ImageComponent( ComponentBase *parent, int minW, int minH ); + ImageComponent( ComponentBase *tqparent ); + ImageComponent( ComponentBase *tqparent, int minW, int minH ); ~ImageComponent(); virtual void setPixmap( const TQPixmap &img, bool adjustSize = true); @@ -344,7 +344,7 @@ public: virtual void paint( TQPainter *painter, const TQColorGroup &cg ); - virtual void scale( int w, int h, TQImage::ScaleMode ); + virtual void scale( int w, int h, TQ_ScaleMode ); static int RTTI; virtual int rtti() const { return RTTI; } protected: @@ -358,8 +358,8 @@ protected: class FaceComponent : public ImageComponent { public: - FaceComponent(ComponentBase *parent): ImageComponent(parent) {} - FaceComponent(ComponentBase *parent, int minW, int minH): ImageComponent(parent, minH, minW) {} + FaceComponent(ComponentBase *tqparent): ImageComponent(tqparent) {} + FaceComponent(ComponentBase *tqparent, int minW, int minH): ImageComponent(tqparent, minH, minW) {} void setPixmap(const TQPixmap &img, bool adjustSize = true); void paint(TQPainter *painter, const TQColorGroup &cg); @@ -371,7 +371,7 @@ public: class ContactComponent : public ImageComponent { public: - ContactComponent( ComponentBase *parent, Kopete::Contact *contact, int iconSize); + ContactComponent( ComponentBase *tqparent, Kopete::Contact *contact, int iconSize); ~ContactComponent(); void updatePixmap(); Kopete::Contact *contact(); @@ -387,7 +387,7 @@ protected: class SpacerComponent : public Component { public: - SpacerComponent( ComponentBase *parent, int w, int h ); + SpacerComponent( ComponentBase *tqparent, int w, int h ); }; /** @@ -400,13 +400,13 @@ public: /** * Constructor */ - DisplayNameComponent( ComponentBase *parent ); + DisplayNameComponent( ComponentBase *tqparent ); /** * Dtor */ ~DisplayNameComponent(); - void layout( const TQRect& rect ); + void tqlayout( const TQRect& rect ); TQString text(); void setText( const TQString& text ); @@ -428,7 +428,7 @@ private: class HSpacerComponent : public Component { public: - HSpacerComponent( ComponentBase *parent ); + HSpacerComponent( ComponentBase *tqparent ); int widthForHeight( int ); static int RTTI; @@ -438,7 +438,7 @@ public: class VSpacerComponent : public Component { public: - VSpacerComponent( ComponentBase *parent ); + VSpacerComponent( ComponentBase *tqparent ); int heightForWidth( int ); static int RTTI; @@ -454,13 +454,14 @@ public: class Item : public TQObject, public KListViewItem, public ComponentBase { Q_OBJECT + TQ_OBJECT public: - Item( TQListView *parent, TQObject *owner = 0, const char *name = 0 ); - Item( TQListViewItem *parent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); + Item( TQListViewItem *tqparent, TQObject *owner = 0, const char *name = 0 ); ~Item(); - void repaint(); - void relayout(); + void tqrepaint(); + void retqlayout(); void setup(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.cpp b/kopete/libkopete/ui/kopetelistviewsearchline.cpp index edb63ffc..1ab9c398 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.cpp +++ b/kopete/libkopete/ui/kopetelistviewsearchline.cpp @@ -24,13 +24,13 @@ namespace Kopete { namespace UI { namespace ListView { -SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name ) - : KListViewSearchLine( parent, listView, name ) +SearchLine::SearchLine( TQWidget *tqparent, ListView *listView, const char *name ) + : KListViewSearchLine( tqparent, listView, name ) { } -SearchLine::SearchLine(TQWidget *parent, const char *name) - : KListViewSearchLine( parent, 0, name ) +SearchLine::SearchLine(TQWidget *tqparent, const char *name) + : KListViewSearchLine( tqparent, 0, name ) { } @@ -67,7 +67,7 @@ void SearchLine::updateSearch( const TQString &s ) for( TQListViewItemIterator it(listView(), TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); it.current() && !currentItem; ++it ) { - if( listView()->itemRect( it.current() ).isValid() ) + if( listView()->tqitemRect( it.current() ).isValid() ) currentItem = it.current(); } } diff --git a/kopete/libkopete/ui/kopetelistviewsearchline.h b/kopete/libkopete/ui/kopetelistviewsearchline.h index be7fc317..799337e8 100644 --- a/kopete/libkopete/ui/kopetelistviewsearchline.h +++ b/kopete/libkopete/ui/kopetelistviewsearchline.h @@ -29,6 +29,7 @@ class ListView; class SearchLine : public KListViewSearchLine { Q_OBJECT + TQ_OBJECT public: /** * Constructs a SearchLine with \a listView being the @@ -37,12 +38,12 @@ public: * If \a listView is null then the widget will be disabled until a listview * is set with setListView(). */ - SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 ); + SearchLine( TQWidget *tqparent, ListView *listView = 0, const char *name = 0 ); /** * Constructs a SearchLine without any ListView to filter. The * KListView object has to be set later with setListView(). */ - SearchLine(TQWidget *parent, const char *name); + SearchLine(TQWidget *tqparent, const char *name); /** * Destroys the SearchLine. */ diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 7ba4dff9..40a94ca8 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -1,7 +1,7 @@ KopetePasswordDialog Olivier Goffart - + KopetePasswordDialog @@ -17,15 +17,15 @@ unnamed - + - layout3 + tqlayout3 unnamed - + m_image @@ -48,15 +48,15 @@ - + - layout2 + tqlayout2 unnamed - + textLabel3 @@ -74,7 +74,7 @@ - + m_save_passwd @@ -92,7 +92,7 @@ MinimumExpanding - + 20 0 @@ -105,5 +105,5 @@ m_password m_save_passwd - + diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp index 52921b16..dd798363 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.cpp +++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp @@ -28,8 +28,8 @@ public: uint maxLength; }; -Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *parent, const char *name, Kopete::Password *from ) - : KopetePasswordWidgetBase( parent, name ), d( new Private ) +Kopete::UI::PasswordWidget::PasswordWidget( TQWidget *tqparent, const char *name, Kopete::Password *from ) + : KopetePasswordWidgetBase( tqparent, name ), d( new Private ) { load( from ); } @@ -49,7 +49,7 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source ) { mRemembered->setTristate(); mRemembered->setNoChange(); - source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) ); + source->requestWithoutPrompt( TQT_TQOBJECT(this), TQT_SLOT( receivePassword( const TQString & ) ) ); } else { diff --git a/kopete/libkopete/ui/kopetepasswordwidget.h b/kopete/libkopete/ui/kopetepasswordwidget.h index 72834bff..e8c45a90 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.h +++ b/kopete/libkopete/ui/kopetepasswordwidget.h @@ -37,15 +37,16 @@ namespace UI class KOPETE_EXPORT PasswordWidget : public KopetePasswordWidgetBase { Q_OBJECT + TQ_OBJECT public: /** * Creates a Kopete::PasswordWidget. - * @param parent The widget to nest this one inside - * @param name The name of this QObject + * @param tqparent The widget to nest this one inside + * @param name The name of this TQObject * @param from The password to load the data for this widget from, or 0 if none */ - PasswordWidget( TQWidget *parent, const char *name = 0, Kopete::Password *from = 0 ); + PasswordWidget( TQWidget *tqparent, const char *name = 0, Kopete::Password *from = 0 ); ~PasswordWidget(); /** diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index 5f6b665a..ecdfda7a 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -1,7 +1,7 @@ KopetePasswordWidgetBase Richard Smith <kde@metafoo.co.uk> - + KopetePasswordWidgetBase @@ -28,7 +28,7 @@ 0 - + mRemembered @@ -49,14 +49,14 @@ Fixed - + 16 20 - + textLabel1 @@ -91,7 +91,7 @@ mRemembered - + kpassdlg.h diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index f1595f4e..cd8f2326 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -36,12 +36,12 @@ KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L; -KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name ) +KopetePreferencesAction::KopetePreferencesAction( KActionCollection *tqparent, const char *name ) #if KDE_IS_VERSION( 3, 3, 90 ) -: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) +: KAction( KStdGuiItem::configure(), 0, 0, 0, tqparent, name ) #else : KAction( KGuiItem( i18n( "&Configure Kopete..." ), - TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) + TQString::tqfromLatin1( "configure" ) ), 0, 0, 0, tqparent, name ) #endif { connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) ); @@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences() KWin::activateWindow( s_settingsDialog->dialog()->winId() ); } -KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name ) +KAction * KopeteStdAction::preferences( KActionCollection *tqparent, const char *name ) { - return new KopetePreferencesAction( parent, name ); + return new KopetePreferencesAction( tqparent, name ); } -KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Start &Chat..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Send Single Message..." ), TQString::tqfromLatin1( "mail_generic" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "User &Info" ), TQString::tqfromLatin1( "messagebox_info" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Send &File..." ), TQString::tqfromLatin1( "attach" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "View &History..." ), TQString::tqfromLatin1( "history" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Create Group..." ), TQString::tqfromLatin1( "folder" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::tqfromLatin1( "move" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), Qt::Key_Delete, recvr, slot, parent, name ); + return new KAction( i18n( "&Delete Contact" ), TQString::tqfromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) +KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *tqparent, const char *name ) { - return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Change A&lias..." ), TQString::tqfromLatin1( "signature" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "&Block Contact" ), TQString::tqfromLatin1( "player_pause" ), 0, recvr, slot, tqparent, name ); } -KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) +KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* tqparent, const char *name ) { - return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name ); + return new KAction( i18n( "Un&block Contact" ), TQString::tqfromLatin1( "player_play" ), 0, recvr, slot, tqparent, name ); } #include "kopetestdaction.moc" diff --git a/kopete/libkopete/ui/kopetestdaction.h b/kopete/libkopete/ui/kopetestdaction.h index bd323943..06bb40eb 100644 --- a/kopete/libkopete/ui/kopetestdaction.h +++ b/kopete/libkopete/ui/kopetestdaction.h @@ -35,64 +35,64 @@ public: * Standard action to start a chat */ static KAction *chat( const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0 ); + TQObject* tqparent, const char *name = 0 ); /** * Standard action to send a single message */ static KAction *sendMessage(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a user info dialog */ static KAction *contactInfo(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to open a history dialog or something similar */ static KAction *viewHistory(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to initiate sending a file to a contact */ static KAction *sendFile(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to change a contacts @ref Kopete::MetaContact */ static KAction *changeMetaContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to add a group */ static KAction *addGroup(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to delete a contact */ static KAction *deleteContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to change a contact alias/nickname in your contactlist */ static KAction *changeAlias(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to block a contact */ static KAction *blockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Standard action to unblock a contact */ static KAction *unblockContact(const TQObject *recvr, const char *slot, - TQObject* parent, const char *name = 0); + TQObject* tqparent, const char *name = 0); /** * Return an action to change the Kopete preferences. * * The object has no signal/slot, the prefs are automatically shown */ - static KAction *preferences(KActionCollection *parent, const char *name = 0); + static KAction *preferences(KActionCollection *tqparent, const char *name = 0); }; @@ -104,9 +104,10 @@ namespace KSettings class KOPETE_EXPORT KopetePreferencesAction : public KAction { Q_OBJECT + TQ_OBJECT public: - KopetePreferencesAction( KActionCollection *parent, const char *name = 0 ); + KopetePreferencesAction( KActionCollection *tqparent, const char *name = 0 ); ~KopetePreferencesAction(); protected slots: diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h index c54b1dba..99655e39 100644 --- a/kopete/libkopete/ui/kopeteview.h +++ b/kopete/libkopete/ui/kopeteview.h @@ -31,7 +31,7 @@ namespace Kopete /** * @author Jason Keirstead * - * Abstract parent class for all types of views used for messaging.These view objects + * Abstract tqparent class for all types of views used for messaging.These view objects * are provided by a @ref Kopete::ViewPlugin * * @see Kopete::ViewPlugin @@ -42,7 +42,7 @@ class KOPETE_EXPORT KopeteView /** * constructor */ - KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *parent ); + KopeteView( Kopete::ChatSession *manager, Kopete::ViewPlugin *tqparent ); virtual ~KopeteView(); /** diff --git a/kopete/libkopete/ui/kopeteviewplugin.cpp b/kopete/libkopete/ui/kopeteviewplugin.cpp index 843fe939..d1d0375e 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.cpp +++ b/kopete/libkopete/ui/kopeteviewplugin.cpp @@ -16,8 +16,8 @@ #include "kopeteviewplugin.h" -Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : - Kopete::Plugin( instance, parent, name ) +Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *tqparent, const char *name ) : + Kopete::Plugin( instance, tqparent, name ) { } diff --git a/kopete/libkopete/ui/kopeteviewplugin.h b/kopete/libkopete/ui/kopeteviewplugin.h index 25ce704b..ccef3950 100644 --- a/kopete/libkopete/ui/kopeteviewplugin.h +++ b/kopete/libkopete/ui/kopeteviewplugin.h @@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin /** * @brief Create and initialize the plugin */ - ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); + ViewPlugin( KInstance *instance, TQObject *tqparent = 0L, const char *name = 0L ); /** * @brief Creates a view to be associated with the passed in session diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index 916b0faf..e424dc45 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -13,7 +13,7 @@ #include #endif -class KopeteWidgets : public QWidgetPlugin +class KopeteWidgets : public TQWidgetPlugin { public: KopeteWidgets(); @@ -28,7 +28,7 @@ public: return result; } - virtual TQWidget *create(const TQString &key, TQWidget *parent = 0, const char *name = 0); + virtual TQWidget *create(const TQString &key, TQWidget *tqparent = 0, const char *name = 0); virtual TQIconSet iconSet(const TQString &key) const { @@ -36,7 +36,7 @@ public: TQPixmap pix(m_widgets[key].iconSet); #else TQPixmap pix(locate( "data", - TQString::fromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); + TQString::tqfromLatin1("kopetewidgets/pics/") + m_widgets[key].iconSet)); #endif return TQIconSet(pix); } @@ -71,41 +71,41 @@ KopeteWidgets::KopeteWidgets() { WidgetInfo widget; - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__addressbooklinkwidget_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__addressbooklinkwidget.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__addressbooklinkwidget.png"); #endif - widget.includeFile = TQString::fromLatin1("addressbooklinkwidget.h"); - widget.toolTip = TQString::fromLatin1("Address Book Link Widget (Kopete)"); - widget.whatsThis = TQString::fromLatin1("KABC::Addressee display/selector"); + widget.includeFile = TQString::tqfromLatin1("addressbooklinkwidget.h"); + widget.toolTip = TQString::tqfromLatin1("Address Book Link Widget (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("KABC::Addressee display/selector"); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget"), widget); - widget.group = TQString::fromLatin1("Views (Kopete)"); + widget.group = TQString::tqfromLatin1("Views (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__listview_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__listview.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__listview.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistview.h"); - widget.toolTip = TQString::fromLatin1("List View (Kopete)"); - widget.whatsThis = TQString::fromLatin1("A component capable list view widget."); + widget.includeFile = TQString::tqfromLatin1("kopetelistview.h"); + widget.toolTip = TQString::tqfromLatin1("List View (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("A component capable list view widget."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::ListView"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::ListView"), widget); - widget.group = TQString::fromLatin1("Input (Kopete)"); + widget.group = TQString::tqfromLatin1("Input (Kopete)"); #ifdef EMBED_IMAGES widget.iconSet = TQPixmap(kopete__ui__listview__searchline_xpm); #else - widget.iconSet = TQString::fromLatin1("kopete__ui__listview__searchline.png"); + widget.iconSet = TQString::tqfromLatin1("kopete__ui__listview__searchline.png"); #endif - widget.includeFile = TQString::fromLatin1("kopetelistviewsearchline.h"); - widget.toolTip = TQString::fromLatin1("List View Search Line (Kopete)"); - widget.whatsThis = TQString::fromLatin1("Search line able to use Kopete custom list View."); + widget.includeFile = TQString::tqfromLatin1("kopetelistviewsearchline.h"); + widget.toolTip = TQString::tqfromLatin1("List View Search Line (Kopete)"); + widget.whatsThis = TQString::tqfromLatin1("Search line able to use Kopete custom list View."); widget.isContainer = false; - m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); + m_widgets.insert(TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine"), widget); new KInstance("kopetewidgets"); } @@ -113,19 +113,19 @@ KopeteWidgets::~KopeteWidgets() { } -TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *parent, const char *name) +TQWidget *KopeteWidgets::create(const TQString &key, TQWidget *tqparent, const char *name) { - if (key == TQString::fromLatin1("Kopete::UI::AddressBookLinkWidget")) - return new Kopete::UI::AddressBookLinkWidget(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::AddressBookLinkWidget")) + return new Kopete::UI::AddressBookLinkWidget(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::ListView")) - return new Kopete::UI::ListView::ListView(parent, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::ListView")) + return new Kopete::UI::ListView::ListView(tqparent, name); - if (key == TQString::fromLatin1("Kopete::UI::ListView::SearchLine")) - return new Kopete::UI::ListView::SearchLine(parent, 0, name); + if (key == TQString::tqfromLatin1("Kopete::UI::ListView::SearchLine")) + return new Kopete::UI::ListView::SearchLine(tqparent, 0, name); return 0; } -KDE_Q_EXPORT_PLUGIN(KopeteWidgets) +KDE_TQ_EXPORT_PLUGIN(KopeteWidgets) diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 34a4c35c..61a4f14e 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -68,7 +68,7 @@ public: }; -MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(parent, owner, name) , d( new Private() ) +MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner, const char *name) : Kopete::UI::ListView::Item(tqparent, owner, name) , d( new Private() ) { d->metaContact = mc; d->photoSize = 60; @@ -112,12 +112,12 @@ void MetaContactSelectorWidgetLVI::slotPhotoChanged() { int photoSize = d->photoSize; - photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ) ; + photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ) ; // draw a 1 pixel black border photoPixmap = photoImg; TQPainter p(&photoPixmap); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(0, 0, photoPixmap.width()-1, 0); p.drawLine(0, photoPixmap.height()-1, photoPixmap.width()-1, photoPixmap.height()-1); p.drawLine(0, 0, 0, photoPixmap.height()-1); @@ -181,8 +181,8 @@ public: }; -MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), d( new Private() ) +MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), d( new Private() ) { TQBoxLayout *l = new TQVBoxLayout(this); d->widget = new MetaContactSelectorWidget_Base(this); @@ -244,7 +244,7 @@ void MetaContactSelectorWidget::selectMetaContact( Kopete::MetaContact *mc ) void MetaContactSelectorWidget::excludeMetaContact( Kopete::MetaContact *mc ) { - if( d->excludedMetaContacts.findIndex(mc) == -1 ) + if( d->excludedMetaContacts.tqfindIndex(mc) == -1 ) { d->excludedMetaContacts.append(mc); } @@ -264,7 +264,7 @@ void MetaContactSelectorWidget::slotLoadMetaContacts() TQPtrList metaContacts = Kopete::ContactList::self()->metaContacts(); for( Kopete::MetaContact *mc = metaContacts.first(); mc ; mc = metaContacts.next() ) { - if( !mc->isTemporary() && (d->excludedMetaContacts.findIndex(mc) == -1) ) + if( !mc->isTemporary() && (d->excludedMetaContacts.tqfindIndex(mc) == -1) ) { new MetaContactSelectorWidgetLVI(mc, d->widget->metaContactListView); } diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h index a265f665..cc30f83f 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.h +++ b/kopete/libkopete/ui/metacontactselectorwidget.h @@ -35,11 +35,12 @@ namespace UI * This class provides a widget which allows easy selection * of available Kopete metacontacts. */ -class KOPETE_EXPORT MetaContactSelectorWidget : public QWidget +class KOPETE_EXPORT MetaContactSelectorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidget( TQWidget *parent = 0, const char *name = 0 ); + MetaContactSelectorWidget( TQWidget *tqparent = 0, const char *name = 0 ); ~MetaContactSelectorWidget(); Kopete::MetaContact* metaContact(); /** @@ -80,8 +81,9 @@ private: class MetaContactSelectorWidgetLVI : public Kopete::UI::ListView::Item { Q_OBJECT + TQ_OBJECT public: - MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *parent, TQObject *owner = 0, const char *name = 0 ); + MetaContactSelectorWidgetLVI(Kopete::MetaContact *mc, TQListView *tqparent, TQObject *owner = 0, const char *name = 0 ); Kopete::MetaContact* metaContact(); virtual TQString text ( int column ) const; protected slots: diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index bc1a38eb..1fd35317 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -1,6 +1,6 @@ MetaContactSelectorWidget_Base - + MetaContactSelectorWidget_Base @@ -40,15 +40,15 @@ - + - layout2 + tqlayout2 unnamed - + lblSearch @@ -95,10 +95,10 @@ kopetelistviewsearchline.h kopetelistview.h - qheader.h + tqheader.h - - + + kactivelabel.h kopetelistviewsearchline.h diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 0ad7d9c2..0b642e7b 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -59,7 +59,7 @@ struct UserInfoDialog::UserInfoDialogPrivate { }; UserInfoDialog::UserInfoDialog( const TQString& descr ) -: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).arg( descr ), KDialogBase::Ok ) +: KDialogBase( Kopete::UI::Global::mainWidget(), "userinfodialog", true, i18n( "User Info for %1" ).tqarg( descr ), KDialogBase::Ok ) { d = new UserInfoDialogPrivate; d->page = new TQWidget( this ); @@ -93,7 +93,7 @@ void UserInfoDialog::setAwayMessage( const TQString& msg ) d->awayMessage = msg; } -void UserInfoDialog::setStatus( const TQString& status ) +void UserInfoDialog::settqStatus( const TQString& status ) { d->status = status; } @@ -138,7 +138,7 @@ TQHBox* UserInfoDialog::addLabelEdit( const TQString& label, const TQString& tex TQHBox *box = new TQHBox( d->page ); new TQLabel( label, box ); edit = new KLineEdit( box ); - edit->setAlignment( Qt::AlignHCenter ); + edit->tqsetAlignment( TQt::AlignHCenter ); edit->setText( text ); edit->setReadOnly( true ); return box; @@ -182,7 +182,7 @@ void UserInfoDialog::fillHTML() } if ( d->status.isEmpty() ) { - text.append( "
" + i18n("Status : ") + "" ); + text.append( "
" + i18n("tqStatus : ") + "" ); text.append( d->status + "

" ); } @@ -214,7 +214,7 @@ void UserInfoDialog::fillWidgets() } if ( !d->status.isEmpty() ) { - d->topLayout->addWidget( addLabelEdit( i18n("Status:"), d->status, d->statusEdit ) ); + d->topLayout->addWidget( addLabelEdit( i18n("tqStatus:"), d->status, d->statusEdit ) ); } if ( !d->warningLevel.isEmpty() ) { diff --git a/kopete/libkopete/ui/userinfodialog.h b/kopete/libkopete/ui/userinfodialog.h index 246d15ec..5926ab5a 100644 --- a/kopete/libkopete/ui/userinfodialog.h +++ b/kopete/libkopete/ui/userinfodialog.h @@ -30,6 +30,7 @@ namespace Kopete { class KOPETE_EXPORT UserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UserInfoDialog( const TQString& descr ); virtual ~UserInfoDialog(); @@ -49,7 +50,7 @@ namespace Kopete { void setName( const TQString& name ); void setId( const TQString& id ); void setAwayMessage( const TQString& msg ); - void setStatus( const TQString& status ); + void settqStatus( const TQString& status ); void setWarningLevel(const TQString& level ); void setOnlineSince( const TQString& since ); void setInfo( const TQString& info ); diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp index ad701b8e..0e47a0d4 100644 --- a/kopete/libkopete/webcamwidget.cpp +++ b/kopete/libkopete/webcamwidget.cpp @@ -23,8 +23,8 @@ namespace Kopete { -WebcamWidget::WebcamWidget( TQWidget* parent, const char* name ) -: TQWidget( parent, name ) +WebcamWidget::WebcamWidget( TQWidget* tqparent, const char* name ) +: TQWidget( tqparent, name ) { clear(); } @@ -67,13 +67,13 @@ void WebcamWidget::setText(const TQString& text) void WebcamWidget::paintEvent( TQPaintEvent* event ) { - TQMemArray rects = event->region().rects(); + TQMemArray rects = TQRegion(event->region()).tqrects(); if (!mPixmap.isNull()) { for (unsigned int i = 0; i < rects.count(); ++i) { - bitBlt(this, rects[i].topLeft(), &mPixmap, rects[i], Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), rects[i].topLeft(), TQT_TQPAINTDEVICE(&mPixmap), rects[i], TQt::CopyROP, true); } } else @@ -88,17 +88,17 @@ void WebcamWidget::paintEvent( TQPaintEvent* event ) // TODO: draw the text TQPainter p(this); - TQRect r = p.boundingRect(rect(), Qt::AlignCenter | Qt::WordBreak, mText ); + TQRect r = p.boundingRect(rect(), TQt::AlignCenter | TQt::WordBreak, mText ); if ( !mText.isEmpty() && event->rect().intersects(r)) { - p.setPen(Qt::black); + p.setPen(TQt::black); TQRect rec = rect(); rec.moveTopLeft(TQPoint(1,1)); - p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); + p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); rec.moveTopLeft(TQPoint(-1,-1)); - p.setPen(Qt::white); - p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); + p.setPen(TQt::white); + p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); } } diff --git a/kopete/libkopete/webcamwidget.h b/kopete/libkopete/webcamwidget.h index fdc60a6e..663c7723 100644 --- a/kopete/libkopete/webcamwidget.h +++ b/kopete/libkopete/webcamwidget.h @@ -28,16 +28,17 @@ namespace Kopete /** * A simple widget to display webcam frames. */ -class KOPETE_EXPORT WebcamWidget : public QWidget +class KOPETE_EXPORT WebcamWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * @brief WebcamWidget constructor. - * @param parent The parent widget of this widget - * @param name The name for this QObject + * @param tqparent The tqparent widget of this widget + * @param name The name for this TQObject */ - WebcamWidget( TQWidget* parent = 0, const char* name = 0 ); + WebcamWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~WebcamWidget(); /** @@ -56,8 +57,11 @@ public: * @param text The text to be displayed */ void setText(const TQString& text); + protected slots: void paintEvent( TQPaintEvent* event ); + +protected: TQPixmap mPixmap; TQString mText; }; diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 113ec95e..b8f32bcf 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -39,8 +39,8 @@ static bool isURLInGroup(const KURL& url, const KBookmarkGroup& group) return false; } -BookmarksPlugin::BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &/*args*/) - : Kopete::Plugin(BookmarksPluginFactory::instance(), parent, name) +BookmarksPlugin::BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &/*args*/) + : Kopete::Plugin(BookmarksPluginFactory::instance(), tqparent, name) { //kdDebug(14501) << "plugin loading" << endl; connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, TQT_SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) ); @@ -144,7 +144,7 @@ KBookmarkGroup BookmarksPlugin::getKopeteFolder() { KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager(); - return getFolder( mgr->root(), TQString::fromLatin1("kopete") ); + return getFolder( mgr->root(), TQString::tqfromLatin1("kopete") ); } KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& folder ) @@ -165,7 +165,7 @@ KBookmarkGroup BookmarksPlugin::getFolder( KBookmarkGroup group, const TQString& TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data ) { - TQString temp = TQString::fromLatin1(data); + TQString temp = TQString::tqfromLatin1(data); TQRegExp rx("]*(charset|CHARSET)\\s*=\\s*[^>]*>"); int pos = rx.search( temp ); TQTextCodec *codec; @@ -176,7 +176,7 @@ TQTextCodec* BookmarksPlugin::getPageEncoding( const TQByteArray& data ) } //kdDebug(14501) << temp.mid(pos, rx.matchedLength()) << endl; temp = temp.mid(pos, rx.matchedLength()-1); - temp = temp.mid( temp.find("charset", 0, false)+7); + temp = temp.mid( temp.tqfind("charset", 0, false)+7); temp = temp.remove('=').simplifyWhiteSpace(); for( pos = 0 ; temp[pos].isLetterOrNumber() || temp[pos] == '-' ; pos++ ); temp = temp.left( pos ); diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h index 459c1b8b..404fe994 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.h +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h @@ -27,8 +27,9 @@ class BookmarksPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: - BookmarksPlugin(TQObject *parent, const char *name, const TQStringList &args); + BookmarksPlugin(TQObject *tqparent, const char *name, const TQStringList &args); private: typedef struct S_URLANDNAME{ diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index 69b7fc1b..2c8f440f 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -26,8 +26,8 @@ typedef KGenericFactory BookmarksPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") ) -BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args) - : KCModule(BookmarksPreferencesFactory::instance(), parent, args) +BookmarksPreferences::BookmarksPreferences(TQWidget *tqparent, const char *name, const TQStringList &args) + : KCModule(BookmarksPreferencesFactory::instance(), tqparent, args) { Q_UNUSED( name ); ( new TQVBoxLayout (this) )->setAutoAdd( true ); @@ -104,7 +104,7 @@ void BookmarksPreferences::load() m_settings.isFolderForEachContact() == BookmarksPrefsSettings::UnselectedContacts ); list = m_settings.getContactsList(); for( it = list.begin() ; it != list.end() ; ++it){ - if ( ( item = p_dialog->contactList->findItem(*it, Qt::ExactMatch ) ) ){ + if ( ( item = p_dialog->contactList->tqfindItem(*it, TQt::ExactMatch ) ) ){ p_dialog->contactList->setSelected( item, true ); } } diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.h b/kopete/plugins/addbookmarks/addbookmarkspreferences.h index 30c94b70..2702de8a 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.h +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.h @@ -22,8 +22,9 @@ class BookmarksPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - BookmarksPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + BookmarksPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); ~BookmarksPreferences(); diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp index 34d921c3..55a89d30 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp @@ -15,8 +15,8 @@ #include "addbookmarksprefssettings.h" -BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *parent, const char *name) - : TQObject(parent, name) +BookmarksPrefsSettings::BookmarksPrefsSettings(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { load(); } @@ -71,9 +71,9 @@ bool BookmarksPrefsSettings::useSubfolderForContact( TQString nickname ) case Always: return true; case SelectedContacts: - return ( m_contactslist.find( nickname ) != m_contactslist.end() ); + return ( m_contactslist.tqfind( nickname ) != m_contactslist.end() ); case UnselectedContacts: - return ( m_contactslist.find( nickname ) == m_contactslist.end() ); + return ( m_contactslist.tqfind( nickname ) == m_contactslist.end() ); } } return false; diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h index 659f3c69..d4bd4c0b 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.h +++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.h @@ -18,13 +18,14 @@ /** @author Roie Kerstein */ -class BookmarksPrefsSettings : public QObject +class BookmarksPrefsSettings : public TQObject { Q_OBJECT + TQ_OBJECT public: enum UseSubfolders { Always=0, Never=1, SelectedContacts=2, UnselectedContacts=3 }; - BookmarksPrefsSettings(TQObject *parent = 0, const char *name = 0); + BookmarksPrefsSettings(TQObject *tqparent = 0, const char *name = 0); ~BookmarksPrefsSettings(); diff --git a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui index 67be2b9e..20102dc5 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui +++ b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui @@ -1,6 +1,6 @@ BookmarksPrefsUI - + BookmarksPrefsUI @@ -16,7 +16,7 @@ unnamed - + buttonGroup1 @@ -27,7 +27,7 @@ unnamed - + yesButton @@ -41,7 +41,7 @@ true - + noButton @@ -55,7 +55,7 @@ 1 - + onlySelectedButton @@ -72,7 +72,7 @@ 2 - + onlyNotSelectedButton @@ -85,12 +85,12 @@ - + contactList - + m_addUntrusted @@ -100,5 +100,5 @@ - + diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui index 1d980d52..b6a7a895 100644 --- a/kopete/plugins/alias/aliasdialog.ui +++ b/kopete/plugins/alias/aliasdialog.ui @@ -1,6 +1,6 @@ AliasDialog - + AliasDialog @@ -19,7 +19,7 @@ unnamed - + textLabel2 @@ -45,7 +45,7 @@ You can use the variables <b>%1, %2 ... %9</b> in your command, and Do not include the '/' in the command (if you do it will be stripped off anyway).</qt> - + textLabel1 @@ -126,7 +126,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway) If you want this alias to only be active for certain protocols, select those protocols here. - + textLabel4 @@ -136,7 +136,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway) For protocols: - + AlignTop @@ -182,7 +182,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway) addButton kPushButton3 - + klineedit.h klineedit.h diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui index f70cc5bf..01e15f9e 100644 --- a/kopete/plugins/alias/aliasdialogbase.ui +++ b/kopete/plugins/alias/aliasdialogbase.ui @@ -1,6 +1,6 @@ AliasDialogBase - + AliasDialogBase @@ -97,7 +97,7 @@ - + klistview.h kpushbutton.h diff --git a/kopete/plugins/alias/aliasplugin.cpp b/kopete/plugins/alias/aliasplugin.cpp index 4824e2fb..4158e3cf 100644 --- a/kopete/plugins/alias/aliasplugin.cpp +++ b/kopete/plugins/alias/aliasplugin.cpp @@ -17,8 +17,8 @@ typedef KGenericFactory AliasPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_alias, AliasPluginFactory( "kopete_alias" ) ) AliasPlugin * AliasPlugin::pluginStatic_ = 0L; -AliasPlugin::AliasPlugin( TQObject *parent, const char * name, const TQStringList & ) - : Kopete::Plugin( AliasPluginFactory::instance(), parent, name ) +AliasPlugin::AliasPlugin( TQObject *tqparent, const char * name, const TQStringList & ) + : Kopete::Plugin( AliasPluginFactory::instance(), tqparent, name ) { if( !pluginStatic_ ) pluginStatic_ = this; diff --git a/kopete/plugins/alias/aliasplugin.h b/kopete/plugins/alias/aliasplugin.h index cf53c791..f961fac4 100644 --- a/kopete/plugins/alias/aliasplugin.h +++ b/kopete/plugins/alias/aliasplugin.h @@ -15,11 +15,12 @@ class AliasPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: static AliasPlugin *plugin(); - AliasPlugin( TQObject *parent, const char *name, const TQStringList &args ); + AliasPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~AliasPlugin(); private: diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index a331a592..330c8d5d 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -32,14 +32,14 @@ typedef KGenericFactory AliasPreferencesFactory; -class AliasItem : public QListViewItem +class AliasItem : public TQListViewItem { public: - AliasItem( TQListView *parent, + AliasItem( TQListView *tqparent, uint number, const TQString &alias, const TQString &command, const ProtocolList &p ) : - TQListViewItem( parent, alias, command ) + TQListViewItem( tqparent, alias, command ) { protocolList = p; id = number; @@ -75,13 +75,13 @@ class AliasItem : public QListViewItem if ( isSelected() && ( column == 0 || listView()->allColumnsShowFocus() ) ) { - p->fillRect( QMAX( cellWidth, r - marg ), 0, + p->fillRect( TQMAX( cellWidth, r - marg ), 0, width - cellWidth - r + marg, height(), cg.brush( TQColorGroup::Highlight ) ); if ( isEnabled() || !lv ) p->setPen( cg.highlightedText() ); else if ( !isEnabled() && lv ) - p->setPen( lv->palette().disabled().highlightedText() ); + p->setPen( lv->tqpalette().disabled().highlightedText() ); } // And last, draw the online status icons @@ -98,17 +98,17 @@ class AliasItem : public QListViewItem } else { - // Use Qt's own drawing + // Use TQt's own drawing TQListViewItem::paintCell( p, cg, column, width, align ); } } }; -class ProtocolItem : public QListViewItem +class ProtocolItem : public TQListViewItem { public: - ProtocolItem( TQListView *parent, KPluginInfo *p ) : - TQListViewItem( parent, p->name() ) + ProtocolItem( TQListView *tqparent, KPluginInfo *p ) : + TQListViewItem( tqparent, p->name() ) { this->setPixmap( 0, SmallIcon( p->icon() ) ); id = p->pluginName(); @@ -119,8 +119,8 @@ class ProtocolItem : public QListViewItem K_EXPORT_COMPONENT_FACTORY( kcm_kopete_alias, AliasPreferencesFactory( "kcm_kopete_alias" ) ) -AliasPreferences::AliasPreferences( TQWidget *parent, const char *, const TQStringList &args ) - : KCModule( AliasPreferencesFactory::instance(), parent, args ) +AliasPreferences::AliasPreferences( TQWidget *tqparent, const char *, const TQStringList &args ) + : KCModule( AliasPreferencesFactory::instance(), tqparent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new AliasDialogBase( this ); @@ -204,14 +204,14 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) { if( *it2 == protocol->pluginId() ) { - QPair pr( protocol, *it ); - if( protocolMap.find( pr ) == protocolMap.end() ) + TQPair pr( protocol, *it ); + if( protocolMap.tqfind( pr ) == protocolMap.end() ) { Kopete::CommandHandler::commandHandler()->registerAlias( protocol, *it, aliasCommand, - TQString::fromLatin1("Custom alias for %1").arg(aliasCommand), + TQString::tqfromLatin1("Custom alias for %1").tqarg(aliasCommand), Kopete::CommandHandler::UserAlias ); @@ -221,7 +221,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) if( item ) { item->protocolList.append( protocol ); - item->repaint(); + item->tqrepaint(); } else { @@ -241,8 +241,8 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin ) void AliasPreferences::save() { KConfig *config = KGlobal::config(); - config->deleteGroup( TQString::fromLatin1("AliasPlugin") ); - config->setGroup( TQString::fromLatin1("AliasPlugin") ); + config->deleteGroup( TQString::tqfromLatin1("AliasPlugin") ); + config->setGroup( TQString::tqfromLatin1("AliasPlugin") ); TQStringList aliases; AliasItem *item = (AliasItem*)preferencesDialog->aliasList->firstChild(); @@ -271,11 +271,11 @@ void AliasPreferences::save() void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id ) { - TQRegExp spaces( TQString::fromLatin1("\\s+") ); + TQRegExp spaces( TQString::tqfromLatin1("\\s+") ); - if( alias.startsWith( TQString::fromLatin1("/") ) ) + if( alias.startsWith( TQString::tqfromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( command.startsWith( TQString::fromLatin1("/") ) ) + if( command.startsWith( TQString::tqfromLatin1("/") ) ) command = command.section( '/', 1 ); if( id == 0 ) @@ -309,13 +309,13 @@ void AliasPreferences::addAlias( TQString &alias, TQString &command, const Proto *it, alias, command, - TQString::fromLatin1("Custom alias for %1").arg(command), + TQString::tqfromLatin1("Custom alias for %1").tqarg(command), Kopete::CommandHandler::UserAlias, 0, argc ); - protocolMap.insert( QPair( *it, alias ), true ); + protocolMap.insert( TQPair( *it, alias ), true ); } } @@ -328,14 +328,14 @@ void AliasPreferences::slotAddAlias() if( addDialog.exec() == TQDialog::Accepted ) { TQString alias = addDialog.alias->text(); - if( alias.startsWith( TQString::fromLatin1("/") ) ) + if( alias.startsWith( TQString::tqfromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( alias.contains( TQRegExp("[_=]") ) ) + if( alias.tqcontains( TQRegExp("[_=]") ) ) { KMessageBox::error( this, i18n("Could not add alias %1. An" " alias name cannot contain the characters \"_\" or \"=\"." - "").arg(alias),i18n("Invalid Alias Name") ); + "").tqarg(alias),i18n("Invalid Alias Name") ); } else { @@ -353,7 +353,7 @@ void AliasPreferences::slotAddAlias() { KMessageBox::error( this, i18n("Could not add alias %1. This " "command is already being handled by either another alias or " - "Kopete itself.").arg(alias), i18n("Could Not Add Alias") ); + "Kopete itself.").tqarg(alias), i18n("Could Not Add Alias") ); return; } } @@ -418,13 +418,13 @@ void AliasPreferences::slotEditAlias() if( editDialog.exec() == TQDialog::Accepted ) { TQString alias = editDialog.alias->text(); - if( alias.startsWith( TQString::fromLatin1("/") ) ) + if( alias.startsWith( TQString::tqfromLatin1("/") ) ) alias = alias.section( '/', 1 ); - if( alias.contains( TQRegExp("[_=]") ) ) + if( alias.tqcontains( TQRegExp("[_=]") ) ) { KMessageBox::error( this, i18n("Could not add alias %1. An" " alias name cannot contain the characters \"_\" or \"=\"." - "").arg(alias),i18n("Invalid Alias Name") ); + "").tqarg(alias),i18n("Invalid Alias Name") ); } else { @@ -449,7 +449,7 @@ void AliasPreferences::slotEditAlias() { KMessageBox::error( this, i18n("Could not add alias %1. This " "command is already being handled by either another alias or " - "Kopete itself.").arg(alias), i18n("Could Not Add Alias") ); + "Kopete itself.").tqarg(alias), i18n("Could Not Add Alias") ); return; } } @@ -479,7 +479,7 @@ void AliasPreferences::slotDeleteAliases() i->text(0) ); - protocolMap.erase( QPair( *it, i->text(0) ) ); + protocolMap.erase( TQPair( *it, i->text(0) ) ); } aliasMap.erase( i->text(0) ); diff --git a/kopete/plugins/alias/aliaspreferences.h b/kopete/plugins/alias/aliaspreferences.h index 9ad25f38..99d6a479 100644 --- a/kopete/plugins/alias/aliaspreferences.h +++ b/kopete/plugins/alias/aliaspreferences.h @@ -24,9 +24,10 @@ namespace Kopete { class Plugin; } class AliasPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - AliasPreferences( TQWidget *parent = 0, const char *name = 0, + AliasPreferences( TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); ~AliasPreferences(); @@ -46,7 +47,7 @@ class AliasPreferences : public KCModule void loadProtocols( EditAliasDialog *dialog ); const ProtocolList selectedProtocols( EditAliasDialog *dialog ); TQMap itemMap; - TQMap, bool> protocolMap; + TQMap, bool> protocolMap; TQMap aliasMap; }; diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp index 6acdf153..1adeea03 100644 --- a/kopete/plugins/alias/editaliasdialog.cpp +++ b/kopete/plugins/alias/editaliasdialog.cpp @@ -24,8 +24,8 @@ #include -EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name ) -: AliasDialog( parent, name ) +EditAliasDialog::EditAliasDialog( TQWidget* tqparent, const char* name ) +: AliasDialog( tqparent, name ) { TQObject::connect( alias, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); TQObject::connect( command, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); @@ -48,4 +48,4 @@ void EditAliasDialog::checkButtonsEnabled() #include "editaliasdialog.moc" -// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; diff --git a/kopete/plugins/alias/editaliasdialog.h b/kopete/plugins/alias/editaliasdialog.h index f5967368..7176904c 100644 --- a/kopete/plugins/alias/editaliasdialog.h +++ b/kopete/plugins/alias/editaliasdialog.h @@ -25,8 +25,9 @@ class TQWidget; class EditAliasDialog : public AliasDialog { Q_OBJECT + TQ_OBJECT public: - EditAliasDialog( TQWidget* parent = 0, const char* name = 0 ); + EditAliasDialog( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~EditAliasDialog(); public slots: @@ -35,4 +36,4 @@ public slots: #endif -// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands; +// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands; diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp index 2537f44a..09ef9d05 100644 --- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp +++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp @@ -63,7 +63,7 @@ void AutoReplaceConfig::load() TQStringList AutoReplaceConfig::defaultAutoReplaceList() { - return TQStringList::split( ",", i18n( "list_of_words_to_replace", + return TQStringList::split( ",", i18n( "list_of_words_to_tqreplace", "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not" ) ); } diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp index f3610a7f..62060ef3 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp +++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp @@ -26,11 +26,11 @@ #include "autoreplaceconfig.h" typedef KGenericFactory AutoReplacePluginFactory; -K_EXPORT_COMPONENT_FACTORY( kopete_autoreplace, AutoReplacePluginFactory( "kopete_autoreplace" ) ) +K_EXPORT_COMPONENT_FACTORY( kopete_autotqreplace, AutoReplacePluginFactory( "kopete_autotqreplace" ) ) AutoReplacePlugin * AutoReplacePlugin::pluginStatic_ = 0L; -AutoReplacePlugin::AutoReplacePlugin( TQObject *parent, const char * name, const TQStringList & ) -: Kopete::Plugin( AutoReplacePluginFactory::instance(), parent, name ) +AutoReplacePlugin::AutoReplacePlugin( TQObject *tqparent, const char * name, const TQStringList & ) +: Kopete::Plugin( AutoReplacePluginFactory::instance(), tqparent, name ) { if( !pluginStatic_ ) pluginStatic_ = this; @@ -81,12 +81,12 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg ) bool isReplaced=false; for ( it = map.begin(); it != map.end(); ++it ) { - TQRegExp re( match.arg( TQRegExp::escape( it.key() ) ) ); + TQRegExp re( match.tqarg( TQRegExp::escape( it.key() ) ) ); if( re.search( replaced_message ) != -1 ) { TQString before = re.cap(1); TQString after = re.cap(3); - replaced_message.replace( re, before + map.find( it.key() ).data() + after ); + replaced_message.tqreplace( re, before + map.tqfind( it.key() ).data() + after ); isReplaced=true; } } @@ -101,8 +101,8 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg ) { TQString replaced_message = msg.plainBody(); // eventually add . at the end of the lines, sent lines only - replaced_message.replace( TQRegExp( "([a-z])$" ), "\\1." ); - // replaced_message.replace(TQRegExp( "([\\w])$" ), "\\1." ); + replaced_message.tqreplace( TQRegExp( "([a-z])$" ), "\\1." ); + // replaced_message.tqreplace(TQRegExp( "([\\w])$" ), "\\1." ); // the message is now the one with replaced words msg.setBody( replaced_message, Kopete::Message::PlainText ); @@ -113,7 +113,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg ) TQString replaced_message = msg.plainBody(); // eventually start each sent line with capital letter // TODO ". " "? " "! " - replaced_message[ 0 ] = replaced_message.at( 0 ).upper(); + replaced_message[ 0 ] = replaced_message.tqat( 0 ).upper(); // the message is now the one with replaced words msg.setBody( replaced_message, Kopete::Message::PlainText ); diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.h b/kopete/plugins/autoreplace/autoreplaceplugin.h index 7d9bcedf..de306a4b 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.h +++ b/kopete/plugins/autoreplace/autoreplaceplugin.h @@ -38,11 +38,12 @@ class AutoReplaceConfig; class AutoReplacePlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: static AutoReplacePlugin *plugin(); - AutoReplacePlugin( TQObject *parent, const char *name, const TQStringList &args ); + AutoReplacePlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~AutoReplacePlugin(); private slots: diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp index 4f852610..628cb679 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp +++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp @@ -34,10 +34,10 @@ typedef KGenericFactory AutoReplacePreferencesFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autoreplace, AutoReplacePreferencesFactory( "kcm_kopete_autoreplace" ) ) +K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autotqreplace, AutoReplacePreferencesFactory( "kcm_kopete_autotqreplace" ) ) -AutoReplacePreferences::AutoReplacePreferences( TQWidget *parent, const char * /* name */, const TQStringList &args ) -: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), parent, args ) +AutoReplacePreferences::AutoReplacePreferences( TQWidget *tqparent, const char * /* name */, const TQStringList &args ) +: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), tqparent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new AutoReplacePrefsUI( this ); @@ -113,7 +113,7 @@ void AutoReplacePreferences::save() KCAutoConfigModule::save(); } -// read m_key m_value, create a QListViewItem +// read m_key m_value, create a TQListViewItem void AutoReplacePreferences::slotAddCouple() { TQString k = preferencesDialog->m_key->text(); @@ -123,10 +123,10 @@ void AutoReplacePreferences::slotAddCouple() TQListViewItem * lvi; TQListViewItem * oldLvi = 0; // see if we are replacing an existing entry - if ( ( oldLvi = preferencesDialog->m_list->findItem( k, 0 ) ) ) + if ( ( oldLvi = preferencesDialog->m_list->tqfindItem( k, 0 ) ) ) delete oldLvi; lvi = new TQListViewItem( preferencesDialog->m_list, k, v ); - // Triggers a size, geometry and content update + // Triggers a size, tqgeometry and content update // during the next iteration of the event loop preferencesDialog->m_list->triggerUpdate(); // select last added diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.h b/kopete/plugins/autoreplace/autoreplacepreferences.h index 00638bfa..72e0b548 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.h +++ b/kopete/plugins/autoreplace/autoreplacepreferences.h @@ -32,9 +32,10 @@ class AutoReplaceConfig; class AutoReplacePreferences : public KCAutoConfigModule { Q_OBJECT + TQ_OBJECT public: - AutoReplacePreferences( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); + AutoReplacePreferences( TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList() ); ~AutoReplacePreferences(); virtual void save(); diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui index 09db8e9d..f7cb8c55 100644 --- a/kopete/plugins/autoreplace/autoreplaceprefs.ui +++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui @@ -1,7 +1,7 @@ AutoReplacePrefsUI Roberto Pariset - + AutoReplacePrefsUI @@ -17,7 +17,7 @@ unnamed - + gb_sentences @@ -28,7 +28,7 @@ unnamed - + DotEndSentence @@ -36,7 +36,7 @@ Add a dot at the end of each sent line - + CapitalizeBeginningSentence @@ -46,7 +46,7 @@ - + gb_options @@ -57,7 +57,7 @@ unnamed - + AutoReplaceIncoming @@ -65,7 +65,7 @@ Auto replace on incoming messages - + AutoReplaceOutgoing @@ -78,7 +78,7 @@ - + replacementsGroup @@ -89,15 +89,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + m_add @@ -111,7 +111,7 @@ false - + m_edit @@ -135,14 +135,14 @@ Expanding - + 20 40 - + m_remove @@ -155,15 +155,15 @@ - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -174,12 +174,12 @@ m_key - + m_key - + textLabel2 @@ -190,14 +190,14 @@ m_value - + m_value - + m_list @@ -215,5 +215,5 @@ - + diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index 33f4e3dd..a35a4cf4 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -28,15 +28,15 @@ typedef KGenericFactory ConnectionStatusPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_connectionstatus, ConnectionStatusPluginFactory( "kopete_connectionstatus" ) ) -ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList& /* args */ ) -: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), parent, name ) +ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList& /* args */ ) +: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), tqparent, name ) { kdDebug( 14301 ) << k_funcinfo << endl; m_process = 0L; m_timer = new TQTimer(); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) ); + connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotChecktqStatus() ) ); m_timer->start( 60000 ); m_pluginConnected = false; @@ -49,7 +49,7 @@ ConnectionStatusPlugin::~ConnectionStatusPlugin() delete m_process; } -void ConnectionStatusPlugin::slotCheckStatus() +void ConnectionStatusPlugin::slotChecktqStatus() { kdDebug( 14301 ) << k_funcinfo << endl; @@ -61,7 +61,7 @@ void ConnectionStatusPlugin::slotCheckStatus() return; } - m_buffer = TQString::null; + m_buffer = TQString(); // Use KProcess to run netstat -rn. We'll then parse the output of // netstat -rn in slotProcessStdout() to see if it mentions the @@ -87,8 +87,8 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process ) if ( process == m_process ) { - setConnectedStatus( m_buffer.contains( "default" ) ); - m_buffer = TQString::null; + setConnectedtqStatus( m_buffer.tqcontains( "default" ) ); + m_buffer = TQString(); delete m_process; m_process = 0L; } @@ -98,11 +98,11 @@ void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int bu { // Look for a default gateway //kdDebug( 14301 ) << k_funcinfo << endl; - m_buffer += TQString::fromLatin1( buffer, buflen ); + m_buffer += TQString::tqfromLatin1( buffer, buflen ); //kdDebug( 14301 ) << qsBuffer << endl; } -void ConnectionStatusPlugin::setConnectedStatus( bool connected ) +void ConnectionStatusPlugin::setConnectedtqStatus( bool connected ) { //kdDebug( 14301 ) << k_funcinfo << endl; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h index 56f662ab..50148b0a 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.h +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h @@ -29,13 +29,14 @@ class KProcess; class ConnectionStatusPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: - ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList &args ); + ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~ConnectionStatusPlugin(); private slots: - void slotCheckStatus(); + void slotChecktqStatus(); void slotProcessStdout( KProcess *process, char *buffer, int len ); /** @@ -44,7 +45,7 @@ private slots: void slotProcessExited( KProcess *process ); private: - void setConnectedStatus( bool newStatus ); + void setConnectedtqStatus( bool newtqStatus ); bool m_pluginConnected; KProcess *m_process; diff --git a/kopete/plugins/contactnotes/contactnotesedit.cpp b/kopete/plugins/contactnotes/contactnotesedit.cpp index 782476b9..607c0f17 100644 --- a/kopete/plugins/contactnotes/contactnotesedit.cpp +++ b/kopete/plugins/contactnotes/contactnotesedit.cpp @@ -33,7 +33,7 @@ ContactNotesEdit::ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p, TQVBox *w=new TQVBox(this); w->setSpacing(KDialog::spacingHint()); - m_label = new TQLabel(i18n("Notes about %1:").arg(m->displayName()) , w , "m_label"); + m_label = new TQLabel(i18n("Notes about %1:").tqarg(m->displayName()) , w , "m_label"); m_linesEdit= new TQTextEdit ( w , "m_linesEdit"); m_linesEdit->setText(p->notes(m)); diff --git a/kopete/plugins/contactnotes/contactnotesedit.h b/kopete/plugins/contactnotes/contactnotesedit.h index a027b1a8..81b9b71e 100644 --- a/kopete/plugins/contactnotes/contactnotesedit.h +++ b/kopete/plugins/contactnotes/contactnotesedit.h @@ -33,6 +33,7 @@ class ContactNotesPlugin; class ContactNotesEdit : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p=0 ,const char *name=0); ~ContactNotesEdit(); diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp index ce67e663..aaa4ee7a 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.cpp +++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory ContactNotesPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_contactnotes, ContactNotesPluginFactory( "kopete_contactnotes" ) ) -ContactNotesPlugin::ContactNotesPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( ContactNotesPluginFactory::instance(), parent, name ) +ContactNotesPlugin::ContactNotesPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( ContactNotesPluginFactory::instance(), tqparent, name ) { if ( pluginStatic_ ) kdDebug(14302)<<"ContactNotesPlugin::ContactNotesPlugin : plugin already initialized"<members().isEmpty()) + if(!tqparent || tqparent->members().isEmpty()) { deleteLater(); //we refuse to build this client, it is based on wrong parametters return; } - TQPtrList mb=parent->members(); + TQPtrList mb=tqparent->members(); Kopete::MetaContact *first=mb.first()->metaContact(); if(!first) @@ -48,8 +48,8 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent ) setInstance( KGenericFactory::instance() ); - m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); - m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ; + m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::tqfromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); + m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::tqfromLatin1("off") ) ; setXMLFile("cryptographychatui.rc"); } @@ -60,7 +60,7 @@ CryptographyGUIClient::~CryptographyGUIClient() void CryptographyGUIClient::slotToggled() { - TQPtrList mb=static_cast(parent())->members(); + TQPtrList mb=static_cast(tqparent())->members(); Kopete::MetaContact *first=mb.first()->metaContact(); if(!first) diff --git a/kopete/plugins/cryptography/cryptographyguiclient.h b/kopete/plugins/cryptography/cryptographyguiclient.h index 7f3d8c4f..5b8b22ed 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.h +++ b/kopete/plugins/cryptography/cryptographyguiclient.h @@ -27,8 +27,9 @@ class KToggleAction; class CryptographyGUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - CryptographyGUIClient(Kopete::ChatSession *parent = 0); + CryptographyGUIClient(Kopete::ChatSession *tqparent = 0); ~CryptographyGUIClient(); private: diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 4e2e9686..bd1ce0dc 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -45,14 +45,14 @@ //In Jabber, the JEP says it's not. so we don't use richtext in our message, but some client did. //We limit the html to some basis tag to limit security problem (bad links) // - Olivier -const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(|[\\s/][^><]*>)[^><]*)+$" ) , false ); +const TQRegExp CryptographyPlugin::isHTML( TQString::tqfromLatin1( "^[^<>]*(|[\\s/][^><]*>)[^><]*)+$" ) , false ); typedef KGenericFactory CryptographyPluginFactory; static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_cryptography, CryptographyPluginFactory( &aboutdata ) ) -CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( CryptographyPluginFactory::instance(), parent, name ), +CryptographyPlugin::CryptographyPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( CryptographyPluginFactory::instance(), tqparent, name ), m_cachedPass() { if( !pluginStatic_ ) @@ -154,14 +154,14 @@ bool CryptographyPlugin::passphraseHandling() void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) { TQString body = msg.plainBody(); - if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") ) - || !body.contains( TQString::fromLatin1("-----END PGP MESSAGE----") ) ) + if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") ) + || !body.tqcontains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) ) return; if( msg.direction() != Kopete::Message::Inbound ) { TQString plainBody; - if ( m_cachedMessages.contains( body ) ) + if ( m_cachedMessages.tqcontains( body ) ) { plainBody = m_cachedMessages[ body ]; m_cachedMessages.remove( body ); @@ -179,16 +179,16 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) plainBody = TQStyleSheet::escape( plainBody ); //this is the same algoritm as in Kopete::Message::escapedBody(); - plainBody.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "
" ) ) - .replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( "    " ) ) - .replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "  " ) ); + plainBody.tqreplace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "
" ) ) + .tqreplace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "    " ) ) + .tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); } - msg.setBody( TQString::fromLatin1("
") + msg.setBody( TQString::tqfromLatin1("
") + i18n("Outgoing Encrypted Message: ") - + TQString::fromLatin1("
") + + TQString::tqfromLatin1("
") + plainBody - + TQString::fromLatin1("
") + + TQString::tqfromLatin1("
") , Kopete::Message::RichText ); } @@ -202,7 +202,7 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) //the Message::unescape is there because client like fire replace linebreak by
to work even if the protocol doesn't allow newlines (IRC) // cf http://fire.sourceforge.net/forums/viewtopic.php?t=174 and Bug #96052 - if(body.contains("<")) + if(body.tqcontains("<")) body= Kopete::Message::unescape(body); body = KgpgInterface::KgpgDecryptText( body, mPrivateKeyID ); @@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg ) body = Kopete::Message::escape( body ); } - msg.setBody( TQString::fromLatin1("
") + msg.setBody( TQString::tqfromLatin1("
") + i18n("Incoming Encrypted Message: ") - + TQString::fromLatin1("
") + + TQString::tqfromLatin1("
") + body - + TQString::fromLatin1("
") + + TQString::tqfromLatin1("
") , Kopete::Message::RichText ); } diff --git a/kopete/plugins/cryptography/cryptographyplugin.h b/kopete/plugins/cryptography/cryptographyplugin.h index 1b1e4489..249eac9e 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.h +++ b/kopete/plugins/cryptography/cryptographyplugin.h @@ -40,6 +40,7 @@ namespace Kopete class CryptographyPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: enum CacheMode @@ -55,7 +56,7 @@ public: static bool passphraseHandling(); static const TQRegExp isHTML; - CryptographyPlugin( TQObject *parent, const char *name, const TQStringList &args ); + CryptographyPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~CryptographyPlugin(); public slots: diff --git a/kopete/plugins/cryptography/cryptographypreferences.cpp b/kopete/plugins/cryptography/cryptographypreferences.cpp index 8e1b96ee..765fb098 100644 --- a/kopete/plugins/cryptography/cryptographypreferences.cpp +++ b/kopete/plugins/cryptography/cryptographypreferences.cpp @@ -27,8 +27,8 @@ typedef KGenericFactory CryptographyPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_cryptography, CryptographyPreferencesFactory("kcm_kopete_cryptography")) -CryptographyPreferences::CryptographyPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCAutoConfigModule(CryptographyPreferencesFactory::instance(), parent, args) +CryptographyPreferences::CryptographyPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCAutoConfigModule(CryptographyPreferencesFactory::instance(), tqparent, args) { // Add actuall widget generated from ui file. preferencesDialog = new CryptographyPrefsUI(this); diff --git a/kopete/plugins/cryptography/cryptographypreferences.h b/kopete/plugins/cryptography/cryptographypreferences.h index 6053e96b..d032bc6e 100644 --- a/kopete/plugins/cryptography/cryptographypreferences.h +++ b/kopete/plugins/cryptography/cryptographypreferences.h @@ -29,8 +29,9 @@ class KAutoConfig; */ class CryptographyPreferences : public KCAutoConfigModule { Q_OBJECT + TQ_OBJECT public: - CryptographyPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + CryptographyPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); private: CryptographyPrefsUI *preferencesDialog; private slots: // Public slots diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui index ecec3507..6cd3caca 100644 --- a/kopete/plugins/cryptography/cryptographyprefsbase.ui +++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui @@ -1,7 +1,7 @@ CryptographyPrefsUI Olivier Goffart - + CryptographyPrefsUI @@ -17,7 +17,7 @@ unnamed - + TextLabel1 @@ -25,7 +25,7 @@ Your private PGP key: - + m_selectOwnKey @@ -41,7 +41,7 @@ true - + Also_my_key @@ -63,14 +63,14 @@ Expanding - + 21 50 - + m_cache @@ -81,7 +81,7 @@ unnamed - + Cache_Till_App_Close @@ -92,7 +92,7 @@ true - + Cache_Time @@ -114,7 +114,7 @@ 15 - + textLabel1 @@ -130,7 +130,7 @@ minutes - + Cache_Till_Time @@ -146,7 +146,7 @@ For - + Cache_Never @@ -156,7 +156,7 @@ - + No_Passphrase_Handling @@ -184,12 +184,12 @@ Cache_Time Cache_Never - + m_selectOwnKey_clicked() m_selectOwnKey_toggled(bool) m_selectOwnKey_stateChanged(int) - - + + klineedit.h diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp index ae92647b..9d692e08 100644 --- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp +++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp @@ -35,7 +35,7 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed())); connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed())); - view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName())); + view->m_titleLabel->setText(i18n("Select public key for %1").tqarg(mc->displayName())); view->m_editKey->setText(key); } CryptographySelectUserKey::~CryptographySelectUserKey() diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.h b/kopete/plugins/cryptography/cryptographyselectuserkey.h index 7ca5ec8e..a7f47853 100644 --- a/kopete/plugins/cryptography/cryptographyselectuserkey.h +++ b/kopete/plugins/cryptography/cryptographyselectuserkey.h @@ -29,6 +29,7 @@ class CryptographyUserKey_ui; class CryptographySelectUserKey : public KDialogBase { Q_OBJECT + TQ_OBJECT public: CryptographySelectUserKey(const TQString &key, Kopete::MetaContact *mc); ~CryptographySelectUserKey(); diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui index d84f2fec..ff766de4 100644 --- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui +++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui @@ -1,6 +1,6 @@ CryptographyUserKey_ui - + CryptographyUserKey_ui @@ -16,7 +16,7 @@ unnamed - + TextLabel3 @@ -32,7 +32,7 @@ true - + m_selectKey @@ -50,14 +50,14 @@ Expanding - + 20 20 - + m_removeButton @@ -65,7 +65,7 @@ Remove - + m_titleLabel @@ -75,5 +75,5 @@ - + diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp index e41e246d..d74f9baa 100644 --- a/kopete/plugins/cryptography/kgpginterface.cpp +++ b/kopete/plugins/cryptography/kgpginterface.cpp @@ -50,12 +50,12 @@ TQString KgpgInterface::KgpgEncryptText(TQString text,TQString userIDs, TQString userIDs=userIDs.simplifyWhiteSpace(); Options=Options.stripWhiteSpace(); - int ct=userIDs.find(" "); + int ct=userIDs.tqfind(" "); while (ct!=-1) // if multiple keys... { dests+=" --recipient "+userIDs.section(' ',0,0); userIDs.remove(0,ct+1); - ct=userIDs.find(" "); + ct=userIDs.tqfind(" "); } dests+=" --recipient "+userIDs; @@ -75,7 +75,7 @@ TQString KgpgInterface::KgpgEncryptText(TQString text,TQString userIDs, TQString if( !encResult.isEmpty() ) return encResult; else - return TQString::null; + return TQString(); } TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID) @@ -95,15 +95,15 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID) { /// pipe for passphrase //userID=TQString::fromUtf8(userID); - userID.replace('<',"<"); - TQString passdlg=i18n("Enter passphrase for %1:").arg(userID); + userID.tqreplace('<',"<"); + TQString passdlg=i18n("Enter passphrase for %1:").tqarg(userID); if (counter>1) - passdlg.prepend(i18n("Bad passphrase
You have %1 tries left.
").arg(TQString::number(4-counter))); + passdlg.prepend(i18n("Bad passphrase
You have %1 tries left.
").tqarg(TQString::number(4-counter))); /// pipe for passphrase int code=KPasswordDialog::getPassword(password,passdlg); if (code!=TQDialog::Accepted) - return TQString::null; + return TQString(); CryptographyPlugin::setCachedPass(password); } @@ -135,7 +135,7 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID) if( !encResult.isEmpty() ) return encResult; else - return TQString::null; + return TQString(); } TQString KgpgInterface::checkForUtf8(TQString txt) @@ -147,22 +147,22 @@ TQString KgpgInterface::checkForUtf8(TQString txt) /* Make sure the encoding is UTF-8. * Test structure suggested by Werner Koch */ if (txt.isEmpty()) - return TQString::null; + return TQString(); for (s = txt.ascii(); *s && !(*s & 0x80); s++) ; - if (*s && !strchr (txt.ascii(), 0xc3) && (txt.find("\\x")==-1)) + if (*s && !strchr (txt.ascii(), 0xc3) && (txt.tqfind("\\x")==-1)) return txt; /* The string is not in UTF-8 */ //if (strchr (txt.ascii(), 0xc3)) return (txt+" +++"); - if (txt.find("\\x")==-1) + if (txt.tqfind("\\x")==-1) return TQString::fromUtf8(txt.ascii()); - // if (!strchr (txt.ascii(), 0xc3) || (txt.find("\\x")!=-1)) { - for ( int idx = 0 ; (idx = txt.find( "\\x", idx )) >= 0 ; ++idx ) { + // if (!strchr (txt.ascii(), 0xc3) || (txt.tqfind("\\x")!=-1)) { + for ( int idx = 0 ; (idx = txt.tqfind( "\\x", idx )) >= 0 ; ++idx ) { char str[2] = "x"; str[0] = (char) TQString( txt.mid( idx + 2, 2 ) ).toShort( 0, 16 ); - txt.replace( idx, 4, str ); + txt.tqreplace( idx, 4, str ); } if (!strchr (txt.ascii(), 0xc3)) return TQString::fromUtf8(txt.ascii()); diff --git a/kopete/plugins/cryptography/kgpginterface.h b/kopete/plugins/cryptography/kgpginterface.h index f324359e..9da953fe 100644 --- a/kopete/plugins/cryptography/kgpginterface.h +++ b/kopete/plugins/cryptography/kgpginterface.h @@ -30,6 +30,7 @@ class KgpgInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 88078ece..1f3d5a39 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -38,7 +38,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////// Secret key selection dialog, used when user wants to sign a key -KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) +KgpgSelKey::KgpgSelKey(TQWidget *tqparent, const char *name,bool showlocal):KDialogBase( tqparent, name, true,i18n("Private Key List"),Ok | Cancel) { TQString keyname; TQWidget *page = new TQWidget(this); @@ -122,7 +122,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo tst=tst.section(":",9,9); // FIXME: Same here: don't use popen! - Martijn - fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).arg( KShellProcess::quote( id ) ).latin1(), "r" ); + fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).tqarg( KShellProcess::quote( id ) ).latin1(), "r" ); bool dead=true; while ( fgets( line, sizeof(line), fp2)) { @@ -147,7 +147,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo if (!tst.isEmpty() && (!dead)) { KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst)); - KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val)); + KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(tr).tqarg(val)); sub->setSelectable(false); item->setPixmap(0,keyPair); } @@ -163,20 +163,20 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo keysListpr->setSelected(keysListpr->firstChild(),true); page->show(); - resize(this->minimumSize()); + resize(this->tqminimumSize()); setMainWidget(page); } TQString KgpgSelKey::extractKeyName(TQString fullName) { TQString kMail; - if (fullName.find("<")!=-1) + if (fullName.tqfind("<")!=-1) { kMail=fullName.section('<',-1,-1); kMail.truncate(kMail.length()-1); } TQString kName=fullName.section('<',0,0); - if (kName.find("(")!=-1) kName=kName.section('(',0,0); + if (kName.tqfind("(")!=-1) kName=kName.section('(',0,0); return TQString(kMail+" ("+kName+")").stripWhiteSpace(); } @@ -201,8 +201,8 @@ void KgpgSelKey::slotSelect(TQListViewItem *item) if (item==NULL) return; if (item->depth()!=0) { - keysListpr->setSelected(item->parent(),true); - keysListpr->setCurrentItem(item->parent()); + keysListpr->setSelected(item->tqparent(),true); + keysListpr->setCurrentItem(item->tqparent()); } } diff --git a/kopete/plugins/cryptography/kgpgselkey.h b/kopete/plugins/cryptography/kgpgselkey.h index 1e357482..190e8186 100644 --- a/kopete/plugins/cryptography/kgpgselkey.h +++ b/kopete/plugins/cryptography/kgpgselkey.h @@ -41,9 +41,10 @@ struct gpgKey { class KgpgSelKey : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true); + KgpgSelKey( TQWidget *tqparent = 0, const char *name = 0,bool showlocal=true); KListView *keysListpr; TQPixmap keyPair; TQCheckBox *local; diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 9c1561f1..43787d47 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -57,14 +57,14 @@ class UpdateViewItem2 : public KListViewItem { public: - UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); + UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault); virtual void paintCell(TQPainter *p, const TQColorGroup &cg,int col, int width, int align); virtual TQString key(int c,bool ) const; bool def; }; -UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) - : KListViewItem(parent) +UpdateViewItem2::UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault) + : KListViewItem(tqparent) { def=isDefault; setText(0,name); @@ -73,14 +73,14 @@ def=isDefault; } -void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment) +void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment) { if ((def) && (column<2)) { TQFont font(p->font()); font.setBold(true); p->setFont(font); } - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } TQString UpdateViewItem2 :: key(int c,bool ) const @@ -90,8 +90,8 @@ TQString UpdateViewItem2 :: key(int c,bool ) const /////////////// main view -popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): -KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) +popupPublic::popupPublic(TQWidget *tqparent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): +KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqparent, name,true) { TQWidget *page = plainPage(); TQVBoxLayout *vbox=new TQVBoxLayout(page,0,spacingHint()); @@ -108,7 +108,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); - if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile)); + if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile)); fmode=filemode; TQHButtonGroup *hBar=new TQHButtonGroup(page); @@ -144,7 +144,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); KActionCollection *actcol=new KActionCollection(this); - (void) new KAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + (void) new KAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -165,16 +165,16 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent "box enables you to use any key, even if it has not be signed.")); if (filemode) { - TQWidget *parentBox=new TQWidget(boutonboxoptions); - TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0); + TQWidget *tqparentBox=new TQWidget(boutonboxoptions); + TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); //shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setMargin(0); - CBshred=new TQCheckBox(i18n("Shred source file"),parentBox); + CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); TQWhatsThis::add (CBshred,i18n("Shred source file: permanently remove source file. No recovery will be possible")); TQString shredWhatsThis = i18n( "Shred source file:

Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.

But you must be aware that this is not secure on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).

"); - KActiveLabel *warn= new KActiveLabel( i18n("Read this before using shredding").arg(shredWhatsThis),parentBox ); + KActiveLabel *warn= new KActiveLabel( i18n("Read this before using shredding").tqarg(shredWhatsThis),tqparentBox ); shredBox->addWidget(CBshred); shredBox->addWidget(warn); } @@ -187,7 +187,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent //BEGIN modified for Kopete - setWFlags( getWFlags() | Qt::WDestructiveClose ); + setWFlags( getWFlags() | TQt::WDestructiveClose ); /*CBarmor->setChecked( KGpgSettings::asciiArmor() ); @@ -221,7 +221,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent char line[200]="\0"; FILE *fp2; - seclist=TQString::null; + seclist=TQString(); fp2 = popen("gpg --no-secmem-warning --no-tty --with-colon --list-secret-keys ", "r"); while ( fgets( line, sizeof(line), fp2)) @@ -269,7 +269,7 @@ void popupPublic::sort() if (current==NULL) return; - if ((untrustedList.find(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())){ + if ((untrustedList.tqfind(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())){ if (current->isSelected()) { current->setSelected(false); reselect=true; @@ -279,7 +279,7 @@ void popupPublic::sort() while ( current->nextSibling() ) { current = current->nextSibling(); - if ((untrustedList.find(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())) { + if ((untrustedList.tqfind(current->text(2))!=untrustedList.end()) && (!current->text(2).isEmpty())) { if (current->isSelected()) { current->setSelected(false); reselect=true; @@ -342,7 +342,7 @@ void popupPublic::refreshkeys() { if (!TQString(*it).isEmpty()) { - UpdateViewItem2 *item=new UpdateViewItem2(keysList,TQString(*it),TQString::null,TQString::null,false); + UpdateViewItem2 *item=new UpdateViewItem2(keysList,TQString(*it),TQString(),TQString(),false); item->setPixmap(0,keyGroup); } } @@ -433,16 +433,16 @@ void popupPublic::slotprocread(KProcIO *p) untrustedList<setSelectable(false); - if (seclist.find(tst,0,FALSE)!=-1) + if (seclist.tqfind(tst,0,FALSE)!=-1) item->setPixmap(0,keyPair); else item->setPixmap(0,keySingle); diff --git a/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h index 7e3208aa..17c05ebb 100644 --- a/kopete/plugins/cryptography/popuppublic.h +++ b/kopete/plugins/cryptography/popuppublic.h @@ -31,12 +31,13 @@ class KListView; class TQButtonGroup; class KProcIO; -class popupPublic : public KDialogBase //QDialog +class popupPublic : public KDialogBase //TQDialog { Q_OBJECT + TQ_OBJECT public: - popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+Qt::Key_Home)); + popupPublic(TQWidget *tqparent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); ~popupPublic(); KListView *keysList; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; diff --git a/kopete/plugins/highlight/highlightconfig.cpp b/kopete/plugins/highlight/highlightconfig.cpp index d6e04d7f..2cfab23b 100644 --- a/kopete/plugins/highlight/highlightconfig.cpp +++ b/kopete/plugins/highlight/highlightconfig.cpp @@ -78,11 +78,11 @@ void HighlightConfig::load() { m_filters.clear(); //clear filters - TQString filename = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) ); + TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) ); if( filename.isEmpty() ) return ; - TQDomDocument filterList( TQString::fromLatin1( "highlight-plugin" ) ); + TQDomDocument filterList( TQString::tqfromLatin1( "highlight-plugin" ) ); TQFile filterListFile( filename ); filterListFile.open( IO_ReadOnly ); @@ -96,7 +96,7 @@ void HighlightConfig::load() TQDomElement element = node.toElement(); if( !element.isNull() ) { -// if( element.tagName() == TQString::fromLatin1("filter") +// if( element.tagName() == TQString::tqfromLatin1("filter") // { Filter *filtre=newFilter(); TQDomNode filterNode = node.firstChild(); @@ -106,40 +106,40 @@ void HighlightConfig::load() TQDomElement filterElement = filterNode.toElement(); if( !filterElement.isNull() ) { - if( filterElement.tagName() == TQString::fromLatin1( "display-name" ) ) + if( filterElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) { filtre->displayName = filterElement.text(); } - else if( filterElement.tagName() == TQString::fromLatin1( "search" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "search" ) ) { filtre->search = filterElement.text(); - filtre->caseSensitive= ( filterElement.attribute( TQString::fromLatin1( "caseSensitive" ), TQString::fromLatin1( "1" ) ) == TQString::fromLatin1( "1" ) ); - filtre->isRegExp= ( filterElement.attribute( TQString::fromLatin1( "regExp" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->caseSensitive= ( filterElement.attribute( TQString::tqfromLatin1( "caseSensitive" ), TQString::tqfromLatin1( "1" ) ) == TQString::tqfromLatin1( "1" ) ); + filtre->isRegExp= ( filterElement.attribute( TQString::tqfromLatin1( "regExp" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::fromLatin1( "FG" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "FG" ) ) { filtre->FG = filterElement.text(); - filtre->setFG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->setFG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::fromLatin1( "BG" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "BG" ) ) { filtre->BG = filterElement.text(); - filtre->setBG= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->setBG= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::fromLatin1( "importance" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "importance" ) ) { filtre->importance = filterElement.text().toUInt(); - filtre->setImportance= ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->setImportance= ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::fromLatin1( "sound" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "sound" ) ) { filtre->soundFN = filterElement.text(); - filtre->playSound = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->playSound = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } - else if( filterElement.tagName() == TQString::fromLatin1( "raise" ) ) + else if( filterElement.tagName() == TQString::tqfromLatin1( "raise" ) ) { - filtre->raiseView = ( filterElement.attribute( TQString::fromLatin1( "set" ), TQString::fromLatin1( "0" ) ) == TQString::fromLatin1( "1" ) ); + filtre->raiseView = ( filterElement.attribute( TQString::tqfromLatin1( "set" ), TQString::tqfromLatin1( "0" ) ) == TQString::tqfromLatin1( "1" ) ); } } filterNode = filterNode.nextSibling(); @@ -154,7 +154,7 @@ void HighlightConfig::load() void HighlightConfig::save() { - TQString fileName = locateLocal( "appdata", TQString::fromLatin1( "highlight.xml" ) ); + TQString fileName = locateLocal( "appdata", TQString::tqfromLatin1( "highlight.xml" ) ); KSaveFile file( fileName ); if( file.status() == 0 ) @@ -162,7 +162,7 @@ void HighlightConfig::save() TQTextStream *stream = file.textStream(); stream->setEncoding( TQTextStream::UnicodeUTF8 ); - TQString xml = TQString::fromLatin1( + TQString xml = TQString::tqfromLatin1( "\n" "\n" "\n" ); @@ -172,32 +172,32 @@ void HighlightConfig::save() for( ; filtreIt.current(); ++filtreIt ) { Filter *filtre = *filtreIt; - xml += TQString::fromLatin1( " \n " ) + xml += TQString::tqfromLatin1( " \n " ) + TQStyleSheet::escape(filtre->displayName) - + TQString::fromLatin1( "\n" ); + + TQString::tqfromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->caseSensitive ) ) + - TQString::fromLatin1("\" regExp=\"") + TQString::number( static_cast( filtre->isRegExp ) ) + - TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::fromLatin1( "\n" ); + xml += TQString::tqfromLatin1(" ( filtre->caseSensitive ) ) + + TQString::tqfromLatin1("\" regExp=\"") + TQString::number( static_cast( filtre->isRegExp ) ) + + TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->search ) + TQString::tqfromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->setBG ) ) + - TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::fromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->setFG ) ) + - TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::fromLatin1( "\n" ); + xml += TQString::tqfromLatin1(" ( filtre->setBG ) ) + + TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->BG.name() ) + TQString::tqfromLatin1( "\n" ); + xml += TQString::tqfromLatin1(" ( filtre->setFG ) ) + + TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->FG.name() ) + TQString::tqfromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->setImportance ) ) + - TQString::fromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::fromLatin1( "\n" ); + xml += TQString::tqfromLatin1(" ( filtre->setImportance ) ) + + TQString::tqfromLatin1( "\">" ) + TQString::number( filtre->importance ) + TQString::tqfromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->playSound ) ) + - TQString::fromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::fromLatin1( "\n" ); + xml += TQString::tqfromLatin1(" ( filtre->playSound ) ) + + TQString::tqfromLatin1( "\">" ) + TQStyleSheet::escape( filtre->soundFN ) + TQString::tqfromLatin1( "\n" ); - xml += TQString::fromLatin1(" ( filtre->raiseView ) ) + - TQString::fromLatin1( "\">\n" ); + xml += TQString::tqfromLatin1(" ( filtre->raiseView ) ) + + TQString::tqfromLatin1( "\">\n" ); - xml += TQString::fromLatin1( " \n" ); + xml += TQString::tqfromLatin1( " \n" ); } - xml += TQString::fromLatin1( "\n" ); + xml += TQString::tqfromLatin1( "\n" ); *stream << xml; } diff --git a/kopete/plugins/highlight/highlightplugin.cpp b/kopete/plugins/highlight/highlightplugin.cpp index 7ec6ba5e..843d7ed5 100644 --- a/kopete/plugins/highlight/highlightplugin.cpp +++ b/kopete/plugins/highlight/highlightplugin.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory HighlightPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_highlight, HighlightPluginFactory( "kopete_highlight" ) ) -HighlightPlugin::HighlightPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( HighlightPluginFactory::instance(), parent, name ) +HighlightPlugin::HighlightPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( HighlightPluginFactory::instance(), tqparent, name ) { if( !pluginStatic_ ) pluginStatic_=this; @@ -70,8 +70,8 @@ void HighlightPlugin::slotIncomingMessage( Kopete::Message& msg ) { ++it; if(f->isRegExp ? - msg.plainBody().contains(TQRegExp(f->search , f->caseSensitive)) : - msg.plainBody().contains(f->search , f->caseSensitive) ) + msg.plainBody().tqcontains(TQRegExp(f->search , f->caseSensitive)) : + msg.plainBody().tqcontains(f->search , f->caseSensitive) ) { if(f->setBG) msg.setBg(f->BG); @@ -80,7 +80,7 @@ void HighlightPlugin::slotIncomingMessage( Kopete::Message& msg ) if(f->setImportance) msg.setImportance((Kopete::Message::MessageImportance)f->importance); if(f->playSound) - KNotifyClient::userEvent (TQString::null, KNotifyClient::Sound, KNotifyClient::Default, f->soundFN ); + KNotifyClient::userEvent (TQString(), KNotifyClient::Sound, KNotifyClient::Default, f->soundFN ); if (f->raiseView && msg.manager() && msg.manager()->view()) { diff --git a/kopete/plugins/highlight/highlightplugin.h b/kopete/plugins/highlight/highlightplugin.h index f5b0f671..866e69d1 100644 --- a/kopete/plugins/highlight/highlightplugin.h +++ b/kopete/plugins/highlight/highlightplugin.h @@ -43,11 +43,12 @@ class Filter; class HighlightPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: static HighlightPlugin *plugin(); - HighlightPlugin( TQObject *parent, const char *name, const TQStringList &args ); + HighlightPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~HighlightPlugin(); public slots: diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 5e8da39c..128ed822 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory HighlightPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_highlight, HighlightPreferencesFactory( "kcm_kopete_highlight" ) ) -HighlightPreferences::HighlightPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(HighlightPreferencesFactory::instance(), parent, args) +HighlightPreferences::HighlightPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule(HighlightPreferencesFactory::instance(), tqparent, args) { donttouch=true; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/plugins/highlight/highlightpreferences.h b/kopete/plugins/highlight/highlightpreferences.h index ff51aa1f..8d7d8242 100644 --- a/kopete/plugins/highlight/highlightpreferences.h +++ b/kopete/plugins/highlight/highlightpreferences.h @@ -31,9 +31,10 @@ class TQListViewItem; class HighlightPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - HighlightPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HighlightPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~HighlightPreferences(); virtual void save(); diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index b8150c56..2d853f0e 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -1,7 +1,7 @@ HighlightPrefsUI Olivier Goffart - + HighlighPrefsUI @@ -20,7 +20,7 @@ unnamed - + groupBox1 @@ -39,7 +39,7 @@ unnamed - + m_add @@ -47,7 +47,7 @@ Add - + m_remove @@ -58,7 +58,7 @@ Remove - + m_rename @@ -95,7 +95,7 @@ - + groupBox2 @@ -114,7 +114,7 @@ unnamed - + textLabel1 @@ -127,7 +127,7 @@ - If the message contains: + If the message tqcontains: @@ -135,15 +135,15 @@ m_search - + - layout3 + tqlayout3 unnamed - + m_regexp @@ -151,7 +151,7 @@ Regular expression - + m_editregexp @@ -177,7 +177,7 @@ Expanding - + 20 20 @@ -186,7 +186,7 @@ - + m_case @@ -196,7 +196,7 @@ - + buttonGroup2 @@ -215,15 +215,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + m_setImportance @@ -277,7 +277,7 @@ Expanding - + 31 21 @@ -286,15 +286,15 @@ - + - layout5 + tqlayout5 unnamed - + m_setBG @@ -328,7 +328,7 @@ Expanding - + 31 21 @@ -337,15 +337,15 @@ - + - layout6 + tqlayout6 unnamed - + m_setFG @@ -379,7 +379,7 @@ Expanding - + 41 21 @@ -388,15 +388,15 @@ - + - layout7 + tqlayout7 unnamed - + m_sound @@ -411,15 +411,15 @@ - + - layout8 + tqlayout8 unnamed - + m_raise @@ -452,7 +452,7 @@ m_soundFN m_raise - + klistview.h klineedit.h diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index d2e4839d..5a84e021 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -40,17 +40,17 @@ void HistoryPlugin::convertOldHistory() i18n( "Would you like to remove old history files?" ) , i18n( "History Converter" ), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes; KProgressDialog *progressDlg=new KProgressDialog(Kopete::UI::Global::mainWidget() , "history_progress_dlg" , i18n( "History converter" ) , - TQString::null , true); //modal to make sure the user will not doing stupid things (we have a kapp->processEvents()) + TQString() , true); //modal to make sure the user will not doing stupid things (we have a kapp->processEvents()) progressDlg->setAllowCancel(false); //because i am too lazy to allow to cancel - TQString kopetedir=locateLocal( "data", TQString::fromLatin1( "kopete")); + TQString kopetedir=locateLocal( "data", TQString::tqfromLatin1( "kopete")); TQDir d( kopetedir ); //d should point to ~/.kde/share/apps/kopete/ d.setFilter( TQDir::Dirs ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -74,9 +74,9 @@ void HistoryPlugin::convertOldHistory() KGlobal::config()->setGroup("MSN"); accountId=KGlobal::config()->readEntry( "UserID" ); } - else if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) + else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) { - protocolId="ICQProtocol"; + protocolId="ICTQProtocol"; KGlobal::config()->setGroup("ICQ"); accountId=KGlobal::config()->readEntry( "UIN" ); } @@ -106,23 +106,23 @@ void HistoryPlugin::convertOldHistory() TQDir d2( fi->absFilePath() ); d2.setFilter( TQDir::Files ); d2.setNameFilter("*.log"); - const QFileInfoList *list = d2.entryInfoList(); - QFileInfoListIterator it2( *list ); + const TQFileInfoList *list = d2.entryInfoList(); + TQFileInfoListIterator it2( *list ); TQFileInfo *fi2; progressDlg->progressBar()->reset(); progressDlg->progressBar()->setTotalSteps(d2.count()); - progressDlg->setLabel(i18n("Parsing old history in %1").arg(fi->fileName())); + progressDlg->setLabel(i18n("Parsing old history in %1").tqarg(fi->fileName())); progressDlg->show(); //if it was not already showed... while ( (fi2 = it2.current()) != 0 ) { //we assume that all "-" are dots. (like in hotmail.com) - TQString contactId=fi2->fileName().replace(".log" , TQString::null).replace("-" , "."); + TQString contactId=fi2->fileName().tqreplace(".log" , TQString()).tqreplace("-" , "."); if(!contactId.isEmpty() ) { - progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").arg(fi->fileName()).arg(contactId)); + progressDlg->setLabel(i18n("Parsing old history in %1:\n%2").tqarg(fi->fileName()).tqarg(contactId)); kapp->processEvents(0); //make sure the text is updated in the progressDlg int month=0; @@ -155,12 +155,12 @@ void HistoryPlugin::convertOldHistory() buffer += TQString::fromUtf8(cbuf); } - if( buffer.startsWith( TQString::fromLatin1( "\n" ) /*strcmp("\n", cbuf )*/ ) + while( !feof( f ) && buffer != TQString::tqfromLatin1( "\n" ) /*strcmp("\n", cbuf )*/ ) { fgets(cbuf, CBUFLENGTH, f); buffer = TQString::fromUtf8(cbuf); @@ -178,7 +178,7 @@ void HistoryPlugin::convertOldHistory() msgelement = xmllist.documentElement(); node = msgelement.firstChild(); - if( msgelement.attribute( TQString::fromLatin1( "direction" ) ) == TQString::fromLatin1( "inbound" ) ) + if( msgelement.attribute( TQString::tqfromLatin1( "direction" ) ) == TQString::tqfromLatin1( "inbound" ) ) dir = Kopete::Message::Inbound; else dir = Kopete::Message::Outbound; @@ -194,12 +194,12 @@ void HistoryPlugin::convertOldHistory() element = node.toElement(); tagname = element.tagName(); - if( tagname == TQString::fromLatin1( "srcnick" ) ) + if( tagname == TQString::tqfromLatin1( "srcnick" ) ) nick = element.text(); - else if( tagname == TQString::fromLatin1( "date" ) ) + else if( tagname == TQString::tqfromLatin1( "date" ) ) date = element.text(); - else if( tagname == TQString::fromLatin1( "body" ) ) + else if( tagname == TQString::tqfromLatin1( "body" ) ) body = element.text().stripWhiteSpace(); } @@ -213,11 +213,11 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + - TQString::fromLatin1( "/" ) + - contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString name = protocolId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString::tqfromLatin1( "/" ) + + contactId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); - KSaveFile file( locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ); + KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); if( file.status() == 0 ) { TQTextStream *stream = file.textStream(); @@ -254,7 +254,7 @@ void HistoryPlugin::convertOldHistory() headElem.appendChild(contactElem); TQDomElement importElem = doc.createElement( "imported" ); importElem.setAttribute( "from", fi->fileName() ); - importElem.setAttribute( "date", TQDateTime::currentDateTime().toString() ); + importElem.setAttribute( "date", TQDateTime::tqcurrentDateTime().toString() ); headElem.appendChild(importElem); } TQDomElement msgElem = doc.createElement( "msg" ); @@ -275,11 +275,11 @@ void HistoryPlugin::convertOldHistory() if(!docElem.isNull()) { TQDate date(year,month,1); - TQString name = protocolId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + - TQString::fromLatin1( "/" ) + - contactId.replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString name = protocolId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString::tqfromLatin1( "/" ) + + contactId.tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); - KSaveFile file( locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ); + KSaveFile file( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ); if( file.status() == 0 ) { TQTextStream *stream = file.textStream(); @@ -310,15 +310,15 @@ bool HistoryPlugin::detectOldHistory() return false; - TQDir d( locateLocal( "data", TQString::fromLatin1( "kopete/logs")) ); + TQDir d( locateLocal( "data", TQString::tqfromLatin1( "kopete/logs")) ); d.setFilter( TQDir::Dirs ); if(d.count() >= 3) // '.' and '..' are included return false; //the new history already exists - TQDir d2( locateLocal( "data", TQString::fromLatin1( "kopete")) ); + TQDir d2( locateLocal( "data", TQString::tqfromLatin1( "kopete")) ); d2.setFilter( TQDir::Dirs ); - const QFileInfoList *list = d2.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d2.entryInfoList(); + TQFileInfoListIterator it( *list ); TQFileInfo *fi; while ( (fi = it.current()) != 0 ) { @@ -327,7 +327,7 @@ bool HistoryPlugin::detectOldHistory() if(fi->fileName() == "MSNProtocol" || fi->fileName() == "msn_logs" ) return true; - else if(fi->fileName() == "ICQProtocol" || fi->fileName() == "icq_logs" ) + else if(fi->fileName() == "ICTQProtocol" || fi->fileName() == "icq_logs" ) return true; else if(fi->fileName() == "AIMProtocol" || fi->fileName() == "aim_logs" ) return true; diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 5dc550be..2496f893 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -60,7 +60,7 @@ class KListViewDateItem : public KListViewItem { public: - KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc); + KListViewDateItem(KListView* tqparent, TQDate date, Kopete::MetaContact *mc); TQDate date() { return mDate; } Kopete::MetaContact *metaContact() { return mMetaContact; } @@ -73,8 +73,8 @@ private: -KListViewDateItem::KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc) - : KListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) +KListViewDateItem::KListViewDateItem(KListView* tqparent, TQDate date, Kopete::MetaContact *mc) + : KListViewItem(tqparent, date.toString(Qt::ISODate), mc->displayName()) { mDate = date; mMetaContact = mc; @@ -93,16 +93,16 @@ int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const } -HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, - const char* name) : KDialogBase(parent, name, false, - i18n("History for %1").arg(mc->displayName()), 0), mSearching(false) +HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent, + const char* name) : KDialogBase(tqparent, name, false, + i18n("History for %1").tqarg(mc->displayName()), 0), mSearching(false) { TQString fontSize; TQString htmlCode; TQString fontStyle; kdDebug(14310) << k_funcinfo << "called." << endl; - setWFlags(Qt::WDestructiveClose); // send TQT_SIGNAL(closing()) on quit + setWFlags(TQt::WDestructiveClose); // send TQT_SIGNAL(closing()) on quit // FIXME: Allow to show this dialog for only one contact mMetaContact = mc; @@ -125,7 +125,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, } if (mMetaContact) - mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.find(mMetaContact)+1); + mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.tqfind(mMetaContact)+1); mMainWidget->dateSearchLine->setListView(mMainWidget->dateListView); mMainWidget->dateListView->setSorting(0, 0); //newest-first @@ -147,8 +147,8 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlView = mHtmlPart->view(); mHtmlView->setMarginWidth(4); mHtmlView->setMarginHeight(4); - mHtmlView->setFocusPolicy(NoFocus); - mHtmlView->setSizePolicy( + mHtmlView->setFocusPolicy(TQ_NoFocus); + mHtmlView->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); l->addWidget(mHtmlView); @@ -157,7 +157,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlPart->begin(); htmlCode = "" + fontStyle + ""; - mHtmlPart->write( TQString::fromLatin1( htmlCode.latin1() ) ); + mHtmlPart->write( TQString::tqfromLatin1( htmlCode.latin1() ) ); mHtmlPart->end(); @@ -174,8 +174,8 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, //initActions KActionCollection* ac = new KActionCollection(this); - mCopyAct = KStdAction::copy( this, TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), ac ); + mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); + mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::tqfromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); @@ -196,7 +196,7 @@ void HistoryDialog::init() { if(mMetaContact) { - HistoryLogger logger(mMetaContact, this); + HistoryLogger logger(mMetaContact, TQT_TQOBJECT(this)); init(mMetaContact); } else @@ -204,7 +204,7 @@ void HistoryDialog::init() TQPtrListIterator it(mMetaContactList); for(; it.current(); ++it) { - HistoryLogger logger(*it, this); + HistoryLogger logger(*it, TQT_TQOBJECT(this)); init(*it); } @@ -226,12 +226,12 @@ void HistoryDialog::slotLoadDays() DMPair pair(mInit.dateMCList.first()); mInit.dateMCList.pop_front(); - HistoryLogger logger(pair.metaContact(), this); + HistoryLogger logger(pair.metaContact(), TQT_TQOBJECT(this)); TQValueList dayList = logger.getDaysForMonth(pair.date()); for (unsigned int i=0; idateListView, c2Date, pair.metaContact()); } mMainWidget->searchProgress->advance(1); @@ -255,24 +255,24 @@ void HistoryDialog::init(Kopete::Contact *c) { // Get year and month list TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" ); - const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ); + const TQString contact_in_filename=c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ); TQFileInfo *fi; // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); - const QFileInfoList *list1 = d1.entryInfoList(); + const TQFileInfoList *list1 = d1.entryInfoList(); if ( list1 != 0 ) { - QFileInfoListIterator it1( *list1 ); + TQFileInfoListIterator it1( *list1 ); while ( (fi = it1.current()) != 0 ) { - if(fi->fileName().contains(contact_in_filename)) + if(fi->fileName().tqcontains(contact_in_filename)) { rx.search(fi->fileName()); @@ -288,20 +288,20 @@ void HistoryDialog::init(Kopete::Contact *c) // END of kopete 0.7.x check TQString logDir = locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + - TQString::fromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + + TQString::tqfromLatin1( "/" ) + + c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) ); TQDir d(logDir); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); d.setSorting( TQDir::Name ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if ( list != 0 ) { - QFileInfoListIterator it( *list ); + TQFileInfoListIterator it( *list ); while ( (fi = it.current()) != 0 ) { - if(fi->fileName().contains(contact_in_filename)) + if(fi->fileName().tqcontains(contact_in_filename)) { rx.search(fi->fileName()); @@ -325,7 +325,7 @@ void HistoryDialog::dateSelected(TQListViewItem* it) TQDate chosenDate = item->date(); - HistoryLogger logger(item->metaContact(), this); + HistoryLogger logger(item->metaContact(), TQT_TQOBJECT(this)); TQValueList msgs=logger.readMessages(chosenDate); setMessages(msgs); @@ -339,16 +339,16 @@ void HistoryDialog::setMessages(TQValueList msgs) htmlBody.removeChild(htmlBody.childNodes().item(htmlBody.childNodes().length() - 1)); // ---- - TQString dir = (TQApplication::reverseLayout() ? TQString::fromLatin1("rtl") : - TQString::fromLatin1("ltr")); + TQString dir = (TQApplication::reverseLayout() ? TQString::tqfromLatin1("rtl") : + TQString::tqfromLatin1("ltr")); TQValueList::iterator it = msgs.begin(); TQString accountLabel; TQString resultHTML = "" + (*it).timestamp().date().toString() + "
"; - DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); - newNode.setAttribute(TQString::fromLatin1("dir"), dir); + DOM::HTMLElement newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); + newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); @@ -375,7 +375,7 @@ void HistoryDialog::setMessages(TQValueList msgs) if (!mMainWidget->searchLine->text().isEmpty()) // If there is a search, then we hightlight the keywords { - body = body.replace(mMainWidget->searchLine->text(), "" + mMainWidget->searchLine->text() + "", false); + body = body.tqreplace(mMainWidget->searchLine->text(), "" + mMainWidget->searchLine->text() + "", false); } resultHTML += "(" + (*it).timestamp().time().toString() + ") " @@ -384,8 +384,8 @@ void HistoryDialog::setMessages(TQValueList msgs) : "textColor().light(200).name() + "\">< ") + body + "
"; - newNode = mHtmlPart->document().createElement(TQString::fromLatin1("span")); - newNode.setAttribute(TQString::fromLatin1("dir"), dir); + newNode = mHtmlPart->document().createElement(TQString::tqfromLatin1("span")); + newNode.setAttribute(TQString::tqfromLatin1("dir"), dir); newNode.setInnerHTML(resultHTML); mHtmlPart->htmlDocument().body().appendChild(newNode); @@ -477,12 +477,12 @@ void HistoryDialog::slotSearch() curItem = static_cast(curItem->nextSibling()) ) { - qApp->processEvents(); + tqApp->processEvents(); if (!mSearching) return; TQDate month(curItem->date().year(),curItem->date().month(),1); // if we haven't searched the relevant history logs, search them now - if (!monthsSearched[month].contains(curItem->metaContact())) + if (!monthsSearched[month].tqcontains(curItem->metaContact())) { monthsSearched[month].push_back(curItem->metaContact()); TQPtrList contacts = curItem->metaContact()->contacts(); @@ -496,7 +496,7 @@ void HistoryDialog::slotSearch() if (!file.isOpen()) { kdWarning(14310) << k_funcinfo << "Error opening " << - file.name() << ": " << file.errorString() << endl; + file.name() << ": " << file.errorString().data() << endl; continue; } @@ -505,19 +505,19 @@ void HistoryDialog::slotSearch() while(!stream.atEnd()) { textLine = stream.readLine(); - if (textLine.contains(mMainWidget->searchLine->text(), false)) + if (textLine.tqcontains(mMainWidget->searchLine->text(), false)) { if(rx.search(textLine) != -1) { // only match message body - if (rx.cap(2).contains(mMainWidget->searchLine->text())) + if (rx.cap(2).tqcontains(mMainWidget->searchLine->text())) matches[TQDate(curItem->date().year(),curItem->date().month(),rx.cap(1).toInt())].push_back(curItem->metaContact()); } // this will happen when multiline messages are searched, properly // parsing the files would fix this else { } } - qApp->processEvents(); + tqApp->processEvents(); if (!mSearching) return; } file.close(); @@ -525,7 +525,7 @@ void HistoryDialog::slotSearch() } // relevant logfiles have been searched now, check if current date matches - if (matches[curItem->date()].contains(curItem->metaContact())) + if (matches[curItem->date()].tqcontains(curItem->metaContact())) curItem->setVisible(true); // Next date item @@ -553,7 +553,7 @@ void HistoryDialog::slotContactChanged(int index) else { mMetaContact = mMetaContactList.at(index-1); - setCaption(i18n("History for %1").arg(mMetaContact->displayName())); + setCaption(i18n("History for %1").tqarg(mMetaContact->displayName())); init(); } } @@ -597,16 +597,16 @@ void HistoryDialog::slotCopy() if ( qsSelection.isEmpty() ) return; disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::clipboard()->setText(qsSelection, QClipboard::Clipboard); - TQApplication::clipboard()->setText(qsSelection, QClipboard::Selection); + TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Clipboard); + TQApplication::tqclipboard()->setText(qsSelection, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } void HistoryDialog::slotCopyURL() { disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); - TQApplication::clipboard()->setText( mURL, QClipboard::Clipboard); - TQApplication::clipboard()->setText( mURL, QClipboard::Selection); + TQApplication::tqclipboard()->setText( mURL, TQClipboard::Clipboard); + TQApplication::tqclipboard()->setText( mURL, TQClipboard::Selection); connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); } diff --git a/kopete/plugins/history/historydialog.h b/kopete/plugins/history/historydialog.h index 63b08470..783bb3a7 100644 --- a/kopete/plugins/history/historydialog.h +++ b/kopete/plugins/history/historydialog.h @@ -62,9 +62,10 @@ class DMPair class HistoryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent=0, + HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent=0, const char* name="HistoryDialog"); ~HistoryDialog(); diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index 4b1798ae..57dfdc1c 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -27,12 +27,12 @@ class HistoryPlugin; -HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name) - : TQObject(parent, name), KXMLGUIClient(parent) +HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *tqparent, const char *name) + : TQObject(tqparent, name), KXMLGUIClient(tqparent) { setInstance(KGenericFactory::instance()); - m_manager = parent; + m_manager = tqparent; // Refuse to build this client, it is based on wrong parameters if(!m_manager || m_manager->members().isEmpty()) @@ -41,7 +41,7 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name TQPtrList mb=m_manager->members(); m_logger=new HistoryLogger( mb.first() , this ); - actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); + actionLast=new KAction( i18n("History Last" ), TQString::tqfromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" ); diff --git a/kopete/plugins/history/historyguiclient.h b/kopete/plugins/history/historyguiclient.h index 792325fc..b48595fc 100644 --- a/kopete/plugins/history/historyguiclient.h +++ b/kopete/plugins/history/historyguiclient.h @@ -29,8 +29,9 @@ class KAction; class HistoryGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - HistoryGUIClient(Kopete::ChatSession *parent = 0, const char *name = 0); + HistoryGUIClient(Kopete::ChatSession *tqparent = 0, const char *name = 0); ~HistoryGUIClient(); HistoryLogger *logger() const { return m_logger; } diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index 96f4d6dc..714fe966 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -37,15 +37,15 @@ #include "kopetechatsession.h" // ----------------------------------------------------------------------------- -HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *parent, const char *name ) - : TQObject(parent, name) +HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *tqparent, const char *name ) + : TQObject(tqparent, name) { m_saveTimer=0L; m_saveTimerTime=0; m_metaContact=m; m_hideOutgoing=false; m_cachedMonth=-1; - m_realMonth=TQDate::currentDate().month(); + m_realMonth=TQDate::tqcurrentDate().month(); m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact @@ -55,15 +55,15 @@ HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *parent, const c } -HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *parent, const char *name ) - : TQObject(parent, name) +HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *tqparent, const char *name ) + : TQObject(tqparent, name) { m_saveTimer=0L; m_saveTimerTime=0; m_cachedMonth=-1; m_metaContact=c->metaContact(); m_hideOutgoing=false; - m_realMonth=TQDate::currentDate().month(); + m_realMonth=TQDate::tqcurrentDate().month(); m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact @@ -107,14 +107,14 @@ void HistoryLogger::setCurrentMonth(int month) TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int month , bool canLoad , bool* contain) { - if(m_realMonth!=TQDate::currentDate().month()) + if(m_realMonth!=TQDate::tqcurrentDate().month()) { //We changed month, our indice are not correct anymore, clean memory. // or we will see what i called "the 31 midnight bug"(TM) :-) -Olivier m_documents.clear(); m_cachedMonth=-1; m_currentMonth++; //Not usre it's ok, but should work; m_oldMonth++; // idem - m_realMonth=TQDate::currentDate().month(); + m_realMonth=TQDate::tqcurrentDate().month(); } if(!m_metaContact) @@ -125,7 +125,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int return TQDomDocument(); } - if(!m_metaContact->contacts().contains(c)) + if(!m_metaContact->contacts().tqcontains(c)) { if(contain) *contain=false; @@ -133,11 +133,11 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, unsigned int } TQMap documents = m_documents[c]; - if (documents.contains(month)) + if (documents.tqcontains(month)) return documents[month]; - TQDomDocument doc = getDocument(c, TQDate::currentDate().addMonths(0-month), canLoad, contain); + TQDomDocument doc = getDocument(c, TQDate::tqcurrentDate().addMonths(0-month), canLoad, contain); documents.insert(month, doc); m_documents[c]=documents; @@ -156,7 +156,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, const TQDate return TQDomDocument(); } - if(!m_metaContact->contacts().contains(c)) + if(!m_metaContact->contacts().tqcontains(c)) { if(contain) *contain=false; @@ -170,7 +170,7 @@ TQDomDocument HistoryLogger::getDocument(const Kopete::Contact *c, const TQDate return TQDomDocument(); } - QString FileName = getFileName(c, date); + TQString FileName = getFileName(c, date); TQDomDocument doc( "Kopete-History" ); @@ -223,7 +223,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co } - if(!c || !m_metaContact->contacts().contains(c) ) + if(!c || !m_metaContact->contacts().tqcontains(c) ) { /*TQPtrList contacts= m_metaContact->contacts(); TQPtrListIterator it( contacts ); @@ -253,8 +253,8 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co TQDomElement headElem = doc.createElement( "head" ); docElem.appendChild( headElem ); TQDomElement dateElem = doc.createElement( "date" ); - dateElem.setAttribute( "year", TQString::number(TQDate::currentDate().year()) ); - dateElem.setAttribute( "month", TQString::number(TQDate::currentDate().month()) ); + dateElem.setAttribute( "year", TQString::number(TQDate::tqcurrentDate().year()) ); + dateElem.setAttribute( "month", TQString::number(TQDate::tqcurrentDate().month()) ); headElem.appendChild(dateElem); TQDomElement myselfElem = doc.createElement( "contact" ); myselfElem.setAttribute( "type", "myself" ); @@ -280,7 +280,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co // On hight-traffic channel, saving can take lots of CPU. (because the file is big) // So i wait a time proportional to the time needed to save.. - const TQString filename=getFileName(c,TQDate::currentDate()); + const TQString filename=getFileName(c,TQDate::tqcurrentDate()); if(!m_toSaveFileName.isEmpty() && m_toSaveFileName != filename) { //that mean the contact or the month has changed, save it now. saveToDisk(); @@ -316,14 +316,14 @@ void HistoryLogger::saveToDisk() m_toSaveDocument.save( *stream, 1 ); file.close(); - m_saveTimerTime=QMIN(t.elapsed()*1000, 300000); + m_saveTimerTime=TQMIN(t.elapsed()*1000, 300000); //a time 1000 times supperior to the time needed to save. but with a upper limit of 5 minutes //on a my machine, (2.4Ghz, but old HD) it should take about 10 ms to save the file. // So that would mean save every 10 seconds, which seems to be ok. // But it may take 500 ms if the file to save becomes too big (1Mb). kdDebug(14310) << k_funcinfo << m_toSaveFileName << " saved in " << t.elapsed() << " ms " < HistoryLogger::readMessages(TQDate date) to.append( dir==Kopete::Message::Inbound ? (*it)->account()->myself() : *it ); Kopete::Message msg(dt, from, to, msgElem2.text(), dir); - msg.setBody( TQString::fromLatin1("%2") - .arg( dt.toString(Qt::LocalDate), msg.escapedBody() ), + msg.setBody( TQString::tqfromLatin1("%2") + .tqarg( dt.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText); @@ -403,7 +403,7 @@ TQValueList HistoryLogger::readMessages(TQDate date) TQValueList HistoryLogger::readMessages(unsigned int lines, const Kopete::Contact *c, Sens sens, bool reverseOrder, bool colorize) { - //TQDate dd = TQDate::currentDate().addMonths(0-m_currentMonth); + //TQDate dd = TQDate::tqcurrentDate().addMonths(0-m_currentMonth); TQValueList messages; @@ -418,7 +418,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, return messages; } - if(c && !m_metaContact->contacts().contains(c) ) + if(c && !m_metaContact->contacts().tqcontains(c) ) return messages; if(sens ==0 ) //if no sens are selected, just continue in the previous sens @@ -473,7 +473,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, // date, this date will bocomes the limit. TQDomNode n; - if(m_currentElements.contains(*it)) + if(m_currentElements.tqcontains(*it)) n=m_currentElements[*it]; else //there is not yet "next message" register, so we will take the first (for the current month) { @@ -490,7 +490,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, if( !msgElem2.isNull() && msgElem2.tagName()=="msg") { rxTime.search(msgElem2.attribute("time")); - TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth); + TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth); TQDateTime dt( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt(), rxTime.cap(5).toUInt() ) ); if(!timestamp.isValid() || ((sens==Chronological )? dt < timestamp : dt > timestamp) ) { @@ -512,7 +512,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, } else //we don't have to merge the history. just take the next item in the contact { - if(m_currentElements.contains(currentContact)) + if(m_currentElements.tqcontains(currentContact)) msgElem=m_currentElements[currentContact]; else { @@ -572,7 +572,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, if(!m_hideOutgoing || dir != Kopete::Message::Outbound) { //parse only if we don't hide it - if( m_filter.isNull() || ( m_filterRegExp? msgElem.text().contains(TQRegExp(m_filter,m_filterCaseSensitive)) : msgElem.text().contains(m_filter,m_filterCaseSensitive) )) + if( m_filter.isNull() || ( m_filterRegExp? msgElem.text().tqcontains(TQRegExp(m_filter,m_filterCaseSensitive)) : msgElem.text().tqcontains(m_filter,m_filterCaseSensitive) )) { TQString f=msgElem.attribute("from" ); const Kopete::Contact *from=(f.isNull() || !currentContact) ? 0L : currentContact->account()->contacts()[f]; @@ -587,23 +587,23 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, { //parse timestamp only if it was not already parsed rxTime.search(msgElem.attribute("time")); - TQDate d=TQDate::currentDate().addMonths(0-m_currentMonth); + TQDate d=TQDate::tqcurrentDate().addMonths(0-m_currentMonth); timestamp=TQDateTime( TQDate(d.year() , d.month() , rxTime.cap(1).toUInt()), TQTime( rxTime.cap(2).toUInt() , rxTime.cap(3).toUInt() , rxTime.cap(5).toUInt() ) ); } Kopete::Message msg(timestamp, from, to, msgElem.text(), dir); if (colorize) { - msg.setBody( TQString::fromLatin1("%3") - .arg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ), + msg.setBody( TQString::tqfromLatin1("%3") + .tqarg( fgColor.name(), timestamp.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); msg.setFg( fgColor ); } else { - msg.setBody( TQString::fromLatin1("%2") - .arg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ), + msg.setBody( TQString::tqfromLatin1("%2") + .tqarg( timestamp.toString(Qt::LocalDate), msg.escapedBody() ), Kopete::Message::RichText ); } @@ -635,7 +635,7 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, TQRegExp rx("(\\d+) (\\d+):(\\d+):(\\d+)"); rx.search(msgElem.attribute("time")); - TQDate d = TQDate::currentDate().addMonths(0-m_currentMonth); + TQDate d = TQDate::tqcurrentDate().addMonths(0-m_currentMonth); timestamp = TQDateTime( TQDate(d.year(), d.month(), rx.cap(1).toUInt()), TQTime( rx.cap(2).toUInt(), rx.cap(3).toUInt() ) ); @@ -663,25 +663,25 @@ TQValueList HistoryLogger::readMessages(unsigned int lines, TQString HistoryLogger::getFileName(const Kopete::Contact* c, TQDate date) { - TQString name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + - TQString::fromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + - TQString::fromLatin1( "/" ) + - c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + TQString name = c->protocol()->pluginId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString::tqfromLatin1( "/" ) + + c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString::tqfromLatin1( "/" ) + + c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); - TQString filename=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ; + TQString filename=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; //Check if there is a kopete 0.7.x file TQFileInfo fi(filename); if(!fi.exists()) { - name = c->protocol()->pluginId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + - TQString::fromLatin1( "/" ) + - c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + + name = c->protocol()->pluginId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + + TQString::tqfromLatin1( "/" ) + + c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) + date.toString(".yyyyMM"); - TQString filename2=locateLocal( "data", TQString::fromLatin1( "kopete/logs/" ) + name+ TQString::fromLatin1( ".xml" ) ) ; + TQString filename2=locateLocal( "data", TQString::tqfromLatin1( "kopete/logs/" ) + name+ TQString::tqfromLatin1( ".xml" ) ) ; TQFileInfo fi2(filename2); if(fi2.exists()) @@ -702,20 +702,20 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) // BEGIN check if there are Kopete 0.7.x TQDir d1(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) )); d1.setFilter( TQDir::Files | TQDir::NoSymLinks ); d1.setSorting( TQDir::Name ); - const QFileInfoList *list1 = d1.entryInfoList(); - QFileInfoListIterator it1( *list1 ); + const TQFileInfoList *list1 = d1.entryInfoList(); + TQFileInfoListIterator it1( *list1 ); while ( (fi = it1.current()) != 0 ) { - if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ))) + if(fi->fileName().tqcontains(c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) { rx.search(fi->fileName()); - int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt(); + int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); if(result < 0) { @@ -730,22 +730,22 @@ unsigned int HistoryLogger::getFirstMonth(const Kopete::Contact *c) TQDir d(locateLocal("data",TQString("kopete/logs/")+ - c->protocol()->pluginId().replace( TQRegExp(TQString::fromLatin1("[./~?*]")),TQString::fromLatin1("-")) + - TQString::fromLatin1( "/" ) + - c->account()->accountId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ) + c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) + + TQString::tqfromLatin1( "/" ) + + c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ) )); d.setFilter( TQDir::Files | TQDir::NoSymLinks ); d.setSorting( TQDir::Name ); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); + const TQFileInfoList *list = d.entryInfoList(); + TQFileInfoListIterator it( *list ); while ( (fi = it.current()) != 0 ) { - if(fi->fileName().contains(c->contactId().replace( TQRegExp( TQString::fromLatin1( "[./~?*]" ) ), TQString::fromLatin1( "-" ) ))) + if(fi->fileName().tqcontains(c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) ))) { rx.search(fi->fileName()); - int result = 12*(TQDate::currentDate().year() - rx.cap(1).toUInt()) +TQDate::currentDate().month() - rx.cap(2).toUInt(); + int result = 12*(TQDate::tqcurrentDate().year() - rx.cap(1).toUInt()) +TQDate::tqcurrentDate().month() - rx.cap(2).toUInt(); if(result < 0) { kdWarning(14310) << k_funcinfo << "Kopete only found log file made in the future. Check your date!" << endl; @@ -838,7 +838,7 @@ TQValueList HistoryLogger::getDaysForMonth(TQDate date) pos += rxTime.matchedLength(); int day=rxTime.capturedTexts()[1].toInt(); - if ( day !=lastDay && dayList.find(day) == dayList.end()) // avoid duplicates + if ( day !=lastDay && dayList.tqfind(day) == dayList.end()) // avoid duplicates { dayList.append(rxTime.capturedTexts()[1].toInt()); lastDay=day; diff --git a/kopete/plugins/history/historylogger.h b/kopete/plugins/history/historylogger.h index c8a7690c..6d01754d 100644 --- a/kopete/plugins/history/historylogger.h +++ b/kopete/plugins/history/historylogger.h @@ -32,9 +32,10 @@ class TQTimer; * * @author Olivier Goffart */ -class HistoryLogger : public QObject +class HistoryLogger : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -46,8 +47,8 @@ public: /** * Constructor, takes the contact, and the color of messages */ - HistoryLogger( Kopete::MetaContact *m , TQObject *parent = 0, const char *name = 0); - HistoryLogger( Kopete::Contact *c , TQObject *parent = 0, const char *name = 0); + HistoryLogger( Kopete::MetaContact *m , TQObject *tqparent = 0, const char *name = 0); + HistoryLogger( Kopete::Contact *c , TQObject *tqparent = 0, const char *name = 0); ~HistoryLogger(); diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index af92fc09..789b331c 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -41,11 +41,11 @@ typedef KGenericFactory HistoryPluginFactory; static const KAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) ) -HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) +HistoryPlugin::HistoryPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( HistoryPluginFactory::instance(), tqparent, name ), m_loggerFactory( this ) { KAction *viewMetaContactHistory = new KAction( i18n("View &History" ), - TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), + TQString::tqfromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), actionCollection(), "viewMetaContactHistory" ); viewMetaContactHistory->setEnabled( Kopete::ContactList::self()->selectedMetaContacts().count() == 1 ); @@ -76,7 +76,7 @@ HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQString TQValueList sessions = Kopete::ChatSessionManager::self()->sessions(); for (TQValueListIterator it= sessions.begin(); it!=sessions.end() ; ++it) { - if(!m_loggers.contains(*it)) + if(!m_loggers.tqcontains(*it)) { m_loggers.insert(*it, new HistoryGUIClient( *it ) ); connect( *it, TQT_SIGNAL(closing(Kopete::ChatSession*)), @@ -102,7 +102,7 @@ void HistoryPlugin::messageDisplayed(const Kopete::Message &m) if(m.direction()==Kopete::Message::Internal || !m.manager()) return; - if(!m_loggers.contains(m.manager())) + if(!m_loggers.tqcontains(m.manager())) { m_loggers.insert(m.manager() , new HistoryGUIClient( m.manager() ) ); connect(m.manager(), TQT_SIGNAL(closing(Kopete::ChatSession*)), @@ -136,7 +136,7 @@ void HistoryPlugin::slotViewHistory() void HistoryPlugin::slotViewCreated( KopeteView* v ) { - if(v->plugin()->pluginInfo()->pluginName() != TQString::fromLatin1("kopete_chatwindow") ) + if(v->plugin()->pluginInfo()->pluginName() != TQString::tqfromLatin1("kopete_chatwindow") ) return; //Email chat windows are not supported. bool autoChatWindow = HistoryConfig::auto_chatwindow(); @@ -149,7 +149,7 @@ void HistoryPlugin::slotViewCreated( KopeteView* v ) if(!m_currentChatSession) return; //i am sorry - if(!m_loggers.contains(m_currentChatSession)) + if(!m_loggers.tqcontains(m_currentChatSession)) { m_loggers.insert(m_currentChatSession , new HistoryGUIClient( m_currentChatSession ) ); connect( m_currentChatSession, TQT_SIGNAL(closing(Kopete::ChatSession*)), diff --git a/kopete/plugins/history/historyplugin.h b/kopete/plugins/history/historyplugin.h index 8c0f553d..560d09b5 100644 --- a/kopete/plugins/history/historyplugin.h +++ b/kopete/plugins/history/historyplugin.h @@ -74,8 +74,9 @@ public: class HistoryPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: - HistoryPlugin( TQObject *parent, const char *name, const TQStringList &args ); + HistoryPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~HistoryPlugin(); /** diff --git a/kopete/plugins/history/historypreferences.cpp b/kopete/plugins/history/historypreferences.cpp index 370e6721..959f9653 100644 --- a/kopete/plugins/history/historypreferences.cpp +++ b/kopete/plugins/history/historypreferences.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory HistoryConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_history, HistoryConfigFactory( "kcm_kopete_history" ) ) -HistoryPreferences::HistoryPreferences(TQWidget *parent, const char*/*name*/, const TQStringList &args) - : KCModule(HistoryConfigFactory::instance(), parent, args) +HistoryPreferences::HistoryPreferences(TQWidget *tqparent, const char*/*name*/, const TQStringList &args) + : KCModule(HistoryConfigFactory::instance(), tqparent, args) { kdDebug(14310) << k_funcinfo << "called." << endl; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/plugins/history/historypreferences.h b/kopete/plugins/history/historypreferences.h index bed6de7b..848580b2 100644 --- a/kopete/plugins/history/historypreferences.h +++ b/kopete/plugins/history/historypreferences.h @@ -29,8 +29,9 @@ class HistoryPrefsUI; class HistoryPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - HistoryPreferences(TQWidget *parent=0, const char* name=0, + HistoryPreferences(TQWidget *tqparent=0, const char* name=0, const TQStringList &args = TQStringList()); ~HistoryPreferences(); diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui index 5942a07a..8bcea1ae 100644 --- a/kopete/plugins/history/historyprefsui.ui +++ b/kopete/plugins/history/historyprefsui.ui @@ -1,7 +1,7 @@ HistoryPrefsUI Olivier Goffart - + HistoryPrefsWidget @@ -20,7 +20,7 @@ unnamed - + grpChatHistory @@ -31,7 +31,7 @@ unnamed - + lblNoLinesPerPage @@ -59,7 +59,7 @@ The number of message that are shown when borwsing history in the chat window - + colorLabel @@ -108,7 +108,7 @@ This is the number of messages that will be added automatically in the chat window when opening a new chat. - + numberLabel @@ -122,7 +122,7 @@ This is the number of messages that will be added automatically in the chat window when opening a new chat. - + chkShowPrevious @@ -148,7 +148,7 @@ Expanding - + 31 90 @@ -178,7 +178,7 @@ Number_Auto_chatwindow History_color - + knuminput.h kcolorbutton.h diff --git a/kopete/plugins/history/historyviewer.ui b/kopete/plugins/history/historyviewer.ui index 4cef647e..cdf49bbe 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -1,6 +1,6 @@ HistoryViewer - + HistoryViewer @@ -20,7 +20,7 @@ 0 - + 300 200 @@ -33,19 +33,19 @@ 0 - + - layout3 + tqlayout3 unnamed - + statusLabel - + 32767 20 @@ -62,15 +62,15 @@ - + - layout8 + tqlayout8 unnamed - + searchErase @@ -81,7 +81,7 @@ - + textLabel2 @@ -94,7 +94,7 @@ searchLine - + searchButton @@ -109,13 +109,13 @@ 0 - + 70 0 - + 150 32767 @@ -127,16 +127,16 @@ - + splitter2 Horizontal - + - layout5 + tqlayout5 @@ -160,13 +160,13 @@ 0 - + 140 0 - + 32767 32767 @@ -207,13 +207,13 @@ 0 - + 0 0 - + 32767 32767 @@ -225,7 +225,7 @@ - + htmlFrame @@ -237,7 +237,7 @@ 0 - + 0 0 @@ -251,15 +251,15 @@ - + - layout11 + tqlayout11 unnamed - + textLabel1 @@ -288,7 +288,7 @@ - + textLabel1_2 @@ -296,7 +296,7 @@ Message Filter: - + All messages @@ -323,7 +323,7 @@ 0 - + 200 0 @@ -336,7 +336,7 @@ - + kprogress.h klineedit.h diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index ea9420fb..154a176a 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -33,13 +33,13 @@ #include "latexplugin.h" #include "latexguiclient.h" -LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent, const char *name ) -: TQObject( parent, name ), KXMLGUIClient( parent ) +LatexGUIClient::LatexGUIClient( Kopete::ChatSession *tqparent, const char *name ) +: TQObject( tqparent, name ), KXMLGUIClient( tqparent ) { setInstance( LatexPlugin::plugin()->instance() ); connect( LatexPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); - m_manager = parent; + m_manager = tqparent; new KAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); @@ -57,14 +57,14 @@ void LatexGUIClient::slotPreview() Kopete::Message msg = m_manager->view()->currentMessage(); TQString messageText = msg.plainBody(); - if(!messageText.contains("$$")) //we haven't found any latex strings + if(!messageText.tqcontains("$$")) //we haven't found any latex strings { KMessageBox::sorry(reinterpret_cast(m_manager->view()) , i18n("There are no latex in the message you are typing. The latex formula must be included between $$ and $$ "), i18n("No Latex Formula") ); return; } msg=Kopete::Message( msg.from() , msg.to() , - i18n("Preview of the latex message :
%1").arg(msg.plainBody()), + i18n("Preview of the latex message :
%1").tqarg(msg.plainBody()), Kopete::Message::Internal , Kopete::Message::RichText); m_manager->appendMessage(msg) ; } diff --git a/kopete/plugins/latex/latexguiclient.h b/kopete/plugins/latex/latexguiclient.h index 03fdbd9e..6807ccb8 100644 --- a/kopete/plugins/latex/latexguiclient.h +++ b/kopete/plugins/latex/latexguiclient.h @@ -37,9 +37,10 @@ namespace Kopete { class ChatSession; } class LatexGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - LatexGUIClient( Kopete::ChatSession *parent, const char *name=0L); + LatexGUIClient( Kopete::ChatSession *tqparent, const char *name=0L); ~LatexGUIClient(); private slots: diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 11537aba..61fab8a6 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -41,8 +41,8 @@ typedef KGenericFactory LatexPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_latex, LatexPluginFactory( "kopete_latex" ) ) -LatexPlugin::LatexPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( LatexPluginFactory::instance(), parent, name ) +LatexPlugin::LatexPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( LatexPluginFactory::instance(), tqparent, name ) { // kdDebug() << k_funcinfo << endl; if( !s_pluginStatic ) @@ -101,7 +101,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) } TQString messageText = msg.plainBody(); - if( !messageText.contains("$$")) + if( !messageText.tqcontains("$$")) return; //kdDebug() << k_funcinfo << " Using converter: " << m_convScript << endl; @@ -132,7 +132,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) if(!securityCheck(formul)) continue; - TQString fileName=handleLatex(formul.replace("$$","")); + TQString fileName=handleLatex(formul.tqreplace("$$","")); // get the image and encode it with base64 #if ENCODED_IMAGE_MODE @@ -145,7 +145,7 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) TQBuffer buffer( ba ); buffer.open( IO_WriteOnly ); renderedImage.save( &buffer, "PNG" ); - TQString imageURL = TQString::fromLatin1("data:image/png;base64,%1").arg( KCodecs::base64Encode( ba ) ); + TQString imageURL = TQString::tqfromLatin1("data:image/png;base64,%1").tqarg( KCodecs::base64Encode( ba ) ); replaceMap[match] = imageURL; } #else @@ -167,8 +167,8 @@ void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg ) continue; imagePxWidth = theImage.width(); imagePxHeight = theImage.height(); - TQString escapedLATEX=TQStyleSheet::escape(it.key()).replace("\"","""); //we need the escape quotes because that string will be in a title="" argument, but not the \n - messageText.replace(Kopete::Message::escape(it.key()), " \"" "); + TQString escapedLATEX=TQStyleSheet::escape(it.key()).tqreplace("\"","""); //we need the escape quotes because that string will be in a title="" argument, but not the \n + messageText.tqreplace(Kopete::Message::escape(it.key()), " \"" "); } msg.setBody( messageText, Kopete::Message::RichText ); @@ -187,7 +187,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) return; TQString messageText = msg.plainBody(); - if( !messageText.contains("$$")) + if( !messageText.tqcontains("$$")) return; /* if( msg.from()->protocol()->pluginId()!="MSNProtocol" ) return;*/ @@ -206,7 +206,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg) if(!url.isNull()) { - TQString escapedLATEX= TQStyleSheet::escape(messageText).replace("\"","""); + TQString escapedLATEX= TQStyleSheet::escape(messageText).tqreplace("\"","""); TQString messageText="\"""; msg.setBody( messageText, Kopete::Message::RichText ); } @@ -230,9 +230,9 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) int hDPI, vDPI; hDPI = LatexConfig::self()->horizontalDPI(); vDPI = LatexConfig::self()->verticalDPI(); - p << m_convScript << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.arg(fileName) /*<< argumentFormat*/ << latexFormula ; + p << m_convScript << argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << argumentOut.tqarg(fileName) /*<< argumentFormat*/ << latexFormula ; - kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.arg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.arg(fileName) << endl; + kdDebug() << k_funcinfo << " Rendering " << m_convScript << " " << argumentRes.tqarg(TQString::number(hDPI), TQString::number(vDPI)) << " " << argumentOut.tqarg(fileName) << endl; // FIXME our sucky sync filter API limitations :-) p.start(KProcess::Block); @@ -241,7 +241,7 @@ TQString LatexPlugin::handleLatex(const TQString &latexFormula) bool LatexPlugin::securityCheck(const TQString &latexFormula) { - return !latexFormula.contains(TQRegExp("\\\\(def|let|futurelet|newcommand|renewcomment|else|fi|write|input|include" + return !latexFormula.tqcontains(TQRegExp("\\\\(def|let|futurelet|newcommand|renewcomment|else|fi|write|input|include" "|chardef|catcode|makeatletter|noexpand|toksdef|every|errhelp|errorstopmode|scrollmode|nonstopmode|batchmode" "|read|csname|newhelp|relax|afterground|afterassignment|expandafter|noexpand|special|command|loop|repeat|toks" "|output|line|mathcode|name|item|section|mbox|DeclareRobustCommand)[^a-zA-Z]")); diff --git a/kopete/plugins/latex/latexplugin.h b/kopete/plugins/latex/latexplugin.h index 2eb9365b..5413626f 100644 --- a/kopete/plugins/latex/latexplugin.h +++ b/kopete/plugins/latex/latexplugin.h @@ -42,11 +42,12 @@ namespace Kopete { class Message; class ChatSession; } class LatexPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: static LatexPlugin *plugin(); - LatexPlugin( TQObject *parent, const char *name, const TQStringList &args ); + LatexPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~LatexPlugin(); public slots: diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp index ff02c831..e7396282 100644 --- a/kopete/plugins/latex/latexpreferences.cpp +++ b/kopete/plugins/latex/latexpreferences.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory LatexPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_latex, LatexPreferencesFactory( "kcm_kopete_latex" ) ) -LatexPreferences::LatexPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(LatexPreferencesFactory::instance(), parent, args) +LatexPreferences::LatexPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule(LatexPreferencesFactory::instance(), tqparent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); m_preferencesDialog = new LatexPrefsUI(this); diff --git a/kopete/plugins/latex/latexpreferences.h b/kopete/plugins/latex/latexpreferences.h index e5a70140..518d0fc6 100644 --- a/kopete/plugins/latex/latexpreferences.h +++ b/kopete/plugins/latex/latexpreferences.h @@ -31,9 +31,10 @@ class TQListViewItem; class LatexPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - LatexPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + LatexPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~LatexPreferences(); virtual void save(); diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui index fbb11a21..fc2a865a 100644 --- a/kopete/plugins/latex/latexprefsbase.ui +++ b/kopete/plugins/latex/latexprefsbase.ui @@ -1,7 +1,7 @@ LatexPrefsUI Duncan Mac-Vicar - + LatexPrefsUI @@ -17,7 +17,7 @@ unnamed - + textLabel1 @@ -29,7 +29,7 @@ <p>This plugin requires ImageMagick convert program installed in order to work.</p> - + groupBox1 @@ -50,22 +50,22 @@ Expanding - + 20 30 - + - layout1 + tqlayout1 unnamed - + textLabel2 @@ -83,7 +83,7 @@ Expanding - + 280 20 @@ -92,9 +92,9 @@ - + - layout2 + tqlayout2 @@ -105,7 +105,7 @@ horizontalDPI - + textLabel3 @@ -128,7 +128,7 @@ Expanding - + 220 20 @@ -149,7 +149,7 @@ Expanding - + 20 40 @@ -158,7 +158,7 @@ - + knuminput.h knuminput.h diff --git a/kopete/plugins/motionautoaway/COPYING.motion b/kopete/plugins/motionautoaway/COPYING.motion index 0b84a43f..0a56ad07 100644 --- a/kopete/plugins/motionautoaway/COPYING.motion +++ b/kopete/plugins/motionautoaway/COPYING.motion @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index 8dbd8853..da4e5431 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -79,7 +79,7 @@ typedef __signed__ long long __s64; #define DEF_WIDTH 352 #define DEF_HEIGHT 288 -#define DEF_QUALITY 50 +#define DEF_TQUALITY 50 #define DEF_CHANGES 5000 #define DEF_POLL_INTERVAL 1500 @@ -92,14 +92,14 @@ typedef __signed__ long long __s64; typedef KGenericFactory MotionAwayPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_motionaway, MotionAwayPluginFactory( "kopete_motionaway" ) ) -MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( MotionAwayPluginFactory::instance(), parent, name ) +MotionAwayPlugin::MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( MotionAwayPluginFactory::instance(), tqparent, name ) { kdDebug(14305) << k_funcinfo << "Called." << endl; /* This should be read from config someday may be */ m_width = DEF_WIDTH; m_height = DEF_HEIGHT; - m_quality = DEF_QUALITY; + m_quality = DEF_TQUALITY; m_maxChanges = DEF_CHANGES; m_gap = DEF_GAP; diff --git a/kopete/plugins/motionautoaway/motionawayplugin.h b/kopete/plugins/motionautoaway/motionawayplugin.h index c15caa3a..c966b832 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.h +++ b/kopete/plugins/motionautoaway/motionawayplugin.h @@ -36,9 +36,10 @@ class TQTimer; class MotionAwayPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: - MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList &args ); + MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~MotionAwayPlugin(); public slots: diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp index 889d4d30..46697051 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp +++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory MotionAwayPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway")) -MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(MotionAwayPreferencesFactory::instance(), parent, args) +MotionAwayPreferences::MotionAwayPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule(MotionAwayPreferencesFactory::instance(), tqparent, args) { // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h index c93784d3..246541d5 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.h +++ b/kopete/plugins/motionautoaway/motionawaypreferences.h @@ -29,8 +29,9 @@ class motionawayPrefsUI; class MotionAwayPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - MotionAwayPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + MotionAwayPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual void save(); virtual void load(); diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui index 134f939a..e43ae524 100644 --- a/kopete/plugins/motionautoaway/motionawayprefs.ui +++ b/kopete/plugins/motionautoaway/motionawayprefs.ui @@ -1,7 +1,7 @@ motionawayPrefsUI Duncan Mac-Vicar P. - + motionawayPrefsUI @@ -25,7 +25,7 @@ unnamed - + textLabel1 @@ -47,7 +47,7 @@ Horizontal - + groupBox2 @@ -58,15 +58,15 @@ unnamed - + - layout21 + tqlayout21 unnamed - + TextLabel2_2 @@ -87,7 +87,7 @@ Expanding - + 95 20 @@ -114,7 +114,7 @@ Fixed - + 20 20 @@ -123,7 +123,7 @@ - + groupBox1 @@ -134,15 +134,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + BecomeAvailableWithActivity @@ -163,7 +163,7 @@ Expanding - + 30 20 @@ -172,15 +172,15 @@ - + - layout6 + tqlayout6 unnamed - + TextLabel2 @@ -201,7 +201,7 @@ Expanding - + 20 20 @@ -210,9 +210,9 @@ - + - layout16 + tqlayout16 @@ -223,7 +223,7 @@ AwayTimeout - + textLabel2 @@ -241,7 +241,7 @@ Expanding - + 180 20 @@ -260,7 +260,7 @@ Fixed - + 20 20 @@ -279,7 +279,7 @@ Fixed - + 20 20 @@ -288,7 +288,7 @@ - + klineedit.h knuminput.h diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index 9dffde7f..d8daa817 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -32,11 +32,11 @@ class NetMeetingPlugin; -NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *name ) -: TQObject( parent, name ) , KXMLGUIClient(parent) +NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *tqparent, const char *name ) +: TQObject( tqparent, name ) , KXMLGUIClient(tqparent) { setInstance(KGenericFactory::instance()); - m_manager=parent; + m_manager=tqparent; new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.h b/kopete/plugins/netmeeting/netmeetingguiclient.h index c847a5cd..5c337431 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.h +++ b/kopete/plugins/netmeeting/netmeetingguiclient.h @@ -34,9 +34,10 @@ class NetMeetingPlugin; class NetMeetingGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - NetMeetingGUIClient( MSNChatSession *parent, const char *name=0L); + NetMeetingGUIClient( MSNChatSession *tqparent, const char *name=0L); ~NetMeetingGUIClient(); private slots: diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index 5fb799c1..73e08d4a 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -32,8 +32,8 @@ #include #include -NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *parent) - : TQObject(parent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) +NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *tqparent) + : TQObject(tqparent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") ) { m_contact=c; oki=false; @@ -59,12 +59,12 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg) TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); TQString command=rx.cap(1); - if( msg.contains("Invitation-Command: INVITE") ) + if( msg.tqcontains("Invitation-Command: INVITE") ) { MSNInvitation::parseInvitation(msg); //for the cookie unsigned int result = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), - i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).arg(m_contact->metaContact()->displayName()), + i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).tqarg(m_contact->metaContact()->displayName()), i18n("MSN Plugin") , i18n("Accept"),i18n("Refuse")); MSNChatSession* manager=dynamic_cast(m_contact->manager()); @@ -98,7 +98,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg) } } } - else if( msg.contains("Invitation-Command: ACCEPT") ) + else if( msg.tqcontains("Invitation-Command: ACCEPT") ) { if( ! incoming() ) { @@ -162,7 +162,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address) KConfig *config=KGlobal::config(); config->setGroup("Netmeeting Plugin"); - TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address); + TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").tqarg(ip_address); kdDebug() << k_funcinfo << app << endl ; diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.h b/kopete/plugins/netmeeting/netmeetinginvitation.h index eb4b2ba6..4efe3ed1 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.h +++ b/kopete/plugins/netmeeting/netmeetinginvitation.h @@ -28,8 +28,9 @@ class MSNContact; class NetMeetingInvitation : public TQObject , public MSNInvitation { Q_OBJECT + TQ_OBJECT public: - NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *parent = 0); + NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *tqparent = 0); ~NetMeetingInvitation(); static TQString applicationID() { return "44BBA842-CC51-11CF-AAFA-00AA00B6015C"; } diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 2d71c257..715f26e6 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -35,8 +35,8 @@ static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory( &aboutdata ) ) -NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( KGlobal::instance(), parent, name ) +NetMeetingPlugin::NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( KGlobal::instance(), tqparent, name ) { if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); @@ -81,7 +81,7 @@ void NetMeetingPlugin::slotNewKMM(Kopete::ChatSession *KMM) void NetMeetingPlugin::slotInvitation(MSNInvitation*& invitation, const TQString &bodyMSG , long unsigned int /*cookie*/ , MSNChatSession* msnMM , MSNContact* c ) { - if(!invitation && bodyMSG.contains(NetMeetingInvitation::applicationID())) + if(!invitation && bodyMSG.tqcontains(NetMeetingInvitation::applicationID())) { invitation=new NetMeetingInvitation(true,c,msnMM); invitation->parseInvitation(bodyMSG); diff --git a/kopete/plugins/netmeeting/netmeetingplugin.h b/kopete/plugins/netmeeting/netmeetingplugin.h index 495eb510..da877926 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.h +++ b/kopete/plugins/netmeeting/netmeetingplugin.h @@ -29,9 +29,10 @@ class MSNInvitation; class NetMeetingPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: - NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &args ); + NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~NetMeetingPlugin(); private slots: diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index 313eb197..1c737cab 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory NetmeetingPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" ) ) -NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(NetmeetingPreferencesFactory::instance(), parent, args) +NetmeetingPreferences::NetmeetingPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule(NetmeetingPreferencesFactory::instance(), tqparent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NetmeetingPrefsUI(this); diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h index 6ad09f58..2711eab8 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.h +++ b/kopete/plugins/netmeeting/netmeetingpreferences.h @@ -28,9 +28,10 @@ class NetmeetingPrefsUI; class NetmeetingPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - NetmeetingPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + NetmeetingPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~NetmeetingPreferences(); virtual void save(); diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui index ed84eb6b..f9ab61be 100644 --- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui +++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui @@ -1,7 +1,7 @@ NetmeetingPrefsUI Olivier Goffart - + Form1 @@ -17,7 +17,7 @@ unnamed - + textLabel1 @@ -26,7 +26,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger®, but uses the older NetMeeting chat you can find in old versions. - + WordBreak|AlignVCenter @@ -44,15 +44,15 @@ This is not the same as webcam chat you can find in the newer Windows Messenger Horizontal - + - layout1 + tqlayout1 unnamed - + textLabel2 @@ -91,14 +91,14 @@ This is not the same as webcam chat you can find in the newer Windows Messenger - + textLabel3 <b>%1</b> will be replaced by the ip to call - + WordBreak|AlignVCenter @@ -112,7 +112,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger Expanding - + 21 60 @@ -139,7 +139,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger - + kcombobox.h klineedit.h diff --git a/kopete/plugins/nowlistening/nlamarok.cpp b/kopete/plugins/nowlistening/nlamarok.cpp index 9101758c..348217bc 100644 --- a/kopete/plugins/nowlistening/nlamarok.cpp +++ b/kopete/plugins/nowlistening/nlamarok.cpp @@ -91,7 +91,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> newTrack; } } @@ -107,7 +107,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> m_album; } } @@ -117,7 +117,7 @@ void NLamaroK::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> m_artist; } } diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp index 422e0db9..fe58aba4 100644 --- a/kopete/plugins/nowlistening/nljuk.cpp +++ b/kopete/plugins/nowlistening/nljuk.cpp @@ -58,13 +58,13 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::fromLatin1("Album"); + arg << TQString::tqfromLatin1("Album"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> m_album; } } @@ -72,13 +72,13 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::fromLatin1("Artist"); + arg << TQString::tqfromLatin1("Artist"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> m_artist; } } @@ -86,13 +86,13 @@ void NLJuk::update() { TQDataStream arg( data, IO_WriteOnly ); - arg << TQString::fromLatin1("Title"); + arg << TQString::tqfromLatin1("Title"); if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data, replyType, replyData ) ) { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> newTrack; } } diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp index d5823298..c2b70ba3 100644 --- a/kopete/plugins/nowlistening/nlkaffeine.cpp +++ b/kopete/plugins/nowlistening/nlkaffeine.cpp @@ -85,7 +85,7 @@ void NLKaffeine::update() { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> newTrack; } } diff --git a/kopete/plugins/nowlistening/nlkscd.cpp b/kopete/plugins/nowlistening/nlkscd.cpp index 06bf6c28..bd9b9b6b 100644 --- a/kopete/plugins/nowlistening/nlkscd.cpp +++ b/kopete/plugins/nowlistening/nlkscd.cpp @@ -69,7 +69,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) reply >> m_artist; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -82,7 +82,7 @@ void NLKscd::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) reply >> m_album; else kdDebug( 14307 ) << "NLKscd::update() trackList returned unexpected reply type!" << endl; @@ -94,7 +94,7 @@ void NLKscd::update() kdDebug( 14307 ) << "NLKscd::update() - there was some error using DCOP." << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> newTrack; //kdDebug( 14307 ) << "the result is: " << newTrack.latin1() // << endl; diff --git a/kopete/plugins/nowlistening/nlnoatun.cpp b/kopete/plugins/nowlistening/nlnoatun.cpp index c9c504c2..4f414a11 100644 --- a/kopete/plugins/nowlistening/nlnoatun.cpp +++ b/kopete/plugins/nowlistening/nlnoatun.cpp @@ -39,7 +39,7 @@ void NLNoatun::update() m_playing = false; TQString newTrack; // see if it's registered with DCOP - TQCString appname = find(); + TQCString appname = tqfind(); if ( !appname.isEmpty() ) { // see if it's playing @@ -76,7 +76,7 @@ void NLNoatun::update() << endl; else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) { + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> newTrack; } else kdDebug( 14307 ) << "NLNoatun::update(), title() returned unexpected reply type!" << endl; @@ -97,7 +97,7 @@ void NLNoatun::update() kdDebug( 14307 ) << "NLNoatun::update() - noatun not found" << endl; } -TQCString NLNoatun::find() const +TQCString NLNoatun::tqfind() const { TQCString app = "noatun"; if ( !m_client->isApplicationRegistered( app ) ) @@ -137,7 +137,7 @@ TQString NLNoatun::currentProperty( TQCString appname, TQString property ) const else { TQDataStream reply( replyData, IO_ReadOnly ); - if ( replyType == "TQString" ) + if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { reply >> result; } diff --git a/kopete/plugins/nowlistening/nlnoatun.h b/kopete/plugins/nowlistening/nlnoatun.h index 85e1aaac..30956611 100644 --- a/kopete/plugins/nowlistening/nlnoatun.h +++ b/kopete/plugins/nowlistening/nlnoatun.h @@ -32,7 +32,7 @@ class NLNoatun : public NLMediaPlayer NLNoatun( DCOPClient *client ); virtual void update(); protected: - TQCString find() const; + TQCString tqfind() const; TQString currentProperty( TQCString appname, TQString property ) const; DCOPClient *m_client; }; diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp index c5e47ef0..ddbf50bd 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp @@ -29,11 +29,11 @@ #include #include -NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowListeningPlugin *plugin ) - : TQObject(parent) , KXMLGUIClient(parent) +NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *tqparent, NowListeningPlugin *plugin ) + : TQObject(tqparent) , KXMLGUIClient(tqparent) { connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded())); - m_msgManager = parent; + m_msgManager = tqparent; m_action = new KAction( i18n( "Send Media Info" ), 0, this, TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); setXMLFile("nowlisteningchatui.rc"); diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.h b/kopete/plugins/nowlistening/nowlisteningguiclient.h index b12b0424..7ed37b7e 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.h +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.h @@ -34,9 +34,10 @@ namespace Kopete { class NowListeningGUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - NowListeningGUIClient( Kopete::ChatSession* parent, NowListeningPlugin* plugin ); + NowListeningGUIClient( Kopete::ChatSession* tqparent, NowListeningPlugin* plugin ); virtual ~NowListeningGUIClient() {} protected slots: diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index 4c286b0f..0d782a39 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -47,7 +47,7 @@ #include "nlkaffeine.h" #include "nowlisteningguiclient.h" -#if defined Q_WS_X11 && !defined K_WS_QTONLY && defined HAVE_XMMS +#if defined TQ_WS_X11 && !defined K_WS_TQTONLY && defined HAVE_XMMS #include "nlxmms.h" #endif @@ -78,8 +78,8 @@ public: typedef KGenericFactory NowListeningPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_nowlistening, NowListeningPluginFactory( "kopete_nowlistening" ) ) -NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, const TQStringList& /*args*/ ) -: Kopete::Plugin( NowListeningPluginFactory::instance(), parent, name ) +NowListeningPlugin::NowListeningPlugin( TQObject *tqparent, const char* name, const TQStringList& /*args*/ ) +: Kopete::Plugin( NowListeningPluginFactory::instance(), tqparent, name ) { if ( pluginStatic_ ) kdDebug( 14307 )<<"####"<<"Now Listening already initialized"<m_mediaPlayerList.append( new NLamaroK( d->m_client ) ); d->m_mediaPlayerList.append( new NLKaffeine( d->m_client ) ); -#if defined Q_WS_X11 && !defined K_WS_QTONLY && HAVE_XMMS +#if defined TQ_WS_X11 && !defined K_WS_TQTONLY && HAVE_XMMS d->m_mediaPlayerList.append( new NLXmms() ); #endif @@ -205,7 +205,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) for( Kopete::Contact *c = dest.first() ; c ; c = dest.next() ) { const TQString& cId = c->contactId(); - if( 0 == d->m_musicSentTo.contains( cId ) ) + if( 0 == d->m_musicSentTo.tqcontains( cId ) ) { mustSendAnyway = true; @@ -298,7 +298,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic() // KDE4 TODO: Use the new status message framework, and remove this "hack". if( isPlaying ) { - advert = TQString("[Music]%1").arg(mediaList); + advert = TQString("[Music]%1").tqarg(mediaList); } } @@ -306,9 +306,9 @@ void NowListeningPlugin::slotAdvertCurrentMusic() { if( NowListeningConfig::self()->appendStatusAdvertising() ) { - // Check for the now listening message in parenthesis, - // include the header to not override other messages in parenthesis. - TQRegExp statusSong( TQString(" \\(%1.*\\)$").arg( NowListeningConfig::header()) ); + // Check for the now listening message in tqparenthesis, + // include the header to not override other messages in tqparenthesis. + TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) ); // HACK: Don't keep appending the now listened song. Replace it in the status message. advert = a->myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString(); @@ -318,16 +318,16 @@ void NowListeningPlugin::slotAdvertCurrentMusic() { if(statusSong.search(advert) != -1) { - advert = advert.replace(statusSong, TQString(" (%1)").arg(mediaPlayerAdvert(false)) ); + advert = advert.tqreplace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) ); } else { - advert += TQString(" (%1)").arg( mediaPlayerAdvert(false) ); + advert += TQString(" (%1)").tqarg( mediaPlayerAdvert(false) ); } } else { - advert = advert.replace(statusSong, ""); + advert = advert.tqreplace(statusSong, ""); } } else @@ -336,7 +336,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic() } } - a->setOnlineStatus(a->myself()->onlineStatus(), advert); + a->setOnlineStatus(a->myself()->onlinetqStatus(), advert); } } } @@ -432,7 +432,7 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player, // recursively replace contents of matching () TQString substitution = substDepthFirst( player, in.mid( i + 1, j - i - 1), true ) ; - in.replace ( i, j - i + 1, substitution ); + in.tqreplace ( i, j - i + 1, substitution ); // perform substitution and return the result i = i + substitution.length() - 1; break; @@ -446,34 +446,34 @@ TQString NowListeningPlugin::substDepthFirst( NLMediaPlayer *player, // no () found, perform substitution! // get each string (to) to substitute for (from) bool done = false; - if ( in.contains ( "%track" ) ) + if ( in.tqcontains ( "%track" ) ) { if ( track.isEmpty() ) track = i18n("Unknown track"); - in.replace( "%track", track ); + in.tqreplace( "%track", track ); done = true; } - if ( in.contains ( "%artist" ) && !artist.isEmpty() ) + if ( in.tqcontains ( "%artist" ) && !artist.isEmpty() ) { if ( artist.isEmpty() ) artist = i18n("Unknown artist"); - in.replace( "%artist", artist ); + in.tqreplace( "%artist", artist ); done = true; } - if ( in.contains ( "%album" ) && !album.isEmpty() ) + if ( in.tqcontains ( "%album" ) && !album.isEmpty() ) { if ( album.isEmpty() ) album = i18n("Unknown album"); - in.replace( "%album", album ); + in.tqreplace( "%album", album ); done = true; } - if ( in.contains ( "%player" ) && !playerName.isEmpty() ) + if ( in.tqcontains ( "%player" ) && !playerName.isEmpty() ) { if ( playerName.isEmpty() ) playerName = i18n("Unknown player"); - in.replace( "%player", playerName ); + in.tqreplace( "%player", playerName ); done = true; } // make whether we return anything dependent on whether we diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.h b/kopete/plugins/nowlistening/nowlisteningplugin.h index 1108a9a5..6b7b3d71 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.h +++ b/kopete/plugins/nowlistening/nowlisteningplugin.h @@ -37,11 +37,12 @@ class TQStringList; class NowListeningPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT friend class NowListeningGUIClient; public: - NowListeningPlugin( TQObject *parent, const char *name, const TQStringList &args ); + NowListeningPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~NowListeningPlugin(); static NowListeningPlugin* plugin(); diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp index 118b37da..6e1751ab 100644 --- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp +++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp @@ -36,8 +36,8 @@ typedef KGenericFactory NowListeningPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_nowlistening, NowListeningPreferencesFactory( "kcm_kopete_nowlistening" ) ) -NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule( NowListeningPreferencesFactory::instance(), parent, args ) +NowListeningPreferences::NowListeningPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule( NowListeningPreferencesFactory::instance(), tqparent, args ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NowListeningPrefsUI( this ); @@ -50,7 +50,7 @@ NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* / preferencesDialog->kcfg_SelectedMediaPlayer->insertItem(TQString::fromUtf8("Juk")); preferencesDialog->kcfg_SelectedMediaPlayer->insertItem(TQString::fromUtf8("amaroK")); preferencesDialog->kcfg_SelectedMediaPlayer->insertItem(TQString::fromUtf8("Kaffeine")); -#if defined Q_WS_X11 && !defined K_WS_QTONLY && defined HAVE_XMMS +#if defined TQ_WS_X11 && !defined K_WS_TQTONLY && defined HAVE_XMMS preferencesDialog->kcfg_SelectedMediaPlayer->insertItem(TQString::fromUtf8("XMMS")); #endif load(); diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.h b/kopete/plugins/nowlistening/nowlisteningpreferences.h index 078b1a0c..a0881113 100644 --- a/kopete/plugins/nowlistening/nowlisteningpreferences.h +++ b/kopete/plugins/nowlistening/nowlisteningpreferences.h @@ -32,8 +32,9 @@ class NowListeningConfig; class NowListeningPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - NowListeningPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + NowListeningPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual ~NowListeningPreferences(); virtual void save(); virtual void load(); diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index 08dd72b9..dc418729 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -1,6 +1,6 @@ NowListeningPrefsUI - + NowListeningPrefsUI @@ -25,18 +25,18 @@ 6 - + advertiseNewMediaToBuddiesLabel <b>Share Your Musical Taste</b> - + AlignVCenter - + advertiseNewMediaToBuddiesHLine @@ -47,11 +47,11 @@ Sunken - + tabWidget2 - + TabPage @@ -62,15 +62,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + useThisMessageLabel @@ -78,7 +78,7 @@ Use this message when advertising: - + helperLabel @@ -86,33 +86,33 @@ %track, %artist, %album, %player will be substituted if known. Expressions in brackets depend on a substitution being made. - + WordBreak|AlignVCenter - + - layout2 + tqlayout2 unnamed - + m_headerLabel Start with: - + AlignVCenter|AlignLeft m_header - + kcfg_Header @@ -120,21 +120,21 @@ Expressions in brackets depend on a substitution being made. Now Listening To: - + m_perTrackLabel For each track: - + AlignVCenter|AlignLeft m_perTrack - + kcfg_PerTrack @@ -142,21 +142,21 @@ Expressions in brackets depend on a substitution being made. %track (by %artist)(on %album) - + m_conjunctionLabel Conjunction (if >1 track): - + AlignVCenter|AlignLeft m_conjunction - + kcfg_Conjunction @@ -178,7 +178,7 @@ Expressions in brackets depend on a substitution being made. Expanding - + 20 40 @@ -187,7 +187,7 @@ Expressions in brackets depend on a substitution being made. - + tab @@ -198,7 +198,7 @@ Expressions in brackets depend on a substitution being made. unnamed - + buttonGroup2 @@ -212,7 +212,7 @@ Expressions in brackets depend on a substitution being made. unnamed - + kcfg_ExplicitAdvertising @@ -222,7 +222,7 @@ or by typing "/media" in the chat window edit area. - + kcfg_ChatAdvertising @@ -230,7 +230,7 @@ window edit area. &Show in chat window (automatic) - + kcfg_StatusAdvertising @@ -239,7 +239,7 @@ window edit area. in place of your status message. - + kcfg_AppendStatusAdvertising @@ -259,7 +259,7 @@ in place of your status message. Expanding - + 20 80 @@ -268,7 +268,7 @@ in place of your status message. - + tab @@ -279,15 +279,15 @@ in place of your status message. unnamed - + - layout2_2 + tqlayout2_2 unnamed - + kcfg_UseSpecifiedMediaPlayer @@ -332,7 +332,7 @@ in place of your status message. Expanding - + 20 40 @@ -352,7 +352,7 @@ in place of your status message. Expanding - + 20 40 @@ -369,7 +369,7 @@ in place of your status message. setEnabled(bool) - + klistbox.h diff --git a/kopete/plugins/smpppdcs/Changelog.smpppdcs b/kopete/plugins/smpppdcs/Changelog.smpppdcs index 80854a86..4884da4f 100644 --- a/kopete/plugins/smpppdcs/Changelog.smpppdcs +++ b/kopete/plugins/smpppdcs/Changelog.smpppdcs @@ -19,7 +19,7 @@ Changelog * using KConfigXT for configuration * using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package), no more own implementation -* experimental implementation of the the KDED-NetworkStatus (not active, yet) +* experimental implementation of the the KDED-NetworktqStatus (not active, yet) * significantly speeded up automatic detection of a SMPPPD * BUGFIX: reloading the plugin in a already running Kopete will no more result in an inactive plugin diff --git a/kopete/plugins/smpppdcs/detector.h b/kopete/plugins/smpppdcs/detector.h index 094de9e5..1889a84f 100644 --- a/kopete/plugins/smpppdcs/detector.h +++ b/kopete/plugins/smpppdcs/detector.h @@ -48,7 +48,7 @@ public: */ virtual ~Detector() {} - virtual void checkStatus() const = 0; + virtual void checktqStatus() const = 0; virtual void smpppdServerChange() {} diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index cb9a393a..a08f2c4f 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -21,13 +21,13 @@ #include "detectornetstat.h" DetectorNetstat::DetectorNetstat(IConnector* connector) - : Detector(connector), m_buffer(TQString::null), m_process(NULL) {} + : Detector(connector), m_buffer(TQString()), m_process(NULL) {} DetectorNetstat::~DetectorNetstat() { delete m_process; } -void DetectorNetstat::checkStatus() const { +void DetectorNetstat::checktqStatus() const { kdDebug(14312) << k_funcinfo << endl; if(m_process) { @@ -37,7 +37,7 @@ void DetectorNetstat::checkStatus() const { return; } - m_buffer = TQString::null; + m_buffer = TQString(); // Use KProcess to run netstat -r. We'll then parse the output of // netstat -r in slotProcessStdout() to see if it mentions the @@ -59,15 +59,15 @@ void DetectorNetstat::checkStatus() const { void DetectorNetstat::slotProcessStdout(KProcess *, char *buffer, int buflen) { // Look for a default gateway kdDebug(14312) << k_funcinfo << endl; - m_buffer += TQString::fromLatin1(buffer, buflen); + m_buffer += TQString::tqfromLatin1(buffer, buflen); kdDebug(14312) << m_buffer << endl; } void DetectorNetstat::slotProcessExited(KProcess *process) { kdDebug(14312) << k_funcinfo << m_buffer << endl; if(process == m_process) { - m_connector->setConnectedStatus(m_buffer.contains("default")); - m_buffer = TQString::null; + m_connector->setConnectedtqStatus(m_buffer.tqcontains("default")); + m_buffer = TQString(); delete m_process; m_process = 0L; } diff --git a/kopete/plugins/smpppdcs/detectornetstat.h b/kopete/plugins/smpppdcs/detectornetstat.h index bd41ae58..1f6d1161 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.h +++ b/kopete/plugins/smpppdcs/detectornetstat.h @@ -29,6 +29,7 @@ class IConnector; */ class DetectorNetstat : protected TQObject, public Detector { Q_OBJECT + TQ_OBJECT DetectorNetstat(const DetectorNetstat&); DetectorNetstat& operator=(const DetectorNetstat&); @@ -37,7 +38,7 @@ public: DetectorNetstat(IConnector* connector); virtual ~DetectorNetstat(); - virtual void checkStatus() const; + virtual void checktqStatus() const; private slots: // Original cs-plugin code diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp index e2b1ae19..a6fd2cb6 100644 --- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp +++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp @@ -22,45 +22,45 @@ #include "iconnector.h" #include "detectornetworkstatus.h" -DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector) +DetectorNetworktqStatus::DetectorNetworktqStatus(IConnector* connector) : Detector(connector), m_connManager(NULL) { m_connManager = ConnectionManager::self(); - connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)), - this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus))); + connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus)), + this, TQT_SLOT(statusChanged(const TQString&, NetworktqStatus::EnumtqStatus))); } -DetectorNetworkStatus::~DetectorNetworkStatus() {} +DetectorNetworktqStatus::~DetectorNetworktqStatus() {} -void DetectorNetworkStatus::checkStatus() const { +void DetectorNetworktqStatus::checktqStatus() const { // needs to do nothing } -void DetectorNetworkStatus::statusChanged(const TQString& host, NetworkStatus::EnumStatus status) { +void DetectorNetworktqStatus::statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status) { switch(status) { - case NetworkStatus::Offline: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl; + case NetworktqStatus::Offline: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::Offline" << endl; break; - case NetworkStatus::OfflineFailed: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl; + case NetworktqStatus::OfflineFailed: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::OfflineFailed" << endl; break; - case NetworkStatus::OfflineDisconnected: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl; + case NetworktqStatus::OfflineDisconnected: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::OfflineDisconnected" << endl; break; - case NetworkStatus::ShuttingDown: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl; + case NetworktqStatus::ShuttingDown: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::ShuttingDown" << endl; break; - case NetworkStatus::Establishing: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl; + case NetworktqStatus::Establishing: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::Establishing" << endl; break; - case NetworkStatus::Online: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl; + case NetworktqStatus::Online: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::Online" << endl; break; - case NetworkStatus::NoNetworks: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl; + case NetworktqStatus::NoNetworks: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::NoNetworks" << endl; break; - case NetworkStatus::Unreachable: - kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Unreachable" << endl; + case NetworktqStatus::Unreachable: + kdDebug(14312) << k_funcinfo << host << ": NetworktqStatus::Unreachable" << endl; break; } } diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.h b/kopete/plugins/smpppdcs/detectornetworkstatus.h index dd3a7394..1c1896e6 100644 --- a/kopete/plugins/smpppdcs/detectornetworkstatus.h +++ b/kopete/plugins/smpppdcs/detectornetworkstatus.h @@ -27,21 +27,22 @@ class ConnectionManager; /** @author Heiko Schäfer */ -class DetectorNetworkStatus : protected TQObject, public Detector +class DetectorNetworktqStatus : protected TQObject, public Detector { Q_OBJECT + TQ_OBJECT - DetectorNetworkStatus(const DetectorNetworkStatus&); - DetectorNetworkStatus& operator=(const DetectorNetworkStatus&); + DetectorNetworktqStatus(const DetectorNetworktqStatus&); + DetectorNetworktqStatus& operator=(const DetectorNetworktqStatus&); public: - DetectorNetworkStatus(IConnector* connector); - virtual ~DetectorNetworkStatus(); + DetectorNetworktqStatus(IConnector* connector); + virtual ~DetectorNetworktqStatus(); - virtual void checkStatus() const; + virtual void checktqStatus() const; protected slots: - void statusChanged(const TQString& host, NetworkStatus::EnumStatus status); + void statusChanged(const TQString& host, NetworktqStatus::EnumtqStatus status); private: ConnectionManager * m_connManager; diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp index 772090d9..1b932d6d 100644 --- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp +++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp @@ -31,9 +31,9 @@ DetectorSMPPPD::DetectorSMPPPD(IConnector * connector) DetectorSMPPPD::~DetectorSMPPPD() {} /*! - \fn DetectorSMPPPD::checkStatus() + \fn DetectorSMPPPD::checktqStatus() */ -void DetectorSMPPPD::checkStatus() const { +void DetectorSMPPPD::checktqStatus() const { kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl; #ifndef NOKINTERNETDCOP @@ -41,10 +41,10 @@ void DetectorSMPPPD::checkStatus() const { if(kapp->dcopClient() && m_kinternetApp != "") { switch(getConnectionStatusDCOP()) { case CONNECTED: - m_connector->setConnectedStatus(true); + m_connector->setConnectedtqStatus(true); return; case DISCONNECTED: - m_connector->setConnectedStatus(false); + m_connector->setConnectedtqStatus(false); return; default: break; @@ -63,9 +63,9 @@ void DetectorSMPPPD::checkStatus() const { c.setPassword(SMPPPDCSConfig::self()->password().utf8()); if(c.connect(server, port)) { - m_connector->setConnectedStatus(c.isOnline()); + m_connector->setConnectedtqStatus(c.isOnline()); } else { kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl; - m_connector->setConnectedStatus(false); + m_connector->setConnectedtqStatus(false); } } diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.h b/kopete/plugins/smpppdcs/detectorsmpppd.h index 197fe65b..cba377e0 100644 --- a/kopete/plugins/smpppdcs/detectorsmpppd.h +++ b/kopete/plugins/smpppdcs/detectorsmpppd.h @@ -39,7 +39,7 @@ public: DetectorSMPPPD(IConnector* connector); virtual ~DetectorSMPPPD(); - virtual void checkStatus() const; + virtual void checktqStatus() const; }; diff --git a/kopete/plugins/smpppdcs/iconnector.h b/kopete/plugins/smpppdcs/iconnector.h index c4846862..ab63ec71 100644 --- a/kopete/plugins/smpppdcs/iconnector.h +++ b/kopete/plugins/smpppdcs/iconnector.h @@ -37,9 +37,9 @@ public: * This method needs to get reimplemented at classes which implement * this interface. * - * @param newStatus the status of the internet connection, TRUE if there is a connection, otherwise FALSE + * @param newtqStatus the status of the internet connection, TRUE if there is a connection, otherwise FALSE */ - virtual void setConnectedStatus(bool newStatus) = 0; + virtual void setConnectedtqStatus(bool newtqStatus) = 0; }; #endif diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp index 5ff1654b..2ba2b740 100644 --- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp +++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.cpp @@ -22,7 +22,7 @@ using namespace SMPPPD; Client::Client() - : m_state(NULL), m_sock(NULL), m_serverID(TQString::null), m_serverVer(TQString::null), m_password(TQString::null) { + : m_state(NULL), m_sock(NULL), m_serverID(TQString()), m_serverVer(TQString()), m_password(TQString()) { changeState(Unsettled::instance()); } diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp index f51aa301..668496ef 100644 --- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp +++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdready.cpp @@ -48,8 +48,8 @@ void Ready::disconnect(Client * client) { delete socket(client); setSocket(client, NULL); - setServerID(client, TQString::null); - setServerVersion(client, TQString::null); + setServerID(client, TQString()); + setServerVersion(client, TQString()); } changeState(client, Unsettled::instance()); diff --git a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp index 3d1f8a79..ef29d992 100644 --- a/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp +++ b/kopete/plugins/smpppdcs/libsmpppdclient/smpppdunsettled.cpp @@ -86,17 +86,17 @@ bool Unsettled::connect(Client * client, const TQString& server, uint port) { TQString response = read(client)[0]; - if(response != TQString::null && + if(response != TQString() && ver.exactMatch(response)) { setServerID(client, response); setServerVersion(client, ver.cap(1)); changeState(client, Ready::instance()); return true; - } else if(response != TQString::null && + } else if(response != TQString() && clg.exactMatch(response)) { - if(password(client) != TQString::null) { + if(password(client) != TQString()) { // we are challenged, ok, respond - write(client, TQString("response = %1\n").arg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1()); + write(client, TQString("response = %1\n").tqarg(make_response(clg.cap(1).stripWhiteSpace(), password(client))).latin1()); response = read(client)[0]; if(ver.exactMatch(response)) { setServerID(client, response); diff --git a/kopete/plugins/smpppdcs/onlineinquiry.cpp b/kopete/plugins/smpppdcs/onlineinquiry.cpp index 4cab45d7..99dc7d5c 100644 --- a/kopete/plugins/smpppdcs/onlineinquiry.cpp +++ b/kopete/plugins/smpppdcs/onlineinquiry.cpp @@ -35,11 +35,11 @@ bool OnlineInquiry::isOnline(bool useSMPPPD) { m_detector = new DetectorNetstat(this); } - m_detector->checkStatus(); + m_detector->checktqStatus(); return m_online; } -void OnlineInquiry::setConnectedStatus(bool newStatus) { - m_online = newStatus; +void OnlineInquiry::setConnectedtqStatus(bool newtqStatus) { + m_online = newtqStatus; } diff --git a/kopete/plugins/smpppdcs/onlineinquiry.h b/kopete/plugins/smpppdcs/onlineinquiry.h index c9b5221a..7a0fcef2 100644 --- a/kopete/plugins/smpppdcs/onlineinquiry.h +++ b/kopete/plugins/smpppdcs/onlineinquiry.h @@ -14,8 +14,8 @@ ************************************************************************* */ -#ifndef ONLINEINQUIRY_H -#define ONLINEINQUIRY_H +#ifndef ONLINEINTQUIRY_H +#define ONLINEINTQUIRY_H #include "iconnector.h" @@ -35,7 +35,7 @@ public: bool isOnline(bool useSMPPPD); - virtual void setConnectedStatus(bool newStatus); + virtual void setConnectedtqStatus(bool newtqStatus); private: Detector * m_detector; diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index f17f2ca9..14f133c1 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -37,9 +37,9 @@ typedef KGenericFactory SMPPPDCSPluginFactory; K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppdcs")) -SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *parent, const char * name, const TQStringList& /* args */) - : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name), - m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(NULL), m_timer(NULL), +SMPPPDCSPlugin::SMPPPDCSPlugin(TQObject *tqparent, const char * name, const TQStringList& /* args */) + : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), tqparent, name), + m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworktqStatus(NULL), m_timer(NULL), m_onlineInquiry(NULL) { kdDebug(14312) << k_funcinfo << endl; @@ -51,7 +51,7 @@ m_onlineInquiry(NULL) { m_detectorNetstat = new DetectorNetstat(this); // experimental, not used yet - m_detectorNetworkStatus = new DetectorNetworkStatus(this); + m_detectorNetworktqStatus = new DetectorNetworktqStatus(this); // we wait for the allPluginsLoaded signal, to connect // as early as possible after startup, but not before @@ -72,7 +72,7 @@ SMPPPDCSPlugin::~SMPPPDCSPlugin() { delete m_timer; delete m_detectorSMPPPD; delete m_detectorNetstat; - delete m_detectorNetworkStatus; + delete m_detectorNetworktqStatus; delete m_onlineInquiry; } @@ -80,7 +80,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { if(Kopete::PluginManager::self()->isAllPluginsLoaded()) { m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus())); if(SMPPPDCSConfig::self()->useSmpppd()) { m_timer->start(30000); @@ -90,7 +90,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { m_timer->start(60000); } - slotCheckStatus(); + slotChecktqStatus(); } } @@ -98,19 +98,19 @@ bool SMPPPDCSPlugin::isOnline() const { return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd()); } -void SMPPPDCSPlugin::slotCheckStatus() { +void SMPPPDCSPlugin::slotChecktqStatus() { // reread config to get changes SMPPPDCSConfig::self()->readConfig(); if(SMPPPDCSConfig::self()->useSmpppd()) { - m_detectorSMPPPD->checkStatus(); + m_detectorSMPPPD->checktqStatus(); } else { - m_detectorNetstat->checkStatus(); + m_detectorNetstat->checktqStatus(); } } -void SMPPPDCSPlugin::setConnectedStatus( bool connected ) { +void SMPPPDCSPlugin::setConnectedtqStatus( bool connected ) { kdDebug(14312) << k_funcinfo << connected << endl; // We have to handle a few cases here. First is the machine is connected, and the plugin thinks @@ -153,7 +153,7 @@ void SMPPPDCSPlugin::connectAllowed() { } #endif - if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()-> + if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()-> accountId())) { it.current()->connect(); } @@ -178,7 +178,7 @@ void SMPPPDCSPlugin::disconnectAllowed() { } #endif - if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { + if(!list.tqcontains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) { it.current()->disconnect(); } } diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.h b/kopete/plugins/smpppdcs/smpppdcsplugin.h index 7b8bdb94..13cd8ec3 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.h +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.h @@ -48,6 +48,7 @@ class OnlineInquiry; */ class SMPPPDCSPlugin : public Kopete::Plugin, public IConnector, virtual public SMPPPDCSIFace { Q_OBJECT + TQ_OBJECT SMPPPDCSPlugin(const SMPPPDCSPlugin&); SMPPPDCSPlugin& operator=(const SMPPPDCSPlugin&); @@ -55,7 +56,7 @@ public: /** * @brief Creates an SMPPPDCSPlugin instance */ - SMPPPDCSPlugin( TQObject *parent, const char *name, const TQStringList &args ); + SMPPPDCSPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); /** * @brief Destroys an SMPPPDCSPlugin instance @@ -76,7 +77,7 @@ public: * * @see SMPPPDCSPrefs */ - virtual void setConnectedStatus( bool newStatus ); + virtual void setConnectedtqStatus( bool newtqStatus ); virtual TQString detectionMethod() const; @@ -86,7 +87,7 @@ public slots: void smpppdServerChanged(const TQString& server); private slots: - void slotCheckStatus(); + void slotChecktqStatus(); void allPluginsLoaded(); private: @@ -98,7 +99,7 @@ private: Detector * m_detectorSMPPPD; Detector * m_detectorNetstat; - Detector * m_detectorNetworkStatus; + Detector * m_detectorNetworktqStatus; bool m_pluginConnected; TQTimer * m_timer; OnlineInquiry * m_onlineInquiry; diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp index 671008bc..de950965 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp @@ -35,8 +35,8 @@ typedef KGenericFactory SMPPPDCSPreferencesFactory; K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs")) -SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name */, const TQStringList& args) - : KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) { +SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * tqparent, const char * /* name */, const TQStringList& args) + : KCModule(SMPPPDCSPreferencesFactory::instance(), tqparent, args), m_ui(NULL) { Kopete::AccountManager * manager = Kopete::AccountManager::self(); (new TQVBoxLayout(this))->setAutoAdd(true); @@ -54,7 +54,7 @@ SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name } if(it.current()->inherits("Kopete::ManagedConnectionAccount")) { - protoName += TQString(", %1").arg(i18n("connection status is managed by Kopete")); + protoName += TQString(", %1").tqarg(i18n("connection status is managed by Kopete")); } TQCheckListItem * cli = new TQCheckListItem(m_ui->accountList, @@ -134,7 +134,7 @@ void SMPPPDCSPreferences::load() while(it.current()) { TQCheckListItem * cli = dynamic_cast(it.current()); if(rex.search(cli->text(0)) > -1) { - bool isOn = list.contains(rex.cap(2) + "Protocol_" + rex.cap(1)); + bool isOn = list.tqcontains(rex.cap(2) + "Protocol_" + rex.cap(1)); // m_accountMapOld[cli->text(0)].m_on = isOn; m_accountMapCur[cli->text(0)].m_on = isOn; cli->setOn(isOn); diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.h b/kopete/plugins/smpppdcs/smpppdcspreferences.h index d521412d..3671d552 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.h +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.h @@ -25,7 +25,7 @@ class SMPPPDCSPrefs; class AccountPrivMap { public: - AccountPrivMap(bool isOn = FALSE, const TQString& id = TQString::null) + AccountPrivMap(bool isOn = FALSE, const TQString& id = TQString()) : m_on(isOn), m_id(id) {} bool m_on; TQString m_id; @@ -38,6 +38,7 @@ public: */ class SMPPPDCSPreferences : public KCModule { Q_OBJECT + TQ_OBJECT SMPPPDCSPreferences(const SMPPPDCSPreferences&); SMPPPDCSPreferences& operator=(const SMPPPDCSPreferences&); @@ -48,7 +49,7 @@ public: /** * @brief Creates an SMPPPDCSPreferences instance */ - SMPPPDCSPreferences(TQWidget * parent = 0, const char * name = 0, const TQStringList &args = TQStringList()); + SMPPPDCSPreferences(TQWidget * tqparent = 0, const char * name = 0, const TQStringList &args = TQStringList()); /** * @brief Destroys an SMPPPDCSPreferences instance diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index 067c55a3..80e8e6ed 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -1,7 +1,7 @@ SMPPPDCSPrefsBase Heiko Schaefer - + SMPPPDCSPrefsBase @@ -20,11 +20,11 @@ unnamed - + tabWidget - + tab @@ -35,9 +35,9 @@ unnamed - + - layout4 + tqlayout4 @@ -49,12 +49,12 @@ 6 - + csMethod - Method of Connection Status Detection + Method of Connection tqStatus Detection @@ -66,7 +66,7 @@ 6 - + useNetstat @@ -80,7 +80,7 @@ Uses the netstat command to find a gateway; suitable on dial-up computers - + useSmpppd @@ -91,7 +91,7 @@ Uses the smpppd on a gateway; suitable for a computer in a private network - + autoCSLayout @@ -120,7 +120,7 @@ Expanding - + 341 20 @@ -131,7 +131,7 @@ - + smpppdPrefs @@ -168,7 +168,7 @@ Expanding - + 20 20 @@ -179,7 +179,7 @@ - + tab @@ -203,14 +203,14 @@ Fixed - + 20 6 - + toIgnoreLabel @@ -275,7 +275,7 @@ useSmpppd accountList - + kpushbutton.h smpppdlocationwidget.h diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp index 4dbedc54..f66f9e47 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp @@ -35,8 +35,8 @@ #include "smpppdcsprefsimpl.h" #include "smpppdsearcher.h" -SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl) - : SMPPPDCSPrefsBase(parent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) { +SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* tqparent, const char* name, WFlags fl) + : SMPPPDCSPrefsBase(tqparent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) { // search for our main-plugin instance Kopete::Plugin * p = Kopete::PluginManager::self()->plugin("kopete_smpppdcs"); @@ -55,7 +55,7 @@ SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl) } // if netstat is NOT available, disable the option and set to SMPPPD - if(KStandardDirs::findExe("netstat") == TQString::null) { + if(KStandardDirs::findExe("netstat") == TQString()) { autoCSTest->setEnabled(FALSE); useNetstat->setEnabled(FALSE); useNetstat->setChecked(FALSE); diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h index 4dcbe46b..607197c3 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.h @@ -32,13 +32,14 @@ class SMPPPDSearcher; class SMPPPDCSPrefs : public SMPPPDCSPrefsBase { Q_OBJECT + TQ_OBJECT SMPPPDCSPrefs(const SMPPPDCSPrefs&); SMPPPDCSPrefs& operator=(const SMPPPDCSPrefs&); public: - SMPPPDCSPrefs(TQWidget* parent, const char* name = 0, WFlags fl = 0); + SMPPPDCSPrefs(TQWidget* tqparent, const char* name = 0, WFlags fl = 0); ~SMPPPDCSPrefs(); signals: diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui index 0424f6f6..9452893f 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationui.ui +++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui @@ -1,6 +1,6 @@ SMPPPDLocationWidgetBase - + SMPPPDLocationWidgetBase @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -47,7 +47,7 @@ The server on which the SMPPPD is running - + textLabel2 @@ -58,9 +58,9 @@ port - + - layout14 + tqlayout14 @@ -83,7 +83,7 @@ The port on which the SMPPPD is running on - + textLabel3 @@ -101,7 +101,7 @@ Expanding - + 130 20 @@ -110,7 +110,7 @@ - + m_passwordLabel @@ -139,7 +139,7 @@ - + klineedit.h knuminput.h diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp index 44de2552..a1f5f9a5 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp +++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.cpp @@ -18,8 +18,8 @@ #include "smpppdlocationwidget.h" -SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* parent, const char* name, WFlags fl) - : SMPPPDLocationWidgetBase(parent, name, fl) {} +SMPPPDLocationWidget::SMPPPDLocationWidget(TQWidget* tqparent, const char* name, WFlags fl) + : SMPPPDLocationWidgetBase(tqparent, name, fl) {} SMPPPDLocationWidget::~SMPPPDLocationWidget() {} diff --git a/kopete/plugins/smpppdcs/smpppdlocationwidget.h b/kopete/plugins/smpppdcs/smpppdlocationwidget.h index 16d1edfb..3f0ba866 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationwidget.h +++ b/kopete/plugins/smpppdcs/smpppdlocationwidget.h @@ -25,12 +25,13 @@ class SMPPPDLocationWidget : public SMPPPDLocationWidgetBase { Q_OBJECT + TQ_OBJECT SMPPPDLocationWidget(const SMPPPDLocationWidget&); SMPPPDLocationWidget& operator=(const SMPPPDLocationWidget&); public: - SMPPPDLocationWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); + SMPPPDLocationWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0); ~SMPPPDLocationWidget(); void setServer(const TQString& serv); diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index a06e30a9..4ec77196 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -64,7 +64,7 @@ void SMPPPDSearcher::searchNetwork() { void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) { kdDebug(14312) << k_funcinfo << endl; - TQString myBuf = TQString::fromLatin1(buf,len); + TQString myBuf = TQString::tqfromLatin1(buf,len); TQRegExp rex("^[ ]{10}.*inet addr:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*Mask:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})"); // tokenize the string into lines TQStringList toks = TQStringList::split("\n", myBuf); @@ -82,7 +82,7 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf kdDebug(14312) << k_funcinfo << endl; TQRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*"); - TQString myBuf = TQString::fromLatin1(buf,len); + TQString myBuf = TQString::tqfromLatin1(buf,len); if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) { // if netstat -r found no gateway we search the network @@ -105,8 +105,8 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf /*! \fn SMPPPDSearcher::scan() const */ -bool SMPPPDSearcher::scan(const TQString& ip, const TQString& mask) { - kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << mask << "..." << endl; +bool SMPPPDSearcher::scan(const TQString& ip, const TQString& tqmask) { + kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << tqmask << "..." << endl; SMPPPD::Client client; @@ -123,7 +123,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& mask) { uint min_range = 0; uint max_range = 255; - // calculate ip range (only last mask entry) + // calculate ip range (only last tqmask entry) TQRegExp lastRex("([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})"); if(lastRex.exactMatch(ip)) { @@ -134,7 +134,7 @@ bool SMPPPDSearcher::scan(const TQString& ip, const TQString& mask) { ipToks.push_back(lastRex.cap(i)); } - if(lastRex.exactMatch(mask)) { + if(lastRex.exactMatch(tqmask)) { uint lastWordMask = lastRex.cap(4).toUInt(); if(lastWordMask == 0) { diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.h b/kopete/plugins/smpppdcs/smpppdsearcher.h index 81c9cb03..1e96f737 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.h +++ b/kopete/plugins/smpppdcs/smpppdsearcher.h @@ -30,6 +30,7 @@ class KProcess; */ class SMPPPDSearcher : public TQObject { Q_OBJECT + TQ_OBJECT SMPPPDSearcher(const SMPPPDSearcher&); SMPPPDSearcher& operator=(const SMPPPDSearcher&); @@ -59,13 +60,13 @@ protected: * @brief Scans a network for a smpppd * * Scans a network for a smpppd described by - * ip and mask. + * ip and tqmask. * * @param ip the ntwork ip - * @param mask the network mask + * @param tqmask the network tqmask * @return TRUE if an smpppd was found */ - bool scan(const TQString& ip, const TQString& mask); + bool scan(const TQString& ip, const TQString& tqmask); signals: /** diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.cpp b/kopete/plugins/smpppdcs/unittest/clienttest.cpp index f668135f..7e19290d 100644 --- a/kopete/plugins/smpppdcs/unittest/clienttest.cpp +++ b/kopete/plugins/smpppdcs/unittest/clienttest.cpp @@ -53,12 +53,12 @@ void ClientTest::testCommunicationBeforeConnect() { void ClientTest::testServerIDBeforeConnect() { SMPPPD::Client c; - CHECK(c.serverID(), TQString::null); + CHECK(c.serverID(), TQString()); } void ClientTest::testServerVersionBeforeConnect() { SMPPPD::Client c; - CHECK(c.serverVersion(), TQString::null); + CHECK(c.serverVersion(), TQString()); } void ClientTest::testCommunicationAfterConnect() { @@ -102,7 +102,7 @@ void ClientTest::testServerIDAfterDisconnect() { SMPPPD::Client c; if(c.connect("warwar", 3185)) { c.disconnect(); - CHECK(c.serverID(), TQString::null); + CHECK(c.serverID(), TQString()); } else { SKIP("Test skipped because no smpppd at warwar:3185"); } @@ -112,7 +112,7 @@ void ClientTest::testServerVersionAfterDisconnect() { SMPPPD::Client c; if(c.connect("warwar", 3185)) { c.disconnect(); - CHECK(c.serverVersion(), TQString::null); + CHECK(c.serverVersion(), TQString()); } else { SKIP("Test skipped because no smpppd at warwar:3185"); } diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.h b/kopete/plugins/smpppdcs/unittest/clienttest.h index 5db7ef7b..0da9d71e 100644 --- a/kopete/plugins/smpppdcs/unittest/clienttest.h +++ b/kopete/plugins/smpppdcs/unittest/clienttest.h @@ -24,6 +24,7 @@ */ class ClientTest : public KUnitTest::SlotTester { Q_OBJECT + TQ_OBJECT ClientTest(const ClientTest&); ClientTest& operator=(const ClientTest&); diff --git a/kopete/plugins/statistics/statisticscontact.cpp b/kopete/plugins/statistics/statisticscontact.cpp index 821b8f59..c178b39b 100644 --- a/kopete/plugins/statistics/statisticscontact.cpp +++ b/kopete/plugins/statistics/statisticscontact.cpp @@ -28,10 +28,10 @@ #include "statisticscontact.h" #include "statisticsdb.h" -StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldStatus(Kopete::OnlineStatus::Unknown) +StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc),m_db(db), m_oldtqStatus(Kopete::OnlineStatus::Unknown) { m_isChatWindowOpen = false; - m_oldStatusDateTime = TQDateTime::currentDateTime(); + m_oldStatusDateTime = TQDateTime::tqcurrentDateTime(); // Last*Changed are always false at start m_timeBetweenTwoMessagesChanged = false; @@ -60,7 +60,7 @@ void StatisticsContact::initialize(Kopete::Contact *c) // Generate statisticsContactId or get it from database TQStringList buffer = m_db->query(TQString("SELECT statisticid FROM contacts " "WHERE contactid LIKE '%1';" - ).arg(c->contactId())); + ).tqarg(c->contactId())); if (buffer.isEmpty()) { @@ -68,7 +68,7 @@ void StatisticsContact::initialize(Kopete::Contact *c) if ( !c->metaContact()->metaContactId().isEmpty() && !m_db->query(TQString("SELECT metacontactid FROM commonstats " "WHERE metacontactid LIKE '%1';" - ).arg(c->metaContact()->metaContactId())).isEmpty()) + ).tqarg(c->metaContact()->metaContactId())).isEmpty()) { // Use old style id m_statisticsContactId = c->metaContact()->metaContactId(); @@ -76,12 +76,12 @@ void StatisticsContact::initialize(Kopete::Contact *c) else { // Create new id - m_statisticsContactId = QUuid::createUuid().toString(); + m_statisticsContactId = TQUuid::createUuid().toString(); } // Assign contactId to m_statisticsContactId m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');" - ).arg(m_statisticsContactId).arg(c->contactId())); + ).tqarg(m_statisticsContactId).tqarg(c->contactId())); } else { @@ -107,7 +107,7 @@ void StatisticsContact::initialize(Kopete::Contact *c) // Get last time a message was received - m_lastMessageReceived = TQDateTime::currentDateTime(); + m_lastMessageReceived = TQDateTime::tqcurrentDateTime(); // Check for lastPresent @@ -129,11 +129,11 @@ void StatisticsContact::contactAdded( Kopete::Contact *c ) // Check if contact is allready in database if not add it if (m_db->query(TQString("SELECT id FROM contacts " "WHERE statisticid LIKE '%1' AND contactid LIKE '%2';" - ).arg(m_statisticsContactId).arg(c->contactId())).isEmpty()) + ).tqarg(m_statisticsContactId).tqarg(c->contactId())).isEmpty()) { // Assign contactId to m_statisticsContactId m_db->query(TQString("INSERT INTO contacts (statisticid, contactid) VALUES('%1', '%2');" - ).arg(m_statisticsContactId).arg(c->contactId())); + ).tqarg(m_statisticsContactId).tqarg(c->contactId())); } kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl; } @@ -151,7 +151,7 @@ void StatisticsContact::contactRemoved( Kopete::Contact *c ) kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl; m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1' AND contactid LIKE '%2';" - ).arg(m_statisticsContactId).arg(c->contactId())); + ).tqarg(m_statisticsContactId).tqarg(c->contactId())); } void StatisticsContact::removeFromDB() @@ -160,11 +160,11 @@ void StatisticsContact::removeFromDB() return; kdDebug() << k_funcinfo << " m_statisticsContactId: " << m_statisticsContactId << endl; - m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").arg(m_statisticsContactId)); - m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId)); - m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").arg(m_statisticsContactId)); + m_db->query(TQString("DELETE FROM contacts WHERE statisticid LIKE '%1';").tqarg(m_statisticsContactId)); + m_db->query(TQString("DELETE FROM contactstatus WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId)); + m_db->query(TQString("DELETE FROM commonstats WHERE metacontactid LIKE '%1';").tqarg(m_statisticsContactId)); - m_statisticsContactId = TQString::null; + m_statisticsContactId = TQString(); } void StatisticsContact::commonStatsSave(const TQString name, const TQString statVar1, const TQString statVar2, const bool statVarChanged) @@ -176,7 +176,7 @@ void StatisticsContact::commonStatsSave(const TQString name, const TQString stat return; m_db->query(TQString("UPDATE commonstats SET statvalue1 = '%1', statvalue2='%2'" - "WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").arg(statVar1).arg(statVar2).arg(name).arg(m_statisticsContactId)); + "WHERE statname LIKE '%3' AND metacontactid LIKE '%4';").tqarg(statVar1).tqarg(statVar2).tqarg(name).tqarg(m_statisticsContactId)); } @@ -196,7 +196,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1 if (m_statisticsContactId.isEmpty()) return; - TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").arg(name, m_statisticsContactId)); + TQStringList buffer = m_db->query(TQString("SELECT statvalue1,statvalue2 FROM commonstats WHERE statname LIKE '%1' AND metacontactid LIKE '%2';").tqarg(name, m_statisticsContactId)); if (!buffer.isEmpty()) { statVar1 = buffer[0]; @@ -204,7 +204,7 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1 } else { - m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").arg(m_statisticsContactId, name)); + m_db->query(TQString("INSERT INTO commonstats (metacontactid, statname, statvalue1, statvalue2) VALUES('%1', '%2', 0, 0);").tqarg(m_statisticsContactId, name)); statVar1 = defaultValue1; statVar2 = defaultValue2; } @@ -234,18 +234,18 @@ void StatisticsContact::commonStatsCheck(const TQString name, TQString& statVar1 void StatisticsContact::newMessageReceived(Kopete::Message& m) { kdDebug() << "statistics: new message received" << endl; - TQDateTime currentDateTime = TQDateTime::currentDateTime(); + TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); if (m_timeBetweenTwoMessagesOn != -1 && m_isChatWindowOpen) { - m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(currentDateTime))/(1 + m_timeBetweenTwoMessagesOn); + m_timeBetweenTwoMessages = (m_timeBetweenTwoMessages*m_timeBetweenTwoMessagesOn + m_lastMessageReceived.secsTo(tqcurrentDateTime))/(1 + m_timeBetweenTwoMessagesOn); } setIsChatWindowOpen(true); m_timeBetweenTwoMessagesOn += 1; - m_lastMessageReceived = currentDateTime; + m_lastMessageReceived = tqcurrentDateTime; // Message lenght @@ -254,7 +254,7 @@ void StatisticsContact::newMessageReceived(Kopete::Message& m) // Last talked /// @todo do this in message sent too. So we need setLastTalk() - m_lastTalk = currentDateTime; + m_lastTalk = tqcurrentDateTime; m_messageLengthChanged = true; m_lastTalkChanged = true; @@ -269,32 +269,32 @@ void StatisticsContact::onlineStatusChanged(Kopete::OnlineStatus::StatusType sta if (m_statisticsContactId.isEmpty()) return; - TQDateTime currentDateTime = TQDateTime::currentDateTime(); + TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); - /// We don't want to log if oldStatus is unknown + /// We don't want to log if oldtqStatus is unknown /// the change could not be a real one; see StatisticsPlugin::slotMySelfOnlineStatusChanged - if (m_oldStatus != Kopete::OnlineStatus::Unknown) + if (m_oldtqStatus != Kopete::OnlineStatus::Unknown) { - kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldStatus) << endl; + kdDebug() << "statistics - status change for "<< metaContact()->metaContactId() << " : "<< TQString::number(m_oldtqStatus) << endl; m_db->query(TQString("INSERT INTO contactstatus " "(metacontactid, status, datetimebegin, datetimeend) " - "VALUES('%1', '%2', '%3', '%4'" ");").arg(m_statisticsContactId).arg(Kopete::OnlineStatus::statusTypeToString(m_oldStatus)).arg(TQString::number(m_oldStatusDateTime.toTime_t())).arg(TQString::number(currentDateTime.toTime_t()))); + "VALUES('%1', '%2', '%3', '%4'" ");").tqarg(m_statisticsContactId).tqarg(Kopete::OnlineStatus::statusTypeToString(m_oldtqStatus)).tqarg(TQString::number(m_oldStatusDateTime.toTime_t())).tqarg(TQString::number(tqcurrentDateTime.toTime_t()))); } - if (m_oldStatus == Kopete::OnlineStatus::Online || m_oldStatus == Kopete::OnlineStatus::Away) + if (m_oldtqStatus == Kopete::OnlineStatus::Online || m_oldtqStatus == Kopete::OnlineStatus::Away) // If the last status was Online or Away, the last time contact was present is the time he goes offline { - m_lastPresent = currentDateTime; + m_lastPresent = tqcurrentDateTime; m_lastPresentChanged = true; } - m_oldStatus = status; - m_oldStatusDateTime = currentDateTime; + m_oldtqStatus = status; + m_oldStatusDateTime = tqcurrentDateTime; } -bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status) +bool StatisticsContact::wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status) { if (m_statisticsContactId.isEmpty()) return false; @@ -303,7 +303,7 @@ bool StatisticsContact::wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusTyp "FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 " "AND status LIKE '%4' " "ORDER BY datetimebegin;" - ).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t()).arg(Kopete::OnlineStatus::statusTypeToString(status))); + ).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t()).tqarg(Kopete::OnlineStatus::statusTypeToString(status))); if (!values.isEmpty()) return true; @@ -318,7 +318,7 @@ TQString StatisticsContact::statusAt(TQDateTime dt) TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend " "FROM contactstatus WHERE metacontactid LIKE '%1' AND datetimebegin <= %2 AND datetimeend >= %3 " "ORDER BY datetimebegin;" - ).arg(m_statisticsContactId).arg(dt.toTime_t()).arg(dt.toTime_t())); + ).tqarg(m_statisticsContactId).tqarg(dt.toTime_t()).tqarg(dt.toTime_t())); if (!values.isEmpty()) return Kopete::OnlineStatus(Kopete::OnlineStatus::statusStringToType(values[0])).description(); else return ""; @@ -337,7 +337,7 @@ TQString StatisticsContact::mainStatusDate(const TQDate& date) "(datetimebegin >= %2 AND datetimebegin <= %3 OR " "datetimeend >= %4 AND datetimeend <= %5) " "ORDER BY datetimebegin;" - ).arg(m_statisticsContactId).arg(dt1.toTime_t()).arg(dt2.toTime_t()).arg(dt1.toTime_t()).arg(dt2.toTime_t()); + ).tqarg(m_statisticsContactId).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t()).tqarg(dt1.toTime_t()).tqarg(dt2.toTime_t()); kdDebug() << request << endl; TQStringList values = m_db->query(request); @@ -389,8 +389,8 @@ TQValueList StatisticsContact::mainEvents(const Kopete::OnlineStatus::St if (m_statisticsContactId.isEmpty()) return mainEvents; - TQDateTime currentDateTime = TQDateTime::currentDateTime(); - buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").arg(m_statisticsContactId)); + TQDateTime tqcurrentDateTime = TQDateTime::tqcurrentDateTime(); + buffer = m_db->query(TQString("SELECT datetimebegin, datetimeend, status FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin").tqarg(m_statisticsContactId)); // Only select the events for which the previous is not Unknown AND the status is status. @@ -413,7 +413,7 @@ TQValueList StatisticsContact::mainEvents(const Kopete::OnlineStatus::St dt1.setTime_t(values[0].toInt()); dt2.setTime_t(values[values.count()-1].toInt()); - avEventsPerDay = qRound((double)values.count()/(double)dt1.daysTo(dt2)); + avEventsPerDay = tqRound((double)values.count()/(double)dt1.daysTo(dt2)); kdDebug() << "statistics: average events per day : " < StatisticsContact::mainEvents(const Kopete::OnlineStatus::St // Then we put some centroids (centroids in [0..24[) TQValueList centroids; - int incr=qRound((double)hoursValues.count()/(double)avEventsPerDay); + int incr=tqRound((double)hoursValues.count()/(double)avEventsPerDay); incr = incr ? incr : 1; for (uint i=0; i StatisticsContact::mainEvents(const Kopete::OnlineStatus::St // We need to compute the centroids centroids = computeCentroids(centroids, hoursValues); - // Convert to QDateTime + // Convert to TQDateTime for (uint i=0; i StatisticsContact::computeCentroids(const TQValueList& cen int value = values[j]; if (whichCentroid[j] == i) { - newCentroids[i] = qRound((double)(value + newCentroids[i]*weight)/(double)(weight + 1)); + newCentroids[i] = tqRound((double)(value + newCentroids[i]*weight)/(double)(weight + 1)); weight++; } diff --git a/kopete/plugins/statistics/statisticscontact.h b/kopete/plugins/statistics/statisticscontact.h index 9d7f6575..1559e1fd 100644 --- a/kopete/plugins/statistics/statisticscontact.h +++ b/kopete/plugins/statistics/statisticscontact.h @@ -55,9 +55,9 @@ public: TQString statisticsContactId() { return m_statisticsContactId; } /** \brief Access method - * \return m_oldStatus + * \return m_oldtqStatus */ - Kopete::OnlineStatus::StatusType oldStatus() { return m_oldStatus; } + Kopete::OnlineStatus::StatusType oldtqStatus() { return m_oldtqStatus; } /** \brief Access method * \return m_oldStatusDateTime @@ -106,7 +106,7 @@ public: /** * \returns true if contact was status at dt, false else. */ - bool wasStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status); + bool wastqStatus(TQDateTime dt, Kopete::OnlineStatus::StatusType status); /** * \returns the status of the contact at dt. Return false if dt is invalid. @@ -209,9 +209,9 @@ private: /** * The interest of statistics contact is to manage the changes of status - * in order to correctly update the database. That's why here we keep the oldStatus + * in order to correctly update the database. That's why here we keep the oldtqStatus */ - Kopete::OnlineStatus::StatusType m_oldStatus; + Kopete::OnlineStatus::StatusType m_oldtqStatus; /// We keep the old status datetime here TQDateTime m_oldStatusDateTime; diff --git a/kopete/plugins/statistics/statisticsdb.cpp b/kopete/plugins/statistics/statisticsdb.cpp index 8f25623e..7d4cbe76 100644 --- a/kopete/plugins/statistics/statisticsdb.cpp +++ b/kopete/plugins/statistics/statisticsdb.cpp @@ -68,7 +68,7 @@ StatisticsDB::StatisticsDB() // Creates the tables if they do not exist. TQStringList result = query("SELECT name FROM sqlite_master WHERE type='table'"); - if (!result.contains("contacts")) + if (!result.tqcontains("contacts")) { query(TQString("CREATE TABLE contacts " "(id INTEGER PRIMARY KEY," @@ -77,7 +77,7 @@ StatisticsDB::StatisticsDB() ");")); } - if (!result.contains("contactstatus")) + if (!result.tqcontains("contactstatus")) { kdDebug() << "[Statistics] Database empty"<< endl; query(TQString("CREATE TABLE contactstatus " @@ -89,7 +89,7 @@ StatisticsDB::StatisticsDB() ");")); } - if (!result.contains("commonstats")) + if (!result.tqcontains("commonstats")) { // To store things like the contact answer time etc. query(TQString("CREATE TABLE commonstats" @@ -102,7 +102,7 @@ StatisticsDB::StatisticsDB() } /// @fixme This is not used anywhere - if (!result.contains("statsgroup")) + if (!result.tqcontains("statsgroup")) { query(TQString("CREATE TABLE statsgroup" "(id INTEGER PRIMARY KEY," diff --git a/kopete/plugins/statistics/statisticsdcopiface.h b/kopete/plugins/statistics/statisticsdcopiface.h index 9a769935..36336ae2 100644 --- a/kopete/plugins/statistics/statisticsdcopiface.h +++ b/kopete/plugins/statistics/statisticsdcopiface.h @@ -60,15 +60,15 @@ k_dcop: /** * \returns return the status of the contact at datetime. */ - virtual TQString dcopStatus(TQString id, TQString datetime) = 0; + virtual TQString dcoptqStatus(TQString id, TQString datetime) = 0; /** * \returns return the status of the contact at timeStamp. */ - virtual TQString dcopStatus(TQString id, int timeStamp) = 0; + virtual TQString dcoptqStatus(TQString id, int timeStamp) = 0; /** * \returns the main status (most used status) of the contact id at date (not time) timeStamp. Will take the day where timeStamp is. */ - virtual TQString dcopMainStatus(TQString id, int timeStamp) = 0; + virtual TQString dcopMaintqStatus(TQString id, int timeStamp) = 0; }; #endif // STATISTICSDCOP_H diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 461dd696..59b2da59 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -40,9 +40,9 @@ #include "statisticsplugin.h" #include "statisticsdb.h" -StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* parent, - const char* name) : KDialogBase(parent, name, false, - i18n("Statistics for %1").arg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact) +StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, TQWidget* tqparent, + const char* name) : KDialogBase(tqparent, name, false, + i18n("Statistics for %1").tqarg(contact->metaContact()->displayName()), Close, Close), m_db(db), m_contact(contact) { mainWidget = new StatisticsWidget(this); setMainWidget(mainWidget); @@ -63,7 +63,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, mainWidget->tabWidget->setCurrentPage(0); mainWidget->timePicker->setTime(TQTime::currentTime()); - mainWidget->datePicker->setDate(TQDate::currentDate()); + mainWidget->datePicker->setDate(TQDate::tqcurrentDate()); connect(mainWidget->askButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAskButtonClicked())); setFocus(); @@ -107,7 +107,7 @@ void StatisticsDialog::slotOpenURLRequest(const KURL& url, const KParts::URLArgs void StatisticsDialog::generatePageForMonth(const int monthOfYear) { TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend " - "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId())); + "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId())); TQStringList values2; @@ -123,13 +123,13 @@ void StatisticsDialog::generatePageForMonth(const int monthOfYear) values2.push_back(values[i+2]); } } - generatePageFromQStringList(values2, TQDate::longMonthName(monthOfYear)); + generatePageFromTQStringList(values2, TQDate::longMonthName(monthOfYear)); } void StatisticsDialog::generatePageForDay(const int dayOfWeek) { TQStringList values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend " - "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").arg(m_contact->statisticsContactId())); + "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;").tqarg(m_contact->statisticsContactId())); TQStringList values2; @@ -161,12 +161,12 @@ void StatisticsDialog::generatePageForDay(const int dayOfWeek) } } } - generatePageFromQStringList(values2, TQDate::longDayName(dayOfWeek)); + generatePageFromTQStringList(values2, TQDate::longDayName(dayOfWeek)); } /// @todo chart problem at midnight. -void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQString & subTitle) +void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const TQString & subTitle) { generalHTMLPart->begin(); generalHTMLPart->write(TQString("" + - i18n("

Statistics for %1

").arg(m_contact->metaContact()->displayName()) + - "

%1

").arg(subTitle)); + i18n("

Statistics for %1

").tqarg(m_contact->metaContact()->displayName()) + + "

%1

").tqarg(subTitle)); generalHTMLPart->write(i18n("
General
" "Days: " @@ -217,14 +217,14 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ "December " "

")); -// mainWidget->listView->addColumn(i18n("Status")); +// mainWidget->listView->addColumn(i18n("tqStatus")); // mainWidget->listView->addColumn(i18n("Start Date")); // mainWidget->listView->addColumn(i18n("End Date")); // mainWidget->listView->addColumn(i18n("Start Date")); // mainWidget->listView->addColumn(i18n("End Date")); TQString todayString; - todayString.append(i18n("

Today

")); + todayString.append(i18n("

Today

StatusFromTo
")); bool today; @@ -265,7 +265,7 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ TQDateTime dateTime2; dateTime2.setTime_t(values[i+2].toInt()); - if (dateTime1.date() == TQDate::currentDate() || dateTime2.date() == TQDate::currentDate()) + if (dateTime1.date() == TQDate::tqcurrentDate() || dateTime2.date() == TQDate::tqcurrentDate()) today = true; else today = false; @@ -351,7 +351,7 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ } else color="white"; - todayString.append(TQString("").arg(color, status, dateTime1.time().toString(), dateTime2.time().toString())); + todayString.append(TQString("").tqarg(color, status, dateTime1.time().toString(), dateTime2.time().toString())); } @@ -386,11 +386,11 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ // Some "total times" generalHTMLPart->write(i18n("
")); generalHTMLPart->write(i18n("" - "Total seen time : %2 hour(s)
").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalTime))); + "Total seen time : %2 hour(s)
").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalTime))); generalHTMLPart->write(i18n("" - "Total online time : %2 hour(s)
").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOnlineTime))); - generalHTMLPart->write(i18n("Total busy time : %2 hour(s)
").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalAwayTime))); - generalHTMLPart->write(i18n("Total offline time : %2 hour(s)").arg(m_contact->metaContact()->displayName()).arg(stringFromSeconds(totalOfflineTime))); + "Total online time : %2 hour(s)
").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOnlineTime))); + generalHTMLPart->write(i18n("Total busy time : %2 hour(s)
").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalAwayTime))); + generalHTMLPart->write(i18n("Total offline time : %2 hour(s)").tqarg(m_contact->metaContact()->displayName()).tqarg(stringFromSeconds(totalOfflineTime))); generalHTMLPart->write(TQString("
")); if (subTitle == i18n("General information")) @@ -399,25 +399,25 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ */ { generalHTMLPart->write(TQString("
")); - generalHTMLPart->write(i18n("Average message length : %1 characters
").arg(m_contact->messageLength())); - generalHTMLPart->write(i18n("Time between two messages : %1 second(s)").arg(m_contact->timeBetweenTwoMessages())); + generalHTMLPart->write(i18n("Average message length : %1 characters
").tqarg(m_contact->messageLength())); + generalHTMLPart->write(i18n("Time between two messages : %1 second(s)").tqarg(m_contact->timeBetweenTwoMessages())); generalHTMLPart->write(TQString("
")); generalHTMLPart->write(TQString("
")); - generalHTMLPart->write(i18n("Last talk : %2
").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastTalk()))); - generalHTMLPart->write(i18n("Last time contact was present : %2").arg(m_contact->metaContact()->displayName()).arg(KGlobal::locale()->formatDateTime(m_contact->lastPresent()))); + generalHTMLPart->write(i18n("Last talk : %2
").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastTalk()))); + generalHTMLPart->write(i18n("Last time contact was present : %2").tqarg(m_contact->metaContact()->displayName()).tqarg(KGlobal::locale()->formatDateTime(m_contact->lastPresent()))); generalHTMLPart->write(TQString("
")); //generalHTMLPart->write(TQString("
")); - //generalHTMLPart->write(i18n("Main online events :
").arg(m_contact->metaContact()->displayName())); + //generalHTMLPart->write(i18n("Main online events :
").tqarg(m_contact->metaContact()->displayName())); //TQValueList mainEvents = m_contact->mainEvents(Kopete::OnlineStatus::Online); //for (uint i=0; iwrite(TQString("%1
").arg(mainEvents[i].toString())); + //generalHTMLPart->write(TQString("%1
").tqarg(mainEvents[i].toString())); //generalHTMLPart->write(TQString("
")); generalHTMLPart->write("
"); - generalHTMLPart->write(i18n("Is %1 since %2").arg( - Kopete::OnlineStatus(m_contact->oldStatus()).description(), + generalHTMLPart->write(i18n("Is %1 since %2").tqarg( + Kopete::OnlineStatus(m_contact->oldtqStatus()).description(), KGlobal::locale()->formatDateTime(m_contact->oldStatusDateTime()))); generalHTMLPart->write(TQString("
")); } @@ -434,13 +434,13 @@ void StatisticsDialog::generatePageFromQStringList(TQStringList values, const TQ for (uint i=0; i<24; i++) { - int hrWidth = qRound((double)hours[i]/(double)hours[iMaxHours]*100.); + int hrWidth = tqRound((double)hours[i]/(double)hours[iMaxHours]*100.); chartString += TQString("metaContact()->displayName()).arg(hrWidth) + +i18n("Between %1:00 and %2:00, I was able to see %3 status %4% of the hour.").tqarg(i).tqarg((i+1)%24).tqarg(m_contact->metaContact()->displayName()).tqarg(hrWidth) +TQString("\">"); } generalHTMLPart->write(chartString); @@ -478,8 +478,8 @@ void StatisticsDialog::generatePageGeneral() TQStringList values; values = m_db->query(TQString("SELECT status, datetimebegin, datetimeend " "FROM contactstatus WHERE metacontactid LIKE '%1' ORDER BY datetimebegin;") - .arg(m_contact->statisticsContactId())); - generatePageFromQStringList(values, i18n("General information")); + .tqarg(m_contact->statisticsContactId())); + generatePageFromTQStringList(values, i18n("General information")); } TQString StatisticsDialog::generateHTMLChart(const int *hours, const int *hours2, const int *hours3, const TQString & caption, const TQString & color) @@ -493,7 +493,7 @@ TQString StatisticsDialog::generateHTMLChart(const int *hours, const int *hours2 { int totalTime = hours[i] + hours2[i] + hours3[i]; - int hrWidth = qRound((double)hours[i]/(double)totalTime*100.); + int hrWidth = tqRound((double)hours[i]/(double)totalTime*100.); chartString += TQString("questionComboBox->currentItem()==0) { TQString text = i18n("1 is date, 2 is contact name, 3 is online status", "%1, %2 was %3") - .arg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) - .arg(m_contact->metaContact()->displayName()) - .arg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))) + .tqarg(m_contact->metaContact()->displayName()) + .tqarg(m_contact->statusAt(TQDateTime(mainWidget->datePicker->date(), mainWidget->timePicker->time()))); mainWidget->answerEdit->setText(text); } else if (mainWidget->questionComboBox->currentItem()==1) diff --git a/kopete/plugins/statistics/statisticsdialog.h b/kopete/plugins/statistics/statisticsdialog.h index 505ea0ef..63d5f499 100644 --- a/kopete/plugins/statistics/statisticsdialog.h +++ b/kopete/plugins/statistics/statisticsdialog.h @@ -39,8 +39,9 @@ namespace KParts class StatisticsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, TQWidget* parent=0, + StatisticsDialog(StatisticsContact *contact, StatisticsDB* db, TQWidget* tqparent=0, const char* name="StatisticsDialog"); private: TQString generateHTMLChart(const int *hours, const int *hours2, const int *hours3, const TQString & caption, const TQString & color); @@ -55,7 +56,7 @@ class StatisticsDialog : public KDialogBase /// Metacontact for which we get the statistics from m_db StatisticsContact *m_contact; - void generatePageFromQStringList(TQStringList values, const TQString & subTitle); + void generatePageFromTQStringList(TQStringList values, const TQString & subTitle); /// Generates the main page void generatePageGeneral(); diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index bef49af8..09015d7a 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -46,14 +46,14 @@ typedef KGenericFactory StatisticsPluginFactory; static const KAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" ); K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata ) ) -StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &) +StatisticsPlugin::StatisticsPlugin( TQObject *tqparent, const char *name, const TQStringList &) : DCOPObject("StatisticsDCOPIface"), - Kopete::Plugin( StatisticsPluginFactory::instance(), parent, name ) + Kopete::Plugin( StatisticsPluginFactory::instance(), tqparent, name ) { KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ), - TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), + TQString::tqfromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), actionCollection(), "viewMetaContactStatistics" ); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); @@ -101,7 +101,7 @@ StatisticsPlugin::~StatisticsPlugin() void StatisticsPlugin::slotAboutToReceive(Kopete::Message& m) { - if ( statisticsMetaContactMap.contains(m.from()->metaContact()) ) + if ( statisticsMetaContactMap.tqcontains(m.from()->metaContact()) ) statisticsMetaContactMap[m.from()->metaContact()]->newMessageReceived(m); } @@ -118,7 +118,7 @@ void StatisticsPlugin::slotViewClosed(Kopete::ChatSession* session) for (; it.current(); ++it) { // If this contact is not in other chat sessions - if (!it.current()->manager() && statisticsMetaContactMap.contains(it.current()->metaContact())) + if (!it.current()->manager() && statisticsMetaContactMap.tqcontains(it.current()->metaContact())) statisticsMetaContactMap[it.current()->metaContact()]->setIsChatWindowOpen(false); } } @@ -129,7 +129,7 @@ void StatisticsPlugin::slotViewStatistics() kdDebug() << k_funcinfo << "statistics - dialog :"+ mc->displayName() << endl; - if ( mc && statisticsMetaContactMap.contains(mc) ) + if ( mc && statisticsMetaContactMap.tqcontains(mc) ) { (new StatisticsDialog(statisticsMetaContactMap[mc], db()))->show(); } @@ -137,7 +137,7 @@ void StatisticsPlugin::slotViewStatistics() void StatisticsPlugin::slotOnlineStatusChanged(Kopete::MetaContact *mc, Kopete::OnlineStatus::StatusType status) { - if ( statisticsMetaContactMap.contains(mc) ) + if ( statisticsMetaContactMap.tqcontains(mc) ) statisticsMetaContactMap[mc]->onlineStatusChanged(status); } @@ -164,7 +164,7 @@ void StatisticsPlugin::slotMetaContactAdded(Kopete::MetaContact *mc) void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc) { - if (statisticsMetaContactMap.contains(mc)) + if (statisticsMetaContactMap.tqcontains(mc)) { StatisticsContact *sc = statisticsMetaContactMap[mc]; statisticsMetaContactMap.remove(mc); @@ -175,7 +175,7 @@ void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc) void StatisticsPlugin::slotContactAdded( Kopete::Contact *c) { - if (statisticsMetaContactMap.contains(c->metaContact())) + if (statisticsMetaContactMap.tqcontains(c->metaContact())) { StatisticsContact *sc = statisticsMetaContactMap[c->metaContact()]; sc->contactAdded(c); @@ -185,7 +185,7 @@ void StatisticsPlugin::slotContactAdded( Kopete::Contact *c) void StatisticsPlugin::slotContactRemoved( Kopete::Contact *c) { - if (statisticsMetaContactMap.contains(c->metaContact())) + if (statisticsMetaContactMap.tqcontains(c->metaContact())) statisticsMetaContactMap[c->metaContact()]->contactRemoved(c); statisticsContactMap.remove(c->contactId()); @@ -195,7 +195,7 @@ void StatisticsPlugin::dcopStatisticsDialog(TQString id) { kdDebug() << k_funcinfo << "statistics - DCOP dialog :" << id << endl; - if (statisticsContactMap.contains(id)) + if (statisticsContactMap.tqcontains(id)) { (new StatisticsDialog(statisticsContactMap[id], db()))->show(); } @@ -205,63 +205,63 @@ bool StatisticsPlugin::dcopWasOnline(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWasStatus(id, dt, Kopete::OnlineStatus::Online); + return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Online); } bool StatisticsPlugin::dcopWasOnline(TQString id, TQString dateTime) { - return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online); + return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Online); } bool StatisticsPlugin::dcopWasAway(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWasStatus(id, dt, Kopete::OnlineStatus::Away); + return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Away); } bool StatisticsPlugin::dcopWasAway(TQString id, TQString dateTime) { - return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away); + return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Away); } bool StatisticsPlugin::dcopWasOffline(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopWasStatus(id, dt, Kopete::OnlineStatus::Offline); + return dcopWastqStatus(id, dt, Kopete::OnlineStatus::Offline); } bool StatisticsPlugin::dcopWasOffline(TQString id, TQString dateTime) { - return dcopWasStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline); + return dcopWastqStatus(id, TQDateTime::fromString(dateTime), Kopete::OnlineStatus::Offline); } -bool StatisticsPlugin::dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status) +bool StatisticsPlugin::dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status) { kdDebug() << k_funcinfo << "statistics - DCOP wasOnline :" << id << endl; - if (dateTime.isValid() && statisticsContactMap.contains(id)) + if (dateTime.isValid() && statisticsContactMap.tqcontains(id)) { - return statisticsContactMap[id]->wasStatus(dateTime, status); + return statisticsContactMap[id]->wastqStatus(dateTime, status); } return false; } -TQString StatisticsPlugin::dcopStatus(TQString id, int timeStamp) +TQString StatisticsPlugin::dcoptqStatus(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - return dcopStatus(id, dt.toString()); + return dcoptqStatus(id, dt.toString()); } -TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime) +TQString StatisticsPlugin::dcoptqStatus(TQString id, TQString dateTime) { TQDateTime dt = TQDateTime::fromString(dateTime); - if (dt.isValid() && statisticsContactMap.contains(id)) + if (dt.isValid() && statisticsContactMap.tqcontains(id)) { return statisticsContactMap[id]->statusAt(dt); } @@ -269,11 +269,11 @@ TQString StatisticsPlugin::dcopStatus(TQString id, TQString dateTime) return ""; } -TQString StatisticsPlugin::dcopMainStatus(TQString id, int timeStamp) +TQString StatisticsPlugin::dcopMaintqStatus(TQString id, int timeStamp) { TQDateTime dt; dt.setTime_t(timeStamp); - if (dt.isValid() && statisticsContactMap.contains(id)) + if (dt.isValid() && statisticsContactMap.tqcontains(id)) { return statisticsContactMap[id]->mainStatusDate(dt.date()); } diff --git a/kopete/plugins/statistics/statisticsplugin.h b/kopete/plugins/statistics/statisticsplugin.h index 47658093..b3b9c9f9 100644 --- a/kopete/plugins/statistics/statisticsplugin.h +++ b/kopete/plugins/statistics/statisticsplugin.h @@ -50,7 +50,7 @@ class KActionCollection; * In the future, it will maybe make prediction on when the contact should be available for chat. * * \subsection install_sec How it works ... - * Each Metacontact is bound to a StatisticsContact which has access to the SQLITE database. + * Each Metacontact is bound to a StatisticsContact which has access to the STQLITE database. * This StatisticsContact stores the last status of the metacontact; the member function onlineStatusChanged is called when the * metacontact status changed (this is managed in the slot slotOnlineStatusChanged of StatisticsPlugin) and then the DB is * updated for the contact. @@ -61,7 +61,7 @@ class KActionCollection; * *
tqStatusFromTo
%2%3%4
%2%3%4
* - * + * * * * @@ -99,9 +99,10 @@ class KActionCollection; class StatisticsPlugin : public Kopete::Plugin, virtual public StatisticsDCOPIface { Q_OBJECT + TQ_OBJECT public: /// Standard plugin constructors - StatisticsPlugin(TQObject *parent, const char *name, const TQStringList &args); + StatisticsPlugin(TQObject *tqparent, const char *name, const TQStringList &args); ~StatisticsPlugin(); /// Method to access m_db member @@ -190,12 +191,12 @@ public slots: bool dcopWasOffline(TQString id, int timeStamp); bool dcopWasOffline(TQString id, TQString dt); - bool dcopWasStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status); + bool dcopWastqStatus(TQString id, TQDateTime dateTime, Kopete::OnlineStatus::StatusType status); - TQString dcopStatus(TQString id, TQString dateTime); - TQString dcopStatus(TQString id, int timeStamp); + TQString dcoptqStatus(TQString id, TQString dateTime); + TQString dcoptqStatus(TQString id, int timeStamp); - TQString dcopMainStatus(TQString id, int timeStamp); + TQString dcopMaintqStatus(TQString id, int timeStamp); private: StatisticsDB *m_db; diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index ca866e18..0a128691 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -1,6 +1,6 @@ StatisticsWidget - + StatisticsWidget @@ -24,11 +24,11 @@ unnamed - + tabWidget - + TabPage @@ -39,7 +39,7 @@ unnamed - + groupBox1 @@ -50,9 +50,9 @@ unnamed - + - layout11 + tqlayout11 @@ -68,16 +68,16 @@ Expanding - + 61 31 - + - layout9 + tqlayout9 @@ -96,15 +96,15 @@ - + - layout7 + tqlayout7 unnamed - + textLabel1 @@ -127,7 +127,7 @@ Expanding - + 40 20 @@ -148,7 +148,7 @@ Expanding - + 60 41 @@ -159,7 +159,7 @@ - + groupBox2 @@ -170,23 +170,23 @@ unnamed - + - layout5 + tqlayout5 unnamed - + - Contact Status at Date & Time + Contact tqStatus at Date & Time - Most Used Status at Date + Most Used tqStatus at Date @@ -201,7 +201,7 @@ - + askButton @@ -213,7 +213,7 @@ - + groupBox3 @@ -224,7 +224,7 @@ unnamed - + answerEdit @@ -236,7 +236,7 @@ - + kdatepicker.h klineedit.h diff --git a/kopete/plugins/texteffect/texteffectplugin.cpp b/kopete/plugins/texteffect/texteffectplugin.cpp index 47bdbc14..664a38a8 100644 --- a/kopete/plugins/texteffect/texteffectplugin.cpp +++ b/kopete/plugins/texteffect/texteffectplugin.cpp @@ -28,8 +28,8 @@ typedef KGenericFactory TextEffectPluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_texteffect, TextEffectPluginFactory( "kopete_texteffect" ) ) -TextEffectPlugin::TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) -: Kopete::Plugin( TextEffectPluginFactory::instance(), parent, name ) +TextEffectPlugin::TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ ) +: Kopete::Plugin( TextEffectPluginFactory::instance(), tqparent, name ) { if( !pluginStatic_ ) pluginStatic_=this; diff --git a/kopete/plugins/texteffect/texteffectplugin.h b/kopete/plugins/texteffect/texteffectplugin.h index 6766bcfa..4090b6b3 100644 --- a/kopete/plugins/texteffect/texteffectplugin.h +++ b/kopete/plugins/texteffect/texteffectplugin.h @@ -41,11 +41,12 @@ class TextEffectConfig; class TextEffectPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT public: static TextEffectPlugin *plugin(); - TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &args ); + TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~TextEffectPlugin(); public slots: diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp index 9fb2994c..ddbe5f61 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.cpp +++ b/kopete/plugins/texteffect/texteffectpreferences.cpp @@ -35,10 +35,10 @@ typedef KGenericFactory TextEffectPreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_texteffect, TextEffectPreferencesFactory( "kcm_kopete_texteffect" ) ) -TextEffectPreferences::TextEffectPreferences(TQWidget *parent, +TextEffectPreferences::TextEffectPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) - : KCModule(TextEffectPreferencesFactory::instance(), parent, args) + : KCModule(TextEffectPreferencesFactory::instance(), tqparent, args) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -106,7 +106,7 @@ void TextEffectPreferences::load() preferencesDialog->m_casewaves->setChecked(config->waves()); - // Call parent's save method + // Call tqparent's save method KCModule::load(); // Indicate that we have not changed ^_^ @@ -134,7 +134,7 @@ void TextEffectPreferences::save() // Notify the plugin that the settings have changed //TextEffectPlugin::plugin()->slotSettingsChanged(); - // Call parent's save method + // Call tqparent's save method KCModule::save(); // Indicate that we have not changed ^_^ @@ -157,7 +157,7 @@ void TextEffectPreferences::slotAddPressed() TQColor myColor; if( KColorDialog::getColor( myColor ) == KColorDialog::Accepted ) { - preferencesDialog->mColorsListBox->insertItem(myColor.name()); + preferencesDialog->mColorsListBox->insertItem(TQString(myColor.name())); } // Indicate that something has changed diff --git a/kopete/plugins/texteffect/texteffectpreferences.h b/kopete/plugins/texteffect/texteffectpreferences.h index 4a64ac1f..eb30faed 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.h +++ b/kopete/plugins/texteffect/texteffectpreferences.h @@ -30,12 +30,13 @@ class TQStringList; class TextEffectPreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - TextEffectPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + TextEffectPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~TextEffectPreferences(); - // Overloaded from parent + // Overloaded from tqparent virtual void save(); virtual void load(); virtual void defaults(); diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui index 95ff801c..919e2f54 100644 --- a/kopete/plugins/texteffect/texteffectprefs.ui +++ b/kopete/plugins/texteffect/texteffectprefs.ui @@ -1,7 +1,7 @@ TextEffectPrefs Olivier Goffart - + TextEffectPrefs @@ -23,11 +23,11 @@ 0 - + TabWidget3 - + tab @@ -38,7 +38,7 @@ unnamed - + groupBox1 @@ -54,7 +54,7 @@ mColorsListBox - + mColorsAdd @@ -62,7 +62,7 @@ &Add... - + mColorsRemove @@ -70,7 +70,7 @@ &Remove - + mColorsUp @@ -78,7 +78,7 @@ Move &Up - + mColorsDown @@ -96,7 +96,7 @@ Expanding - + 21 81 @@ -105,7 +105,7 @@ - + m_colorRandom @@ -127,7 +127,7 @@ Horizontal - + m_fg @@ -135,7 +135,7 @@ Change global text foreground color - + m_char @@ -143,7 +143,7 @@ Change color every letter - + m_words @@ -153,7 +153,7 @@ - + tab @@ -164,7 +164,7 @@ unnamed - + m_lamer @@ -180,7 +180,7 @@ L4m3r t4lk - + m_casewaves @@ -206,7 +206,7 @@ Expanding - + 20 279 @@ -224,7 +224,7 @@ knuminput.h - + klistbox.h diff --git a/kopete/plugins/translator/translatordialog.cpp b/kopete/plugins/translator/translatordialog.cpp index 02e405ec..15c6b7d9 100644 --- a/kopete/plugins/translator/translatordialog.cpp +++ b/kopete/plugins/translator/translatordialog.cpp @@ -21,7 +21,7 @@ #include "translatordialog.h" -TranslatorDialog::TranslatorDialog(const TQString &text,TQWidget *parent, const char *name ) : KDialogBase(parent,name,true,i18n("Translator Plugin"), Ok) +TranslatorDialog::TranslatorDialog(const TQString &text,TQWidget *tqparent, const char *name ) : KDialogBase(tqparent,name,true,i18n("Translator Plugin"), Ok) { m_textEdit=new KTextEdit(this); setMainWidget(m_textEdit); diff --git a/kopete/plugins/translator/translatordialog.h b/kopete/plugins/translator/translatordialog.h index 40a5523e..79c910d0 100644 --- a/kopete/plugins/translator/translatordialog.h +++ b/kopete/plugins/translator/translatordialog.h @@ -31,9 +31,10 @@ class KTextEdit; class TranslatorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TranslatorDialog(const TQString &translated, TQWidget *parent=0, const char *name=0); + TranslatorDialog(const TQString &translated, TQWidget *tqparent=0, const char *name=0); ~TranslatorDialog(); TQString translatedText(); diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp index ef5ac9ac..f583fcd1 100644 --- a/kopete/plugins/translator/translatorguiclient.cpp +++ b/kopete/plugins/translator/translatorguiclient.cpp @@ -33,13 +33,13 @@ #include "translatorguiclient.h" #include "translatorlanguages.h" -TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const char *name ) -: TQObject( parent, name ), KXMLGUIClient( parent ) +TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *tqparent, const char *name ) +: TQObject( tqparent, name ), KXMLGUIClient( tqparent ) { setInstance( TranslatorPlugin::plugin()->instance() ); connect( TranslatorPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); - m_manager = parent; + m_manager = tqparent; new KAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h index 68cb4fa7..e292b0e2 100644 --- a/kopete/plugins/translator/translatorguiclient.h +++ b/kopete/plugins/translator/translatorguiclient.h @@ -37,9 +37,10 @@ namespace Kopete { class ChatSession; } class TranslatorGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - TranslatorGUIClient( Kopete::ChatSession *parent, const char *name=0L); + TranslatorGUIClient( Kopete::ChatSession *tqparent, const char *name=0L); ~TranslatorGUIClient(); private slots: diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index 9bff86f2..175cb9d8 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -17,7 +17,7 @@ * * ************************************************************************* Patched by Francesco Rossi in order to support new - google translation page layout (13-sept-2007) + google translation page tqlayout (13-sept-2007) */ #include @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( &aboutda K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( "kopete_translator" ) ) #endif -TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Plugin( TranslatorPluginFactory::instance(), parent, name ) +TranslatorPlugin::TranslatorPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Plugin( TranslatorPluginFactory::instance(), tqparent, name ) { kdDebug( 14308 ) << k_funcinfo << endl; @@ -237,14 +237,14 @@ TQString TranslatorPlugin::translateMessage( const TQString &msg, const TQString if ( from == to ) { kdDebug( 14308 ) << k_funcinfo << "Src and Dst languages are the same" << endl; - return TQString::null; + return TQString(); } // We search for src_dst - if(! m_languages->supported( m_service ).contains( from + "_" + to ) ) + if(! m_languages->supported( m_service ).tqcontains( from + "_" + to ) ) { kdDebug( 14308 ) << k_funcinfo << from << "_" << to << " is not supported by service " << m_service << endl; - return TQString::null; + return TQString(); } @@ -253,7 +253,7 @@ TQString TranslatorPlugin::translateMessage( const TQString &msg, const TQString else if ( m_service == "google" ) return googleTranslateMessage( msg ,from, to ); else - return TQString::null; + return TQString(); } TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQString &from, const TQString &to ) @@ -282,9 +282,9 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ // FIXME: We need to make the libkopete API async to get rid of this processEvents. // It often causes crashes in the code. - Martijn while ( !m_completed[ job ] ) - qApp->processEvents(); + tqApp->processEvents(); - TQString data = TQString::fromLatin1( m_data[ job ] ); + TQString data = TQString::tqfromLatin1( m_data[ job ] ); // After hacks, we need to clean m_data.remove( job ); @@ -318,7 +318,7 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS // FIXME: We need to make the libkopete API async to get rid of this processEvents. // It often causes crashes in the code. - Martijn while ( !m_completed[ job ] ) - qApp->processEvents(); + tqApp->processEvents(); TQString data = TQString::fromUtf8( m_data[ job ] ); @@ -364,7 +364,7 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr msg.setBody( translated, msg.format() ); break; case ShowOriginal: - msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).arg( translated, msg.plainBody() ), msg.format() ); + msg.setBody( i18n( "%2 \nAuto Translated: \n%1" ).tqarg( translated, msg.plainBody() ), msg.format() ); break; case ShowDialog: { diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h index d82a00be..d7b40a2d 100644 --- a/kopete/plugins/translator/translatorplugin.h +++ b/kopete/plugins/translator/translatorplugin.h @@ -52,13 +52,14 @@ class TranslatorLanguages; class TranslatorPlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT friend class TranslatorGUIClient; public: static TranslatorPlugin *plugin(); - TranslatorPlugin( TQObject *parent, const char *name, const TQStringList &args ); + TranslatorPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); ~TranslatorPlugin(); enum TranslateMode diff --git a/kopete/plugins/translator/translatorprefs.cpp b/kopete/plugins/translator/translatorprefs.cpp index 8d06b49f..4eca00e6 100644 --- a/kopete/plugins/translator/translatorprefs.cpp +++ b/kopete/plugins/translator/translatorprefs.cpp @@ -30,7 +30,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_translator, TranslatorConfigFactory( "kcm class TranslatorPreferences : public KCAutoConfigModule { public: - TranslatorPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( TranslatorConfigFactory::instance(), parent, args ) + TranslatorPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( TranslatorConfigFactory::instance(), tqparent, args ) { TranslatorPrefsUI *preferencesDialog = new TranslatorPrefsUI(this); diff --git a/kopete/plugins/translator/translatorprefsbase.ui b/kopete/plugins/translator/translatorprefsbase.ui index 56b75543..f6c063a2 100644 --- a/kopete/plugins/translator/translatorprefsbase.ui +++ b/kopete/plugins/translator/translatorprefsbase.ui @@ -1,7 +1,7 @@ TranslatorPrefsUI Duncan Mac-Vicar P. - + TranslatorPrefsUI @@ -25,12 +25,12 @@ unnamed - + Service - + TextLabel2_2 @@ -38,7 +38,7 @@ Translation service: - + TextLabel2 @@ -46,7 +46,7 @@ Default native language: - + myLang @@ -59,7 +59,7 @@ - + IncomingMessages @@ -70,7 +70,7 @@ unnamed - + IncomingDontTranslate @@ -84,7 +84,7 @@ 0 - + IncomingShowOriginal @@ -98,7 +98,7 @@ 1 - + IncomingTranslate @@ -111,7 +111,7 @@ - + OutgoingMessages @@ -122,7 +122,7 @@ unnamed - + OutgoingDontTranslate @@ -136,7 +136,7 @@ 0 - + OutgoingShowOriginal @@ -150,7 +150,7 @@ 1 - + OutgoingTranslate @@ -158,7 +158,7 @@ Translate directly - + OutgoingAsk @@ -178,7 +178,7 @@ Expanding - + 20 20 @@ -187,5 +187,5 @@ - + diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN index d62c9c34..cd7ed095 100644 --- a/kopete/plugins/webpresence/DESIGN +++ b/kopete/plugins/webpresence/DESIGN @@ -8,5 +8,5 @@ Every so often, it writes a file containing a snapshot of who is online and who Use KIO::NetAccess to upload the files! -Getting Info about Local User's Status +Getting Info about Local User's tqStatus Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol. So we need to know (protocol, uin, status). diff --git a/kopete/plugins/webpresence/webpresence_html.xsl b/kopete/plugins/webpresence/webpresence_html.xsl index f768ccf5..5dac1837 100644 --- a/kopete/plugins/webpresence/webpresence_html.xsl +++ b/kopete/plugins/webpresence/webpresence_html.xsl @@ -17,7 +17,7 @@ - My IM Status + My IM tqStatus

diff --git a/kopete/plugins/webpresence/webpresence_xhtml.xsl b/kopete/plugins/webpresence/webpresence_xhtml.xsl index 9d749c14..4ba456d5 100644 --- a/kopete/plugins/webpresence/webpresence_xhtml.xsl +++ b/kopete/plugins/webpresence/webpresence_xhtml.xsl @@ -16,7 +16,7 @@ - My IM Status + My IM tqStatus

diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index bb7b9d4c..2755c12a 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory WebPresencePluginFactory; K_EXPORT_COMPONENT_FACTORY( kopete_webpresence, WebPresencePluginFactory( "kopete_webpresence" ) ) -WebPresencePlugin::WebPresencePlugin( TQObject *parent, const char *name, const TQStringList& /*args*/ ) - : Kopete::Plugin( WebPresencePluginFactory::instance(), parent, name ), +WebPresencePlugin::WebPresencePlugin( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) + : Kopete::Plugin( WebPresencePluginFactory::instance(), tqparent, name ), shuttingDown( false ), resultFormatting( WEB_HTML ) { m_writeScheduler = new TQTimer( this ); @@ -228,7 +228,7 @@ KTempFile* WebPresencePlugin::generateFile() // insert the current date/time TQDomElement date = doc.createElement( "listdate" ); TQDomText t = doc.createTextNode( - KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); date.appendChild( t ); root.appendChild( date ); @@ -272,30 +272,30 @@ KTempFile* WebPresencePlugin::generateFile() accName.appendChild( accNameText ); acc.appendChild( accName ); - TQDomElement accStatus = doc.createElement( "accountstatus" ); + TQDomElement acctqStatus = doc.createElement( "accountstatus" ); TQDomText statusText = doc.createTextNode( ( me ) - ? statusAsString( me->onlineStatus() ) + ? statusAsString( me->onlinetqStatus() ) : notKnown ) ; - accStatus.appendChild( statusText ); + acctqStatus.appendChild( statusText ); // Dont add these if we're shutting down, because the result // would be quite weird. if ( !shuttingDown ) { // Add away message as an attribute, if one exists. - if ( me->onlineStatus().status() == Kopete::OnlineStatus::Away && + if ( me->onlinetqStatus().status() == Kopete::OnlineStatus::Away && !me->property("awayMessage").value().toString().isEmpty() ) { - accStatus.setAttribute( "awayreason", + acctqStatus.setAttribute( "awayreason", me->property("awayMessage").value().toString() ); } // Add the online status description as an attribute, if one exits. - if ( !me->onlineStatus().description().isEmpty() ) { - accStatus.setAttribute( "statusdescription", - me->onlineStatus().description() ); + if ( !me->onlinetqStatus().description().isEmpty() ) { + acctqStatus.setAttribute( "statusdescription", + me->onlinetqStatus().description() ); } } - acc.appendChild( accStatus ); + acc.appendChild( acctqStatus ); if ( showAddresses ) { @@ -430,13 +430,13 @@ ProtocolList WebPresencePlugin::allProtocols() return result; } -TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newStatus ) +TQString WebPresencePlugin::statusAsString( const Kopete::OnlineStatus &newtqStatus ) { if (shuttingDown) return "OFFLINE"; TQString status; - switch ( newStatus.status() ) + switch ( newtqStatus.status() ) { case Kopete::OnlineStatus::Online: status = "ONLINE"; diff --git a/kopete/plugins/webpresence/webpresenceplugin.h b/kopete/plugins/webpresence/webpresenceplugin.h index eec5647e..6580a3c9 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.h +++ b/kopete/plugins/webpresence/webpresenceplugin.h @@ -38,6 +38,7 @@ typedef TQValueList ProtocolList; class WebPresencePlugin : public Kopete::Plugin { Q_OBJECT + TQ_OBJECT private: int frequency; @@ -62,7 +63,7 @@ private: TQString resultURL; public: - WebPresencePlugin( TQObject *parent, const char *name, const TQStringList &args ); + WebPresencePlugin( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~WebPresencePlugin(); virtual void aboutToUnload(); @@ -108,7 +109,7 @@ protected: /** * Converts numeric status to a string */ - TQString statusAsString( const Kopete::OnlineStatus &newStatus ); + TQString statusAsString( const Kopete::OnlineStatus &newtqStatus ); /** * Schedules writes */ diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp index 8aebcd53..a727277b 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.cpp +++ b/kopete/plugins/webpresence/webpresencepreferences.cpp @@ -27,8 +27,8 @@ typedef KGenericFactory WebPresencePreferencesFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kopete_webpresence, WebPresencePreferencesFactory("kcm_kopete_webpresence")) -WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args) - : KCModule(WebPresencePreferencesFactory::instance(), parent, args) +WebPresencePreferences::WebPresencePreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args) + : KCModule(WebPresencePreferencesFactory::instance(), tqparent, args) { // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -37,7 +37,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n preferencesDialog->formatStylesheetURL->setFilter( "*.xsl" ); // KAutoConfig stuff - kautoconfig = new KAutoConfig(KGlobal::config(), this, "kautoconfig"); + kautoconfig = new KAutoConfig(KGlobal::config(), TQT_TQOBJECT(this), "kautoconfig"); connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified())); connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin"); diff --git a/kopete/plugins/webpresence/webpresencepreferences.h b/kopete/plugins/webpresence/webpresencepreferences.h index 8c272cdc..f7a9fd19 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.h +++ b/kopete/plugins/webpresence/webpresencepreferences.h @@ -29,9 +29,10 @@ class KAutoConfig; */ class WebPresencePreferences : public KCModule { Q_OBJECT + TQ_OBJECT public: - WebPresencePreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList()); + WebPresencePreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList()); virtual void save(); virtual void defaults(); diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index 9aae819a..7f872fb7 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -1,6 +1,6 @@ WebPresencePrefsUI - + WebPresencePrefsUI @@ -25,7 +25,7 @@ 6 - + groupBox1 @@ -42,7 +42,7 @@ 6 - + textLabel1 @@ -74,7 +74,7 @@ Expanding - + 449 0 @@ -83,7 +83,7 @@ - + buttonGroup2_2 @@ -100,7 +100,7 @@ 6 - + formatHTML @@ -119,7 +119,7 @@ This version should be easily opened by most web browsers. - + formatXHTML @@ -135,7 +135,7 @@ This version should be easily opened by most web browsers. Note that some web browsers do not support XHTML. You should also make sure your web server serves it out with the correct mime type, such as application/xhtml+xml. - + formatXML @@ -149,7 +149,7 @@ Note that some web browsers do not support XHTML. You should also make sure your Save the output in XML format using the UTF-8 encoding. - + formatStylesheet @@ -157,9 +157,9 @@ Note that some web browsers do not support XHTML. You should also make sure your XML transformation &using this XSLT sheet: - + - layout1 + tqlayout1 @@ -175,7 +175,7 @@ Note that some web browsers do not support XHTML. You should also make sure your Fixed - + 30 20 @@ -192,7 +192,7 @@ Note that some web browsers do not support XHTML. You should also make sure your - + useImagesHTML @@ -222,7 +222,7 @@ images/winpopup_protocol.png - + buttonGroup2 @@ -239,7 +239,7 @@ images/winpopup_protocol.png 6 - + showName @@ -250,7 +250,7 @@ images/winpopup_protocol.png true - + showAnotherName @@ -258,9 +258,9 @@ images/winpopup_protocol.png Use another &name: - + - layout2 + tqlayout2 @@ -276,14 +276,14 @@ images/winpopup_protocol.png Fixed - + 30 20 - + showThisName @@ -293,7 +293,7 @@ images/winpopup_protocol.png - + includeIMAddress @@ -313,7 +313,7 @@ images/winpopup_protocol.png Expanding - + 16 93 @@ -357,7 +357,7 @@ images/winpopup_protocol.png showThisName includeIMAddress - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 2293143f..985111a4 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -81,7 +81,7 @@ public: int currentServer; unsigned int serverIP; - QString lastDescription; + TQString lastDescription; bool forFriends; bool ignoreAnons; @@ -114,8 +114,8 @@ static const char* const servers_ip[] = { #define NUM_SERVERS (sizeof(servers_ip)/sizeof(char*)) - GaduAccount::GaduAccount( Kopete::Protocol* parent, const TQString& accountID,const char* name ) -: Kopete::PasswordedAccount( parent, accountID, 0, name ) + GaduAccount::GaduAccount( Kopete::Protocol* tqparent, const TQString& accountID,const char* name ) +: Kopete::PasswordedAccount( tqparent, accountID, 0, name ) { TQHostAddress ip; p = new GaduAccountPrivate; @@ -132,8 +132,8 @@ static const char* const servers_ip[] = { setMyself( new GaduContact( accountId().toInt(), accountId(), this, Kopete::ContactList::self()->myself() ) ); - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); - p->lastDescription = TQString::null; + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + p->lastDescription = TQString(); for ( unsigned int i = 0; i < NUM_SERVERS ; i++ ) { ip.setAddress( TQString( servers_ip[i] ) ); @@ -234,15 +234,15 @@ GaduAccount::initConnections() void GaduAccount::setAway( bool isAway, const TQString& awayMessage ) { - unsigned int currentStatus; + unsigned int currenttqStatus; if ( isAway ) { - currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; + currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_BUSY : GG_STATUS_BUSY_DESCR; } else{ - currentStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; + currenttqStatus = ( awayMessage.isEmpty() ) ? GG_STATUS_AVAIL : GG_STATUS_AVAIL_DESCR; } - changeStatus( GaduProtocol::protocol()->convertStatus( currentStatus ), awayMessage ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( currenttqStatus ), awayMessage ); } @@ -251,8 +251,8 @@ GaduAccount::actionMenu() { kdDebug(14100) << "actionMenu() " << endl; - p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); - p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). + p->actionMenu_ = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); + p->actionMenu_->popupMenu()->insertTitle( myself()->onlinetqStatus().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()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ).iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ).iconFor( this ), 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ).iconFor( this ), 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), - GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), + GaduProtocol::protocol()->converttqStatus( 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. - changeStatus( initialStatus(), p->lastDescription ); + changetqStatus( initialtqStatus(), p->lastDescription ); } void @@ -353,7 +353,7 @@ void GaduAccount::setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason ) { kdDebug(14100) << k_funcinfo << "Called" << endl; - changeStatus( status, reason); + changetqStatus( status, reason); } void @@ -375,12 +375,12 @@ GaduAccount::userlistChanged() } bool -GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) +GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) { kdDebug(14100) << "createContact " << contactId << endl; uin_t uinNumber = contactId.toUInt(); - GaduContact* newContact = new GaduContact( uinNumber, parentContact->displayName(),this, parentContact ); + GaduContact* newContact = new GaduContact( uinNumber, tqparentContact->displayName(),this, tqparentContact ); newContact->setParentIdentity( accountId() ); addNotify( uinNumber ); @@ -390,13 +390,13 @@ GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* pare } void -GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& descr ) +GaduAccount::changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr ) { unsigned int ns; kdDebug(14100) << "##### change status #####" << endl; - kdDebug(14100) << "### Status = " << p->session_->isConnected() << endl; - kdDebug(14100) << "### Status description = \"" << descr << "\"" << endl; + kdDebug(14100) << "### tqStatus = " << p->session_->isConnected() << endl; + kdDebug(14100) << "### tqStatus description = \"" << descr << "\"" << endl; // if change to not available, log off if ( GG_S_NA( status.internalStatus() ) ) { @@ -418,14 +418,14 @@ GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& d 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 ); - changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( 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 ); - changeStatus( GaduProtocol::protocol()->convertStatus( ns ), descr ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( ns ), descr ); return; } @@ -455,7 +455,7 @@ GaduAccount::changeStatus( const Kopete::OnlineStatus& status, const TQString& d else { p->status = status; if ( descr.isEmpty() ) { - if ( p->session_->changeStatus( status.internalStatus(), p->forFriends ) != 0 ) + if ( p->session_->changetqStatus( 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()->convertStatus( GG_STATUS_CONNECTING )); + myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 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_->changeStatus( status ); + p->session_->changetqStatus( status ); } } void GaduAccount::slotLogoff() { - if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->convertStatus( GG_STATUS_CONNECTING )) { - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); - changeStatus( p->status ); + if ( p->session_->isConnected() || p->status == GaduProtocol::protocol()->converttqStatus( GG_STATUS_CONNECTING )) { + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); + changetqStatus( p->status ); p->session_->logoff(); dccOff(); } @@ -525,7 +525,7 @@ GaduAccount::slotLogoff() void GaduAccount::slotGoOnline() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_AVAIL ) ); } void GaduAccount::slotGoOffline() @@ -537,13 +537,13 @@ GaduAccount::slotGoOffline() void GaduAccount::slotGoInvisible() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_INVISIBLE ) ); } void GaduAccount::slotGoBusy() { - changeStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ) ); + changetqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_BUSY ) ); } void @@ -648,7 +648,7 @@ GaduAccount::contactStatusChanged( KGaduNotify* gaduNotify ) return; } - contact->changedStatus( gaduNotify ); + contact->changedtqStatus( gaduNotify ); } void @@ -675,14 +675,14 @@ GaduAccount::connectionFailed( gg_failure_t failure ) case GG_FAILURE_PASSWORD: password().setWrong(); // user pressed CANCEL - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ); myself()->setOnlineStatus( p->status ); disconnected( BadPassword ); return; default: if ( p->connectWithSSL ) { if ( useTls() != TLS_only ) { - slotCommandDone( TQString::null, i18n( "connection using SSL was not possible, retrying without." ) ); + slotCommandDone( TQString(), i18n( "connection using SSL was not possible, retrying without." ) ); kdDebug( 14100 ) << "try without tls now" << endl; p->connectWithSSL = false; tryReconnect = true; @@ -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\")." ).arg( GaduSession::failureDescription( failure ) ), + error( i18n( "unable to connect to the Gadu-Gadu server(\"%1\")." ).tqarg( GaduSession::failureDescription( failure ) ), i18n( "Connection Error" ) ); - p->status = GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ); + p->status = GaduProtocol::protocol()->converttqStatus( 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()->convertStatus( p->session_->status() ); + p->status = GaduProtocol::protocol()->converttqStatus( 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(); } - setAllContactsStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); + setAllContactstqStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); - status = myself()->onlineStatus().internalStatus(); + status = myself()->onlinetqStatus().internalStatus(); if ( status != GG_STATUS_NOT_AVAIL || status != GG_STATUS_NOT_AVAIL_DESCR ) { - myself()->setOnlineStatus( GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ) ); + myself()->setOnlineStatus( GaduProtocol::protocol()->converttqStatus( GG_STATUS_NOT_AVAIL ) ); } GaduAccount::disconnect( reason ); } @@ -894,7 +894,7 @@ GaduAccount::userlist( const TQString& contactsListString ) void GaduAccount::userListExportDone() { - slotCommandDone( TQString::null, i18n( "Contacts exported to the server.") ); + slotCommandDone( TQString(), i18n( "Contacts exported to the server.") ); } void @@ -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 - changeStatus( p->status, p->lastDescription ); + changetqStatus( p->status, p->lastDescription ); saveFriendsMode( p->forFriends ); @@ -922,10 +922,10 @@ GaduAccount::slotExportContactsListToFile() return; } - p->saveListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString::null, + 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").arg( + i18n("Save Contacts List for Account %1 As").tqarg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString() ) ); if ( p->saveListDialog->exec() == TQDialog::Accepted ) { @@ -968,10 +968,10 @@ GaduAccount::slotImportContactsFromFile() return; } - p->loadListDialog = new KFileDialog( "::kopete-gadu" + accountId(), TQString::null, + 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").arg( + i18n("Load Contacts List for Account %1 As").tqarg( 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 ) { - changeStatus( GaduProtocol::protocol()->convertStatus( away->status() ), + changetqStatus( GaduProtocol::protocol()->converttqStatus( away->status() ), away->awayText() ); } delete away; @@ -1156,8 +1156,8 @@ GaduAccount::setDcc( bool d ) void GaduAccount::saveFriendsMode( bool i ) { - p->config->writeEntry( TQString::fromAscii( "forFriends" ), - i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) ); + p->config->writeEntry( TQString(TQString::fromAscii( "forFriends" )), + TQString(i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) )); } bool @@ -1201,8 +1201,8 @@ void GaduAccount::setIgnoreAnons( bool i ) { p->ignoreAnons = i; - p->config->writeEntry( TQString::fromAscii( "ignoreAnons" ), - i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) ); + p->config->writeEntry( TQString(TQString::fromAscii( "ignoreAnons" )), + TQString(i == true ? TQString::fromAscii( "1" ) : TQString::fromAscii( "0" ) )); } GaduAccount::tlsConnection diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index 0d870deb..ad7b4edf 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -54,12 +54,13 @@ class GaduDCCTransaction; class GaduAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: GaduAccount( Kopete::Protocol*, const TQString& accountID, const char* name = 0L ); ~GaduAccount(); //{ - void setAway( bool isAway, const TQString& awayMessage = TQString::null ); + void setAway( bool isAway, const TQString& awayMessage = TQString() ); KActionMenu* actionMenu(); void dccRequest( GaduContact* ); void sendFile( GaduContact* , TQString& ); @@ -73,11 +74,11 @@ public slots: void connectWithPassword(const TQString &password); void disconnect( DisconnectReason ); void disconnect(); - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); //} - void changeStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString::null ); - void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString::null ); + void changetqStatus( const Kopete::OnlineStatus& status, const TQString& descr = TQString() ); + void slotLogin( int status = GG_STATUS_AVAIL, const TQString& dscr = TQString() ); void slotLogoff(); void slotGoOnline(); void slotGoOffline(); @@ -127,7 +128,7 @@ signals: protected: //{ bool createContact( const TQString& contactId, - Kopete::MetaContact* parentContact ); + Kopete::MetaContact* tqparentContact ); //} private slots: diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 89645afd..6cc671b0 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -43,8 +43,8 @@ #include #include -GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, const char* name ) -: AddContactPage( parent, name ) +GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* tqparent, const char* name ) +: AddContactPage( tqparent, name ) { account_ = owner; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -80,7 +80,7 @@ GaduAddContactPage::fillGroups() void GaduAddContactPage::showEvent( TQShowEvent* e ) { - slotUinChanged( TQString::null ); + slotUinChanged( TQString() ); AddContactPage::showEvent( e ); } diff --git a/kopete/protocols/gadu/gaduaddcontactpage.h b/kopete/protocols/gadu/gaduaddcontactpage.h index b21f9a27..71ab9c6c 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.h +++ b/kopete/protocols/gadu/gaduaddcontactpage.h @@ -37,9 +37,10 @@ class GaduAddUI; class GaduAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - GaduAddContactPage( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); + GaduAddContactPage( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); ~GaduAddContactPage(); virtual bool validateData(); virtual bool apply( Kopete::Account* , Kopete::MetaContact * ); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index dd86fa23..e1eb5487 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -36,8 +36,8 @@ #include "gaduawayui.h" #include "gaduaway.h" -GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Away Dialog" ), +GaduAway::GaduAway( GaduAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Away Dialog" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ) { @@ -47,11 +47,11 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) ui_ = new GaduAwayUI( this ); setMainWidget( ui_ ); - ks = account->myself()->onlineStatus(); + ks = account->myself()->onlinetqStatus(); s = GaduProtocol::protocol()->statusToWithDescription( ks ); if ( s == GG_STATUS_NOT_AVAIL_DESCR ) { - ui_->statusGroup_->find( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); + ui_->statusGroup_->tqfind( GG_STATUS_NOT_AVAIL_DESCR )->setDisabled( TRUE ); ui_->statusGroup_->setButton( GG_STATUS_AVAIL_DESCR ); } else { @@ -68,7 +68,7 @@ GaduAway::status() const return ui_->statusGroup_->id( ui_->statusGroup_->selected() ); } -QString +TQString GaduAway::awayText() const { return ui_->textEdit_->text(); @@ -79,7 +79,7 @@ void GaduAway::slotApply() { if ( account_ ) { - account_->changeStatus( GaduProtocol::protocol()->convertStatus( status() ),awayText() ); + account_->changetqStatus( GaduProtocol::protocol()->converttqStatus( status() ),awayText() ); } } diff --git a/kopete/protocols/gadu/gaduaway.h b/kopete/protocols/gadu/gaduaway.h index c7ec2f5f..0cf8eef7 100644 --- a/kopete/protocols/gadu/gaduaway.h +++ b/kopete/protocols/gadu/gaduaway.h @@ -32,9 +32,10 @@ class GaduAwayUI; class GaduAway : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GaduAway( GaduAccount*, TQWidget* parent = 0, const char* name = 0 ); + GaduAway( GaduAccount*, TQWidget* tqparent = 0, const char* name = 0 ); int status() const; TQString awayText() const; diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 2be539c0..8f45f94c 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -37,14 +37,14 @@ #include -GaduCommand::GaduCommand( TQObject* parent, const char* name ) -: TQObject( parent, name ), read_( 0 ), write_( 0 ) +GaduCommand::GaduCommand( TQObject* tqparent, const char* name ) +: TQObject( tqparent, name ), read_( 0 ), write_( 0 ) { } GaduCommand::~GaduCommand() { - //QSocketNotifiers are children and will + //TQSocketNotifiers are tqchildren and will //be deleted anyhow } @@ -114,13 +114,13 @@ GaduCommand::forwarder() emit socketReady(); } -RegisterCommand::RegisterCommand( TQObject* parent, const char* name ) -:GaduCommand( parent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( TQObject* tqparent, const char* name ) +:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), session_( 0 ), uin( 0 ) { } -RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* parent, const char* name ) -:GaduCommand( parent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) +RegisterCommand::RegisterCommand( const TQString& email, const TQString& password, TQObject* tqparent, const char* name ) +:GaduCommand( tqparent, name ), state( RegisterStateNoToken ), email_( email ), password_( password ), session_( 0 ), uin( 0 ) { } @@ -204,7 +204,7 @@ void RegisterCommand::watcher() } pubDir = (struct gg_pubdir *)session_->data; - emit operationStatus( i18n( "Token retrieving status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); + emit operationtqStatus( i18n( "Token retrieving status: %1" ).tqarg( 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 operationStatus( i18n( "Registration status: %1" ).arg( GaduSession::stateDescription( session_->state ) ) ); + emit operationtqStatus( i18n( "Registration status: %1" ).tqarg( GaduSession::stateDescription( session_->state ) ) ); switch ( session_->state ) { case GG_STATE_CONNECTING: kdDebug( 14100 ) << "Recreating notifiers " << endl; @@ -293,13 +293,13 @@ void RegisterCommand::watcher() } } -RemindPasswordCommand::RemindPasswordCommand( TQObject* parent, const char* name ) -: GaduCommand( parent, name ), uin_( 0 ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), uin_( 0 ), session_( 0 ) { } -RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* parent, const char* name ) -: GaduCommand( parent, name ), uin_( uin ), session_( 0 ) +RemindPasswordCommand::RemindPasswordCommand( uin_t uin, TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), uin_( uin ), session_( 0 ) { } @@ -351,8 +351,8 @@ RemindPasswordCommand::watcher() enableNotifiers( session_->check ); } -ChangePasswordCommand::ChangePasswordCommand( TQObject* parent, const char* name ) -: GaduCommand( parent, name ), session_( 0 ) +ChangePasswordCommand::ChangePasswordCommand( TQObject* tqparent, const char* name ) +: GaduCommand( tqparent, name ), session_( 0 ) { } diff --git a/kopete/protocols/gadu/gaducommands.h b/kopete/protocols/gadu/gaducommands.h index 7fc8792d..c0576b35 100644 --- a/kopete/protocols/gadu/gaducommands.h +++ b/kopete/protocols/gadu/gaducommands.h @@ -35,12 +35,13 @@ class TQSocketNotifier; class TQStringList; class TQPixmap; -class GaduCommand : public QObject +class GaduCommand : public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduCommand( TQObject* parent = 0, const char* name = 0 ); + GaduCommand( TQObject* tqparent = 0, const char* name = 0 ); virtual ~GaduCommand(); virtual void execute() = 0; @@ -52,7 +53,7 @@ signals: void done( const TQString& title, const TQString& what ); void error( const TQString& title, const TQString& error ); void socketReady(); - void operationStatus( const TQString ); + void operationtqStatus( const TQString ); protected: void checkSocket( int, int ); @@ -73,11 +74,12 @@ private: class RegisterCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - RegisterCommand( TQObject* parent = 0, const char* name = 0 ); + RegisterCommand( TQObject* tqparent = 0, const char* name = 0 ); RegisterCommand( const TQString& email, const TQString& password , - TQObject* parent = 0, const char* name = 0 ); + TQObject* tqparent = 0, const char* name = 0 ); ~RegisterCommand(); void setUserinfo( const TQString& email, const TQString& password, const TQString& token ); @@ -95,21 +97,22 @@ protected slots: private: enum RegisterState{ RegisterStateNoToken, RegisterStateWaitingForToken, RegisterStateGotToken, RegisterStateWaitingForNumber, RegisterStateDone }; RegisterState state; - QString email_; - QString password_; + TQString email_; + TQString password_; struct gg_http* session_; int uin; - QString tokenId; - QString tokenString; + TQString tokenId; + TQString tokenString; }; class RemindPasswordCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - RemindPasswordCommand( uin_t uin, TQObject* parent = 0, const char* name = 0 ); - RemindPasswordCommand( TQObject* parent = 0, const char* name = 0 ); + RemindPasswordCommand( uin_t uin, TQObject* tqparent = 0, const char* name = 0 ); + RemindPasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); ~RemindPasswordCommand(); void setUIN( uin_t ); @@ -126,9 +129,10 @@ private: class ChangePasswordCommand : public GaduCommand { Q_OBJECT + TQ_OBJECT public: - ChangePasswordCommand( TQObject* parent = 0, const char* name = 0 ); + ChangePasswordCommand( TQObject* tqparent = 0, const char* name = 0 ); ~ChangePasswordCommand(); void setInfo( uin_t uin, const TQString& passwd, const TQString& newpasswd, @@ -140,9 +144,9 @@ protected slots: private: struct gg_http* session_; - QString passwd_; - QString newpasswd_; - QString newemail_; + TQString passwd_; + TQString newpasswd_; + TQString newemail_; uin_t uin_; }; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index dfbb93a4..2ee61e97 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -44,8 +44,8 @@ using Kopete::UserInfoDialog; -GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* parent ) -: Kopete::Contact( account, TQString::number( uin ), parent ), uin_( uin ) +GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* account, Kopete::MetaContact* tqparent ) +: Kopete::Contact( account, TQString::number( uin ), tqparent ), uin_( uin ) { msgManager_ = 0L; account_ = static_cast( account ); @@ -66,21 +66,21 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco setFileCapable( true ); //offline - setOnlineStatus( GaduProtocol::protocol()->convertStatus( 0 ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( 0 ) ); setProperty( Kopete::Global::Properties::self()->nickName(), name ); } -QString +TQString GaduContact::identityId() const { - return parentIdentity_; + return tqparentIdentity_; } void GaduContact::setParentIdentity( const TQString& id) { - parentIdentity_ = id; + tqparentIdentity_ = id; } uin_t @@ -96,7 +96,7 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint //If the file location is null, then get it from a file open dialog if( !sourceURL.isValid() ) - filePath = KFileDialog::getOpenFileName(TQString::null, "*", 0l , i18n("Kopete File Transfer")); + filePath = KFileDialog::getOpenFileName(TQString(), "*", 0l , i18n("Kopete File Transfer")); else filePath = sourceURL.path(-1); @@ -107,14 +107,14 @@ GaduContact::sendFile( const KURL &sourceURL, const TQString &/*fileName*/, uint void -GaduContact::changedStatus( KGaduNotify* newstatus ) +GaduContact::changedtqStatus( KGaduNotify* newstatus ) { if ( newstatus->description.isNull() ) { - setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); removeProperty( GaduProtocol::protocol()->propAwayMessage ); } else { - setOnlineStatus( GaduProtocol::protocol()->convertStatus( newstatus->status ) ); + setOnlineStatus( GaduProtocol::protocol()->converttqStatus( newstatus->status ) ); setProperty( GaduProtocol::protocol()->propAwayMessage, newstatus->description ); } @@ -230,7 +230,7 @@ GaduContact::slotUserInfo() dlg->setName( metaContact()->displayName() ); dlg->setId( TQString::number( uin_ ) ); - dlg->setStatus( onlineStatus().description() ); + dlg->settqStatus( onlinetqStatus().description() ); dlg->setAwayMessage( description_ ); dlg->show(); } @@ -277,7 +277,7 @@ GaduContactsList::ContactLine* GaduContact::contactDetails() { Kopete::GroupList groupList; - QString groups; + TQString groups; GaduContactsList::ContactLine* cl = new GaduContactsList::ContactLine; @@ -315,7 +315,7 @@ GaduContact::contactDetails() return cl; } -QString +TQString GaduContact::findBestContactName( const GaduContactsList::ContactLine* cl ) { TQString name; diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index 27c99e00..ee244a96 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -45,6 +45,7 @@ class TQStringList; class GaduContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: GaduContact( unsigned int, const TQString&, Kopete::Account*, Kopete::MetaContact* ); @@ -66,7 +67,7 @@ public: bool ignored(); static TQString findBestContactName( const GaduContactsList::ContactLine* ); - void changedStatus( KGaduNotify* ); + void changedtqStatus( KGaduNotify* ); uin_t uin() const; @@ -82,7 +83,7 @@ public slots: void slotShowPublicProfile(); void slotEditContact(); virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); protected: @@ -94,8 +95,8 @@ private: bool ignored_; Kopete::ChatSession* msgManager_; - QString description_; - QString parentIdentity_; + TQString description_; + TQString tqparentIdentity_; GaduAccount* account_; KAction* actionSendMessage_; diff --git a/kopete/protocols/gadu/gaducontactlist.cpp b/kopete/protocols/gadu/gaducontactlist.cpp index 314e661f..9c003751 100644 --- a/kopete/protocols/gadu/gaducontactlist.cpp +++ b/kopete/protocols/gadu/gaducontactlist.cpp @@ -45,7 +45,7 @@ GaduContactsList::GaduContactsList( TQString sList ) return; } - if ( ( !sList.contains( '\n' ) && sList.contains( ';' ) ) || !sList.contains( ';' ) ) { + if ( ( !sList.tqcontains( '\n' ) && sList.tqcontains( ';' ) ) || !sList.tqcontains( ';' ) ) { return; } @@ -164,7 +164,7 @@ GaduContactsList::addContact( } -QString +TQString GaduContactsList::asString() { TQString contacts; diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index 4235d4e3..6e5b416a 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -50,8 +50,8 @@ static TQMutex initmutex; typedef TQMap< unsigned int, GaduAccount* > gaduAccounts; static gaduAccounts accounts; -GaduDCC::GaduDCC( TQObject* parent, const char* name ) -:TQObject( parent, name ) +GaduDCC::GaduDCC( TQObject* tqparent, const char* name ) +:TQObject( tqparent, name ) { } @@ -78,7 +78,7 @@ GaduDCC::unregisterAccount( unsigned int id ) return false; } - if ( !accounts.contains( id ) ) { + if ( !accounts.tqcontains( id ) ) { kdDebug(14100) << "attempt to unregister not registered account" << endl; initmutex.unlock(); return false; @@ -118,7 +118,7 @@ GaduDCC::registerAccount( GaduAccount* account ) aid = account->accountId().toInt(); - if ( accounts.contains( aid ) ) { + if ( accounts.tqcontains( aid ) ) { kdDebug(14100) << "attempt to register already registered account" << endl; initmutex.unlock(); return false; @@ -168,7 +168,7 @@ GaduDCC::slotIncoming( gg_dcc* incoming, bool& handled ) GaduDCC::~GaduDCC() { - if ( accounts.contains( accountId ) ) { + if ( accounts.tqcontains( accountId ) ) { kdDebug( 14100 ) << "unregister account " << accountId << " in destructor " << endl; unregisterAccount( accountId ); } diff --git a/kopete/protocols/gadu/gadudcc.h b/kopete/protocols/gadu/gadudcc.h index d065d199..52f07750 100644 --- a/kopete/protocols/gadu/gadudcc.h +++ b/kopete/protocols/gadu/gadudcc.h @@ -35,8 +35,9 @@ class GaduDCCServer; class GaduDCC: public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduDCC( TQObject* parent, const char* name = NULL ); + GaduDCC( TQObject* tqparent, const char* name = NULL ); ~GaduDCC(); bool unregisterAccount(); bool registerAccount( GaduAccount* ); diff --git a/kopete/protocols/gadu/gadudccserver.h b/kopete/protocols/gadu/gadudccserver.h index e5c4b8e5..50982eab 100644 --- a/kopete/protocols/gadu/gadudccserver.h +++ b/kopete/protocols/gadu/gadudccserver.h @@ -34,6 +34,7 @@ class GaduAccount; class GaduDCCServer: public TQObject { Q_OBJECT + TQ_OBJECT public: GaduDCCServer( TQHostAddress* dccIp = NULL, unsigned int port = 1550 ); ~GaduDCCServer(); diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index 7ec8d2ac..f152b942 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -44,8 +44,8 @@ #include "libgadu.h" -GaduDCCTransaction::GaduDCCTransaction( GaduDCC* parent, const char* name ) -:TQObject( parent, name ), gaduDCC_( parent ) +GaduDCCTransaction::GaduDCCTransaction( GaduDCC* tqparent, const char* name ) +:TQObject( tqparent, name ), gaduDCC_( tqparent ) { read_ = NULL; write_ = NULL; @@ -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?" ).arg( fileName ), - i18n( "File Exists: %1" ).arg( fileName ), resumeButton, overwriteButton ) ) + i18n( "The file %1 already exists, do you want to resume or overwrite it?" ).tqarg( fileName ), + i18n( "File Exists: %1" ).tqarg( fileName ), resumeButton, overwriteButton ) ) { // resume case KMessageBox::Yes: @@ -384,7 +384,7 @@ GaduDCCTransaction::watcher() { return; break; case GG_EVENT_DCC_NEED_FILE_INFO: - if (gaduDCC_->requests.contains(dccSock_->peer_uin)) { + if (gaduDCC_->requests.tqcontains(dccSock_->peer_uin)) { TQString filePath = gaduDCC_->requests[dccSock_->peer_uin]; kdDebug() << "Callback request found. Sending " << filePath << endl; gaduDCC_->requests.remove(dccSock_->peer_uin); diff --git a/kopete/protocols/gadu/gadudcctransaction.h b/kopete/protocols/gadu/gadudcctransaction.h index 4b9807af..43c6395a 100644 --- a/kopete/protocols/gadu/gadudcctransaction.h +++ b/kopete/protocols/gadu/gadudcctransaction.h @@ -36,6 +36,7 @@ class GaduDCC; class GaduDCCTransaction: TQObject { Q_OBJECT + TQ_OBJECT public: GaduDCCTransaction( GaduDCC*, const char* name = NULL ); ~GaduDCCTransaction(); diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 08987c16..244aee2a 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -43,8 +43,8 @@ #include "kopetepasswordwidget.h" -GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* parent, const char* name ) -: GaduAccountEditUI( parent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) +GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, TQWidget* tqparent, const char* name ) +: GaduAccountEditUI( tqparent, name ), KopeteEditAccountWidget( ident ), protocol_( proto ), rcmd( 0 ) { #ifdef __GG_LIBGADU_HAVE_OPENSSL diff --git a/kopete/protocols/gadu/gadueditaccount.h b/kopete/protocols/gadu/gadueditaccount.h index 1b870496..c63ac450 100644 --- a/kopete/protocols/gadu/gadueditaccount.h +++ b/kopete/protocols/gadu/gadueditaccount.h @@ -35,9 +35,10 @@ namespace Kopete { class Account; } class GaduEditAccount : public GaduAccountEditUI, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* parent = 0, const char* name = 0 ); + GaduEditAccount( GaduProtocol*, Kopete::Account*, TQWidget* tqparent = 0, const char* name = 0 ); virtual bool validateData(); Kopete::Account* apply(); diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index 985a9874..6c13f1ff 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -46,8 +46,8 @@ // FIXME: this and gaduadcontactpage should have one base class, with some code duplicated in both. GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, - TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( contact ) { @@ -64,8 +64,8 @@ GaduEditContact::GaduEditContact( GaduAccount* account, GaduContact* contact, } GaduEditContact::GaduEditContact( GaduAccount* account, GaduContactsList::ContactLine* clin, - TQWidget* parent , const char* name ) -: KDialogBase( parent, name, true, i18n( "Edit Contact's Properties" ), + TQWidget* tqparent , const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Edit Contact's Properties" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ), account_( account ), contact_( NULL ) { diff --git a/kopete/protocols/gadu/gadueditcontact.h b/kopete/protocols/gadu/gadueditcontact.h index f135d55a..a48bd697 100644 --- a/kopete/protocols/gadu/gadueditcontact.h +++ b/kopete/protocols/gadu/gadueditcontact.h @@ -36,12 +36,13 @@ class TQListViewItem; class GaduEditContact : public KDialogBase { Q_OBJECT + TQ_OBJECT public: GaduEditContact( GaduAccount*, GaduContact*, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); GaduEditContact( GaduAccount*, GaduContactsList::ContactLine*, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); protected slots: void slotApply(); void listClicked( TQListViewItem* ); diff --git a/kopete/protocols/gadu/gaduprotocol.cpp b/kopete/protocols/gadu/gaduprotocol.cpp index 1a59f17f..8336b6fd 100644 --- a/kopete/protocols/gadu/gaduprotocol.cpp +++ b/kopete/protocols/gadu/gaduprotocol.cpp @@ -45,8 +45,8 @@ K_EXPORT_COMPONENT_FACTORY( kopete_gadu, KGenericFactory( "kopete_ GaduProtocol* GaduProtocol::protocolStatic_ = 0L; -GaduProtocol::GaduProtocol( TQObject* parent, const char* name, const TQStringList& ) -:Kopete::Protocol( GaduProtocolFactory::instance(), parent, name ), +GaduProtocol::GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& ) +:Kopete::Protocol( GaduProtocolFactory::instance(), tqparent, name ), propFirstName(Kopete::Global::Properties::self()->firstName()), propLastName(Kopete::Global::Properties::self()->lastName()), propEmail(Kopete::Global::Properties::self()->emailAddress()), @@ -68,7 +68,7 @@ GaduProtocol::GaduProtocol( TQObject* parent, const char* name, const TQStringLi gaduStatusInvisibleDescr_(Kopete::OnlineStatus::Invisible, GG_STATUS_INVISIBLE_DESCR, this, GG_STATUS_INVISIBLE_DESCR, TQStringList::split( '|', "contact_invisible_overlay|gg_description_overlay" ), i18n( "Invisible" ) , i18n( "I&nvisible" )), gaduStatusAvail_(Kopete::OnlineStatus::Online, GG_STATUS_AVAIL, this, GG_STATUS_AVAIL, - TQString::null, i18n( "Online" ) , i18n( "&Online" ) , Kopete::OnlineStatusManager::Online ), + TQString(), i18n( "Online" ) , i18n( "&Online" ) , Kopete::OnlineStatusManager::Online ), gaduStatusAvailDescr_(Kopete::OnlineStatus::Online, GG_STATUS_AVAIL_DESCR, this, GG_STATUS_AVAIL_DESCR, "gg_description_overlay", i18n( "Online" ) , i18n( "&Online" )), gaduConnecting_(Kopete::OnlineStatus::Offline, GG_STATUS_CONNECTING, this, GG_STATUS_CONNECTING, @@ -99,9 +99,9 @@ GaduProtocol::protocol() } AddContactPage* -GaduProtocol::createAddContactWidget( TQWidget* parent, Kopete::Account* account ) +GaduProtocol::createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ) { - return new GaduAddContactPage( static_cast( account ), parent ); + return new GaduAddContactPage( static_cast( account ), tqparent ); } void @@ -199,7 +199,7 @@ GaduProtocol::statusWithDescription( uint status ) } Kopete::OnlineStatus -GaduProtocol::convertStatus( uint status ) const +GaduProtocol::converttqStatus( uint status ) const { switch( status ) { case GG_STATUS_NOT_AVAIL: @@ -235,9 +235,9 @@ GaduProtocol::createNewAccount( const TQString& accountId ) } KopeteEditAccountWidget* -GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* parent ) +GaduProtocol::createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ) { - return( new GaduEditAccount( this, account, parent ) ); + return( new GaduEditAccount( this, account, tqparent ) ); } #include "gaduprotocol.moc" diff --git a/kopete/protocols/gadu/gaduprotocol.h b/kopete/protocols/gadu/gaduprotocol.h index 0a4524b8..99076f9d 100644 --- a/kopete/protocols/gadu/gaduprotocol.h +++ b/kopete/protocols/gadu/gaduprotocol.h @@ -50,18 +50,19 @@ class GaduPreferences; class GaduProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - GaduProtocol( TQObject* parent, const char* name, const TQStringList& str); + GaduProtocol( TQObject* tqparent, const char* name, const TQStringList& str); ~GaduProtocol(); static GaduProtocol *protocol(); // Plugin reimplementation // { - AddContactPage* createAddContactWidget( TQWidget* parent, Kopete::Account* account ); + AddContactPage* createAddContactWidget( TQWidget* tqparent, Kopete::Account* account ); Kopete::Account* createNewAccount( const TQString& accountId ); - KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* parent ); + KopeteEditAccountWidget *createEditAccountWidget( Kopete::Account* account, TQWidget* tqparent ); bool canSendOffline() const { return true; } virtual Kopete::Contact *deserializeContact( Kopete::MetaContact* metaContact, @@ -70,7 +71,7 @@ public: // } //!Plugin reimplementation - Kopete::OnlineStatus convertStatus( uint ) const; + Kopete::OnlineStatus converttqStatus( 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 1c329cf0..8c33aef2 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -40,8 +40,8 @@ #include #include -GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { mAccount = account; createWidget(); @@ -50,8 +50,8 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char show(); } -GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, false, TQString::null, User1|User2|User3|Cancel, User2 ) +GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) { ResLine rs; @@ -80,7 +80,7 @@ GaduPublicDir::GaduPublicDir( GaduAccount* account, int searchFor, TQWidget* par // now it is time to switch to Right Page(tm) rs.uin = searchFor; - fName = fSurname = fNick = fCity = TQString::null; + fName = fSurname = fNick = fCity = TQString(); fUin = searchFor; fGender = fAgeFrom = fAgeTo = 0; fOnlyOnline = false; @@ -170,7 +170,7 @@ GaduPublicDir::initConnections() void GaduPublicDir::inputChanged( bool ) { - inputChanged( TQString::null ); + inputChanged( TQString() ); } void @@ -217,20 +217,20 @@ GaduPublicDir::validateData() CHECK_INT( fAgeTo ); } else { - fSurname = TQString::null; + fSurname = TQString(); CHECK_INT( fUin ); } return false; } // Move to GaduProtocol someday -QPixmap -GaduPublicDir::iconForStatus( uint status ) +TQPixmap +GaduPublicDir::iconFortqStatus( uint status ) { TQPixmap n; if ( GaduProtocol::protocol() ) { - return GaduProtocol::protocol()->convertStatus( status ).protocolIcon(); + return GaduProtocol::protocol()->converttqStatus( 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, iconForStatus( (*r).status ) ); + sl->setPixmap( 0, iconFortqStatus( (*r).status ) ); } // if not found anything, obviously we don't want to search for more @@ -282,7 +282,7 @@ GaduPublicDir::slotNewSearch() showButton( User1, false ); showButton( User3, false ); enableButton( User2, false ); - inputChanged( TQString::null ); + inputChanged( TQString() ); mAccount->pubDirSearchClose(); } diff --git a/kopete/protocols/gadu/gadupubdir.h b/kopete/protocols/gadu/gadupubdir.h index 4dd1b545..78e92e2f 100644 --- a/kopete/protocols/gadu/gadupubdir.h +++ b/kopete/protocols/gadu/gadupubdir.h @@ -39,11 +39,12 @@ class GaduContact; class GaduPublicDir : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GaduPublicDir( GaduAccount* , TQWidget *parent = 0, const char* name = "GaduPublicDir" ); - GaduPublicDir( GaduAccount* , int searchFor, TQWidget* parent = 0, const char* name = "GaduPublicDir" ); - TQPixmap iconForStatus( uint status ); + GaduPublicDir( GaduAccount* , TQWidget *tqparent = 0, const char* name = "GaduPublicDir" ); + GaduPublicDir( GaduAccount* , int searchFor, TQWidget* tqparent = 0, const char* name = "GaduPublicDir" ); + TQPixmap iconFortqStatus( uint status ); private slots: void slotSearch(); @@ -67,10 +68,10 @@ private: GaduPublicDirectory* mMainWidget; // form data - QString fName; - QString fSurname; - QString fNick; - QString fCity; + TQString fName; + TQString fSurname; + TQString fNick; + TQString fCity; int fUin; int fGender; bool fOnlyOnline; diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index b2ee0bc1..7baaa1bc 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -35,8 +35,8 @@ #include "gaduregisteraccount.h" #include "gaducommands.h" -GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) +GaduRegisterAccount::GaduRegisterAccount( TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "Register New Account" ), KDialogBase::User1 | KDialogBase::Ok, KDialogBase::User1, true ) { ui = new GaduRegisterAccountUI( this ); setMainWidget( ui ); @@ -46,7 +46,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) setButtonText( Ok, i18n( "&Cancel" ) ); enableButton( User1, false ); - cRegister = new RegisterCommand( this ); + cRegister = new RegisterCommand( TQT_TQOBJECT(this) ); emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = KGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small ); @@ -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( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) ); + connect( cRegister, TQT_SIGNAL( operationtqStatus( const TQString ) ), TQT_SLOT( updatetqStatus( const TQString ) ) ); - updateStatus( i18n( "Retrieving token" ) ); + updatetqStatus( i18n( "Retrieving token" ) ); cRegister->requestToken(); show(); @@ -86,7 +86,7 @@ GaduRegisterAccount::validateInput() if ( !emailRegexp->exactMatch( ui->valueEmailAddress->text() ) ) { - updateStatus( i18n( "Please enter a valid E-Mail Address." ) ); + updatetqStatus( 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() ) ) ) { - updateStatus( i18n( "Please enter the same password twice." ) ); + updatetqStatus( i18n( "Please enter the same password twice." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valuePassword->text() != ui->valuePasswordVerify->text() ) ) { - updateStatus( i18n( "Password entries do not match." ) ); + updatetqStatus( i18n( "Password entries do not match." ) ); valid = false; passwordHighlight = true; } if ( valid && ( ui->valueVerificationSequence->text().isEmpty() ) ) { - updateStatus( i18n( "Please enter the verification sequence." ) ); + updatetqStatus( 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 - updateStatus( i18n( "" ) ); + updatetqStatus( 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() ); - updateStatus( i18n( "Account created; your new UIN is %1." ).arg(TQString::number( cRegister->newUin() ) ) ); + updatetqStatus( i18n( "Account created; your new UIN is %1." ).tqarg(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 ) { - updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); + updatetqStatus( i18n( "Registration failed: %1" ).tqarg( 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( updateStatus( const TQString ) ) ); + disconnect( this, TQT_SLOT( updatetqStatus( const TQString ) ) ); ui->valueVerificationSequence->setDisabled( true ); ui->valueVerificationSequence->setText( "" ); enableButton( User1, false ); - updateStatus( "" ); + updatetqStatus( "" ); // 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::updateStatus( const TQString status ) +GaduRegisterAccount::updatetqStatus( const TQString status ) { - ui->labelStatusMessage->setAlignment( AlignCenter ); + ui->labelStatusMessage->tqsetAlignment( AlignCenter ); ui->labelStatusMessage->setText( status ); } diff --git a/kopete/protocols/gadu/gaduregisteraccount.h b/kopete/protocols/gadu/gaduregisteraccount.h index c449986f..f6abb06d 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.h +++ b/kopete/protocols/gadu/gaduregisteraccount.h @@ -33,6 +33,7 @@ class GaduRegisterAccountUI; class GaduRegisterAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT public: GaduRegisterAccount( TQWidget* , const char* ); @@ -48,7 +49,7 @@ protected slots: void registrationDone( const TQString&, const TQString& ); void inputChanged( const TQString & ); void doRegister(); - void updateStatus( const TQString status ); + void updatetqStatus( const TQString status ); private: void validateInput(); @@ -56,7 +57,7 @@ private: GaduRegisterAccountUI* ui; RegisterCommand* cRegister; TQRegExp* emailRegexp; - QPixmap hintPixmap; + TQPixmap hintPixmap; }; #endif diff --git a/kopete/protocols/gadu/gadurichtextformat.cpp b/kopete/protocols/gadu/gadurichtextformat.cpp index fd567bf6..9e46b967 100644 --- a/kopete/protocols/gadu/gadurichtextformat.cpp +++ b/kopete/protocols/gadu/gadurichtextformat.cpp @@ -37,7 +37,7 @@ GaduRichTextFormat::~GaduRichTextFormat() { } -QString +TQString GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, void* formatStructure) { TQString tmp, nb; @@ -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 ); ").arg( r ).arg( g ).arg( b ); + style += TQString(" color: rgb( %1, %2, %3 ); ").tqarg( r ).tqarg( g ).tqarg( b ); - tmp += formatOpeningTag( TQString::fromLatin1("span"), TQString::fromLatin1("style=\"%1\"").arg( style ) ); + tmp += formatOpeningTag( TQString::tqfromLatin1("span"), TQString::tqfromLatin1("style=\"%1\"").tqarg( style ) ); opened = true; } @@ -121,7 +121,7 @@ GaduRichTextFormat::convertToHtml( const TQString& msg, unsigned int formats, vo return tmp; } -QString +TQString GaduRichTextFormat::formatOpeningTag( const TQString& tag, const TQString& attributes ) { TQString res = "<" + tag; @@ -130,7 +130,7 @@ GaduRichTextFormat::formatOpeningTag( const TQString& tag, const TQString& attri return res + ">"; } -QString +TQString GaduRichTextFormat::formatClosingTag( const TQString& tag ) { return ""; @@ -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::fromLatin1(" -1 ) { - TQRegExp findTags( TQString::fromLatin1("(.*)") ); + if( htmlString.tqfind( TQString::tqfromLatin1(" -1 ) { + TQRegExp findTags( TQString::tqfromLatin1("(.*)") ); findTags.setMinimal( true ); int pos = 0; int lastpos = 0; @@ -198,8 +198,8 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) return NULL; } - TQString rep = TQString("%2" ).arg( styleHTML ).arg( replacement ); - htmlString.replace( findTags.pos( 0 ), rep.length(), replacement ); + TQString rep = TQString("%2" ).tqarg( styleHTML ).tqarg( replacement ); + htmlString.tqreplace( findTags.pos( 0 ), rep.length(), replacement ); replacement = unescapeGaduMessage( replacement ); output->message += replacement; @@ -226,26 +226,26 @@ GaduRichTextFormat::convertToGaduMessage( const Kopete::Message& message ) void GaduRichTextFormat::parseAttributes( const TQString attribute, const TQString value ) { - if( attribute == TQString::fromLatin1("color") ) { + if( attribute == TQString::tqfromLatin1("color") ) { color.setNamedColor( value ); } - if( attribute == TQString::fromLatin1("font-weight") && value == TQString::fromLatin1("600") ) { + if( attribute == TQString::tqfromLatin1("font-weight") && value == TQString::tqfromLatin1("600") ) { rtfs.font |= GG_FONT_BOLD; } - if( attribute == TQString::fromLatin1("text-decoration") && value == TQString::fromLatin1("underline") ) { + if( attribute == TQString::tqfromLatin1("text-decoration") && value == TQString::tqfromLatin1("underline") ) { rtfs.font |= GG_FONT_UNDERLINE ; } - if( attribute == TQString::fromLatin1("font-style") && value == TQString::fromLatin1("italic") ) { + if( attribute == TQString::tqfromLatin1("font-style") && value == TQString::tqfromLatin1("italic") ) { rtfs.font |= GG_FONT_ITALIC; } } -QString +TQString GaduRichTextFormat::unescapeGaduMessage( TQString& ns ) { TQString s; s = Kopete::Message::unescape( ns ); - s.replace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); + s.tqreplace( TQString::fromAscii( "\n" ), TQString::fromAscii( "\r\n" ) ); return s; } @@ -263,14 +263,14 @@ GaduRichTextFormat::insertRtf( uint position) // append font description rtfs.position = position; uint csize = rtf.size(); - if ( rtf.resize( csize + sizeof( gg_msg_richtext_format ) ) == FALSE ) { + if ( rtf.tqresize( 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.resize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { + if ( rtf.tqresize( csize + sizeof( gg_msg_richtext_color ) ) == FALSE ) { return false; }; memcpy( rtf.data() + csize, &rtcs, sizeof( rtcs ) ); @@ -279,13 +279,13 @@ GaduRichTextFormat::insertRtf( uint position) return true; } -QString +TQString GaduRichTextFormat::escapeBody( TQString& input ) { - input.replace( '<', TQString::fromLatin1("<") ); - input.replace( '>', TQString::fromLatin1(">") ); - input.replace( '\n', TQString::fromLatin1( "
" ) ); - input.replace( '\t', TQString::fromLatin1( "    " ) ); - input.replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "  " ) ); + input.tqreplace( '<', TQString::tqfromLatin1("<") ); + input.tqreplace( '>', TQString::tqfromLatin1(">") ); + input.tqreplace( '\n', TQString::tqfromLatin1( "
" ) ); + input.tqreplace( '\t', TQString::tqfromLatin1( "    " ) ); + input.tqreplace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "  " ) ); return input; } diff --git a/kopete/protocols/gadu/gadurichtextformat.h b/kopete/protocols/gadu/gadurichtextformat.h index 9476539e..ff9ba208 100644 --- a/kopete/protocols/gadu/gadurichtextformat.h +++ b/kopete/protocols/gadu/gadurichtextformat.h @@ -37,7 +37,7 @@ public: KGaduMessage* convertToGaduMessage( const Kopete::Message& ); private: - TQString formatOpeningTag( const TQString& , const TQString& = TQString::null ); + TQString formatOpeningTag( const TQString& , const TQString& = TQString() ); TQString formatClosingTag( const TQString& ); bool insertRtf( uint ); TQString unescapeGaduMessage( TQString& ); @@ -47,7 +47,7 @@ private: gg_msg_richtext_format rtfs; gg_msg_richtext_color rtcs; gg_msg_richtext* header; - QByteArray rtf; + TQByteArray rtf; }; #endif diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 63b696d4..f7fe5970 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -38,8 +38,8 @@ #include #include -GaduSession::GaduSession( TQObject* parent, const char* name ) -: TQObject( parent, name ), session_( 0 ), searchSeqNr_( 0 ) +GaduSession::GaduSession( TQObject* tqparent, const char* name ) +: TQObject( tqparent, name ), session_( 0 ), searchSeqNr_( 0 ) { textcodec = TQTextCodec::codecForName( "CP1250" ); rtf = new GaduRichTextFormat; @@ -62,7 +62,7 @@ GaduSession::isConnected() const int GaduSession::status() const { - kdDebug(14100)<<"Status = " << session_->status <<", initial = "<< session_->initial_status <fromUnicode( sendMsg ); return gg_send_message( session_, msgClass, recipient, (const unsigned char *)cpMsg.data() ); @@ -279,7 +279,7 @@ GaduSession::sendMessage( uin_t recipient, const Kopete::Message& msg, int msgCl } int -GaduSession::changeStatus( int status, bool forFriends ) +GaduSession::changetqStatus( int status, bool forFriends ) { kdDebug(14101)<<"## Changing to "<fromUnicode( query.city ) ); } if ( ageFrom || ageTo ) { - TQString yearFrom = TQString::number( TQDate::currentDate().year() - ageFrom ); - TQString yearTo = TQString::number( TQDate::currentDate().year() - ageTo ); + TQString yearFrom = TQString::number( TQDate::tqcurrentDate().year() - ageFrom ); + TQString yearTo = TQString::number( TQDate::tqcurrentDate().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::currentDate().year() - age ); + resultLine.age = TQString::number( TQDate::tqcurrentDate().year() - age ); } else { resultLine.age.truncate( 0 ); @@ -566,7 +566,7 @@ GaduSession::handleUserlist( gg_event* event ) } } -QString +TQString GaduSession::stateDescription( int state ) { switch( state ) { @@ -604,7 +604,7 @@ GaduSession::stateDescription( int state ) return i18n( "unknown" ); } } -QString +TQString GaduSession::errorDescription( int err ) { switch( err ){ @@ -617,11 +617,11 @@ GaduSession::errorDescription( int err ) case GG_ERROR_WRITING: return i18n( "Writing error." ); default: - return i18n( "Unknown error number %1." ).arg( TQString::number( (unsigned int)err ) ); + return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)err ) ); } } -QString +TQString GaduSession::failureDescription( gg_failure_t f ) { switch( f ) { @@ -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." ).arg( TQString::number( (unsigned int)f ) ); + return i18n( "Unknown error number %1." ).tqarg( TQString::number( (unsigned int)f ) ); } } @@ -730,7 +730,7 @@ GaduSession::checkDescriptor() gaduNotify.description = textcodec->toUnicode( event->event.status.descr ); } else { - gaduNotify.description = TQString::null; + gaduNotify.description = TQString(); } gaduNotify.remote_port = 0; gaduNotify.version = 0; @@ -747,7 +747,7 @@ GaduSession::checkDescriptor() gaduNotify.description = textcodec->toUnicode( event->event.status60.descr ); } else { - gaduNotify.description = TQString::null; + gaduNotify.description = TQString(); } gaduNotify.remote_ip.setAddress( ntohl( event->event.status60.remote_ip ) ); gaduNotify.remote_port = event->event.status60.remote_port; diff --git a/kopete/protocols/gadu/gadusession.h b/kopete/protocols/gadu/gadusession.h index a1caeb0d..4487b63a 100644 --- a/kopete/protocols/gadu/gadusession.h +++ b/kopete/protocols/gadu/gadusession.h @@ -39,10 +39,10 @@ #include struct KGaduMessage { - QString message; // Unicode + TQString message; // Unicode unsigned int sender_id; // sender's UIN - QDateTime sendTime; - QByteArray rtf; + TQDateTime sendTime; + TQByteArray rtf; }; struct KGaduLoginParams { @@ -89,12 +89,13 @@ class TQStringList; namespace Kopete { class Message; } class GaduRichTextFormat; -class GaduSession : public QObject +class GaduSession : public TQObject { Q_OBJECT + TQ_OBJECT public: - GaduSession( TQObject* parent = 0, const char* name = 0 ); + GaduSession( TQObject* tqparent = 0, const char* name = 0 ); virtual ~GaduSession(); bool isConnected() const; int status() const; @@ -123,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 changeStatus( int, bool forFriends = false ); + int changetqStatus( 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 f8d673b6..afc259b1 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -1,6 +1,6 @@ GaduAddUI - + GaduAddUI @@ -16,15 +16,15 @@ unnamed - + - layout39 + tqlayout39 unnamed - + TextLabel1 @@ -45,7 +45,7 @@ false - + AlignVCenter @@ -71,34 +71,34 @@ - + textLabel2 <i>(for example: 1234567)</i> - + AlignVCenter|AlignRight - + - layout10 + tqlayout10 unnamed - + - layout8 + tqlayout8 unnamed - + textLabel1 @@ -118,7 +118,7 @@ The forename (first name) of the contact you wish to add. Optionally this may include a middle name. - + TextLabel1_2 @@ -138,7 +138,7 @@ The surname (last name) of the contact you wish to add. - + TextLabel1_2_2 @@ -163,7 +163,7 @@ A nickname for the contact you wish to add. - + TextLabel1_4 @@ -191,7 +191,7 @@ E-Mail address for this contact. - + TextLabel1_4_2 @@ -221,15 +221,15 @@ - + - layout9 + tqlayout9 unnamed - + fornameEdit_ @@ -243,7 +243,7 @@ The forename (first name) of the contact you wish to add. Optionally this may include a middle name. - + snameEdit_ @@ -257,7 +257,7 @@ The surname (last name) of the contact you wish to add. - + nickEdit_ @@ -268,7 +268,7 @@ A nickname for the contact you wish to add. - + emailEdit_ @@ -282,7 +282,7 @@ E-Mail address for this contact. - + telephoneEdit_ @@ -300,7 +300,7 @@ - + notAFriend_ @@ -317,7 +317,7 @@ Check if you want to exclude this contact from the "Just for friends" status mode. - + Group @@ -353,7 +353,7 @@ - + krestrictedline.h diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui index 3e475bce..fbc9411c 100644 --- a/kopete/protocols/gadu/ui/gaduawayui.ui +++ b/kopete/protocols/gadu/ui/gaduawayui.ui @@ -1,6 +1,6 @@ GaduAwayUI - + GaduAwayUI @@ -31,20 +31,20 @@ 6 - + - layout3 + tqlayout3 unnamed - + statusGroup_ - Status + tqStatus Choose status, by default present status is selected. @@ -55,15 +55,15 @@ Choosing Offline status will disconnect you, with given description. unnamed - + - layout2 + tqlayout2 unnamed - + onlineButton_ @@ -80,7 +80,7 @@ Choosing Offline status will disconnect you, with given description. Set your status to Online, indicating that you are available to chat with anyone who wishes. - + awayButton_ @@ -97,7 +97,7 @@ Choosing Offline status will disconnect you, with given description. Set your status to busy, indicating that you may should not be bothered with trivial chat, and may not be able to reply immediately. - + invisibleButton_ @@ -114,7 +114,7 @@ Choosing Offline status will disconnect you, with given description. Set status to invisible, which will hide your presence from other users (who will see you as offline). However you may still chat, and see the online presence of others. - + offlineButton_ @@ -135,15 +135,15 @@ Choosing Offline status will disconnect you, with given description. - + - layout278 + tqlayout278 unnamed - + textLabel3 @@ -160,7 +160,7 @@ Choosing Offline status will disconnect you, with given description. Description of your status (up to 70 characters). - + textEdit_ @@ -190,5 +190,5 @@ Choosing Offline status will disconnect you, with given description. invisibleButton_ offlineButton_ - + diff --git a/kopete/protocols/gadu/ui/gadueditaccountui.ui b/kopete/protocols/gadu/ui/gadueditaccountui.ui index 01edaa08..1542a76f 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -1,6 +1,6 @@ GaduAccountEditUI - + GaduAccountEditUI @@ -27,14 +27,14 @@ unnamed - + tabWidget4 true - + tab @@ -45,7 +45,7 @@ unnamed - + groupBox63 @@ -56,15 +56,15 @@ unnamed - + - layout8 + tqlayout8 unnamed - + textLabel1 @@ -111,7 +111,7 @@ passwordWidget_ - + autoLoginCheck_ @@ -127,7 +127,7 @@ - + groupBox5 @@ -146,7 +146,7 @@ unnamed - + textLabel6 @@ -158,7 +158,7 @@ 0 - + 0 0 @@ -168,11 +168,11 @@ To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account.<br><br> If you do not currently have an account, please click the button to create one. - + WordBreak|AlignVCenter - + registerNew @@ -201,7 +201,7 @@ If you do not currently have an account, please click the button to create one.< Expanding - + 20 80 @@ -210,7 +210,7 @@ If you do not currently have an account, please click the button to create one.< - + tab @@ -231,14 +231,14 @@ If you do not currently have an account, please click the button to create one.< Expanding - + 20 160 - + groupBox64 @@ -249,7 +249,7 @@ If you do not currently have an account, please click the button to create one.< unnamed - + dccCheck_ @@ -263,15 +263,15 @@ If you do not currently have an account, please click the button to create one.< true - + - layout65 + tqlayout65 unnamed - + textLabel1_2 @@ -288,7 +288,7 @@ If you do not currently have an account, please click the button to create one.< Whether or not you want to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server. - + If Available @@ -322,7 +322,7 @@ If you do not currently have an account, please click the button to create one.< - + cacheServersCheck__ @@ -342,7 +342,7 @@ If you do not currently have an account, please click the button to create one.< This option is used whenever the primary Gadu-Gadu load-balancing server fails. If this is checked, Kopete will try to connect to the actual servers directly using cached information about them. This prevents connection errors when the main load-balancing server does not answer. In practice it only helps very rarely. - + ignoreCheck_ @@ -363,7 +363,7 @@ If you do not currently have an account, please click the button to create one.< - + TabPage @@ -374,7 +374,7 @@ If you do not currently have an account, please click the button to create one.< unnamed - + connectLabel @@ -397,7 +397,7 @@ If you do not currently have an account, please click the button to create one.< <p align="center">You must be connected to change your Personal Information.</p> - + userInformation @@ -411,23 +411,23 @@ If you do not currently have an account, please click the button to create one.< unnamed - + - layout9 + tqlayout9 unnamed - + - layout8 + tqlayout8 unnamed - + textLabel1_5 @@ -435,7 +435,7 @@ If you do not currently have an account, please click the button to create one.< Name: - + uiSurnamea @@ -443,7 +443,7 @@ If you do not currently have an account, please click the button to create one.< Surname: - + textLabel1_5_3 @@ -451,7 +451,7 @@ If you do not currently have an account, please click the button to create one.< Your nick name: - + textLabel1_5_3_2 @@ -459,7 +459,7 @@ If you do not currently have an account, please click the button to create one.< Gender: - + textLabel1_5_3_2_2 @@ -467,7 +467,7 @@ If you do not currently have an account, please click the button to create one.< Year of birth: - + textLabel1_5_3_2_3 @@ -477,15 +477,15 @@ If you do not currently have an account, please click the button to create one.< - + - layout7 + tqlayout7 unnamed - + uiName @@ -493,7 +493,7 @@ If you do not currently have an account, please click the button to create one.< false - + uiSurname @@ -501,7 +501,7 @@ If you do not currently have an account, please click the button to create one.< false - + nickName @@ -509,7 +509,7 @@ If you do not currently have an account, please click the button to create one.< true - + @@ -532,7 +532,7 @@ If you do not currently have an account, please click the button to create one.< false - + uiYOB @@ -540,7 +540,7 @@ If you do not currently have an account, please click the button to create one.< false - + uiCity @@ -552,7 +552,7 @@ If you do not currently have an account, please click the button to create one.< - + textLabel1_5_3_2_4_2 @@ -570,30 +570,30 @@ If you do not currently have an account, please click the button to create one.< Expanding - + 20 30 - + - layout12 + tqlayout12 unnamed - + - layout11 + tqlayout11 unnamed - + textLabel1_5_3_2_4 @@ -601,7 +601,7 @@ If you do not currently have an account, please click the button to create one.< Maiden name: - + textLabel1_5_3_2_4_3 @@ -611,15 +611,15 @@ If you do not currently have an account, please click the button to create one.< - + - layout10 + tqlayout10 unnamed - + uiMeiden @@ -627,7 +627,7 @@ If you do not currently have an account, please click the button to create one.< false - + uiOrgin @@ -643,7 +643,7 @@ If you do not currently have an account, please click the button to create one.< - + TabPage @@ -654,7 +654,7 @@ If you do not currently have an account, please click the button to create one.< unnamed - + dcc @@ -668,7 +668,7 @@ If you do not currently have an account, please click the button to create one.< unnamed - + textLabel1_4 @@ -676,7 +676,7 @@ If you do not currently have an account, please click the button to create one.< <qt><p align="center"><font color="#ff0000">These options affect <b>all</b> Gadu-Gadu accounts.</font></p></qt> - + optionOverrideDCC @@ -684,17 +684,17 @@ If you do not currently have an account, please click the button to create one.< &Override default configuration - + - layout33 + tqlayout33 unnamed - + - layout32 + tqlayout32 @@ -703,7 +703,7 @@ If you do not currently have an account, please click the button to create one.< 3 - + textLabel2 @@ -717,7 +717,7 @@ If you do not currently have an account, please click the button to create one.< ipAddress - + textLabel2_3 @@ -752,7 +752,7 @@ If you do not currently have an account, please click the button to create one.< 0.0.0.0 - + dccPort @@ -780,7 +780,7 @@ If you do not currently have an account, please click the button to create one.< Expanding - + 20 180 @@ -790,14 +790,14 @@ If you do not currently have an account, please click the button to create one.< - + labelStatusMessage - + AlignCenter @@ -865,7 +865,7 @@ If you do not currently have an account, please click the button to create one.< ipAddress dccPort - + klineedit.h krestrictedline.h diff --git a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui index 5a0e475e..9490ffb6 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -1,6 +1,6 @@ GaduRegisterAccountUI - + GaduRegisterAccountUI @@ -19,15 +19,15 @@ unnamed - + - layout33 + tqlayout33 unnamed - + pixmapEmailAddress @@ -39,13 +39,13 @@ 0 - + 16 16 - + 32767 32767 @@ -55,7 +55,7 @@ true - + labelPasswordVerify @@ -100,7 +100,7 @@ The E-mail address you would like to use to register this account. - + pixmapVerificationSequence @@ -112,13 +112,13 @@ 0 - + 16 16 - + 32767 32767 @@ -128,7 +128,7 @@ true - + labelEmailAddress @@ -145,7 +145,7 @@ The E-mail address you would like to use to register this account. - + pixmapPasswordVerify @@ -157,13 +157,13 @@ 0 - + 16 16 - + 32767 32767 @@ -173,7 +173,7 @@ true - + labelVerificationSequence @@ -193,7 +193,7 @@ The text from the image below. This is used to prevent abusive automated registration scripts. - + valueVerificationSequence @@ -204,7 +204,7 @@ The text from the image below. This is used to prevent abusive automated registration scripts. - + pixmapPassword @@ -216,13 +216,13 @@ 0 - + 16 16 - + 32767 32767 @@ -232,7 +232,7 @@ true - + labelPassword @@ -265,9 +265,9 @@ - + - layoutImageCenter + tqlayoutImageCenter @@ -283,14 +283,14 @@ Expanding - + 23 20 - + pixmapToken @@ -302,13 +302,13 @@ 13 - + 256 64 - + 256 64 @@ -350,7 +350,7 @@ Expanding - + 22 20 @@ -359,7 +359,7 @@ - + labelInstructions @@ -374,7 +374,7 @@ <i>Type the letters and numbers shown in the image above into the <b>Verification Sequence</b> field. This is used to prevent automated registration abuse.</i> - + WordBreak|AlignTop @@ -388,21 +388,21 @@ Expanding - + 20 16 - + labelStatusMessage - + AlignCenter @@ -414,7 +414,7 @@ valuePasswordVerify valueVerificationSequence - + klineedit.h klineedit.h diff --git a/kopete/protocols/gadu/ui/gadusearch.ui b/kopete/protocols/gadu/ui/gadusearch.ui index ac215b1a..2aef2334 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -1,6 +1,6 @@ GaduPublicDirectory - + GaduPublicDirectory @@ -16,11 +16,11 @@ unnamed - + pubsearch - + page @@ -31,7 +31,7 @@ unnamed - + buttonGroup2 @@ -48,39 +48,39 @@ unnamed - + - layout38 + tqlayout38 unnamed - + - layout36 + tqlayout36 unnamed - + - layout31 + tqlayout31 unnamed - + - layout29 + tqlayout29 unnamed - + textLabel1a @@ -88,7 +88,7 @@ Name: - + textLabel1_2a @@ -96,7 +96,7 @@ Surname: - + textLabel1_3a @@ -104,7 +104,7 @@ Nick: - + textLabel1_3_2a @@ -114,30 +114,30 @@ - + - layout30 + tqlayout30 unnamed - + nameS - + surname - + nick - + cityS @@ -146,15 +146,15 @@ - + - layout34 + tqlayout34 unnamed - + textLabel1_2_2a @@ -162,7 +162,7 @@ Age from: - + ageFrom @@ -182,7 +182,7 @@ 0 - + textLabel1_2_3 @@ -190,7 +190,7 @@ to: - + ageTo @@ -220,7 +220,7 @@ Expanding - + 297 21 @@ -229,15 +229,15 @@ - + - layout32 + tqlayout32 unnamed - + textLabel1_4a @@ -251,7 +251,7 @@ false - + @@ -280,23 +280,23 @@ - + - layout37 + tqlayout37 unnamed - + - layout33 + tqlayout33 unnamed - + uin_static @@ -319,7 +319,7 @@ - + radioByUin @@ -330,7 +330,7 @@ true - + radioByData @@ -341,15 +341,15 @@ Search by specified data: - + - layout35 + tqlayout35 unnamed - + onlyOnline @@ -367,7 +367,7 @@ Expanding - + 224 21 @@ -386,7 +386,7 @@ Expanding - + 20 21 @@ -397,7 +397,7 @@ - + page @@ -411,7 +411,7 @@ - Status + tqStatus image0 @@ -527,13 +527,13 @@ 0 - + 512 256 - + 640 512 @@ -684,7 +684,7 @@ onlyOnline listFound - + krestrictedline.h klistview.h diff --git a/kopete/protocols/groupwise/DESIGN b/kopete/protocols/groupwise/DESIGN index aa976191..86fb1dac 100644 --- a/kopete/protocols/groupwise/DESIGN +++ b/kopete/protocols/groupwise/DESIGN @@ -19,7 +19,7 @@ Add new event tasks ChatOwner changed - vlarge Event proto update (large update -> requires new EventTransfer subclass) -Update Client with event signals +Update Client with event Q_SIGNALS Broadcast DONE Chatroom diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index b2951233..ff5b53b4 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -65,8 +65,8 @@ #include "gwaccount.h" -GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name ) -: Kopete::ManagedConnectionAccount ( parent, accountID, 0, "groupwiseaccount" ) +GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name ) +: Kopete::ManagedConnectionAccount ( tqparent, accountID, 0, "groupwiseaccount" ) { Q_UNUSED( name ); // Init the myself contact @@ -79,11 +79,11 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString::null, 0, this, + m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); - m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString::null, 0, this, + m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString(), 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); - m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString::null, 0, this, + m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); m_connector = 0; @@ -112,7 +112,7 @@ KActionMenu* GroupWiseAccount::actionMenu() m_actionMenu->insert( m_actionJoinChatRoom ); /* Used for debugging */ /* - theActionMenu->insert( new KAction ( "Test rtfize()", TQString::null, 0, this, + theActionMenu->insert( new KAction ( "Test rtfize()", TQString(), 0, this, TQT_SLOT( slotTestRTFize() ), this, "actionTestRTFize") ); */ @@ -224,7 +224,7 @@ void GroupWiseAccount::setAway( bool away, const TQString & reason ) if ( away ) { if ( Kopete::Away::getInstance()->idleTime() > 10 ) // don't go AwayIdle unless the user has actually been idle this long - setOnlineStatus( protocol()->groupwiseAwayIdle, TQString::null ); + setOnlineStatus( protocol()->groupwiseAwayIdle, TQString() ); else setOnlineStatus( protocol()->groupwiseAway, reason ); } @@ -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 &, Q_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, Q_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receivetqStatus( 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::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::tqStatus, const TQString &, const TQString & ) ), TQT_SLOT( changeOurtqStatus( GroupWise::tqStatus, 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 for analysis." ).arg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").arg( 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 for analysis." ).tqarg( accountId() ) , i18n ("Unable to Send Message on Account '%1'").tqarg( 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->setStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->settqStatus( GroupWise::Offline, reason, configGroup()->readEntry( "AutoReply" ) ); else - m_client->setStatus( ( GroupWise::Status )status.internalStatus(), reason, configGroup()->readEntry( "AutoReply" ) ); + m_client->settqStatus( ( GroupWise::tqStatus )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 ( initialStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && - ( ( GroupWise::Status )initialStatus().internalStatus() != GroupWise::Unknown ) ) + if ( initialtqStatus() != Kopete::OnlineStatus(Kopete::OnlineStatus::Online) && + ( ( GroupWise::tqStatus )initialtqStatus().internalStatus() != GroupWise::Unknown ) ) { - 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" ) ); + 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" ) ); } } @@ -533,7 +533,7 @@ void GroupWiseAccount::reconcileOfflineChanges() else continue; - GWFolder * folder = ::qt_cast( ( *instIt )->parent() ); + GWFolder * folder = ::tqqt_cast( ( *instIt )->tqparent() ); if ( folder->id == ( unsigned int )groupId.toInt() ) { found = true; @@ -566,7 +566,7 @@ void GroupWiseAccount::reconcileOfflineChanges() break; } else - 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; + 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; 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." ).arg( accountId() ) , i18n ("Unable to Connect '%1'").arg( 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." ).tqarg( accountId() ) , i18n ("Unable to Connect '%1'").tqarg( accountId() ) ); disconnect(); } @@ -664,7 +664,7 @@ void GroupWiseAccount::slotCSDisconnected() TQValueList::ConstIterator it; for ( it = m_chatSessions.begin() ; it != m_chatSessions.end(); ++it ) (*it)->setClosed(); - setAllContactsStatus( protocol()->groupwiseOffline ); + setAllContactstqStatus( 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->onlineStatus().description() << endl; - if ( sender->onlineStatus() == protocol()->groupwiseOffline ) { + kdDebug( GROUPWISE_DEBUG_GLOBAL) << "sender is: " << sender->onlinetqStatus().description() << endl; + if ( sender->onlinetqStatus() == 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: " ).arg( sender->metaContact()->displayName() ); + "Auto reply from %1: " ).tqarg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } if ( message.type == GroupWise::ReceivedBroadcast ) { TQString prefix = i18n("Prefix used for broadcast messages", - "Broadcast message from %1: " ).arg( sender->metaContact()->displayName() ); + "Broadcast message from %1: " ).tqarg( 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: " ).arg( sender->metaContact()->displayName() ); + "System Broadcast message from %1: " ).tqarg( sender->metaContact()->displayName() ); messageMunged = prefix + message.message; } @@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << folder.id << " sequence: " << folder.sequence - << " parentId: " << folder.parentId + << " tqparentId: " << folder.tqparentId << " displayName: " << folder.name << endl; - if ( folder.parentId != 0 ) + if ( folder.tqparentId != 0 ) { - kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (parentId = " << folder.parentId << ")" << endl; + kdWarning( GROUPWISE_DEBUG_GLOBAL ) << " - received a nested folder. These were not supported in GroupWise or Kopete as of Sept 2004, aborting! (tqparentId = " << folder.tqparentId << ")" << endl; return; } @@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << contact.id << ", sequence: " << contact.sequence - << ", parentId: " << contact.parentId + << ", tqparentId: " << contact.tqparentId << ", dn: " << contact.dn << ", displayName: " << contact.displayName << endl; //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <addContactInstance( contact.id, contact.parentId, contact.sequence, contact.displayName, contact.dn ); + GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn ); Q_ASSERT( gwInst ); GroupWiseContact * c = contactForDN( contact.dn ); @@ -925,21 +925,21 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) { Kopete::MetaContact *metaContact = new Kopete::MetaContact(); metaContact->setDisplayName( contact.displayName ); - c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence ); + c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.tqparentId, contact.sequence ); Kopete::ContactList::self()->addMetaContact( metaContact ); } // add the metacontact to the ContactItem's group, if not there aleady - if ( contact.parentId == 0 ) + if ( contact.tqparentId == 0 ) c->metaContact()->addToGroup( Kopete::Group::topLevel() ); else { // check the metacontact is in the group this listing-of-the-contact is in... - GWFolder * folder = m_serverListModel->findFolderById( contact.parentId ); + GWFolder * folder = m_serverListModel->findFolderById( contact.tqparentId ); if ( !folder ) // inconsistent { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); - dit->item( contact.parentId, contact.id ); + dit->item( contact.tqparentId, contact.id ); // TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); return; @@ -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->requestStatus( details.dn ); + m_client->requesttqStatus( details.dn ); } else kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Notified of existing temporary contact DN: " << details.dn << endl; return c; } -void GroupWiseAccount::receiveStatus( const TQString & contactId, Q_UINT16 status, const TQString &awayMessage ) +void GroupWiseAccount::receivetqStatus( 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 ); @@ -1059,10 +1059,10 @@ void GroupWiseAccount::receiveStatus( const TQString & contactId, Q_UINT16 statu c->setProperty( protocol()->propAwayMessage, awayMessage ); } else - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't find " << contactId << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " couldn't tqfind " << contactId << endl; } -void GroupWiseAccount::changeOurStatus( GroupWise::Status status, const TQString & awayMessage, const TQString & autoReply ) +void GroupWiseAccount::changeOurtqStatus( GroupWise::tqStatus status, const TQString & awayMessage, const TQString & autoReply ) { if ( status == GroupWise::Offline ) myself()->setOnlineStatus( protocol()->groupwiseAppearOffline ); @@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const } } -bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) +bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "contactId: " << contactId << endl; @@ -1101,7 +1101,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // Set object id to 0 if not found - they do not exist on the server bool topLevel = false; TQValueList< FolderItem > folders; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for ( Kopete::Group *group = groupList.first(); group; group = groupList.next() ) { if ( group->type() == Kopete::Group::TopLevel ) // no need to create it on the server @@ -1117,7 +1117,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << fld->displayName << endl; //FIXME - get rid of FolderItem & co - fi.parentId = ::qt_cast( fld->parent() )->id; + fi.tqparentId = ::tqqt_cast( fld->tqparent() )->id; fi.id = fld->id; fi.name = fld->displayName; } @@ -1125,7 +1125,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "folder: " << group->displayName() << "not found in server list model." << endl; - fi.parentId = 0; + fi.tqparentId = 0; fi.id = 0; fi.name = group->displayName(); } @@ -1144,7 +1144,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // // Since ToMetaContact expects synchronous contact creation // we have to create the contact optimistically. - GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 0, 0, 0 ); + GroupWiseContact * gc = new GroupWiseContact( this, contactId, tqparentContact, 0, 0, 0 ); ContactDetails dt = client()->userDetailsManager()->details( contactId ); TQString displayAs; if ( dt.fullName.isEmpty() ) @@ -1164,7 +1164,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // get the contact's full name to use as the display name of the created contact CreateContactTask * cct = new CreateContactTask( client()->rootTask() ); - cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel ); + cct->contactFromUserId( contactId, tqparentContact->displayName(), highestFreeSequence, folders, topLevel ); TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); cct->go( true ); return true; @@ -1189,7 +1189,7 @@ void GroupWiseAccount::receiveContactCreated() else { client()->requestDetails( TQStringList( cct->dn() ) ); - client()->requestStatus( cct->dn() ); + client()->requesttqStatus( 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"). - arg(cct->userId() ).arg( cct->statusString() ), + tqarg(cct->userId() ).tqarg( cct->statusString() ), i18n ("Error Adding Contact") ); } } @@ -1227,7 +1227,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact ) for ( ; it != instances.end(); ++it ) { DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); - dit->item( ::qt_cast( (*it)->parent() )->id, (*it)->id ); + dit->item( ::tqqt_cast( (*it)->tqparent() )->id, (*it)->id ); TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); } @@ -1255,8 +1255,8 @@ void GroupWiseAccount::receiveContactDeleted( const ContactItem & instance ) void GroupWiseAccount::slotConnectedElsewhere() { - 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() ); + 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() ); 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.").arg( 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.").tqarg( c->metaContact()->displayName() ), Kopete::Message::Internal, Kopete::Message::PlainText ); sess->appendMessage( declined ); } else @@ -1377,7 +1377,7 @@ void GroupWiseAccount::slotLeavingConference( GroupWiseChatSession * sess ) if( isConnected () ) m_client->leaveConference( sess->guid() ); m_chatSessions.remove( sess ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now contains:" << m_chatSessions.count() << " managers" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "m_chatSessions now tqcontains:" << m_chatSessions.count() << " managers" << endl; Kopete::ContactPtrList members = sess->members(); for ( Kopete::Contact * contact = members.first(); contact; contact = members.next() ) { @@ -1400,14 +1400,14 @@ void GroupWiseAccount::slotSetAutoReply() void GroupWiseAccount::slotTestRTFize() { /* bool ok; - const TQString query = TQString::fromLatin1("Enter a string to rtfize:"); - TQString testText = KLineEditDlg::getText( query, TQString::null, &ok, Kopete::UI::Global::mainWidget() ); + const TQString query = TQString::tqfromLatin1("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;*/ // bool ok; // const TQString query = i18n("Enter a contactId:"); -// TQString testText = KInputDialog::getText( query, i18n("This is a test dialog and will not be in the final product!" ), TQString::null, &ok, Kopete::UI::Global::mainWidget() ); +// TQString testText = KInputDialog::getText( query, i18n("This is a test dialog and will not be in the final product!" ), TQString(), &ok, Kopete::UI::Global::mainWidget() ); // if ( !ok ) // return; // kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Trying to add contact: '" << protocol()->rtfizeText( testText ) << "'" << endl; @@ -1470,7 +1470,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = CONTACT '" << contact->nickName() << "' IS IN " << contact->metaContact()->groups().count() << " MC GROUPS, AND HAS " << m_serverListModel->instancesWithDn( contact->dn() ).count() << " CONTACT LIST INSTANCES." << endl; kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " = LOOKING FOR NOOP GROUP MEMBERSHIPS" << endl; - // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid + // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, tqparentid // 2) Each remaining unmatched pair is a move, initiate and remove - need to take care to always use greatest unused sequence number - if we have to set the sequence number to the following sequence number within the folder, we may have a problem where after the first move, we have to wait for the state of the CLIs to be updated pending the completion of the first move - this would be difficult to cope with, because our current lists would be out of date, or we'd have to restart the sync - assuming the first move created a new matched CLI-MCG pair, we could do that with little cost. // 3) Any remaining entries in MCG list are adds, carry out // 4) Any remaining entries in CLI list are removes, carry out @@ -1499,7 +1499,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder = ::qt_cast( ( *candidateInst )->parent() ); + GWFolder * folder = ::tqqt_cast( ( *candidateInst )->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - Looking for a match, MC grp '" << ( *candidateGrp )->displayName() << "', GWFolder '" << folder->displayName << "', objectId is " << folder->id << endl; @@ -1525,13 +1525,13 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) candidateGrp = grpIt; ++grpIt; GWContactInstanceList::Iterator instIt = instances.begin(); - GWFolder * sourceFolder =::qt_cast( ( *instIt)->parent() ); + GWFolder * sourceFolder =::tqqt_cast( ( *instIt)->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - moving contact instance from group '" << sourceFolder->displayName << "' to group '" << ( *candidateGrp )->displayName() << "'" << endl; // create contactItem parameter ContactItem instance; instance.id = ( *instIt )->id; - instance.parentId = sourceFolder->id; + instance.tqparentId = sourceFolder->id; instance.sequence = ( *instIt )->sequence; instance.dn = ( *instIt )->dn; instance.displayName = contact->nickName(); @@ -1579,8 +1579,8 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) // does this group exist on the server? Create the contact appropriately if ( destinationFolder ) { - int parentId = destinationFolder->id; - ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId ); + int tqparentId = destinationFolder->id; + ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId ); } else { @@ -1604,7 +1604,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { GWContactInstanceList::Iterator candidateInst = instIt; ++instIt; - GWFolder * folder =::qt_cast( ( *candidateInst )->parent() ); + GWFolder * folder =::tqqt_cast( ( *candidateInst )->tqparent() ); kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - remove contact instance '"<< ( *candidateInst )->id << "' in group '" << folder->displayName << "'" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); @@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) TQValueList< ContactItem > instancesToChange; ContactItem instance; instance.id = (*it)->id; - instance.parentId = ::qt_cast( (*it)->parent() )->id; + instance.tqparentId = ::tqqt_cast( (*it)->tqparent() )->id; instance.sequence = (*it)->sequence; instance.dn = contact->dn(); instance.displayName = contact->nickName(); diff --git a/kopete/protocols/groupwise/gwaccount.h b/kopete/protocols/groupwise/gwaccount.h index fd137154..314769f0 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -57,8 +57,9 @@ using namespace GroupWise; class GroupWiseAccount : public Kopete::ManagedConnectionAccount { Q_OBJECT + TQ_OBJECT public: - GroupWiseAccount( GroupWiseProtocol *parent, const TQString& accountID, const char *name = 0 ); + GroupWiseAccount( GroupWiseProtocol *tqparent, const TQString& accountID, const char *name = 0 ); ~GroupWiseAccount(); /** @@ -73,7 +74,7 @@ public: * Creates a protocol specific Kopete::Contact subclass and adds it to the supplied * Kopete::MetaContact */ - virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); /** * Delete a contact on the server */ @@ -153,7 +154,7 @@ public slots: virtual void disconnect( Kopete::Account::DisconnectReason reason ); /** Set the online status for the account. Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); signals: void conferenceCreated( const int mmId, const GroupWise::ConferenceGuid & guid ); void conferenceCreationFailed( const int mmId, const int statusCode ); @@ -224,11 +225,11 @@ protected slots: /** * A contact changed status */ - void receiveStatus( const TQString &, Q_UINT16, const TQString & ); + void receivetqStatus( const TQString &, TQ_UINT16, const TQString & ); /** * Our status changed on the server */ - void changeOurStatus( GroupWise::Status, const TQString &, const TQString & ); + void changeOurtqStatus( GroupWise::tqStatus, const TQString &, const TQString & ); /** * Called when we've been disconnected for logging in as this user somewhere else */ @@ -306,7 +307,7 @@ protected: /** * Sends a status message to the server - called by the status specific slotGoAway etc */ - //void setStatus( GroupWise::Status status, const TQString & reason = TQString::null ); + //void settqStatus( GroupWise::tqStatus status, const TQString & reason = TQString() ); int handleTLSWarning (int warning, TQString server, TQString accountId); @@ -346,8 +347,9 @@ private: /*class OnlineStatusMessageAction : public KAction { Q_OBJECT + TQ_OBJECT public: - OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *parent=0, const char *name=0); + OnlineStatusMessageAction ( const Kopete::OnlineStatus& status, const TQString &text, const TQString &message, const TQIconSet &pix, TQObject *tqparent=0, const char *name=0); signals: void activated( const Kopete::OnlineStatus& status, const TQString & ); private slots: diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 97bdd3b4..4de7649d 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -1,6 +1,6 @@ GroupWiseAddUI - + GroupWiseAddUI @@ -22,15 +22,15 @@ 0 - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -47,7 +47,7 @@ The account name of the account you would like to add. - + m_uniqueName @@ -60,7 +60,7 @@ - + buttonGroup1 @@ -71,7 +71,7 @@ unnamed - + m_rbEcho @@ -100,7 +100,7 @@ Expanding - + 20 100 @@ -109,5 +109,5 @@ - + diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index e3c71483..5bd048cd 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -25,8 +25,8 @@ #include "gwbytestream.h" #include "gwerror.h" -KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ ) - : ByteStream ( parent ) +KNetworkByteStream::KNetworkByteStream ( TQObject *tqparent, const char */*name*/ ) + : ByteStream ( tqparent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; @@ -113,7 +113,7 @@ void KNetworkByteStream::slotConnectionClosed () if ( mClosing ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << "..by ourselves!" << endl; - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->errorString( socket()->error() ) << "\"" << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->KSocketBase::errorString( socket()->error() ) << "\"" << endl; emit connectionClosed (); } else diff --git a/kopete/protocols/groupwise/gwbytestream.h b/kopete/protocols/groupwise/gwbytestream.h index 0cd95f77..457d9593 100644 --- a/kopete/protocols/groupwise/gwbytestream.h +++ b/kopete/protocols/groupwise/gwbytestream.h @@ -35,9 +35,10 @@ class KNetworkByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); ~KNetworkByteStream (); diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index 946116b6..b353a6a2 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -25,8 +25,8 @@ #include "gwerror.h" #include "gwbytestream.h" -KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ ) - : Connector ( parent ) +KNetworkConnector::KNetworkConnector ( TQObject *tqparent, const char */*name*/ ) + : Connector ( tqparent ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl; @@ -109,7 +109,7 @@ void KNetworkConnector::done () mByteStream->close (); } -void KNetworkConnector::setOptHostPort ( const TQString &host, Q_UINT16 port ) +void KNetworkConnector::setOptHostPort ( const TQString &host, TQ_UINT16 port ) { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl; diff --git a/kopete/protocols/groupwise/gwconnector.h b/kopete/protocols/groupwise/gwconnector.h index bfd6c260..c582fc01 100644 --- a/kopete/protocols/groupwise/gwconnector.h +++ b/kopete/protocols/groupwise/gwconnector.h @@ -35,9 +35,10 @@ class KNetworkConnector : public Connector { Q_OBJECT + TQ_OBJECT public: - KNetworkConnector ( TQObject *parent = 0, const char *name = 0 ); + KNetworkConnector ( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KNetworkConnector (); @@ -45,7 +46,7 @@ public: virtual ByteStream *stream () const; virtual void done (); - void setOptHostPort ( const TQString &host, Q_UINT16 port ); + void setOptHostPort ( const TQString &host, TQ_UINT16 port ); void setOptSSL ( bool ); int errorCode (); @@ -56,7 +57,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; KNetworkByteStream *mByteStream; diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index d15c76b9..dd74fc67 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -47,18 +47,18 @@ using namespace GroupWise; GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, - Kopete::MetaContact *parent, - const int objectId, const int parentId, const int sequence ) -: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), parent ), m_objectId( objectId ), m_parentId( parentId ), + Kopete::MetaContact *tqparent, + const int objectId, const int tqparentId, const int sequence ) +: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( tqparentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { - if ( dn.find( '=' ) != -1 ) + if ( dn.tqfind( '=' ) != -1 ) { m_dn = dn; } connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); - setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); + setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); } GroupWiseContact::~GroupWiseContact() @@ -96,17 +96,17 @@ void GroupWiseContact::updateDetails( const ContactDetails & details ) TQMap::Iterator it; // work phone number - if ( ( it = m_serverProperties.find( "telephoneNumber" ) ) + if ( ( it = m_serverProperties.tqfind( "telephoneNumber" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneWork, it.data() ); // mobile phone number - if ( ( it = m_serverProperties.find( "mobile" ) ) + if ( ( it = m_serverProperties.tqfind( "mobile" ) ) != m_serverProperties.end() ) setProperty( protocol()->propPhoneMobile, it.data() ); // email - if ( ( it = m_serverProperties.find( "Internet EMail Address" ) ) + if ( ( it = m_serverProperties.tqfind( "Internet EMail Address" ) ) != m_serverProperties.end() ) setProperty( protocol()->propEmail, it.data() ); @@ -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()->onlineStatus() != protocol()->groupwiseAppearOffline */) + if ( account()->isConnected() && ( isOnline() || messageReceivedOffline() ) /* && account()->myself()->onlinetqStatus() != protocol()->groupwiseAppearOffline */) return true; - if ( !account()->isConnected()/* || account()->myself()->onlineStatus() == protocol()->groupwiseAppearOffline*/ ) + if ( !account()->isConnected()/* || account()->myself()->onlinetqStatus() == protocol()->groupwiseAppearOffline*/ ) return false; // fallback, something went wrong @@ -155,7 +155,7 @@ Kopete::ChatSession * GroupWiseContact::manager( Kopete::Contact::CanCreateFlags Kopete::ContactPtrList chatMembers; chatMembers.append( this ); - return account()->chatSession( chatMembers, TQString::null, canCreate ); + return account()->chatSession( chatMembers, TQString(), canCreate ); } TQPtrList *GroupWiseContact::customContextMenuActions() @@ -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->onlineStatus() ); + setOnlineStatus( this->onlinetqStatus() ); } void GroupWiseContact::setOnlineStatus( const Kopete::OnlineStatus& status ) { setMessageReceivedOffline( false ); - if ( status == protocol()->groupwiseAwayIdle && status != onlineStatus() ) + if ( status == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) setIdleTime( 1 ); - else if ( onlineStatus() == protocol()->groupwiseAwayIdle && status != onlineStatus() ) + else if ( onlinetqStatus() == protocol()->groupwiseAwayIdle && status != onlinetqStatus() ) 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::fromLatin1("msn_blocked"), - i18n("%1|Blocked").arg( status.description() ) ) ); + protocol() , status.internalStatus()+15 , TQString::tqfromLatin1("msn_blocked"), + i18n("%1|Blocked").tqarg( status.description() ) ) ); } else { diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index 64486e75..183df1a4 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -53,19 +53,20 @@ using namespace GroupWise; class GroupWiseContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param account The GroupWiseAccount this belongs to. * @param uniqueName The userId for this contact. May be a DN, in which case it will be converted to dotted format for the contactId and stored. - * @param parent The Kopete::MetaContact this contact is part of. + * @param tqparent The Kopete::MetaContact this contact is part of. * @param objectId The contact's numeric object ID. - * @param parentId The ID of this contact's parent (folder). - * @param sequence This contact's sequence number (The position it appears in within its parent). + * @param tqparentId The ID of this contact's tqparent (folder). + * @param sequence This contact's sequence number (The position it appears in within its tqparent). */ GroupWiseContact( Kopete::Account* account, const TQString &uniqueName, - Kopete::MetaContact *parent, - const int objectId, const int parentId, const int sequence ); + Kopete::MetaContact *tqparent, + const int objectId, const int tqparentId, const int sequence ); ~GroupWiseContact(); @@ -131,11 +132,11 @@ public: */ void setDeleting( bool deleting ); /** - * Marks this contact as having sent a message whilst apparently offline + * Marks this contact as having sent a message whilst aptqparently offline */ void setMessageReceivedOffline( bool on ); /** - * Has this contact sent a message whilst apparently offline? + * Has this contact sent a message whilst aptqparently offline? */ bool messageReceivedOffline() const; diff --git a/kopete/protocols/groupwise/gwcontactlist.cpp b/kopete/protocols/groupwise/gwcontactlist.cpp index 3f8b5c4d..03e66f45 100644 --- a/kopete/protocols/groupwise/gwcontactlist.cpp +++ b/kopete/protocols/groupwise/gwcontactlist.cpp @@ -22,8 +22,8 @@ #include "gwcontactlist.h" #include "gwerror.h" //debug area -GWContactList::GWContactList( TQObject * parent ) - : TQObject( parent ), rootFolder( new GWFolder( this, 0, 0, TQString::null ) ) +GWContactList::GWContactList( TQObject * tqparent ) + : TQObject( tqparent ), rootFolder( new GWFolder( this, 0, 0, TQString() ) ) { } GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ) @@ -34,7 +34,7 @@ GWFolder * GWContactList::addFolder( unsigned int id, unsigned int sequence, con return 0; } -GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ) +GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ) { TQObjectList * l = queryList( "GWFolder", 0, false, true ); TQObjectListIt it( *l ); // iterate over the buttons @@ -42,8 +42,8 @@ GWContactInstance * GWContactList::addContactInstance( unsigned int id, unsigned GWContactInstance * contact = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); - if ( folder && folder->id == parent ) + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); + if ( folder && folder->id == tqparent ) { contact = new GWContactInstance( folder, id, sequence, displayName, dn ); break; @@ -62,7 +62,7 @@ GWFolder * GWContactList::findFolderById( unsigned int id ) GWFolder * candidate, * folder = 0; while ( (obj = it.current()) != 0 ) { - candidate = ::qt_cast< GWFolder * >( obj ); + candidate = ::tqqt_cast< GWFolder * >( obj ); if ( candidate->id == id ) { folder = candidate; @@ -82,7 +82,7 @@ GWFolder * GWContactList::findFolderByName( const TQString & displayName ) GWFolder * folder = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * candidate = ::qt_cast< GWFolder * >( obj ); + GWFolder * candidate = ::tqqt_cast< GWFolder * >( obj ); if ( candidate->displayName == displayName ) { folder = candidate; @@ -102,8 +102,8 @@ int GWContactList::maxSequenceNumber() unsigned int sequence = 0; while ( (obj = it.current()) != 0 ) { - GWFolder * current = ::qt_cast< GWFolder * >( obj ); - sequence = QMAX( sequence, current->sequence ); + GWFolder * current = ::tqqt_cast< GWFolder * >( obj ); + sequence = TQMAX( sequence, current->sequence ); ++it; } delete l; @@ -119,7 +119,7 @@ GWContactInstanceList GWContactList::instancesWithDn( const TQString & dn ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::qt_cast( obj ); + GWContactInstance * current = ::tqqt_cast( obj ); if ( current->dn == dn ) matches.append( current ); } @@ -141,7 +141,7 @@ void GWContactList::removeInstanceById( unsigned int id ) while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * current = ::qt_cast( obj ); + GWContactInstance * current = ::tqqt_cast( obj ); if ( current->id == id ) { delete current; @@ -154,14 +154,14 @@ void GWContactList::removeInstanceById( unsigned int id ) void GWContactList::dump() { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; - const TQObjectList * l = children(); - if ( l && !l->isEmpty() ) + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); // iterate over the buttons + TQObjectListIt it( l ); // iterate over the buttons TQObject *obj; while ( (obj = it.current()) != 0 ) { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( 1 ); ++it; @@ -174,10 +174,10 @@ void GWContactList::dump() void GWContactList::clear() { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; - const TQObjectList * l = children(); - if ( l && !l->isEmpty() ) + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); + TQObjectListIt it( l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { @@ -187,33 +187,33 @@ void GWContactList::clear() } } -GWContactListItem::GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - TQObject( parent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) +GWContactListItem::GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + TQObject( tqparent), id( theId ), sequence( theSequence ), displayName( theDisplayName ) { } -GWFolder::GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : - GWContactListItem( parent, theId, theSequence, theDisplayName ) +GWFolder::GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ) : + GWContactListItem( tqparent, theId, theSequence, theDisplayName ) { } void GWFolder::dump( unsigned int depth ) { TQString s; s.fill( ' ', ++depth * 2 ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " contains: " << endl; - const TQObjectList * l = children(); - if ( l ) + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s <<"Folder " << displayName << " id: " << id << " tqcontains: " << endl; + const TQObjectList l = childrenListObject(); + if ( !l.isEmpty() ) { - TQObjectListIt it( *l ); // iterate over the buttons + TQObjectListIt it( l ); // iterate over the buttons TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; - GWContactInstance * instance = ::qt_cast< GWContactInstance * >( obj ); + GWContactInstance * instance = ::tqqt_cast< GWContactInstance * >( obj ); if (instance) instance->dump( depth ); else { - GWFolder * folder = ::qt_cast< GWFolder * >( obj ); + GWFolder * folder = ::tqqt_cast< GWFolder * >( obj ); if ( folder ) folder->dump( depth ); } @@ -223,8 +223,8 @@ void GWFolder::dump( unsigned int depth ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << s << " no contacts." << endl; } -GWContactInstance::GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : - GWContactListItem( parent, theId, theSequence, theDisplayName ), dn( theDn ) +GWContactInstance::GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ) : + GWContactListItem( tqparent, theId, theSequence, theDisplayName ), dn( theDn ) { } void GWContactInstance::dump( unsigned int depth ) diff --git a/kopete/protocols/groupwise/gwcontactlist.h b/kopete/protocols/groupwise/gwcontactlist.h index 613e1b3f..e6f2dcac 100644 --- a/kopete/protocols/groupwise/gwcontactlist.h +++ b/kopete/protocols/groupwise/gwcontactlist.h @@ -39,13 +39,14 @@ typedef TQValueList GWContactInstanceList; * different clients. * The list is volatile - it is not stored in stable storage, but is purged on disconnect and recreated at login. */ -class GWContactList : public QObject +class GWContactList : public TQObject { Q_OBJECT + TQ_OBJECT public: - GWContactList( TQObject * parent ); + GWContactList( TQObject * tqparent ); GWFolder * addFolder( unsigned int id, unsigned int sequence, const TQString & displayName ); - GWContactInstance * addContactInstance( unsigned int id, unsigned int parent, unsigned int sequence, const TQString & displayName, const TQString & dn ); + GWContactInstance * addContactInstance( unsigned int id, unsigned int tqparent, unsigned int sequence, const TQString & displayName, const TQString & dn ); GWFolder * findFolderById( unsigned int id ); GWFolder * findFolderByName( const TQString & name ); GWContactInstanceList instancesWithDn( const TQString & dn ); @@ -57,11 +58,12 @@ public: GWFolder * rootFolder; }; -class GWContactListItem : public QObject +class GWContactListItem : public TQObject { Q_OBJECT + TQ_OBJECT public: - GWContactListItem( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWContactListItem( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); unsigned int id; // OBJECT_ID unsigned int sequence; // SEQUENCE_NUMBER @@ -71,16 +73,18 @@ public: class GWFolder : public GWContactListItem { Q_OBJECT + TQ_OBJECT public: - GWFolder( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); + GWFolder( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName ); virtual void dump( unsigned int depth ); }; class GWContactInstance : public GWContactListItem { Q_OBJECT + TQ_OBJECT public: - GWContactInstance( TQObject * parent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); + GWContactInstance( TQObject * tqparent, unsigned int theId, unsigned int theSequence, const TQString & theDisplayName, const TQString & theDn ); TQString dn; // DN virtual void dump( unsigned int depth ); }; diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 7a792486..c45371b9 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -65,10 +65,10 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete:: m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; - m_secure = new KAction( i18n( "Security Status" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); + m_secure = new KAction( i18n( "Security tqStatus" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure->setToolTip( i18n( "Conversation is secure" ) ); - m_logging = new KAction( i18n( "Archiving Status" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); + m_logging = new KAction( i18n( "Archiving tqStatus" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); updateArchiving(); setXMLFile("gwchatui.rc"); @@ -116,7 +116,7 @@ bool GroupWiseChatSession::secure() void GroupWiseChatSession::setClosed() { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " Conference " << m_guid << " is now Closed " << endl; - m_guid = TQString::null; + m_guid = TQString(); m_flags = m_flags | GroupWise::Closed; } @@ -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").arg( 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").tqarg( 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()->onlineStatus() != GroupWiseProtocol::protocol()->groupwiseAppearOffline ) ) + ( account()->myself()->onlinetqStatus() != 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()->onlineStatus() == ( static_cast( protocol() ) )->groupwiseAppearOffline ) + else*/ if ( account()->myself()->onlinetqStatus() == ( static_cast( 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 ); @@ -307,7 +307,7 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() TQDictIterator it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); @@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact ) } else { - TQWidget * w = view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : 0L; + TQWidget * w = view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; bool ok; TQRegExp rx( ".*" ); @@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact() if ( !m_searchDlg ) { // show search dialog - TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : 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( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : 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->onlineStatus() ); + invitee->setOnlineStatus( c->onlinetqStatus() ); // TODO: we could set all the placeholder's properties etc here too addContact( invitee, true ); m_invitees.append( invitee ); @@ -417,7 +417,7 @@ void GroupWiseChatSession::joined( GroupWiseContact * c ) { if ( pending->contactId().startsWith( c->contactId() ) ) { - removeContact( pending, TQString::null, Kopete::Message::PlainText, true ); + removeContact( pending, TQString(), Kopete::Message::PlainText, true ); break; } } @@ -459,7 +459,7 @@ void GroupWiseChatSession::inviteDeclined( GroupWiseContact * c ) { if ( pending->contactId().startsWith( c->contactId() ) ) { - removeContact( pending, TQString::null, Kopete::Message::PlainText, true ); + removeContact( pending, TQString(), Kopete::Message::PlainText, true ); break; } } @@ -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.").arg( from ), + i18n("%1 has rejected an invitation to join this conversation.").tqarg( from ), Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( declined ); } @@ -501,16 +501,16 @@ void GroupWiseChatSession::updateArchiving() void GroupWiseChatSession::slotShowSecurity() { - TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); - KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); + KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security tqStatus" ) ); } void GroupWiseChatSession::slotShowArchiving() { - TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->topLevelWidget() ) : + TQWidget * w = ( view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : Kopete::UI::Global::mainWidget() ); - KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); + KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving tqStatus" ) ); } #include "gwmessagemanager.moc" diff --git a/kopete/protocols/groupwise/gwmessagemanager.h b/kopete/protocols/groupwise/gwmessagemanager.h index d3bd863b..7c0d3d2c 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.h +++ b/kopete/protocols/groupwise/gwmessagemanager.h @@ -35,6 +35,7 @@ using namespace GroupWise; class GroupWiseChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT friend class GroupWiseAccount; diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 6eb489a2..176a4b92 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -41,12 +41,12 @@ K_EXPORT_COMPONENT_FACTORY( kopete_groupwise, GroupWiseProtocolFactory( "kopete_ GroupWiseProtocol *GroupWiseProtocol::s_protocol = 0L; -GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( GroupWiseProtocolFactory::instance(), parent, name ), +GroupWiseProtocol::GroupWiseProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( GroupWiseProtocolFactory::instance(), tqparent, name ), /* initialise Kopete::OnlineStatus that should be user selectable in the user interface */ - groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString::null, + groupwiseOffline ( Kopete::OnlineStatus::Offline, 0, this, GroupWise::Offline, TQString(), i18n( "Offline" ), i18n( "O&ffline" ), Kopete::OnlineStatusManager::Offline ), - groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString::null, + groupwiseAvailable ( Kopete::OnlineStatus::Online, 25, this, GroupWise::Available, TQString(), i18n( "Online" ), i18n( "&Online" ), Kopete::OnlineStatusManager::Online ), groupwiseBusy ( Kopete::OnlineStatus::Away, 18, this, GroupWise::Busy, "contact_busy_overlay", i18n( "Busy" ), i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), @@ -61,15 +61,15 @@ GroupWiseProtocol::GroupWiseProtocol( TQObject* parent, const char *name, const groupwiseUnknown ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Unknown, "status_unknown", i18n( "Unknown" ) ), groupwiseInvalid ( Kopete::OnlineStatus::Unknown, 25, this, GroupWise::Invalid, "status_unknown", - i18n( "Invalid Status" ) ), + i18n( "Invalid tqStatus" ) ), groupwiseConnecting ( Kopete::OnlineStatus::Connecting, 25, this, 99, "groupwise_connecting", i18n( "Connecting" ) ), propGivenName( Kopete::Global::Properties::self()->firstName() ), propLastName( Kopete::Global::Properties::self()->lastName() ), propFullName( Kopete::Global::Properties::self()->fullName() ), propAwayMessage( Kopete::Global::Properties::self()->awayMessage() ), - propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString::null, false, false ), - propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString::null, true, false ), + propAutoReply( "groupwiseAutoReply", i18n( "Auto Reply Message" ), TQString(), false, false ), + propCN( "groupwiseCommonName", i18n( "Common Name" ), TQString(), true, false ), propPhoneWork( Kopete::Global::Properties::self()->workPhone() ), propPhoneMobile( Kopete::Global::Properties::self()->privateMobilePhone() ), propEmail( Kopete::Global::Properties::self()->emailAddress() ) @@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( TQString accountId = serializedData[ "accountId" ]; TQString displayName = serializedData[ "displayName" ]; int objectId = serializedData[ "objectId" ].toInt(); - int parentId = serializedData[ "parentId" ].toInt(); + int tqparentId = serializedData[ "tqparentId" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt(); TQDict accounts = Kopete::AccountManager::self()->accounts( this ); @@ -107,19 +107,19 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( } // FIXME: creating a contact with a userId here - return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); + return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); } -AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * account ) +AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "Creating Add Contact Page" << endl; - return new GroupWiseAddContactPage( account, parent, "addcontactpage"); + return new GroupWiseAddContactPage( account, tqparent, "addcontactpage"); } -KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget * GroupWiseProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << "Creating Edit Account Page" << endl; - return new GroupWiseEditAccountWidget( parent, account ); + return new GroupWiseEditAccountWidget( tqparent, account ); } Kopete::Account *GroupWiseProtocol::createNewAccount( const TQString &accountId ) @@ -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? strings // vanilla RTF "envelope" that doesn't say much but causes other clients to accept the message - TQString rtfTemplate = TQString::fromLatin1("{\\rtf1\\ansi\n" + TQString rtfTemplate = TQString::tqfromLatin1("{\\rtf1\\ansi\n" "{\\fonttbl{\\f0\\fnil Unknown;}}\n" "{\\colortbl ;\\red0\\green0\\blue0;}\n" "\\uc1\\cf1\\f0\\fs18 %1\\par\n}"); @@ -182,7 +182,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) uint index = 0; // current char to transcode while ( index < plainUtf8.length() ) { - Q_UINT8 current = plainUtf8.data()[ index ]; + TQ_UINT8 current = plainUtf8.data()[ index ]; if ( current <= 0x7F ) { switch ( current ) @@ -190,7 +190,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) case '{': case '}': case '\\': - outputText.append( TQString( "\\%1" ).arg( TQChar( current ) ) ); + outputText.append( TQString( "\\%1" ).tqarg( TQChar( current ) ) ); break; case '\n': outputText.append( "\\par " ); @@ -203,7 +203,7 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) } else { - Q_UINT32 ucs4Char; + TQ_UINT32 ucs4Char; int bytesEncoded; TQString escapedUnicodeChar; if ( current <= 0xDF ) @@ -253,18 +253,18 @@ TQString GroupWiseProtocol::rtfizeText( const TQString & plain ) bytesEncoded = 1; } index += bytesEncoded; - escapedUnicodeChar = TQString("\\u%1?").arg( ucs4Char ); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "unicode escaped char: " << escapedUnicodeChar << endl; + escapedUnicodeChar = TQString("\\u%1?").tqarg( ucs4Char ); + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "tqunicode escaped char: " << escapedUnicodeChar << endl; outputText.append( escapedUnicodeChar ); } } - return rtfTemplate.arg( outputText ); + return rtfTemplate.tqarg( outputText ); } TQString GroupWiseProtocol::dnToDotted( const TQString & dn ) { TQRegExp rx("[a-zA-Z]*=(.*)$", false ); - if( !dn.find( '=' ) ) // if it's not a DN, return it unprocessed + if( !dn.tqfind( '=' ) ) // if it's not a DN, return it unprocessed return dn; // split the dn into elements diff --git a/kopete/protocols/groupwise/gwprotocol.h b/kopete/protocols/groupwise/gwprotocol.h index f0c439f1..001d6f96 100644 --- a/kopete/protocols/groupwise/gwprotocol.h +++ b/kopete/protocols/groupwise/gwprotocol.h @@ -34,8 +34,9 @@ class GroupWiseProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - GroupWiseProtocol(TQObject *parent, const char *name, const TQStringList &args); + GroupWiseProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~GroupWiseProtocol(); /** * Convert the serialised data back into a GroupWiseContact and add this @@ -49,11 +50,11 @@ public: /** * Generate the widget needed to add GroupWiseContacts */ - virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account ); + virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); /** * Generate the widget needed to add/edit accounts for this protocol */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); /** * Generate a GroupWiseAccount */ diff --git a/kopete/protocols/groupwise/libgroupwise/Makefile.am b/kopete/protocols/groupwise/libgroupwise/Makefile.am index 2df23a01..bf57f0e3 100644 --- a/kopete/protocols/groupwise/libgroupwise/Makefile.am +++ b/kopete/protocols/groupwise/libgroupwise/Makefile.am @@ -26,7 +26,7 @@ libgroupwise_la_SOURCES = bytestream.cpp chatroommanager.cpp client.cpp \ safedelete.cpp securestream.cpp stream.cpp task.cpp tlshandler.cpp transfer.cpp \ transferbase.cpp userdetailsmanager.cpp usertransfer.cpp libgroupwise_la_LDFLAGS = -no-undefined $(all_libraries) -libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la -lqt-mt qca/src/libqca.la +libgroupwise_la_LIBADD = tasks/libgroupwise_tasks.la qca/src/libqca.la tests_COMPILE_FIRST = libgroupwise.la libgwtest.la @@ -37,4 +37,4 @@ libgwtest_la_SOURCES = coreprotocol.cpp eventtransfer.cpp \ bytestream.cpp libgwtest_la_LDFLAGS = $(all_libraries) -no-undefined libgwtest_la_LIBADD = qca/src/libqca.la \ - $(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la -lqt-mt + $(top_builddir)/kopete/protocols/groupwise/libgroupwise/tasks/libgroupwise_tasks.la diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp index 0b20c050..35ef278e 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h index f10b46a1..5706fff6 100644 --- a/kopete/protocols/groupwise/libgroupwise/bytestream.h +++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 3ee9b947..87333c41 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -28,8 +28,8 @@ #include "chatroommanager.h" -ChatroomManager::ChatroomManager( Client * parent, const char *name) - : TQObject(parent, name), m_client( parent ), m_replace( false ) +ChatroomManager::ChatroomManager( Client * tqparent, const char *name) + : TQObject(tqparent, name), m_client( tqparent ), m_tqreplace( false ) { } @@ -49,7 +49,7 @@ GroupWise::ChatroomMap ChatroomManager::rooms() void ChatroomManager::getChatrooms( bool refresh ) { - m_replace = !refresh; + m_tqreplace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); @@ -62,7 +62,7 @@ void ChatroomManager::slotGotChatroomList() SearchChatTask * sct = (SearchChatTask *)sender(); if ( sct ) { - if ( m_replace ) + if ( m_tqreplace ) m_rooms.clear(); TQValueList roomsFound = sct->results(); @@ -94,7 +94,7 @@ void ChatroomManager::slotGotChatCounts() const TQMap< TQString, int >::iterator end = newCounts.end(); for ( ; it != end; ++it ) - if ( m_rooms.contains( it.key() ) ) + if ( m_rooms.tqcontains( it.key() ) ) m_rooms[ it.key() ].participantsCount = it.data(); } emit updated(); @@ -102,7 +102,7 @@ void ChatroomManager::slotGotChatCounts() void ChatroomManager::requestProperties( const TQString & displayName ) { - if ( 0 /*m_rooms.contains( displayName ) */) + if ( 0 /*m_rooms.tqcontains( displayName ) */) emit gotProperties( m_rooms[ displayName ] ); else { diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h index 5fff7b73..60f55b01 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.h +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.h @@ -29,9 +29,10 @@ class Client; * Keeps a record of the server side chatrooms * @author SUSE Linux Products GmbH */ -class ChatroomManager : public QObject +class ChatroomManager : public TQObject { Q_OBJECT + TQ_OBJECT public: ChatroomManager( Client * client, const char *name = 0); ~ChatroomManager(); @@ -60,7 +61,7 @@ class ChatroomManager : public QObject private: Client * m_client; GroupWise::ChatroomMap m_rooms; - bool m_replace; + bool m_tqreplace; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index 1a88fbc3..c91f652d 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 customStatuses; + TQValueList customStatuses; TQTimer * keepAliveTimer; }; @@ -103,7 +103,7 @@ void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &))); + //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); @@ -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( gotCustomStatus( const GroupWise::CustomStatus & ) ), - TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); + connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), + TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) ); connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); @@ -185,7 +185,7 @@ int Client::port() return d->port; } -TQValueList Client::customStatuses() +TQValueList 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( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) ); + connect( st, TQT_SIGNAL( gottqStatus( 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::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) +void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ) { - debug( TQString("Setting status to %1").arg( status ) );; + debug( TQString("Setting status to %1").tqarg( 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::setStatus( GroupWise::Status status, const TQString & reason, const // TODO: set status change in progress flag } -void Client::requestStatus( const TQString & userDN ) +void Client::requesttqStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) ); + connect( gst, TQT_SIGNAL( gottqStatus( 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)" ).arg( error ) ); + debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) ); } void Client::streamReadyRead() @@ -326,7 +326,7 @@ void Client::lt_loginFinished() debug( "Client::lt_loginFinished() LOGIN SUCCEEDED" ); // set our initial status SetStatusTask * sst = new SetStatusTask( d->root ); - sst->status( GroupWise::Available, TQString::null, TQString::null ); + sst->status( GroupWise::Available, TQString(), TQString() ); sst->go( true ); emit loggedIn(); // fetch details for any privacy list items that aren't in our contact list. @@ -348,7 +348,7 @@ void Client::sst_statusChanged() const SetStatusTask * sst = (SetStatusTask *)sender(); if ( sst->success() ) { - emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() ); + emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() ); } } @@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent ) // we can drop these once the server reenables the sending of unformatted text // redundant linebreak at the end of the message TQRegExp rx("
$"); - transformedEvent.message.replace( rx, "" ); + transformedEvent.message.tqreplace( rx, "" ); // missing linebreak after first line of an encrypted message TQRegExp ry("-----BEGIN PGP MESSAGE----- "); - transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----
" ); + transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----
" ); emit messageReceived( transformedEvent ); } @@ -390,19 +390,19 @@ void Client::jct_joinConfCompleted() { const JoinConferenceTask * jct = ( JoinConferenceTask * )sender(); #ifdef LIBGW_DEBUG - debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) ); + debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) ); TQStringList parts = jct->participants(); for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it ) - debug( TQString( " - %1" ).arg(*it) ); + debug( TQString( " - %1" ).tqarg(*it) ); debug( "invitees are: " ); TQStringList invitees = jct->invitees(); for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it ) - debug( TQString( " - %1" ).arg(*it) ); + debug( TQString( " - %1" ).tqarg(*it) ); #endif emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() ); } -void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom ) +void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom ) { d->customStatuses.append( custom ); } @@ -431,7 +431,7 @@ TQString Client::password() TQString Client::userAgent() { - return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname ); + return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( 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").arg(out)); +// debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); // xmlOutgoing(out); d->stream->write( request ); diff --git a/kopete/protocols/groupwise/libgroupwise/client.h b/kopete/protocols/groupwise/libgroupwise/client.h index 9cdb7c68..9d559bf3 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.h +++ b/kopete/protocols/groupwise/libgroupwise/client.h @@ -36,9 +36,10 @@ class Task; using namespace GroupWise; -class Client : public QObject +class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -46,7 +47,7 @@ Q_OBJECT EXTERNAL API *************/ - Client( TQObject *parent = 0, uint protocolVersion = 2 ); + Client( TQObject *tqparent = 0, uint protocolVersion = 2 ); ~Client(); void setOSName( const TQString &name ); void setClientName( const TQString &s ); @@ -91,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 setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ); + void settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply ); /** * Send a message @@ -117,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 requestStatus( const TQString & userDN ); + void requesttqStatus( const TQString & userDN ); /** * Add a contact to the contact list @@ -210,7 +211,7 @@ fd * @param password /** * Obtain the list of custom statuses stored on the server */ - TQValueList customStatuses(); + TQValueList customStatuses(); /** * Get a reference to the RequestFactory for this Client. @@ -276,11 +277,11 @@ fd * @param password /** * A remote contact changed status */ - void statusReceived( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void statusReceived( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); /** * Our status changed on the server */ - void ourStatusChanged( GroupWise::Status status, const TQString & statusText, const TQString & autoReply ); + void ourStatusChanged( GroupWise::tqStatus status, const TQString & statusText, const TQString & autoReply ); /** CONFERENCE (MANAGEMENT) EVENTS */ /** @@ -370,7 +371,7 @@ fd * @param password /** * Receive a custom status during login and record it */ - void lt_gotCustomStatus( const GroupWise::CustomStatus & ); + void lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ); /** * Notify us of the keepalive period contained in the login response */ diff --git a/kopete/protocols/groupwise/libgroupwise/connector.cpp b/kopete/protocols/groupwise/libgroupwise/connector.cpp index 57e4d222..3b702d7a 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.cpp +++ b/kopete/protocols/groupwise/libgroupwise/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setUseSSL(false); setPeerAddressNone(); @@ -46,7 +46,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -63,7 +63,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; diff --git a/kopete/protocols/groupwise/libgroupwise/connector.h b/kopete/protocols/groupwise/libgroupwise/connector.h index b1c31743..d09d0a7f 100644 --- a/kopete/protocols/groupwise/libgroupwise/connector.h +++ b/kopete/protocols/groupwise/libgroupwise/connector.h @@ -26,11 +26,12 @@ class ByteStream; -class Connector : public QObject +class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -40,7 +41,7 @@ public: bool useSSL() const; bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -49,13 +50,13 @@ signals: protected: void setUseSSL(bool b); void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool ssl; bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 4c811eba..e48bf368 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -50,7 +50,7 @@ //#define GW_COREPROTOCOL_DEBUG -QCString +TQCString url_escape_string( const char *src) { uint escape = 0; @@ -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" ).arg( transferCount ) ); + debug( TQString( "CoreProtocol::addIncomingData() - parsed transfer #%1 in chunk" ).tqarg( 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" ).arg( bytes.count() ) ); + CoreProtocol::debug( TQString( "tqcontains: %1 bytes" ).tqarg( bytes.count() ) ); for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -213,7 +213,7 @@ void CoreProtocol::outgoingTransfer( Request* outgoing ) 0, NMFIELD_TYPE_UTF8, request->transactionId() ); fields.append( fld ); - // convert to QByteArray + // convert to TQByteArray TQByteArray bytesOut; TQTextStream dout( bytesOut, IO_WriteOnly ); dout.setEncoding( TQTextStream::Latin1 ); @@ -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" ).arg( host.data() ).arg( port.data() ) ); + debug( TQString( "Host: %1 Port: %2" ).tqarg( host.data() ).tqarg( 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" ).arg( bytesOut.data() ) ); + debug( TQString( "data out: %1" ).tqarg( bytesOut.data() ) ); emit outgoingData( bytesOut ); // now convert @@ -278,7 +278,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) continue; // GAIM writes these tags to the secure socket separately - if we can't connect, check here - // NM Protocol 1 writes them in an apparently arbitrary order + // NM Protocol 1 writes them in an aptqparently arbitrary order // tag //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout << field->tag(); @@ -286,7 +286,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) // method //dout.writeRawBytes( GW_URLVAR_METHOD, sizeof( GW_URLVAR_METHOD ) ); // char methodChar = encode_method( field->method() ); - //dout << (Q_UINT8)methodChar; + //dout << (TQ_UINT8)methodChar; // value //dout.writeRawBytes( GW_URLVAR_VAL, sizeof( GW_URLVAR_VAL ) ); @@ -300,7 +300,7 @@ void CoreProtocol::fieldsToWire( Field::FieldList fields, int depth ) //debug( " - it's a single string" ); const Field::SingleField *sField = static_cast( field ); // TQString encoded = KURL::encode_string( sField->value().toString(), 106 /* UTF-8 */); -// encoded.replace( "%20", "+" ); +// encoded.tqreplace( "%20", "+" ); // dout << encoded.ascii(); snprintf( valString, NMFIELD_MAX_STR_LENGTH, "%s", url_escape_string( sField->value().toString().utf8() ).data() ); @@ -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" ).arg( outgoing.data() ) ); + debug( TQString( "CoreProtocol::fieldsToWire - outgoing data: %1" ).tqarg( 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; @@ -375,14 +375,14 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) m_din->setByteOrder( TQDataStream::LittleEndian ); // look at first four bytes and decide what to do with the chunk - Q_UINT32 val; + TQ_UINT32 val; if ( okToProceed() ) { *m_din >> val; // if is 'HTTP', it's a Response. PTTH it is after endian conversion - if ( !qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || - !qstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) + if ( !tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) || + !tqstrncmp( (const char *)&val, "PTTH", strlen( "PTTH" ) ) ) { Transfer * t = m_responseProtocol->parse( wire, bytesParsed ); if ( t ) @@ -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" ).arg( val ).arg( wire.size() ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - looks like an EVENT: %1, length %2" ).tqarg( val ).tqarg( wire.size() ) ); Transfer * t = m_eventProtocol->parse( wire, bytesParsed ); if ( t ) { m_inTransfer = t; - debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).arg( val ).arg( bytesParsed ) ); + debug( TQString( "CoreProtocol::wireToTransfer() - got an EVENT: %1, parsed: %2" ).tqarg( val ).tqarg( bytesParsed ) ); m_state = Available; emit incomingData(); } @@ -423,7 +423,7 @@ void CoreProtocol::reset() m_in.resize( 0 ); } -TQChar CoreProtocol::encode_method( Q_UINT8 method ) +TQChar CoreProtocol::encode_method( TQ_UINT8 method ) { TQChar str; @@ -486,7 +486,7 @@ TQChar CoreProtocol::encode_method( Q_UINT8 method ) void CoreProtocol::slotOutgoingData( const TQCString &out ) { - debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).arg( out ) ); + debug( TQString( "CoreProtocol::slotOutgoingData() %1" ).tqarg( out.data() ) ); } bool CoreProtocol::okToProceed() diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h index e9a14122..50ac0f65 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h @@ -108,13 +108,14 @@ class Transfer; * any of three ways - * ascii text, * latin1 as hexadecimal, - * 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 + * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) + * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server * */ -class CoreProtocol : public QObject +class CoreProtocol : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State { NeedMore, Available, NoData }; @@ -187,7 +188,7 @@ protected: /** * encodes a method number (usually supplied as a #defined symbol) to a char */ - TQChar encode_method( Q_UINT8 method ); + TQChar encode_method( TQ_UINT8 method ); private: TQByteArray m_in; // buffer containing unprocessed bytes we received TQDataStream* m_din; // contains the packet currently being parsed diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp index da8025b7..d779564a 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp @@ -25,8 +25,8 @@ using namespace GroupWise; -EventProtocol::EventProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +EventProtocol::EventProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -42,7 +42,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) inBuf.open( IO_ReadOnly); m_din.setDevice( &inBuf ); m_din.setByteOrder( TQDataStream::LittleEndian ); - Q_UINT32 type; + TQ_UINT32 type; if ( !okToProceed() ) { @@ -51,12 +51,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) } // read the event type m_din >> type; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); - debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) ); + debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) ); if ( type > Stop ) { - debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) ); + debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) ); m_state = OutOfSync; return 0; } @@ -71,14 +71,14 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) // now create an event object //HACK: lowercased DN - EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() ); + EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() ); // 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 TQString statusText; TQString guid; - Q_UINT16 status; - Q_UINT32 flags; + TQ_UINT16 status; + TQ_UINT32 flags; TQString message; switch ( type ) @@ -90,15 +90,15 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return 0; } m_din >> status; - m_bytes += sizeof( Q_UINT16 ); + m_bytes += sizeof( TQ_UINT16 ); if ( !readString( statusText ) ) { m_din.unsetDevice(); return 0; } - debug( TQString( "got status: %1").arg( status ) ); - tentative->setStatus( status ); - debug( TQString( "tentative status: %1").arg( tentative->status() ) ); + debug( TQString( "got status: %1").tqarg( status ) ); + tentative->settqStatus( status ); + debug( TQString( "tentative status: %1").tqarg( 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 UndeliverableStatus: //102 - GUID + case UndeliverabletqStatus: //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" ).arg( type ) ); + debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) ); break; } // if we got this far, the parse succeeded, return the Transfer @@ -202,12 +202,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes ) return tentative; } -bool EventProtocol::readFlags( Q_UINT32 &flags) +bool EventProtocol::readFlags( TQ_UINT32 &flags) { if ( okToProceed() ) { m_din >> flags; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); return true; } return false; diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h index cb9fe204..65c0672b 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.h @@ -33,7 +33,7 @@ class EventTransfer; CoreProtocol receives data in addIncomingData, and passes to wireToTransfer. wireToTransfer detects an event. Passes whole chunk to EventProtocol ( as TQByteArray ) - In to EventProtocol - QByteArray + In to EventProtocol - TQByteArray Returned from EventProtocol - EventTransfer *, bytes read, set state? EventProtocol tries to parse data into eventTransfer If not complete, sets state to NeedMore and returns 0 @@ -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 unicode. 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 tqunicode. 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,10 +58,10 @@ class EventTransfer; From gwerror.h: enum Event { InvalidRecipient = 101, NOTHANDLED - UndeliverableStatus = 102, + UndeliverabletqStatus = 102, NOTHANDLED * StatusChange = 103, - Q_UINT16 STATUS + TQ_UINT16 STATUS STATUSTEXT ContactAdd = 104, NOTHANDLED @@ -109,8 +109,9 @@ class EventTransfer; class EventProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - EventProtocol(TQObject *parent = 0, const char *name = 0); + EventProtocol(TQObject *tqparent = 0, const char *name = 0); ~EventProtocol(); /** * Attempt to parse the supplied data into an @ref EventTransfer object. @@ -124,7 +125,7 @@ protected: /** * Reads a conference's flags */ - bool readFlags( Q_UINT32 &flags); + bool readFlags( TQ_UINT32 &flags); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp index fb3f3101..be645abb 100644 --- a/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp +++ b/kopete/protocols/groupwise/libgroupwise/eventtransfer.cpp @@ -17,7 +17,7 @@ #include "eventtransfer.h" -EventTransfer::EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp ) +EventTransfer::EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ) : Transfer(), m_eventType( eventType ), m_source( source ), m_timeStamp( timeStamp ) { m_contentFlags |= ( EventType | Source | TimeStamp ); @@ -60,9 +60,9 @@ bool EventTransfer::hasMessage() return ( m_contentFlags & Message ); } -bool EventTransfer::hasStatus() +bool EventTransfer::hastqStatus() { - return ( m_contentFlags & Status ); + return ( m_contentFlags & tqStatus ); } bool EventTransfer::hasStatusText() @@ -92,7 +92,7 @@ GroupWise::ConferenceGuid EventTransfer::guid() return m_guid; } -Q_UINT32 EventTransfer::flags() +TQ_UINT32 EventTransfer::flags() { return m_flags; } @@ -102,7 +102,7 @@ TQString EventTransfer::message() return m_message; } -Q_UINT16 EventTransfer::status() +TQ_UINT16 EventTransfer::status() { return m_status; } @@ -119,7 +119,7 @@ void EventTransfer::setGuid( const GroupWise::ConferenceGuid & guid ) m_guid = guid; } -void EventTransfer::setFlags( const Q_UINT32 flags ) +void EventTransfer::setFlags( const TQ_UINT32 flags ) { m_contentFlags |= Flags; m_flags = flags; @@ -131,10 +131,10 @@ void EventTransfer::setMessage( const TQString & message ) m_message = message; } -void EventTransfer::setStatus( const Q_UINT16 inStatus ) +void EventTransfer::settqStatus( const TQ_UINT16 intqStatus ) { - m_contentFlags |= Status; - m_status = inStatus; + m_contentFlags |= tqStatus; + m_status = intqStatus; } void EventTransfer::setStatusText( const TQString & statusText ) diff --git a/kopete/protocols/groupwise/libgroupwise/eventtransfer.h b/kopete/protocols/groupwise/libgroupwise/eventtransfer.h index d044fb55..f08e350e 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, - Status = 0x00000040, + tqStatus = 0x00000040, StatusText = 0x00000080 }; /** * Constructor @@ -55,14 +55,14 @@ public: * @param source the user generating the event. * @param timeStamp the time at which the event was received. */ - EventTransfer( const Q_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); + EventTransfer( const TQ_UINT32 eventType, const TQString & source, TQDateTime timeStamp ); ~EventTransfer(); /** - * Access the bitmask that describes the transfer's contents. Use @ref Contents to determine what it contains + * Access the bittqmask that describes the transfer's contents. Use @ref Contents to determine what it tqcontains */ - Q_UINT32 contents(); + TQ_UINT32 contents(); /** - * Convenience accessors to see what the transfer contains + * Convenience accessors to see what the transfer tqcontains */ bool hasEventType(); bool hasSource(); @@ -70,7 +70,7 @@ public: bool hasGuid(); bool hasFlags(); bool hasMessage(); - bool hasStatus(); + bool hastqStatus(); bool hasStatusText(); /** @@ -81,29 +81,29 @@ public: TQString source(); TQDateTime timeStamp(); GroupWise::ConferenceGuid guid(); - Q_UINT32 flags(); + TQ_UINT32 flags(); TQString message(); - Q_UINT16 status(); + TQ_UINT16 status(); TQString statusText(); /** * Mutators to set the transfer's contents */ void setGuid( const GroupWise::ConferenceGuid & guid ); - void setFlags( const Q_UINT32 flags ); + void setFlags( const TQ_UINT32 flags ); void setMessage( const TQString & message ); - void setStatus( const Q_UINT16 status ); + void settqStatus( const TQ_UINT16 status ); void setStatusText( const TQString & statusText); private: - Q_UINT32 m_contentFlags; + TQ_UINT32 m_contentFlags; int m_eventType; TQString m_source; TQDateTime m_timeStamp; GroupWise::ConferenceGuid m_guid; - Q_UINT32 m_flags; + TQ_UINT32 m_flags; TQString m_message; - Q_UINT16 m_status; + TQ_UINT16 m_status; TQString m_statusText; }; diff --git a/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h b/kopete/protocols/groupwise/libgroupwise/gwchatrooms.h index 4e73955a..5349fd30 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 UserStatus { Participating, NotParticipating }; + enum UsertqStatus { 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; - UserStatus userStatus; + UsertqStatus usertqStatus; 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 5d964ad0..e2e5269a 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -106,7 +106,7 @@ public: bool allowPlain, mutualAuth; bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; // int minimumSSF, maximumSSF; // TQString sasl_mech; bool doBinding; @@ -143,8 +143,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) +:Stream(tqparent) { d = new Private; d->mode = Client; @@ -295,7 +295,7 @@ void ClientStream::setNoopTime(int mills) d->noopTimer.start(d->noop_time); } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -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 " ).arg( bytes.count() ) ); + CoreProtocol::debug( TQString( "tqcontains: %1 bytes " ).tqarg( 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" ).arg( d->client.state() ) ); + CoreProtocol::debug( TQString( " - client signalled incomingData but none was available, state is: %1" ).tqarg( 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" ).arg( a.size() ) ); + CoreProtocol::debug( TQString( "ClientStream: ss_readyRead() recv: %1 bytes" ).tqarg( 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" ).arg( bytes ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_bytesWritten: %1 bytes written" ).tqarg( 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 ").arg( x ) ); + CoreProtocol::debug( TQString( "ClientStream::ss_error() x=%1 ").tqarg( x ) ); if(x == SecureStream::ErrTLS) { reset(); d->errCond = TLSFail; diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h index 2d0cef92..749eeaa7 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h @@ -40,6 +40,7 @@ typedef struct NovellDN class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -86,7 +87,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); ~ClientStream(); void connectToServer(const NovellDN &id, bool auth=true); @@ -103,7 +104,7 @@ public: // security options (old protocol only uses the first !) void setAllowPlain(bool); void setRequireMutualAuth(bool); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); void close(); @@ -179,7 +180,7 @@ private: /** * convert internal method representation to wire */ - static char* encode_method(Q_UINT8 method); + static char* encode_method(TQ_UINT8 method); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp index ba2a2a58..65574eb3 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").arg( errorCode ); + errorString = i18n("Unrecognized error code: %s").tqarg( 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").arg( errorCode ); + errorString = TQString("Unrecognized error code: %s").tqarg( errorCode ); #endif } return errorString; diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index 52a5ef36..a6afa5c8 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -23,7 +23,7 @@ #include #include -typedef Q_UINT16 NMERR_T; +typedef TQ_UINT16 NMERR_T; #define GROUPWISE_DEBUG_GLOBAL 14190 #define GROUPWISE_DEBUG_LIBGW 14191 #define GROUPWISE_DEBUG_RAW 14192 @@ -36,7 +36,7 @@ typedef Q_UINT16 NMERR_T; namespace GroupWise { - enum Status { Unknown = 0, + enum tqStatus { Unknown = 0, Offline = 1, Available = 2, Busy = 3, @@ -58,7 +58,7 @@ namespace GroupWise }; enum Event { InvalidRecipient = 101, - UndeliverableStatus = 102, + UndeliverabletqStatus = 102, StatusChange = 103, ContactAdd = 104, ConferenceClosed = 105, @@ -115,7 +115,7 @@ namespace GroupWise ConferenceGuid guid; TQString user; TQDateTime timeStamp; - Q_UINT32 flags; + TQ_UINT32 flags; TQString message; }; @@ -123,14 +123,14 @@ namespace GroupWise { uint id; uint sequence; - uint parentId; + uint tqparentId; TQString name; }; struct ContactItem { uint id; - uint parentId; + uint tqparentId; uint sequence; TQString dn; TQString displayName; @@ -164,9 +164,9 @@ namespace GroupWise int operation; }; - struct CustomStatus + struct CustomtqStatus { - GroupWise::Status status; + GroupWise::tqStatus status; TQString name; TQString autoReply; }; diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp index 6d025e47..94f82937 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.cpp @@ -36,16 +36,16 @@ FieldList::~FieldList() { } -FieldListIterator FieldList::find( TQCString tag ) +FieldListIterator FieldList::tqfind( TQCString tag ) { FieldListIterator it = begin(); - return find( it, tag ); + return tqfind( it, tag ); } -FieldListIterator FieldList::find( FieldListIterator &it, TQCString tag ) +FieldListIterator FieldList::tqfind( FieldListIterator &it, TQCString tag ) { FieldListIterator theEnd = end(); - //cout << "FieldList::find() looking for " << tag.data() << endl; + //cout << "FieldList::tqfind() looking for " << tag.data() << endl; for ( ; it != theEnd; ++it ) { //cout << " - on " << (*it)->tag().data() << endl; @@ -113,7 +113,7 @@ SingleField * FieldList::findSingleField( TQCString tag ) SingleField * FieldList::findSingleField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = find( it, tag ); + FieldListIterator found = tqfind( it, tag ); if ( found == end() ) return 0; else @@ -128,7 +128,7 @@ MultiField * FieldList::findMultiField( TQCString tag ) MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) { - FieldListIterator found = find( it, tag ); + FieldListIterator found = tqfind( it, tag ); if ( found == end() ) return 0; else @@ -138,7 +138,7 @@ MultiField * FieldList::findMultiField( FieldListIterator &it, TQCString tag ) /* === FieldBase ========================================================= */ -FieldBase::FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ) +FieldBase::FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ) : m_tag( tag ), m_method( method ), m_flags( flags ), m_type( type ) { @@ -149,34 +149,34 @@ TQCString FieldBase::tag() const return m_tag; } -Q_UINT8 FieldBase::method() const +TQ_UINT8 FieldBase::method() const { return m_method; } -Q_UINT8 FieldBase::flags() const +TQ_UINT8 FieldBase::flags() const { return m_flags; } -Q_UINT8 FieldBase::type() const +TQ_UINT8 FieldBase::type() const { return m_type; } -void FieldBase::setFlags( const Q_UINT8 flags ) +void FieldBase::setFlags( const TQ_UINT8 flags ) { m_flags = flags; } /* === SingleField ========================================================= */ -SingleField::SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value ) +SingleField::SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ) : FieldBase( tag, method, flags, type ), m_value( value ) { } -SingleField::SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value ) +SingleField::SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ) : FieldBase( tag, NMFIELD_METHOD_VALID, flags, type ), m_value( value ) { } @@ -197,12 +197,12 @@ TQVariant SingleField::value() const /* === MultiField ========================================================= */ -MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields ) +MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields ) : FieldBase( tag, method, flags, type ), m_fields( fields ) { } -MultiField::MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ) +MultiField::MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ) : FieldBase( tag, method, flags, type ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 0117b3e5..1f8deea2 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwfield.h +++ b/kopete/protocols/groupwise/libgroupwise/gwfield.h @@ -22,7 +22,7 @@ #define GWFIELD_H /* Field types */ -/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */ +/* Comments: ^1 not used ^2 ignored ^3 aptqparently only used in _field_to_string for debug */ /* Otherwise: widely used */ #define NMFIELD_TYPE_INVALID 0 /* ^1 */ @@ -122,14 +122,14 @@ // GW7 #define NM_A_FA_CUSTOM_STATUSES "NM_A_FA_CUSTOM_STATUSES" #define NM_A_FA_STATUS "NM_A_FA_STATUS" -#define NM_A_UD_QUERY_COUNT "NM_A_UD_QUERY_COUNT" +#define NM_A_UD_TQUERY_COUNT "NM_A_UD_TQUERY_COUNT" #define NM_A_FA_CHAT "NM_A_FA_CHAT" #define NM_A_DISPLAY_NAME "nnmDisplayName" #define NM_A_CHAT_OWNER_DN "nnmChatOwnerDN" #define NM_A_UD_PARTICIPANTS "NM_A_UD_PARTICIPANTS" #define NM_A_DESCRIPTION "nnmDescription" #define NM_A_DISCLAIMER "nnmDisclaimer" -#define NM_A_QUERY "nnmQuery" +#define NM_A_TQUERY "nnmQuery" #define NM_A_ARCHIVE "nnmArchive" #define NM_A_MAX_USERS "nnmMaxUsers" #define NM_A_SZ_TOPIC "NM_A_SZ_TOPIC" @@ -167,18 +167,18 @@ namespace Field { public: FieldBase() {} - FieldBase( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ); + FieldBase( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ); virtual ~FieldBase() {} TQCString tag() const; - Q_UINT8 method() const; - Q_UINT8 flags() const; - Q_UINT8 type() const; - void setFlags( const Q_UINT8 flags ); + TQ_UINT8 method() const; + TQ_UINT8 flags() const; + TQ_UINT8 type() const; + void setFlags( const TQ_UINT8 flags ); protected: TQCString m_tag; - Q_UINT8 m_method; - Q_UINT8 m_flags; - Q_UINT8 m_type; // doch needed + TQ_UINT8 m_method; + TQ_UINT8 m_flags; + TQ_UINT8 m_type; // doch needed }; typedef TQValueListIterator FieldListIterator; @@ -194,18 +194,18 @@ namespace Field */ virtual ~FieldList(); /** - * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::find(). + * Locate the first occurrence of a given field in the list. Same semantics as TQValueList::tqfind(). * @param tag The tag name of the field to search for. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator find( TQCString tag ); + FieldListIterator tqfind( TQCString tag ); /** * Locate the first occurrence of a given field in the list, starting at the supplied iterator * @param tag The tag name of the field to search for. * @param it An iterator within the list, to start searching from. * @return An iterator pointing to the first occurrence found, or end() if none was found. */ - FieldListIterator find( FieldListIterator &it, TQCString tag ); + FieldListIterator tqfind( FieldListIterator &it, TQCString tag ); /** * Get the index of the first occurrence of tag, or -1 if not found */ @@ -242,11 +242,11 @@ namespace Field /** * Single field constructor */ - SingleField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, TQVariant value ); + SingleField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ); /** * Convenience constructor for NMFIELD_METHOD_VALID fields */ - SingleField( TQCString tag, Q_UINT8 flags, Q_UINT8 type, TQVariant value ); + SingleField( TQCString tag, TQ_UINT8 flags, TQ_UINT8 type, TQVariant value ); ~SingleField(); void setValue( const TQVariant v ); TQVariant value() const; @@ -261,8 +261,8 @@ namespace Field class MultiField : public FieldBase { public: - MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type ); - MultiField( TQCString tag, Q_UINT8 method, Q_UINT8 flags, Q_UINT8 type, FieldList fields ); + MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type ); + MultiField( TQCString tag, TQ_UINT8 method, TQ_UINT8 flags, TQ_UINT8 type, FieldList fields ); ~MultiField(); FieldList fields() const; void setFields( FieldList ); diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 6dfb1d0f..0a7d7d8d 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -23,8 +23,8 @@ #include "gwfield.h" #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) - : TQObject(parent, name) +InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -76,11 +76,11 @@ bool InputProtocolBase::okToProceed() bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) { // read the length of the bytes - Q_UINT32 val; + TQ_UINT32 val; if ( !okToProceed() ) return false; m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); if ( val > NMFIELD_MAX_STR_LENGTH ) return false; //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); @@ -95,10 +95,10 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // the rest of the string will be filled with FF, // so look for that in the last position instead of \0 // this caused a crash - guessing that temp.length() is set to the number of bytes actually read... - // if ( (Q_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) + // 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" ).arg( temp.length() ).arg( val ) ); + debug( TQString( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %1 bytes out of %2" ).tqarg( temp.length() ).tqarg( val ) ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h index 529fea21..2f2f9f1e 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.h @@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se @author Kopete Developers */ -class InputProtocolBase : public QObject +class InputProtocolBase : public TQObject { Q_OBJECT + TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *parent = 0, const char *name = 0); + InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); ~InputProtocolBase(); /** @@ -63,7 +64,7 @@ protected: */ bool okToProceed(); /** - * read a Q_UINT32 giving the number of following bytes, then a string of that length + * read a TQ_UINT32 giving the number of following bytes, then a string of that length * updates the bytes parsed counter * @return false if the string was broken or there was no data available at all */ diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index 4960310a..a887c8cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -59,21 +59,21 @@ bool PrivacyManager::isPrivacyLocked() bool PrivacyManager::isBlocked( const TQString & dn ) { if ( m_defaultDeny ) - return !m_allowList.contains( dn ); + return !m_allowList.tqcontains( dn ); else - return m_denyList.contains( dn ); + return m_denyList.tqcontains( dn ); } void PrivacyManager::setAllow( const TQString & dn ) { if ( m_defaultDeny ) { - if ( !m_allowList.contains( dn ) ) + if ( !m_allowList.tqcontains( dn ) ) addAllow( dn ); } else { - if ( m_denyList.contains( dn ) ) + if ( m_denyList.tqcontains( dn ) ) removeDeny( dn ); } } @@ -82,12 +82,12 @@ void PrivacyManager::setDeny( const TQString & dn ) { if ( m_defaultDeny ) { - if ( m_allowList.contains( dn ) ) + if ( m_allowList.tqcontains( dn ) ) removeAllow( dn ); } else { - if ( !m_denyList.contains( dn ) ) + if ( !m_denyList.tqcontains( dn ) ) addDeny( dn ); } } @@ -243,7 +243,7 @@ TQStringList PrivacyManager::difference( const TQStringList & lhs, const TQStrin const TQStringList::ConstIterator rhsEnd = rhs.end(); for ( TQStringList::ConstIterator lhsIt = lhs.begin(); lhsIt != lhsEnd; ++lhsIt ) { - if ( rhs.find( *lhsIt ) == rhsEnd ) + if ( rhs.tqfind( *lhsIt ) == rhsEnd ) diff.append( *lhsIt ); } return diff; diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.h b/kopete/protocols/groupwise/libgroupwise/privacymanager.h index 0f01eb89..3d1e29f3 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.h +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.h @@ -29,9 +29,10 @@ Keeps a record of the server side privacy allow and deny lists, default policy a @author SUSE AG */ -class PrivacyManager : public QObject +class PrivacyManager : public TQObject { Q_OBJECT + TQ_OBJECT public: PrivacyManager( Client * client, const char *name = 0); ~PrivacyManager(); diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am index b7ae1bb4..e9a361d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am @@ -5,4 +5,4 @@ INCLUDES = $(all_includes) libqca_la_SOURCES = \ qca.cpp -libqca_la_LIBADD = -lqt-mt +# libqca_la_LIBADD = -lqt-mt diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp index 10cae6b8..f00eee70 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp @@ -1,5 +1,5 @@ /* - * qca.cpp - Qt Cryptographic Architecture + * qca.cpp - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -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::fromLatin1(cs); + return TQString::tqfromLatin1(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::fromLatin1(cs); + return TQString::tqfromLatin1(cs); } bool Cert::fromPEM(const TQString &str) @@ -864,8 +864,8 @@ public: TQPtrList store; }; -TLS::TLS(TQObject *parent) -:TQObject(parent) +TLS::TLS(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } @@ -1132,8 +1132,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *parent) -:TQObject(parent) +SASL::SASL(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; reset(); @@ -1232,13 +1232,13 @@ void SASL::setExternalSSF(int x) d->ext_ssf = x; } -void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->localAddr = addr; d->localPort = port; } -void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->remoteAddr = addr; d->remotePort = port; diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h index 9df6f7cd..dab99d5a 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h @@ -1,5 +1,5 @@ /* - * qca.h - Qt Cryptographic Architecture + * qca.h - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -311,9 +311,10 @@ namespace QCA void fromContext(QCA_CertContext *); }; - class QCA_EXPORT TLS : public QObject + class QCA_EXPORT TLS : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Validity { NoCert, @@ -332,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *parent=0); + TLS(TQObject *tqparent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -372,9 +373,10 @@ namespace QCA Private *d; }; - class QCA_EXPORT SASL : public QObject + class QCA_EXPORT SASL : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrAuth, ErrCrypt }; enum ErrorCond { @@ -390,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *parent=0); + SASL(TQObject *tqparent=0); ~SASL(); static void setAppName(const TQString &name); @@ -412,8 +414,8 @@ namespace QCA void setExternalAuthID(const TQString &authid); void setExternalSSF(int); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); - void setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); + void setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port); // initialize bool startClient(const TQString &service, const TQString &host, const TQStringList &mechlist, bool allowClientSendFirst=true); diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h +++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h @@ -141,7 +141,7 @@ public: struct QCA_SASLHostPort { TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; struct QCA_SASLNeedParams diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp index 0cf55684..1213b6dc 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp @@ -30,11 +30,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *parent) -:TLSHandler(parent) +QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) +:TLSHandler(tqparent) { d = new Private; - d->tls = parent; + d->tls = tqparent; connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h index e7ac398e..3a2ee71e 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h @@ -28,8 +28,9 @@ class QCA::TLS; class QCATLSHandler : public TLSHandler { Q_OBJECT + TQ_OBJECT public: - QCATLSHandler(QCA::TLS *parent); + QCATLSHandler(QCA::TLS *tqparent); ~QCATLSHandler(); QCA::TLS *tls() const; diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp index 48ee8b88..1145583a 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.cpp @@ -22,7 +22,7 @@ #include "responseprotocol.h" -ResponseProtocol::ResponseProtocol(TQObject* parent, const char* name): InputProtocolBase(parent, name) +ResponseProtocol::ResponseProtocol(TQObject* tqparent, const char* name): InputProtocolBase(tqparent, name) { } @@ -42,19 +42,19 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) m_din.setByteOrder( TQDataStream::LittleEndian ); // check that this begins with a HTTP (is a response) - Q_UINT32 val; + TQ_UINT32 val; m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); - Q_ASSERT( qstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 ); + Q_ASSERT( tqstrncmp( (const char *)&val, "HTTP", strlen( "HTTP" ) ) == 0 ); // read rest of HTTP header and look for a 301 redirect. TQCString headerFirst; if ( !readGroupWiseLine( headerFirst ) ) return 0; // pull out the HTTP return code - int firstSpace = headerFirst.find( ' ' ); - TQString rtnField = headerFirst.mid( firstSpace, headerFirst.find( ' ', firstSpace + 1 ) ); + int firstSpace = headerFirst.tqfind( ' ' ); + TQString rtnField = headerFirst.mid( firstSpace, headerFirst.tqfind( ' ', firstSpace + 1 ) ); bool ok = true; int rtnCode; int packetState = -1; @@ -71,7 +71,7 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) return 0; } headerRest.append( line ); - debug( TQString( "- read header line - (%1) : %2" ).arg( line.length() ).arg( line.data() ) ); + debug( TQString( "- read header line - (%1) : %2" ).tqarg( line.length() ).tqarg( 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" ).arg( rtnCode ) ); + debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; } if ( ok && rtnCode == 404 ) { - debug( TQString( "- server error %1" ).arg( rtnCode ) ); + debug( TQString( "- server error %1" ).tqarg( rtnCode ) ); packetState = ServerError; m_din.unsetDevice(); return 0; @@ -116,26 +116,26 @@ Transfer * ResponseProtocol::parse( const TQByteArray & wire, uint & bytes ) int resultCode = 0; Field::FieldListIterator it; Field::FieldListIterator end = m_collatingFields.end(); - it = m_collatingFields.find( NM_A_SZ_TRANSACTION_ID ); + it = m_collatingFields.tqfind( NM_A_SZ_TRANSACTION_ID ); if ( it != end ) { Field::SingleField * sf = dynamic_cast( *it ); if ( sf ) { tId = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).arg( tId ) ); + debug( TQString( "ResponseProtocol::readResponse() - transaction ID is %1" ).tqarg( tId ) ); m_collatingFields.remove( it ); delete sf; } } - it = m_collatingFields.find( NM_A_SZ_RESULT_CODE ); + it = m_collatingFields.tqfind( NM_A_SZ_RESULT_CODE ); if ( it != end ) { Field::SingleField * sf = dynamic_cast( *it ); if ( sf ) { resultCode = sf->value().toInt(); - debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).arg( resultCode ) ); + debug( TQString( "ResponseProtocol::readResponse() - result code is %1" ).tqarg( 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" ).arg(m_collatingFields.count() ) ); + debug( TQString( "ResponseProtocol::readResponse() - setting state Available, got %1 fields in base array" ).tqarg(m_collatingFields.count() ) ); packetState = Available; bytes = m_bytes; m_din.unsetDevice(); @@ -169,14 +169,14 @@ 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" ).arg( fieldCount ) ); + debug( TQString( "reading %1 fields" ).tqarg( fieldCount ) ); Field::FieldList currentList; while ( fieldCount != 0 ) // prevents bad input data from ruining our day { // the field being read // read field - Q_UINT8 type, method; - Q_UINT32 val; + TQ_UINT8 type, method; + TQ_UINT32 val; TQCString tag; // read uint8 type if ( !okToProceed() ) @@ -185,7 +185,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> type; - m_bytes += sizeof( Q_UINT8 ); + m_bytes += sizeof( TQ_UINT8 ); // if type is 0 SOMETHING_INVALID, we're at the end of the fields if ( type == 0 ) /*&& m_din->atEnd() )*/ { @@ -201,7 +201,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> method; - m_bytes += sizeof( Q_UINT8 ); + m_bytes += sizeof( TQ_UINT8 ); // read tag and length if ( !safeReadBytes( tag, val ) ) { @@ -209,7 +209,7 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } - debug( TQString( "- type: %1, method: %2, tag: %3," ).arg( type ).arg( method ).arg( tag.data() ) ); + debug( TQString( "- type: %1, method: %2, tag: %3," ).tqarg( type ).tqarg( method ).tqarg( tag.data() ) ); // if multivalue or array if ( type == NMFIELD_TYPE_MV || type == NMFIELD_TYPE_ARRAY ) { @@ -220,10 +220,10 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); // create multifield - debug( TQString( " multi field containing: %1" ).arg( val ) ); + debug( TQString( " multi field containing: %1" ).tqarg( val ) ); Field::MultiField* m = new Field::MultiField( tag, method, 0, type ); currentList.append( m ); if ( !readFields( val, ¤tList) ) @@ -248,9 +248,9 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) m_packetState = ProtocolError; break; } - // convert to unicode - ignore the terminating NUL, because Qt<3.3.2 doesn't sanity check val. + // convert to tqunicode - 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" ).arg( fieldValue ) ); + debug( TQString( "- utf/dn single field: %1" ).tqarg( fieldValue ) ); // create singlefield Field::SingleField* s = new Field::SingleField( tag, method, 0, type, fieldValue ); currentList.append( s ); @@ -265,8 +265,8 @@ bool ResponseProtocol::readFields( int fieldCount, Field::FieldList * list ) return false; } m_din >> val; - m_bytes += sizeof( Q_UINT32 ); - debug( TQString( "- numeric field: %1" ).arg( val ) ); + m_bytes += sizeof( TQ_UINT32 ); + debug( TQString( "- numeric field: %1" ).tqarg( val ) ); Field::SingleField* s = new Field::SingleField( tag, method, 0, type, val ); currentList.append( s ); } @@ -298,13 +298,13 @@ bool ResponseProtocol::readGroupWiseLine( TQCString & line ) line = TQCString(); while ( true ) { - Q_UINT8 c; + TQ_UINT8 c; if (! okToProceed() ) return false; m_din >> c; m_bytes++; - line += TQChar(c); + line += TQChar(c).ascii(); if ( c == '\n' ) break; } diff --git a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h index f64aee7d..9010ef3c 100644 --- a/kopete/protocols/groupwise/libgroupwise/responseprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/responseprotocol.h @@ -32,6 +32,7 @@ Handles the parsing of incoming Response messages class ResponseProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: /** * Describes the current state of the protocol @@ -43,7 +44,7 @@ public: */ enum PacketState { FieldsRead, ProtocolError }; - ResponseProtocol(TQObject* parent, const char* name); + ResponseProtocol(TQObject* tqparent, const char* name); ~ResponseProtocol(); /** * Attempt to parse the supplied data into an @ref Response object. diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index 9a691ec9..35fea9d1 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/kopete/protocols/groupwise/libgroupwise/rtf.cc @@ -1732,17 +1732,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.replace(TQRegExp("&"), "&"); - str.replace(TQRegExp("<"), "<"); - str.replace(TQRegExp(">"), ">"); - str.replace(TQRegExp("\""), """); - str.replace(TQRegExp("\r"), ""); + str.tqreplace(TQRegExp("&"), "&"); + str.tqreplace(TQRegExp("<"), "<"); + str.tqreplace(TQRegExp(">"), ">"); + str.tqreplace(TQRegExp("\""), """); + str.tqreplace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(TQRegExp("\n"), "
\n"); + str.tqreplace(TQRegExp("\n"), "
\n"); break; case quoteXML: - str.replace(TQRegExp("\n"), "
\n"); + str.tqreplace(TQRegExp("\n"), "
\n"); break; default: break; @@ -1759,7 +1759,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -1994,7 +1994,7 @@ void RTF2HTML::FlushParagraph() /* s += "

"; s += sParagraph; @@ -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. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // 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(); @@ -2273,7 +2273,7 @@ void Level::flush() /* const char *encoding = NULL; if (m_nEncoding){ - for (const ENCODING *c = ICQPlugin::core->encodings; c->language; c++){ + for (const ENCODING *c = ICTQPlugin::core->encodings; c->language; c++){ if (!c->bMain) continue; if ((unsigned)c->rtf_code == m_nEncoding){ @@ -2285,7 +2285,7 @@ void Level::flush() if (encoding == NULL) encoding = p->encoding; - TQTextCodec *codec = ICQClient::_getCodec(encoding); + TQTextCodec *codec = ICTQClient::_getCodec(encoding); */ //p->PrintQuoted(codec->toUnicode(text.c_str(), text.length())); p->PrintQuoted(text.c_str()); @@ -2374,15 +2374,15 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) } case IMG:{ cur_level.flush(); - const char ICQIMAGE[] = "icqimage"; + const char ICTQIMAGE[] = "icqimage"; const char *smiles[] = { ":-)" , ":-O" , ":-|" , ":-/" , // 0-3 ":-(" , ":-*" , ":-/" , ":'(" , // 4-7 ";-)" , ":-@" , ":-$" , ":-X" , // 8-B ":-P" , "8-)" , "O:)" , ":-D" }; // C-F const char *p = rtftext + 3; - if ((strlen(p) > strlen(ICQIMAGE)) && !memcmp(p, ICQIMAGE, strlen(ICQIMAGE))){ + if ((strlen(p) > strlen(ICTQIMAGE)) && !memcmp(p, ICTQIMAGE, strlen(ICTQIMAGE))){ unsigned n = 0; - for (p += strlen(ICQIMAGE); *p; p++){ + for (p += strlen(ICTQIMAGE); *p; p++){ if ((*p >= '0') && (*p <= '9')){ n = n << 4; n += (*p - '0'); @@ -2516,7 +2516,7 @@ TQString RTF2HTML::Parse(const char *rtf, const char *_encoding) } /* -bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) +bool ICTQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) { char _RTF[] = "{\\rtf"; if ((strlen(rtf) > strlen(_RTF)) && !memcmp(rtf, _RTF, strlen(_RTF))){ @@ -2524,7 +2524,7 @@ bool ICQClient::parseRTF(const char *rtf, const char *encoding, TQString &res) res = p.Parse(rtf, encoding); return true; } - TQTextCodec *codec = ICQClient::_getCodec(encoding); + TQTextCodec *codec = ICTQClient::_getCodec(encoding); res = codec->toUnicode(rtf, strlen(rtf)); return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 67e9f5f5..70d4daa5 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.replace(QRegExp("&"), "&"); - str.replace(QRegExp("<"), "<"); - str.replace(QRegExp(">"), ">"); - str.replace(QRegExp("\""), """); - str.replace(QRegExp("\r"), ""); + str.tqreplace(QRegExp("&"), "&"); + str.tqreplace(QRegExp("<"), "<"); + str.tqreplace(QRegExp(">"), ">"); + str.tqreplace(QRegExp("\""), """); + str.tqreplace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(QRegExp("\n"), "
\n"); + str.tqreplace(QRegExp("\n"), "
\n"); break; case quoteXML: - str.replace(QRegExp("\n"), "
\n"); + str.tqreplace(QRegExp("\n"), "
\n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -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. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // 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/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp index 5dde3725..9de147f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp +++ b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp @@ -62,13 +62,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h index 0d4150d9..88cfb3d4 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.h +++ b/kopete/protocols/groupwise/libgroupwise/safedelete.h @@ -57,9 +57,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h index 82752cea..f0c6223e 100644 --- a/kopete/protocols/groupwise/libgroupwise/securestream.h +++ b/kopete/protocols/groupwise/libgroupwise/securestream.h @@ -34,6 +34,7 @@ class SecureStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrTLS = ErrCustom, ErrSASL }; SecureStream(ByteStream *s); @@ -100,9 +101,10 @@ USE_TLSHANDLER }; -class SecureLayer : public QObject +class SecureLayer : public TQObject { Q_OBJECT + TQ_OBJECT public: SecureLayer(QCA::TLS *t); SecureLayer(QCA::SASL *s); diff --git a/kopete/protocols/groupwise/libgroupwise/stream.cpp b/kopete/protocols/groupwise/libgroupwise/stream.cpp index d3410578..87da3baa 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/stream.h b/kopete/protocols/groupwise/libgroupwise/stream.h index c06649fd..15544a6c 100644 --- a/kopete/protocols/groupwise/libgroupwise/stream.h +++ b/kopete/protocols/groupwise/libgroupwise/stream.h @@ -28,9 +28,10 @@ #define GW_STREAM_H -class Stream : public QObject +class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond { @@ -45,7 +46,7 @@ public: SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 96259254..142db094 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -41,22 +41,22 @@ public: Transfer * transfer; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); d->transfer = 0; - d->client = parent->client(); + d->client = tqparent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *parent, bool) +Task::Task(Client *tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -77,9 +77,9 @@ void Task::init() d->statusCode = 0; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -126,12 +126,12 @@ void Task::go(bool autoDelete) bool Task::take( Transfer * transfer) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; - // pass along the transfer to our children - TQObjectListIt it(*p); + // pass along the transfer to our tqchildren + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { TQObject *obj = it.current(); @@ -142,7 +142,7 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - client()->debug( TQString( "Transfer ACCEPTED by: %1" ).arg( t->className() ) ); + client()->debug( TQString( "Transfer ACCEPTED by: %1" ).tqarg( t->className() ) ); return true; } } @@ -256,7 +256,7 @@ void Task::clientDisconnected() void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/groupwise/libgroupwise/task.h b/kopete/protocols/groupwise/libgroupwise/task.h index b0b623d2..8d2bc380 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.h +++ b/kopete/protocols/groupwise/libgroupwise/task.h @@ -29,16 +29,17 @@ class Client; class Request; -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task( Client *, bool isRoot ); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Client *client() const; Transfer *transfer() const; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp index fb028c44..08f04b40 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp @@ -26,7 +26,7 @@ using namespace GroupWise; -ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent) +ChatCountsTask::ChatCountsTask(Task* tqparent): RequestTask(tqparent) { Field::FieldList lst; createTransfer( "chatcounts", lst ); @@ -59,9 +59,9 @@ bool ChatCountsTask::take( Transfer * transfer ) } Field::FieldList counts = resultsArray->fields(); const Field::FieldListIterator end = counts.end(); - for ( Field::FieldListIterator it = counts.find( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = counts.tqfind( NM_A_FA_CHAT ); it != end; - it = counts.find( ++it, NM_A_FA_CHAT ) ) + it = counts.tqfind( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast( *it ); Field::FieldList chat = mf->fields(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h index 6197352d..9a052dac 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatcountstask.h @@ -34,8 +34,9 @@ Get the current number of users in each chat on the server class ChatCountsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ChatCountsTask(Task* parent); + ChatCountsTask(Task* tqparent); ~ChatCountsTask(); bool take( Transfer * transfer ); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp index 7f60f3c5..fe8cf20c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp @@ -25,7 +25,7 @@ using namespace GroupWise; -ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent) +ChatPropertiesTask::ChatPropertiesTask(Task* tqparent): RequestTask(tqparent) { } @@ -82,7 +82,7 @@ bool ChatPropertiesTask::take( Transfer * transfer ) m_description = sf->value().toString(); else if ( sf->tag() == NM_A_DISCLAIMER ) m_disclaimer = sf->value().toString(); - else if ( sf->tag() == NM_A_QUERY ) + else if ( sf->tag() == NM_A_TQUERY ) m_query = sf->value().toString(); else if ( sf->tag() == NM_A_ARCHIVE ) m_archive = sf->value().toString(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h index d52661f3..dfb73139 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.h @@ -35,8 +35,9 @@ Get the current number of users in each chat on the server class ChatPropertiesTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ChatPropertiesTask(Task* parent); + ChatPropertiesTask(Task* tqparent); ~ChatPropertiesTask(); /** * Specify which chatroom to get properties for diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index c88e22b4..de78465f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -23,8 +23,8 @@ #include "conferencetask.h" -ConferenceTask::ConferenceTask( Task* parent ) - : EventTask( parent ) +ConferenceTask::ConferenceTask( Task* tqparent ) + : EventTask( tqparent ) { // register all the events that this task monitors registerEvent( GroupWise::ConferenceClosed ); @@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask() void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt ) { - 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 ) ); + 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 ) ); } 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" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message.ascii() ) ); + client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( 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" ).arg( event.message ) ); + client()->debug( TQString( "message: %1" ).tqarg( event.message ) ); emit systemBroadcast( event ); break; default: - client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) ); + client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( 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" ).arg( (*current).user ) ); + client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*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" ).arg( event.user ) ); + client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) ); client()->userDetailsManager()->requestDetails( event.user ); m_pendingEvents.append( event ); return true; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h index 7f35d08b..4a1f6d19 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.h @@ -36,8 +36,9 @@ using namespace GroupWise; class ConferenceTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - ConferenceTask( Task* parent ); + ConferenceTask( Task* tqparent ); ~ConferenceTask(); bool take( Transfer * transfer ); signals: @@ -57,7 +58,7 @@ signals: protected slots: void slotReceiveUserDetails( const GroupWise::ContactDetails & ); protected: - Q_UINT32 readFlags( TQDataStream & din ); + TQ_UINT32 readFlags( TQDataStream & din ); TQString readMessage( TQDataStream & din ); /** * Checks to see if we need more data from the client before we can propagate this event diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp index 3d041208..3778e80a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp @@ -21,7 +21,7 @@ #include "connectiontask.h" -ConnectionTask::ConnectionTask(Task* parent): EventTask(parent) +ConnectionTask::ConnectionTask(Task* tqparent): EventTask(tqparent) { registerEvent( GroupWise::UserDisconnect ); registerEvent( GroupWise::ServerDisconnect ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h index 95df34f9..da7507b1 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/connectiontask.h @@ -31,8 +31,9 @@ This task monitors connection related events, currently 'connected elsewhere' di class ConnectionTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - ConnectionTask(Task* parent); + ConnectionTask(Task* tqparent); ~ConnectionTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp index 01d2fa05..e87ee0f4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp @@ -24,7 +24,7 @@ #include "createconferencetask.h" -CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID ) +CreateConferenceTask::CreateConferenceTask(Task* tqparent): RequestTask(tqparent), m_confId( 0 ), m_guid( BLANK_GUID ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h index de66f734..c43e5725 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createconferencetask.h @@ -31,8 +31,9 @@ This task is responsible for creating a conference at the server, and confirming class CreateConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - CreateConferenceTask(Task* parent); + CreateConferenceTask(Task* tqparent); ~CreateConferenceTask(); /** * Set up a create conference request diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index d41db4a9..ae1a6984 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -21,7 +21,7 @@ #include "createcontactinstancetask.h" -CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) +CreateContactInstanceTask::CreateContactInstanceTask(Task* tqparent) : NeedFolderTask(tqparent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); @@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask() { } -void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ) { - contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder ); + contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder ); } void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -46,9 +46,9 @@ void CreateContactInstanceTask::contactFromUserIdAndFolder( const TQString & use m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ) { - contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder ); + contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder ); } void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ) @@ -61,10 +61,10 @@ void CreateContactInstanceTask::contactFromDNAndFolder( const TQString & dn, con m_folderDisplayName = folderDisplayName; } -void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ) +void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); // this is either a user Id or a DN lst.append( id ); if ( displayName.isEmpty() ) // fallback so that the contact is created diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h index 6c960a4c..84347964 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h @@ -24,26 +24,27 @@ #include "needfoldertask.h" /** -Creates a contact on the server. The response to this action is handled by its parent +Creates a contact on the server. The response to this action is handled by its tqparent @author SUSE AG */ class CreateContactInstanceTask : public NeedFolderTask { Q_OBJECT + TQ_OBJECT public: - CreateContactInstanceTask(Task* parent); + CreateContactInstanceTask(Task* tqparent); ~CreateContactInstanceTask(); /** * Sets up the request message. */ - void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ); - void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); + void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ); + void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); void contactFromUserIdAndFolder( const TQString & userId, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void contactFromDNAndFolder( const TQString & dn, const TQString & displayName, const int folderSequence, const TQString & folderDisplayName ); void onGo(); protected: - void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ); + void contact( Field::SingleField * id, const TQString & displayName, const int tqparentFolder ); void onFolderCreated(); private: TQString m_userId; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 0d167236..4e9d3e8a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -24,7 +24,7 @@ #include "createcontacttask.h" -CreateContactTask::CreateContactTask(Task* parent): Task(parent) +CreateContactTask::CreateContactTask(Task* tqparent): Task(tqparent) { } @@ -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" ).arg( (*it).name ).arg( (*it).id ) ); + client()->debug( TQString( " - contact is in folder %1 with id %2" ).tqarg( (*it).name ).tqarg( (*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" ).arg - ( addedContact.displayName ).arg( addedContact.id ).arg( addedContact.parentId ) ); + 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.tqparentId ) ); if ( m_dn.isEmpty() ) m_dn = addedContact.dn; @@ -123,7 +123,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) m_folders.pop_back(); // clear the topLevel flag once the corresponding server side entry has been successfully created - if ( addedContact.parentId == 0 ) + if ( addedContact.tqparentId == 0 ) m_topLevel = false; if ( m_folders.isEmpty() && !m_topLevel ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h index 2a46a51c..8b973361 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h @@ -42,8 +42,9 @@ using namespace GroupWise; class CreateContactTask : public Task { Q_OBJECT + TQ_OBJECT public: - CreateContactTask(Task* parent); + CreateContactTask(Task* tqparent); ~CreateContactTask(); /** * Get the userId of the contact just created @@ -64,7 +65,7 @@ public: * @param topLevel is the folder also in the top level folder? */ void contactFromUserId( const TQString & userId, const TQString & displayName, const int firstSeqNo, const TQValueList< FolderItem > folders, bool topLevel ); - //void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); + //void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); /** * This task doesn't do any I/O itself, so this take prints an error and returns false; */ diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp index c6e6a78a..363882d8 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp @@ -20,7 +20,7 @@ #include "createfoldertask.h" -CreateFolderTask::CreateFolderTask(Task* parent): ModifyContactListTask(parent) +CreateFolderTask::CreateFolderTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask() { } -void CreateFolderTask::folder( const int parentId, const int sequence, const TQString & displayName ) +void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentId ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentId ) ) ); lst.append( new Field::SingleField( NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_TYPE_UTF8, displayName ) ); lst.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, TQString::number( sequence ) ) ); createTransfer( "createfolder", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h index cac19900..4befdf40 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h @@ -31,10 +31,11 @@ Creates a folder on the server class CreateFolderTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - CreateFolderTask(Task* parent); + CreateFolderTask(Task* tqparent); ~CreateFolderTask(); - void folder( const int parentId, const int sequence, const TQString & displayName ); + void folder( const int tqparentId, const int sequence, const TQString & displayName ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp index 04ce1fb4..4559c1f7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp @@ -20,7 +20,7 @@ #include "deleteitemtask.h" -DeleteItemTask::DeleteItemTask(Task* parent): ModifyContactListTask(parent) +DeleteItemTask::DeleteItemTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask() { } -void DeleteItemTask::item( const int parentFolder, const int objectId ) +void DeleteItemTask::item( const int tqparentFolder, const int objectId ) { if ( objectId == 0 ) { @@ -37,7 +37,7 @@ void DeleteItemTask::item( const int parentFolder, const int objectId ) return; } Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); // this is either a user Id or a DN lst.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( objectId ) ) ); createTransfer( "deletecontact", lst ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h index f249c2f5..15ea9702 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h @@ -29,10 +29,11 @@ class DeleteItemTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - DeleteItemTask(Task* parent); + DeleteItemTask(Task* tqparent); ~DeleteItemTask(); - void item( const int parentFolder, const int objectId ); + void item( const int tqparentFolder, const int objectId ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp index c6bd2d85..8af45d93 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.cpp @@ -21,8 +21,8 @@ #include "gwfield.h" #include "eventtask.h" -EventTask::EventTask( Task * parent ) -: Task( parent ) +EventTask::EventTask( Task * tqparent ) +: Task( tqparent ) { } @@ -40,7 +40,7 @@ bool EventTask::forMe( Transfer * transfer, EventTransfer*& event ) const { // see if we are supposed to handle this kind of event // consider speeding this up by having 1 handler per event - return ( m_eventCodes.find( event->eventType() ) != m_eventCodes.end() ); + return ( m_eventCodes.tqfind( event->eventType() ) != m_eventCodes.end() ); } return false; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h index 609728a4..5de20281 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/eventtask.h @@ -31,8 +31,9 @@ class Transfer; class EventTask : public Task { Q_OBJECT + TQ_OBJECT public: - EventTask( Task *parent ); + EventTask( Task *tqparent ); protected: bool forMe( Transfer * transfer, EventTransfer *& event ) const; void registerEvent( GroupWise::Event e ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp index 8104ec24..81898ca2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp @@ -29,7 +29,7 @@ using namespace GroupWise; -GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent) +GetChatSearchResultsTask::GetChatSearchResultsTask(Task* tqparent): RequestTask(tqparent) { } @@ -42,7 +42,7 @@ void GetChatSearchResultsTask::poll( int queryHandle ) { Field::FieldList lst; lst.append( new Field::SingleField( NM_A_UD_OBJECT_ID, 0, NMFIELD_TYPE_UDWORD, queryHandle ) ); - lst.append( new Field::SingleField( NM_A_UD_QUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) ); + lst.append( new Field::SingleField( NM_A_UD_TQUERY_COUNT, 0, NMFIELD_TYPE_UDWORD, 10 ) ); createTransfer( "getchatsearchresults", lst ); } @@ -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_queryStatus = (SearchResultCode)sf->value().toInt(); + m_querytqStatus = (SearchResultCode)sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -72,9 +72,9 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.find( NM_A_FA_CHAT ); + for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CHAT ); it != end; - it = matches.find( ++it, NM_A_FA_CHAT ) ) + it = matches.tqfind( ++it, NM_A_FA_CHAT ) ) { Field::MultiField * mf = static_cast( *it ); Field::FieldList chat = mf->fields(); @@ -82,12 +82,12 @@ bool GetChatSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - if ( m_queryStatus != DataRetrieved ) - setError( m_queryStatus ); + if ( m_querytqStatus != DataRetrieved ) + setError( m_querytqStatus ); else { kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << " we won!" << endl; - setSuccess( m_queryStatus ); + setSuccess( m_querytqStatus ); } return true; } @@ -97,9 +97,9 @@ TQValueList< GroupWise::ChatroomSearchResult > GetChatSearchResultsTask::results return m_results; } -int GetChatSearchResultsTask::queryStatus() +int GetChatSearchResultsTask::querytqStatus() { - return m_queryStatus; + return m_querytqStatus; } 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 e85c1e74..dcafb3e7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.h @@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle returned by the class GetChatSearchResultsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchResultCode { Completed=2, Cancelled=4, Error=5, GettingData=8, DataRetrieved=9 }; - GetChatSearchResultsTask(Task* parent); + GetChatSearchResultsTask(Task* tqparent); ~GetChatSearchResultsTask(); void poll( int queryHandle); bool take( Transfer * transfer ); - int queryStatus(); + int querytqStatus(); TQValueList< GroupWise::ChatroomSearchResult > results(); private: GroupWise::ChatroomSearchResult extractChatDetails( Field::FieldList & fields ); - SearchResultCode m_queryStatus; + SearchResultCode m_querytqStatus; TQValueList< GroupWise::ChatroomSearchResult > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp index 61753d84..27a0c7f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp @@ -26,8 +26,8 @@ using namespace GroupWise; -GetDetailsTask::GetDetailsTask( Task * parent ) - : RequestTask( parent ) +GetDetailsTask::GetDetailsTask( Task * tqparent ) + : RequestTask( tqparent ) { } @@ -58,9 +58,9 @@ bool GetDetailsTask::take( Transfer * transfer ) // parse received details and signal like billio Field::MultiField * container = 0; Field::FieldListIterator end = detailsFields.end(); - for ( Field::FieldListIterator it = detailsFields.find( NM_A_FA_RESULTS ); + for ( Field::FieldListIterator it = detailsFields.tqfind( NM_A_FA_RESULTS ); it != end; - it = detailsFields.find( ++it, NM_A_FA_RESULTS ) ) + it = detailsFields.tqfind( ++it, NM_A_FA_RESULTS ) ) { container = static_cast( *it ); ContactDetails cd = extractUserDetails( container ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h index 747b494f..c45ad0e9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getdetailstask.h @@ -34,8 +34,9 @@ using namespace GroupWise; class GetDetailsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - GetDetailsTask( Task * parent ); + GetDetailsTask( Task * tqparent ); ~GetDetailsTask(); bool take( Transfer * transfer ); void userDNs( const TQStringList & userDNs ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp index 153746ea..68063261 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp @@ -22,7 +22,7 @@ #include "getstatustask.h" -GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent) +GetStatusTask::GetStatusTask(Task* tqparent): RequestTask(tqparent) { } @@ -52,7 +52,7 @@ bool GetStatusTask::take( Transfer * transfer ) responseFields.dump( true ); // parse received details and signal like billio Field::SingleField * sf = 0; - Q_UINT16 status; + TQ_UINT16 status; sf = responseFields.findSingleField( NM_A_SZ_STATUS ); if ( sf ) { @@ -60,8 +60,8 @@ bool GetStatusTask::take( Transfer * transfer ) // This must be because the sender is not on our contact list but has sent us a message. // 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::null here - emit gotStatus( m_userDN, status, TQString::null ); + // unfortunately getstatus doesn't give us an away message so we pass TQString() here + emit gottqStatus( 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 6294f053..9188fdd4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/getstatustask.h @@ -30,13 +30,14 @@ class GetStatusTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - GetStatusTask(Task* parent); + GetStatusTask(Task* tqparent); ~GetStatusTask(); void userDN( const TQString & dn ); bool take( Transfer * transfer ); signals: - void gotStatus( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); private: TQString m_userDN; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp index a14d6eec..35fab516 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp @@ -25,7 +25,7 @@ #include "joinchattask.h" -JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent) +JoinChatTask::JoinChatTask(Task* tqparent): RequestTask(tqparent) { } @@ -59,9 +59,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast( *it ); if ( contact ) @@ -83,9 +83,9 @@ bool JoinChatTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast( *it ); if ( contact ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h index 9d6babe5..654d1a64 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinchattask.h @@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation class JoinChatTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - JoinChatTask(Task* parent); + JoinChatTask(Task* tqparent); ~JoinChatTask(); void join( const TQString & displayName ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index b7b1f1cc..63a57fda 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -25,7 +25,7 @@ #include "joinconferencetask.h" -JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent) +JoinConferenceTask::JoinConferenceTask(Task* tqparent): RequestTask(tqparent) { } @@ -59,9 +59,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = participants->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast( *it ); if ( contact ) @@ -85,9 +85,9 @@ bool JoinConferenceTask::take( Transfer * transfer ) Field::SingleField * contact = 0; Field::FieldList contactList = invitees->fields(); const Field::FieldListIterator end = contactList.end(); - for ( Field::FieldListIterator it = contactList.find( NM_A_SZ_DN ); + for ( Field::FieldListIterator it = contactList.tqfind( NM_A_SZ_DN ); it != end; - it = contactList.find( ++it, NM_A_SZ_DN ) ) + it = contactList.tqfind( ++it, NM_A_SZ_DN ) ) { contact = static_cast( *it ); if ( contact ) @@ -128,14 +128,14 @@ bool JoinConferenceTask::take( Transfer * transfer ) void JoinConferenceTask::slotReceiveUserDetails( const ContactDetails & details ) { - client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).arg( details.dn ) ); + client()->debug( TQString( "JoinConferenceTask::slotReceiveUserDetails() - got %1" ).tqarg( 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?" ).arg(current ) ); + client()->debug( TQString( " - can we remove %1?" ).tqarg(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").arg( m_unknowns.count() ) ); + client()->debug( TQString( " - now %1 unknowns").tqarg( m_unknowns.count() ) ); if ( m_unknowns.empty() ) { client()->debug( " - finished()" ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h index d95e5084..29f34679 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h @@ -34,8 +34,9 @@ Sends Join Conference messages when the user accepts an invitation class JoinConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - JoinConferenceTask(Task* parent); + JoinConferenceTask(Task* tqparent); ~JoinConferenceTask(); void join( const ConferenceGuid & guid ); bool take( Transfer * transfer ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp index ac84ac2b..d3c75055 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp @@ -24,7 +24,7 @@ #include "requestfactory.h" #include "keepalivetask.h" -KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent) +KeepAliveTask::KeepAliveTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h index 04f9a352..dffe1059 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/keepalivetask.h @@ -29,8 +29,9 @@ class KeepAliveTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - KeepAliveTask(Task* parent); + KeepAliveTask(Task* tqparent); ~KeepAliveTask(); void setup(); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp index d2d58b83..516c74c3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.cpp @@ -20,7 +20,7 @@ #include "leaveconferencetask.h" -LeaveConferenceTask::LeaveConferenceTask(Task* parent): RequestTask(parent) +LeaveConferenceTask::LeaveConferenceTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h index 65ebe540..72262b9e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/leaveconferencetask.h @@ -31,8 +31,9 @@ Tells the server that you are leaving a conference (closed the chatwindow) class LeaveConferenceTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - LeaveConferenceTask(Task* parent); + LeaveConferenceTask(Task* tqparent); ~LeaveConferenceTask(); void leave( const GroupWise::ConferenceGuid & guid ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index 6a28124f..a09af45a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -25,8 +25,8 @@ #include "logintask.h" -LoginTask::LoginTask( Task * parent ) - : RequestTask( parent ) +LoginTask::LoginTask( Task * tqparent ) + : RequestTask( tqparent ) { } @@ -36,7 +36,7 @@ LoginTask::~LoginTask() void LoginTask::initialise() { - TQString command = TQString::fromLatin1("login:%1:%2").arg( client()->host() ).arg( client()->port() ); + TQString command = TQString::tqfromLatin1("login:%1:%2").tqarg( client()->host() ).tqarg( client()->port() ); Field::FieldList lst; lst.append( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, client()->userId() ) ); @@ -67,7 +67,7 @@ bool LoginTask::take( Transfer * transfer ) ContactDetails cd = extractUserDetails( loginResponseFields ); emit gotMyself( cd ); - // read the privacy settings first, because this affects all contacts' apparent status + // read the privacy settings first, because this affects all contacts' aptqparent status extractPrivacy( loginResponseFields ); extractCustomStatuses( loginResponseFields ); @@ -80,18 +80,18 @@ bool LoginTask::take( Transfer * transfer ) Field::FieldList contactListFields = contactList->fields(); Field::MultiField * container; // read folders - for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_FOLDER ); + for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_FOLDER ); it != contactListFields.end(); - it = contactListFields.find( ++it, NM_A_FA_FOLDER ) ) + it = contactListFields.tqfind( ++it, NM_A_FA_FOLDER ) ) { container = static_cast( *it ); extractFolder( container ); } // read contacts - for ( Field::FieldListIterator it = contactListFields.find( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = contactListFields.tqfind( NM_A_FA_CONTACT ); it != contactListFields.end(); - it = contactListFields.find( ++it, NM_A_FA_CONTACT ) ) + it = contactListFields.tqfind( ++it, NM_A_FA_CONTACT ) ) { container = static_cast( *it ); extractContact( container ); @@ -119,11 +119,11 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // parent + // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.parentId = current->value().toInt(); + folder.tqparentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, parent: %3, seq: %3." ).arg( folder.name ).arg( folder.id ).arg( folder.parentId ).arg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } @@ -135,11 +135,11 @@ void LoginTask::extractContact( Field::MultiField * contactContainer ) ContactItem contact; Field::SingleField * current; Field::FieldList fl = contactContainer->fields(); - // sequence number, object and parent IDs are a numeric values but are stored as strings... + // sequence number, object and tqparent IDs are a numeric values but are stored as strings... current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.parentId = current->value().toInt(); + contact.tqparentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -206,13 +206,13 @@ ContactDetails LoginTask::extractUserDetails( Field::FieldList & fields ) if ( propList ) { // Hello A Nagappan. GW gave us a multiple field where we previously got a single field - TQString parentName = propList->tag(); + TQString tqparentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) { propField = dynamic_cast( *it ); - if ( propField /*&& propField->tag() == parentName */) + if ( propField /*&& propField->tag() == tqparentName */) { TQString propValue = propField->value().toString(); TQString contents = propMap[ propField->tag() ]; @@ -241,12 +241,12 @@ void LoginTask::extractPrivacy( Field::FieldList & fields ) TQStringList denyList; // read blocking // may be a single field or may be an array - Field::FieldListIterator it = fields.find( NM_A_LOCKED_ATTR_LIST ); + Field::FieldListIterator it = fields.tqfind( NM_A_LOCKED_ATTR_LIST ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast( *it ) ) { - if ( sf->value().toString().find( NM_A_BLOCKING ) ) + if ( sf->value().toString().tqfind( NM_A_BLOCKING ) ) privacyLocked = true; } else if ( Field::MultiField * mf = dynamic_cast( *it ) ) @@ -284,7 +284,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis { TQStringList items; - Field::FieldListIterator it = fields.find( tag ); + Field::FieldListIterator it = fields.tqfind( tag ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast( *it ) ) @@ -308,7 +308,7 @@ TQStringList LoginTask::readPrivacyItems( const TQCString & tag, Field::FieldLis void LoginTask::extractCustomStatuses( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.find( NM_A_FA_CUSTOM_STATUSES ); + Field::FieldListIterator it = fields.tqfind( NM_A_FA_CUSTOM_STATUSES ); if ( it != fields.end() ) { if ( Field::MultiField * mf = dynamic_cast( *it ) ) @@ -319,21 +319,21 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) Field::MultiField * mf2 = dynamic_cast( *custStatIt ); if ( mf2 && ( mf2->tag() == NM_A_FA_STATUS ) ) { - GroupWise::CustomStatus custom; + GroupWise::CustomtqStatus custom; Field::FieldList fl2 = mf2->fields(); for ( Field::FieldListIterator custContentIt = fl2.begin(); custContentIt != fl2.end(); ++custContentIt ) { if ( Field::SingleField * sf3 = dynamic_cast( *custContentIt ) ) { if ( sf3->tag() == NM_A_SZ_TYPE ) - custom.status = (GroupWise::Status)sf3->value().toInt(); + custom.status = (GroupWise::tqStatus)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 gotCustomStatus( custom ); + emit gotCustomtqStatus( custom ); } } } @@ -342,7 +342,7 @@ void LoginTask::extractCustomStatuses( Field::FieldList & fields ) void LoginTask::extractKeepalivePeriod( Field::FieldList & fields ) { - Field::FieldListIterator it = fields.find( NM_A_UD_KEEPALIVE ); + Field::FieldListIterator it = fields.tqfind( NM_A_UD_KEEPALIVE ); if ( it != fields.end() ) { if ( Field::SingleField * sf = dynamic_cast( *it ) ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h index 3d745bf9..b099be6a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.h @@ -31,8 +31,9 @@ using namespace GroupWise; class LoginTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - LoginTask( Task * parent ); + LoginTask( Task * tqparent ); ~LoginTask(); /** * Get the login fields ready to go @@ -57,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 gotCustomStatus( const GroupWise::CustomStatus & ); + void gotCustomtqStatus( const GroupWise::CustomtqStatus & ); void gotKeepalivePeriod( int ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp index 10233a18..703c0582 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp @@ -23,7 +23,7 @@ #include "gwerror.h" #include "modifycontactlisttask.h" -ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent) +ModifyContactListTask::ModifyContactListTask(Task* tqparent): RequestTask(tqparent) { } @@ -92,7 +92,7 @@ void ModifyContactListTask::processContactChange( Field::MultiField * container current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.parentId = current->value().toInt(); + contact.tqparentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -125,9 +125,9 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container ) // name current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); folder.name = current->value().toString(); - // parent + // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.parentId = current->value().toInt(); + folder.tqparentId = current->value().toInt(); if ( container->method() == NMFIELD_METHOD_ADD ) emit gotFolderAdded( folder ); else if ( container->method() == NMFIELD_METHOD_DELETE ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h index 2f5a4939..62d02bfa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.h @@ -24,7 +24,7 @@ #include "requesttask.h" /** -This is the parent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. +This is the tqparent of all tasks that manipulate the contact list. The server responds to each one in the same way, and this task contains a take() to process this response. @author SUSE AG */ @@ -34,8 +34,9 @@ using namespace GroupWise; class ModifyContactListTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - ModifyContactListTask(Task* parent); + ModifyContactListTask(Task* tqparent); ~ModifyContactListTask(); bool take( Transfer * transfer ); signals: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 4a24f44f..044a4e24 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -22,7 +22,7 @@ #include "movecontacttask.h" -MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) +MoveContactTask::MoveContactTask(Task* tqparent): NeedFolderTask(tqparent) { // make the client tell the client app (Kopete) when we receive a contact connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); @@ -39,7 +39,7 @@ void MoveContactTask::moveContact( const ContactItem & contact, const int newPar // TODO: - write a contact_item_to_fields method and factor duplicate code like this out Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, contact.id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, contact.sequence ) ); if ( !contact.dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, contact.dn ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h index ad3bce44..adeeb68d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.h @@ -31,8 +31,9 @@ Moves a contact between folders on the server class MoveContactTask : public NeedFolderTask { Q_OBJECT + TQ_OBJECT public: - MoveContactTask(Task* parent); + MoveContactTask(Task* tqparent); ~MoveContactTask(); void moveContact( const ContactItem & contact, const int newParent ); void moveContactToNewFolder( const ContactItem & contact, const int newSequenceNumber, const TQString & folderDisplayName ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 12c7382a..842ef31c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -15,7 +15,7 @@ #include "needfoldertask.h" -NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent) +NeedFolderTask::NeedFolderTask(Task* tqparent): ModifyContactListTask(tqparent) { } @@ -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" ).arg( addedFolder.name ).arg( addedFolder.id ) ); + client()->debug( TQString( "NeedFolderTask::slotFolderAdded() - Folder %1 was created on the server, now has objectId %2" ).tqarg( addedFolder.name ).tqarg( addedFolder.id ) ); m_folderId = addedFolder.id; } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h index d1ad1a1e..167197e0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.h @@ -22,8 +22,9 @@ This Task is the ancestor of Tasks that may need to create a folder on the serve class NeedFolderTask : public ModifyContactListTask { Q_OBJECT + TQ_OBJECT public: - NeedFolderTask(Task* parent); + NeedFolderTask(Task* tqparent); ~NeedFolderTask(); void createFolder(); virtual void onFolderCreated() = 0; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index d65a5a20..ae0f9456 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -27,7 +27,7 @@ using namespace GroupWise; -PollSearchResultsTask::PollSearchResultsTask(Task* parent): RequestTask(parent) +PollSearchResultsTask::PollSearchResultsTask(Task* tqparent): RequestTask(tqparent) { } @@ -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_queryStatus = sf->value().toInt(); + m_querytqStatus = sf->value().toInt(); Field::MultiField * resultsArray = responseFields.findMultiField( NM_A_FA_RESULTS ); if ( !resultsArray ) @@ -69,9 +69,9 @@ bool PollSearchResultsTask::take( Transfer * transfer ) } Field::FieldList matches = resultsArray->fields(); const Field::FieldListIterator end = matches.end(); - for ( Field::FieldListIterator it = matches.find( NM_A_FA_CONTACT ); + for ( Field::FieldListIterator it = matches.tqfind( NM_A_FA_CONTACT ); it != end; - it = matches.find( ++it, NM_A_FA_CONTACT ) ) + it = matches.tqfind( ++it, NM_A_FA_CONTACT ) ) { Field::MultiField * mf = static_cast( *it ); Field::FieldList contact = mf->fields(); @@ -79,7 +79,7 @@ bool PollSearchResultsTask::take( Transfer * transfer ) m_results.append( cd ); } - // first field: NM_A_SZ_STATUS contains + // first field: NM_A_SZ_STATUS tqcontains #define SEARCH_PENDING 0 #define SEARCH_INPROGRESS 1 #define SEARCH_COMPLETED 2 @@ -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_queryStatus != 2 ) - setError( m_queryStatus ); + if ( m_querytqStatus != 2 ) + setError( m_querytqStatus ); else - setSuccess( m_queryStatus ); + setSuccess( m_querytqStatus ); return true; } @@ -102,9 +102,9 @@ TQValueList< GroupWise::ContactDetails > PollSearchResultsTask::results() return m_results; } -int PollSearchResultsTask::queryStatus() +int PollSearchResultsTask::querytqStatus() { - return m_queryStatus; + return m_querytqStatus; } GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::FieldList & fields ) @@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel Field::MultiField * propList = dynamic_cast( *it ); if ( propList ) { - TQString parentName = propList->tag(); + TQString tqparentName = propList->tag(); Field::FieldList propFields = propList->fields(); const Field::FieldListIterator end = propFields.end(); for ( Field::FieldListIterator it = propFields.begin(); it != end; ++it ) diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h index c03f75bb..a882a9b3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.h @@ -35,17 +35,18 @@ Search results are polled on the server, using the search handle supplied by the class PollSearchResultsTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchResultCode { Pending=0, InProgess=1, Completed=2, TimeOut=3, Cancelled=4, Error=5 }; - PollSearchResultsTask(Task* parent); + PollSearchResultsTask(Task* tqparent); ~PollSearchResultsTask(); void poll( const TQString & queryHandle); bool take( Transfer * transfer ); - int queryStatus(); + int querytqStatus(); TQValueList< GroupWise::ContactDetails > results(); GroupWise::ContactDetails extractUserDetails( Field::FieldList & fields ); private: - int m_queryStatus; + int m_querytqStatus; TQValueList< GroupWise::ContactDetails > m_results; }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp index 508b3306..2c9ac7ef 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.cpp @@ -20,7 +20,7 @@ #include "privacyitemtask.h" -PrivacyItemTask::PrivacyItemTask( Task* parent) : RequestTask( parent ) +PrivacyItemTask::PrivacyItemTask( Task* tqparent) : RequestTask( tqparent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h index 401dc765..de894186 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/privacyitemtask.h @@ -31,8 +31,9 @@ Adds a contact to the server side allow or deny lists class PrivacyItemTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - PrivacyItemTask( Task* parent); + PrivacyItemTask( Task* tqparent); ~PrivacyItemTask(); void allow( const TQString & dn ); void deny( const TQString & dn ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp index 2b252ff5..9a3f8780 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.cpp @@ -20,7 +20,7 @@ #include "rejectinvitetask.h" -RejectInviteTask::RejectInviteTask(Task* parent): RequestTask(parent) +RejectInviteTask::RejectInviteTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h index b82f4e77..b7ee62f0 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/rejectinvitetask.h @@ -31,8 +31,9 @@ Used to reject an invitation to join a conference class RejectInviteTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - RejectInviteTask(Task* parent); + RejectInviteTask(Task* tqparent); ~RejectInviteTask(); void reject( const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp index 44f54124..12645297 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.cpp @@ -26,8 +26,8 @@ #include "requesttask.h" -RequestTask::RequestTask( Task * parent ) -: Task( parent ) +RequestTask::RequestTask( Task * tqparent ) +: Task( tqparent ) { } @@ -50,7 +50,7 @@ void RequestTask::onGo() { if ( transfer() ) { - client()->debug( TQString( "%1::onGo() - sending %2 fields" ).arg( className() ).arg( static_cast( transfer() )->command() ) ); + client()->debug( TQString( "%1::onGo() - sending %2 fields" ).tqarg( className() ).tqarg( static_cast( transfer() )->command() ) ); send( static_cast( transfer() ) ); } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h index 71101fab..e12bd741 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/requesttask.h @@ -28,8 +28,9 @@ class Transfer; class RequestTask : public Task { Q_OBJECT + TQ_OBJECT public: - RequestTask( Task *parent ); + RequestTask( Task *tqparent ); bool take( Transfer * transfer ); virtual void onGo(); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 87694eb4..e0e56634 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -40,7 +40,7 @@ using namespace GroupWise; -SearchChatTask::SearchChatTask(Task* parent): RequestTask(parent), m_polls( 0 ) +SearchChatTask::SearchChatTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) { } @@ -91,9 +91,9 @@ void SearchChatTask::slotPollForResults() void SearchChatTask::slotGotPollResults() { GetChatSearchResultsTask * gcsrt = (GetChatSearchResultsTask *)sender(); - kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->queryStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << gcsrt->querytqStatus() << endl; m_polls++; - switch ( gcsrt->queryStatus() ) + switch ( gcsrt->querytqStatus() ) { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h index ea887657..4d010ffe 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.h @@ -35,10 +35,11 @@ This Task searches for chatrooms on the server class SearchChatTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: enum SearchType { FetchAll=0, SinceLastSearch }; - SearchChatTask(Task* parent); + SearchChatTask(Task* tqparent); ~SearchChatTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 1b64c47d..2d0522c3 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -39,7 +39,7 @@ using namespace GroupWise; -SearchUserTask::SearchUserTask(Task* parent): RequestTask(parent), m_polls( 0 ) +SearchUserTask::SearchUserTask(Task* tqparent): RequestTask(tqparent), m_polls( 0 ) { } @@ -50,7 +50,7 @@ SearchUserTask::~SearchUserTask() void SearchUserTask::search( const TQValueList & query ) { - m_queryHandle = TQString::number( TQDateTime::currentDateTime().toTime_t () ); + m_queryHandle = TQString::number( TQDateTime::tqcurrentDateTime().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->queryStatus() << endl; + kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "status code is " << psrt->querytqStatus() << endl; m_polls++; - switch ( psrt->queryStatus() ) + switch ( psrt->querytqStatus() ) { case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h index d5347c73..5e79ac2f 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.h @@ -33,8 +33,9 @@ This Task performs user searching on the server class SearchUserTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - SearchUserTask(Task* parent); + SearchUserTask(Task* tqparent); ~SearchUserTask(); /** diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp index 9fa7d65e..60d9f986 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp @@ -20,7 +20,7 @@ #include "sendinvitetask.h" -SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent) +SendInviteTask::SendInviteTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h index b08c7259..70672e3e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendinvitetask.h @@ -33,7 +33,7 @@ This sends an invitation to a conference class SendInviteTask : public RequestTask { public: - SendInviteTask(Task* parent); + SendInviteTask(Task* tqparent); ~SendInviteTask(); void invite( const GroupWise::ConferenceGuid & guid, const TQStringList & invitees, const GroupWise::OutgoingMessage & msg ); private: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp index fdf1173f..13e65435 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.cpp @@ -20,7 +20,7 @@ #include "sendmessagetask.h" -SendMessageTask::SendMessageTask(Task* parent): RequestTask(parent) +SendMessageTask::SendMessageTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h index 44559e15..95175d77 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/sendmessagetask.h @@ -32,7 +32,7 @@ Sends messages to a particular conference on the server class SendMessageTask : public RequestTask { public: - SendMessageTask(Task* parent); + SendMessageTask(Task* tqparent); ~SendMessageTask(); void message( const TQStringList & recipientDNList, const OutgoingMessage & msg ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp index bf463407..696ffffa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.cpp @@ -22,7 +22,7 @@ using namespace GroupWise; -SetStatusTask::SetStatusTask(Task* parent): RequestTask(parent) +SetStatusTask::SetStatusTask(Task* tqparent): RequestTask(tqparent) { } @@ -30,20 +30,20 @@ SetStatusTask::~SetStatusTask() { } -void SetStatusTask::status( Status newStatus, const TQString &awayMessage, const TQString &autoReply ) +void SetStatusTask::status( tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ) { - if ( newStatus > GroupWise::Invalid ) + if ( newtqStatus > GroupWise::Invalid ) { - setError( 1, "Invalid Status" ); + setError( 1, "Invalid tqStatus" ); return; } - m_status = newStatus; + m_status = newtqStatus; m_awayMessage = awayMessage; m_autoReply = autoReply; Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newStatus ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UTF8, TQString::number( newtqStatus ) ) ); 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( Status newStatus, const TQString &awayMessage, const createTransfer( "setstatus", lst ); } -Status SetStatusTask::requestedStatus() const +tqStatus SetStatusTask::requestedtqStatus() const { return m_status; } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h index 4e41e681..72eaf9a4 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/setstatustask.h @@ -30,15 +30,16 @@ class SetStatusTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - SetStatusTask(Task* parent); + SetStatusTask(Task* tqparent); ~SetStatusTask(); - void status( GroupWise::Status newStatus, const TQString &awayMessage, const TQString &autoReply ); - GroupWise::Status requestedStatus() const; + void status( GroupWise::tqStatus newtqStatus, const TQString &awayMessage, const TQString &autoReply ); + GroupWise::tqStatus requestedtqStatus() const; TQString awayMessage() const; TQString autoReply() const; private: - GroupWise::Status m_status; + GroupWise::tqStatus 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 e7272402..fa360a45 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.cpp @@ -22,7 +22,7 @@ #include "statustask.h" -StatusTask::StatusTask(Task* parent): EventTask(parent) +StatusTask::StatusTask(Task* tqparent): EventTask(tqparent) { registerEvent( GroupWise::StatusChange ); } @@ -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" ).arg( event->source() ).arg( event->status() ).arg( event->statusText() ) ); - emit gotStatus( event->source().lower(), event->status(), event->statusText() ); + 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() ); return true; } else diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h index 2a57cd04..90d46bc7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/statustask.h @@ -29,12 +29,13 @@ class StatusTask : public EventTask { Q_OBJECT + TQ_OBJECT public: - StatusTask(Task* parent); + StatusTask(Task* tqparent); ~StatusTask(); bool take( Transfer * transfer ); signals: - void gotStatus( const TQString & contactId, Q_UINT16 status, const TQString & statusText ); + void gottqStatus( const TQString & contactId, TQ_UINT16 status, const TQString & statusText ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp index 2a421752..f9136eca 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.cpp @@ -22,7 +22,7 @@ #include "typingtask.h" -TypingTask::TypingTask(Task* parent): RequestTask(parent) +TypingTask::TypingTask(Task* tqparent): RequestTask(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h index 4f4da1cd..84fe6e46 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/typingtask.h @@ -31,9 +31,10 @@ class TypingTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - TypingTask(Task* parent); + TypingTask(Task* tqparent); ~TypingTask(); void typing( const GroupWise::ConferenceGuid & guid, const bool typing ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp index aa75441d..e1a863a7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp @@ -24,7 +24,7 @@ using namespace GroupWise; -UpdateContactTask::UpdateContactTask(Task* parent): UpdateItemTask(parent) +UpdateContactTask::UpdateContactTask(Task* tqparent): UpdateItemTask(tqparent) { } @@ -48,7 +48,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); @@ -61,7 +61,7 @@ void UpdateContactTask::renameContact( const TQString & newName, const TQValueLi { Field::FieldList contactFields; contactFields.append( new Field::SingleField( NM_A_SZ_OBJECT_ID, 0, NMFIELD_TYPE_UTF8, (*it).id ) ); - contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).tqparentId ) ); contactFields.append( new Field::SingleField( NM_A_SZ_SEQUENCE_NUMBER, 0, NMFIELD_TYPE_UTF8, (*it).sequence ) ); if ( !(*it).dn.isNull() ) contactFields.append( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, (*it).dn ) ); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h index 4126658e..5ced02a5 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.h @@ -32,8 +32,9 @@ class UpdateContactTask : public UpdateItemTask { Q_OBJECT + TQ_OBJECT public: - UpdateContactTask(Task* parent); + UpdateContactTask(Task* tqparent); ~UpdateContactTask(); void renameContact( const TQString& newName, const TQValueList & contactInstances ); TQString displayName(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp index 3f8ff7bf..af0785de 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp @@ -21,7 +21,7 @@ #include "updatefoldertask.h" -UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent) +UpdateFolderTask::UpdateFolderTask(Task* tqparent): UpdateItemTask(tqparent) { } @@ -39,7 +39,7 @@ void UpdateFolderTask::renameFolder( const TQString & newName, const GroupWise:: renamed.name = newName; // add the new version of the folder, marked add lst.append( new Field::MultiField( NM_A_FA_FOLDER, NMFIELD_METHOD_ADD, 0, NMFIELD_TYPE_ARRAY, folderToFields( renamed ) ) ); - // let our parent class package it up as a contactlist in a transfer + // let our tqparent class package it up as a contactlist in a transfer UpdateItemTask::item( lst ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h index 479a6bdd..90882a3d 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatefoldertask.h @@ -31,8 +31,9 @@ Renames a folder on the server class UpdateFolderTask : public UpdateItemTask { Q_OBJECT + TQ_OBJECT public: - UpdateFolderTask(Task* parent); + UpdateFolderTask(Task* tqparent); ~UpdateFolderTask(); void renameFolder( const TQString & newName, const GroupWise::FolderItem & existing ); protected: diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp index 1af4ef12..95edb593 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.cpp @@ -20,7 +20,7 @@ #include "updateitemtask.h" -UpdateItemTask::UpdateItemTask( Task* parent) : RequestTask( parent ) +UpdateItemTask::UpdateItemTask( Task* tqparent) : RequestTask( tqparent ) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h index a087d276..a988e371 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updateitemtask.h @@ -31,8 +31,9 @@ Rename a folder or contact on the server. In future may be used for changing th class UpdateItemTask : public RequestTask { Q_OBJECT + TQ_OBJECT public: - UpdateItemTask( Task* parent ); + UpdateItemTask( Task* tqparent ); ~UpdateItemTask(); void item( Field::FieldList updateItemFields ); }; diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h index fcd540fc..a40f337c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h +++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h @@ -20,18 +20,19 @@ #include "gwclientstream.h" #include "gwconnector.h" #include -#include "qcatlshandler.h" +#include "tqcatlshandler.h" #include "requestfactory.h" #include "request.h" #include "usertransfer.h" #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class ClientStreamTest : public QApplication +class ClientStreamTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: ClientStreamTest(int argc, char ** argv); diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp index 2dace60b..69cd1991 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp @@ -11,12 +11,12 @@ int main() { buildFakeContactList(); // look for a field in the list -/* if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() ) +/* if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() ) printf( "Found a field, where there was supposed to be one :)\n" ); else printf( "Didn't find a field, where there was supposed to be one :(\n" ); Field::FieldListIterator it; - if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) + if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() ) printf( "Found a field, where there was NOT supposed to be one :(\n" ); else printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/ @@ -26,19 +26,19 @@ int main() printf( "\nNow testing find routines.\n"); // find the field containing the contact list - Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) ); + Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) ); if ( clf ) { Field::FieldList cl = clf->fields(); // look for a folder in the list - Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER ); + Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER ); if ( it != cl.end() ) printf( "Found the first folder :)\n"); else printf( "Didn't find the first folder, where did it go? :(\n"); printf( "Looking for a second folder :)\n"); - it = cl.find( ++it, NM_A_FA_FOLDER ); + it = cl.tqfind( ++it, NM_A_FA_FOLDER ); if ( it == cl.end() ) printf( "Didn't find a second folder :)\n" ); else @@ -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::fromLatin1( "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::tqfromLatin1( "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::fromLatin1( "maeuschen" ) ); + sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "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::fromLatin1( "bla bla" ) ); + sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "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/tlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp index 16527bba..21010e57 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.cpp @@ -19,8 +19,8 @@ #include "tlshandler.h" -TLSHandler::TLSHandler(TQObject *parent) -:TQObject(parent) +TLSHandler::TLSHandler(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h index ede9d4e3..67c47409 100644 --- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h +++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h @@ -28,11 +28,12 @@ //#include //#include -class TLSHandler : public QObject +class TLSHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - TLSHandler(TQObject *parent=0); + TLSHandler(TQObject *tqparent=0); virtual ~TLSHandler(); virtual void reset()=0; diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index ceb29632..315a60d0 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -20,8 +20,8 @@ #include "userdetailsmanager.h" -UserDetailsManager::UserDetailsManager( Client * parent, const char *name) - : TQObject(parent, name), m_client( parent ) +UserDetailsManager::UserDetailsManager( Client * tqparent, const char *name) + : TQObject(tqparent, name), m_client( tqparent ) { } @@ -41,8 +41,8 @@ bool UserDetailsManager::known( const TQString & dn ) { if ( dn == m_client->userDN() ) return true; - // TODO: replace with m_detailsMap.contains( dn ); - TQStringList::Iterator found = m_detailsMap.keys().find( dn ); + // TODO: replace with m_detailsMap.tqcontains( dn ); + TQStringList::Iterator found = m_detailsMap.keys().tqfind( dn ); // we always know the local user's details, so don't look them up return ( found !=m_detailsMap.keys().end() ); } @@ -85,10 +85,10 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU // don't request details we already have unless the caller specified this if ( onlyUnknown && known( *it ) ) break; - TQStringList::Iterator found = m_pendingDNs.find( *it ); + TQStringList::Iterator found = m_pendingDNs.tqfind( *it ); if ( found == m_pendingDNs.end() ) { - m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).arg( (*it) ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails - including %1" ).tqarg( (*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" ).arg( dn ) ); + m_client->debug( TQString( "UserDetailsManager::requestDetails for %1" ).tqarg( dn ) ); TQStringList list; list.append( dn ); requestDetails( list, onlyUnknown ); diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h index f5a5ff6c..e7ba7ac4 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.h @@ -31,11 +31,12 @@ Several client event handling processes require that a contact's details are ava @author SUSE AG */ -class UserDetailsManager : public QObject +class UserDetailsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - UserDetailsManager( Client * parent, const char *name = 0); + UserDetailsManager( Client * tqparent, const char *name = 0); ~UserDetailsManager(); /** * List of DNs that we have already received details for diff --git a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index b5cfabcc..6b3d89f7 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -1,6 +1,6 @@ GroupWiseAccountPreferences - + GroupWiseAccountPreferences @@ -25,11 +25,11 @@ 0 - + tabWidget11 - + tab @@ -40,7 +40,7 @@ unnamed - + groupBox55 @@ -51,15 +51,15 @@ unnamed - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -76,7 +76,7 @@ The account name of your account. - + m_userId @@ -94,7 +94,7 @@ m_password - + m_autoConnect @@ -119,15 +119,15 @@ Horizontal - + - layout66 + tqlayout66 unnamed - + labelServer @@ -155,7 +155,7 @@ The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com). - + m_server @@ -172,7 +172,7 @@ The IP address or hostname of the server you would like to connect to (for example im.yourcorp.com). - + labelPort @@ -200,7 +200,7 @@ The port on the server that you would like to connect to (default is 5222). - + m_port @@ -240,7 +240,7 @@ - + TabPage @@ -251,7 +251,7 @@ unnamed - + m_alwaysAccept @@ -269,7 +269,7 @@ Expanding - + 20 91 @@ -279,14 +279,14 @@ - + labelStatusMessage - + AlignCenter @@ -316,5 +316,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082 - + diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5ece3882..5f48d727 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -45,8 +45,8 @@ #include "gwaddui.h" #include "userdetailsmanager.h" -GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent, const char* name ) - : AddContactPage(parent, name) +GroupWiseAddContactPage::GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent, const char* name ) + : AddContactPage(tqparent, name) { m_account = static_cast( owner ); kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; @@ -73,7 +73,7 @@ GroupWiseAddContactPage::~GroupWiseAddContactPage() // i18n( "There was an error while carrying out your search. Please change your search terms or try again later." ) } -bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact ) +bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* tqparentContact ) { if ( validateData() ) { @@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta else return false; - return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ); + return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); } else return false; diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.h b/kopete/protocols/groupwise/ui/gwaddcontactpage.h index 209a601a..10a36e21 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.h +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.h @@ -41,8 +41,9 @@ class GroupWiseContactSearch; class GroupWiseAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* parent = 0, const char* name = 0 ); + GroupWiseAddContactPage( Kopete::Account * owner, TQWidget* tqparent = 0, const char* name = 0 ); ~GroupWiseAddContactPage(); /** diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui index 16859bef..6c360392 100644 --- a/kopete/protocols/groupwise/ui/gwaddui.ui +++ b/kopete/protocols/groupwise/ui/gwaddui.ui @@ -1,6 +1,6 @@ GroupWiseAddUI - + GroupWiseAddUI @@ -28,11 +28,11 @@ 0 - + m_tabWidget - + tab @@ -43,7 +43,7 @@ unnamed - + bg_addMethod @@ -54,7 +54,7 @@ unnamed - + m_userName @@ -68,7 +68,7 @@ Type some or all of the contact's name. Matches will be shown below - + rb_userId @@ -79,7 +79,7 @@ true - + rb_userName @@ -90,7 +90,7 @@ Userna&me: - + m_userId @@ -108,7 +108,7 @@ - + tab @@ -133,5 +133,5 @@ setEnabled(bool) - + diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 1cfee7ee..41b26f66 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -29,16 +29,16 @@ #include "gwchatpropsdialog.h" -GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), +GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); } GroupWiseChatPropsDialog::GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ) - : KDialogBase( parent, name, false, i18n( "Chatroom properties" ), + TQWidget * tqparent, const char * name ) + : KDialogBase( tqparent, name, false, i18n( "Chatroom properties" ), KDialogBase::Ok|KDialogBase::Cancel, Ok, true ), m_dirty( false ) { initialise(); diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h index 7228bb57..d7ba18c3 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.h @@ -41,16 +41,17 @@ class GroupWiseChatPropsWidget; class GroupWiseChatPropsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Construct an empty dialog */ - GroupWiseChatPropsDialog( TQWidget * parent, const char * name ); + GroupWiseChatPropsDialog( TQWidget * tqparent, const char * name ); /** * Construct a populated dialog */ GroupWiseChatPropsDialog( const GroupWise::Chatroom & room, bool readOnly, - TQWidget * parent, const char * name ); + TQWidget * tqparent, const char * name ); ~GroupWiseChatPropsDialog() {} diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index ecb764b9..651a3b17 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -1,6 +1,6 @@ GroupWiseChatPropsWidget - + GroupWiseChatPropsWidget @@ -19,7 +19,7 @@ unnamed - + m_displayName @@ -27,15 +27,15 @@ DISPLAY NAME - + - layout16 + tqlayout16 unnamed - + m_creator @@ -49,7 +49,7 @@ The user who created the chatroom - + textLabel10_2 @@ -60,7 +60,7 @@ m_firstName_2 - + lblTopic @@ -71,7 +71,7 @@ m_displayName - + m_disclaimer @@ -85,7 +85,7 @@ A disclaimer for users entering the chatroom - + m__2_2 @@ -96,7 +96,7 @@ m_displayName_3 - + m_topic @@ -110,7 +110,7 @@ The current topic of the discussion - + m_query @@ -124,7 +124,7 @@ UNKNOWN - + textLabel11_2_2 @@ -135,7 +135,7 @@ m_lastName_2_2 - + m__2_2_2 @@ -146,7 +146,7 @@ m_displayName_3 - + lbl_displayName_2 @@ -157,7 +157,7 @@ m_displayName_2 - + m_description @@ -171,7 +171,7 @@ General description of the chatroom - + m_maxUsers @@ -185,7 +185,7 @@ Maximum simultaneous users allowed in the chatroom - + textLabel10 @@ -196,7 +196,7 @@ m_firstName - + textLabel11 @@ -207,7 +207,7 @@ m_lastName - + m_createdOn @@ -221,7 +221,7 @@ Date and time the chatroom was created - + m_archive @@ -235,7 +235,7 @@ Indicates if the chatroom is being archived on the server - + m_owner @@ -265,7 +265,7 @@ - + buttonGroup2 @@ -276,7 +276,7 @@ unnamed - + m_chkRead @@ -290,7 +290,7 @@ General permission to read messages in the chatroom - + m_chkWrite @@ -304,7 +304,7 @@ General permission to write messages in the chatroom - + m_chkModify @@ -320,7 +320,7 @@ - + textLabel1 @@ -339,9 +339,9 @@ Access permissions for specific users - + - layout15 + tqlayout15 @@ -384,7 +384,7 @@ - + klistbox.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index b9021b1f..5c55310d 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -34,8 +34,8 @@ #include "gwchatsearchdialog.h" -GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Search Chatrooms" ), +GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Search Chatrooms" ), KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel, Ok, true ), m_account( account ) { m_widget = new GroupWiseChatSearchWidget( this ); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h index c65cfa43..e22860d3 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.h +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.h @@ -29,8 +29,9 @@ class GroupWiseChatSearchWidget; class GroupWiseChatSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWiseChatSearchDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWiseChatSearchDialog(); protected: void populateWidget(); diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index f6f2014c..c239ce86 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -1,6 +1,6 @@ GroupWiseChatSearchWidget - + GroupWiseChatSearchWidget @@ -63,9 +63,9 @@ false - + - layout2 + tqlayout2 @@ -89,14 +89,14 @@ Expanding - + 340 20 - + m_btnRefresh @@ -108,7 +108,7 @@ - + klistview.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 92f4da11..7c7042dd 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -41,13 +41,13 @@ #include "gwcontactproperties.h" -GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget m_propsWidget->m_userId->setText( contact->contactId() ); - m_propsWidget->m_status->setText( contact->onlineStatus().description() ); + m_propsWidget->m_status->setText( contact->onlinetqStatus().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() ); @@ -56,8 +56,8 @@ GroupWiseContactProperties::GroupWiseContactProperties( GroupWiseContact * conta m_dialog->show(); } -GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *parent, const char *name ) - : TQObject(parent, name) +GroupWiseContactProperties::GroupWiseContactProperties( GroupWise::ContactDetails cd, TQWidget *tqparent, const char *name ) + : TQObject(tqparent, name) { init(); // set up the contents of the props widget @@ -78,7 +78,7 @@ GroupWiseContactProperties::~GroupWiseContactProperties() void GroupWiseContactProperties::init() { - m_dialog = new KDialogBase( ::qt_cast( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); + m_dialog = new KDialogBase( ::tqqt_cast( tqparent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); @@ -137,7 +137,7 @@ void GroupWiseContactProperties::slotCopy() kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; if ( m_propsWidget->m_propsView->currentItem() ) { - QClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); cb->setText( m_propsWidget->m_propsView->currentItem()->text( 1 ) ); } } diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.h b/kopete/protocols/groupwise/ui/gwcontactproperties.h index 226a6229..38cce07d 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.h +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.h @@ -32,18 +32,19 @@ Logic, wrapping UI, for displaying contact properties @author SUSE AG */ -class GroupWiseContactProperties : public QObject +class GroupWiseContactProperties : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Display properties given a GroupWiseContact */ - GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *parent, const char *name ); + GroupWiseContactProperties( GroupWiseContact * contact, TQWidget *tqparent, const char *name ); /** * Display properties given a GroupWise::ContactDetails */ - GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *parent = 0, const char *name = 0 ); + GroupWiseContactProperties( GroupWise::ContactDetails contactDetails, TQWidget *tqparent = 0, const char *name = 0 ); ~GroupWiseContactProperties(); protected: void setupProperties( TQMap< TQString, TQString > serverProps ); diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 3aece991..12e0deb2 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -1,6 +1,6 @@ GroupWiseContactPropsWidget - + GroupWiseContactPropsWidget @@ -16,7 +16,7 @@ unnamed - + m_userId @@ -46,15 +46,15 @@ Horizontal - + - layout15 + tqlayout15 unnamed - + m_lastName @@ -68,15 +68,15 @@ Change the display name used for this contact - + textLabel14 - Status: + tqStatus: - + m_displayName @@ -90,7 +90,7 @@ Change the display name used for this contact - + m_status @@ -98,7 +98,7 @@ USER_STATUS - + textLabel10 @@ -106,7 +106,7 @@ First name: - + lbl_displayName @@ -117,7 +117,7 @@ m_displayName - + m_firstName @@ -131,7 +131,7 @@ Change the display name used for this contact - + textLabel11 @@ -155,7 +155,7 @@ Horizontal - + textLabel15 @@ -204,7 +204,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 868072ce..8c215959 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -1,6 +1,6 @@ GroupWiseContactSearchWidget - + GroupWiseContactSearchWidget @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -38,7 +38,7 @@ m_firstName - + textLabel3 @@ -49,7 +49,7 @@ m_userId - + textLabel4 @@ -60,17 +60,17 @@ m_title - + m_userId - + m_firstName - + textLabel5 @@ -81,10 +81,10 @@ m_dept - + - contains + tqcontains @@ -101,10 +101,10 @@ m_userIdOperation - + - contains + tqcontains @@ -121,15 +121,15 @@ m_firstNameOperation - + m_dept - + - contains + tqcontains @@ -146,7 +146,7 @@ m_lastNameOperation - + textLabel2 @@ -157,7 +157,7 @@ m_lastName - + m_clear @@ -165,10 +165,10 @@ Cl&ear - + - contains + tqcontains @@ -185,17 +185,17 @@ m_deptOperation - + m_title - + m_lastName - + m_search @@ -206,10 +206,10 @@ true - + - contains + tqcontains @@ -242,7 +242,7 @@ Horizontal - + textLabel9 @@ -253,18 +253,18 @@ m_results - + - layout12 + tqlayout12 unnamed - + - Status + tqStatus true @@ -316,15 +316,15 @@ AllColumns - + - layout8 + tqlayout8 unnamed - + m_details @@ -345,7 +345,7 @@ Expanding - + 20 141 @@ -356,7 +356,7 @@ - + m_matchCount @@ -382,5 +382,5 @@ m_details m_firstNameOperation - + diff --git a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui index 43a9af15..366cb717 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -1,6 +1,6 @@ GroupWiseCustomStatusEdit - + GroupWiseCustomStatusEdit @@ -19,15 +19,15 @@ unnamed - + - layout3 + tqlayout3 unnamed - + m_name @@ -41,23 +41,23 @@ - + - m_cmbStatus + m_cmbtqStatus - + textLabel3 - &Status: + &tqStatus: comboBox1 - + textLabel2 @@ -68,7 +68,7 @@ lineEdit2 - + textLabel1 @@ -79,7 +79,7 @@ lineEdit1 - + m_awayMessage @@ -88,5 +88,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index 8c69aa76..df25aaef 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -1,6 +1,6 @@ GroupWiseCustomStatusWidget - + GroupWiseCustomStatusWidget @@ -52,15 +52,15 @@ true - + - layout2 + tqlayout2 unnamed - + m_btnAdd @@ -68,7 +68,7 @@ &Add - + m_btnEdit @@ -76,7 +76,7 @@ &Edit - + m_btnRemove @@ -94,7 +94,7 @@ Expanding - + 20 41 @@ -105,7 +105,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 7f049d7c..43ae480d 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "gweditaccountwidget.h" -GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* theAccount) -: TQWidget( parent ), KopeteEditAccountWidget( theAccount ) +GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* theAccount) +: TQWidget( tqparent ), KopeteEditAccountWidget( theAccount ) { kdDebug(GROUPWISE_DEBUG_GLOBAL) << k_funcinfo << endl; m_layout = new TQVBoxLayout( this ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.h b/kopete/protocols/groupwise/ui/gweditaccountwidget.h index 42a0400a..24171353 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.h +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.h @@ -36,8 +36,9 @@ class GroupWiseAccountPreferences; class GroupWiseEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - GroupWiseEditAccountWidget( TQWidget* parent, Kopete::Account* account); + GroupWiseEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); ~GroupWiseEditAccountWidget(); diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 8b09cab6..13070437 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -1,6 +1,6 @@ GroupWisePrivacyWidget - + GroupWisePrivacyWidget @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -24,23 +24,23 @@ Who can see my online status and send me messages: - + - layout11 + tqlayout11 unnamed - + - layout9 + tqlayout9 unnamed - + textLabel2 @@ -51,16 +51,16 @@ m_allowList - + m_allowList - + - layout8 + tqlayout8 @@ -76,14 +76,14 @@ Expanding - + 20 21 - + m_btnBlock @@ -91,7 +91,7 @@ &Block >> - + m_btnAllow @@ -109,14 +109,14 @@ Expanding - + 20 53 - + m_btnAdd @@ -124,7 +124,7 @@ A&dd... - + m_btnRemove @@ -142,7 +142,7 @@ Expanding - + 20 52 @@ -151,15 +151,15 @@ - + - layout10 + tqlayout10 unnamed - + textLabel3 @@ -170,7 +170,7 @@ m_denyList - + m_denyList @@ -179,7 +179,7 @@ - + m_status @@ -189,5 +189,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index f18d6737..462d53ee 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -36,7 +36,7 @@ #include "userdetailsmanager.h" #include "gwprivacydialog.h" -class PrivacyLBI : public QListBoxPixmap +class PrivacyLBI : public TQListBoxPixmap { public: PrivacyLBI( TQListBox * listBox, const TQPixmap & pixmap, const TQString & text, const TQString & dn ) @@ -48,8 +48,8 @@ private: TQString m_dn; }; -GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).arg( account->accountId() ), +GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Account specific privacy settings", "Manage Privacy for %1" ).tqarg( 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").arg( 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").tqarg( m_account->accountId() ) ); } #include "gwprivacydialog.moc" diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.h b/kopete/protocols/groupwise/ui/gwprivacydialog.h index 27ead5d8..0211e85e 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.h +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.h @@ -34,8 +34,9 @@ Logic for the UI part managing the allow and deny lists, and the default privacy class GroupWisePrivacyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * parent, const char * name ); + GroupWisePrivacyDialog( GroupWiseAccount * account, TQWidget * tqparent, const char * name ); ~GroupWisePrivacyDialog(); protected: void commitChanges(); diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 6005f61a..d8846bbd 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -33,8 +33,8 @@ #include "gwreceiveinvitationdialog.h" -ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name) - : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, parent, name, false ) +ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name) + : KDialogBase( i18n("Invitation to Conversation"), KDialogBase::Yes|KDialogBase::No, KDialogBase::Yes, KDialogBase::No, tqparent, name, false ) { m_account = account; m_guid = event.guid; @@ -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("%1").arg( event.message ) ); + m_wid->m_message->setText( TQString("%1").tqarg( event.message ) ); setMainWidget( m_wid ); } diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h index 529ceaa3..20cb28e6 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.h @@ -31,8 +31,9 @@ This is the dialog that is shown when you receive an invitation to chat. class ReceiveInvitationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *parent, const char *name ); + ReceiveInvitationDialog( GroupWiseAccount * account, const ConferenceEvent & event, TQWidget *tqparent, const char *name ); ~ReceiveInvitationDialog(); signals: void invitationAccepted( bool, const GroupWise::ConferenceGuid & guid ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index 885b6192..dc0788eb 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -37,11 +37,11 @@ #include "gwsearch.h" -class GWSearchResultsLVI : public QListViewItem +class GWSearchResultsLVI : public TQListViewItem { public: - GWSearchResultsLVI( TQListView * parent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) - : TQListViewItem( parent, TQString::null, details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) + GWSearchResultsLVI( TQListView * tqparent, GroupWise::ContactDetails details, int status, const TQPixmap & statusPM/*, const TQString & userId */) + : TQListViewItem( tqparent, TQString(), details.givenName, details.surname, GroupWiseProtocol::protocol()->dnToDotted( details.dn ) ), m_details( details ), m_status( status ) { setPixmap( 0, statusPM ); } @@ -56,8 +56,8 @@ public: int m_status; }; -GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *parent, const char *name) - : GroupWiseContactSearchWidget(parent, name), m_account( account ), m_onlineOnly( onlineOnly ) +GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, TQWidget *tqparent, const char *name) + : GroupWiseContactSearchWidget(tqparent, name), m_account( account ), m_onlineOnly( onlineOnly ) { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.h b/kopete/protocols/groupwise/ui/gwsearch.h index ec57cfb1..c3aee10a 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.h +++ b/kopete/protocols/groupwise/ui/gwsearch.h @@ -33,9 +33,10 @@ Logic for searching for and displaying users and chat rooms using a GroupWiseCon class GroupWiseContactSearch : public GroupWiseContactSearchWidget { Q_OBJECT + TQ_OBJECT public: GroupWiseContactSearch( GroupWiseAccount * account, TQListView::SelectionMode mode, bool onlineOnly, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~GroupWiseContactSearch(); TQValueList< GroupWise::ContactDetails > selectedResults(); signals: @@ -46,7 +47,7 @@ protected slots: void slotClear(); void slotDoSearch(); void slotGotSearchResults(); - // shows a GroupWiseContactProperties for the selected contact. Dialog's parent is this instance + // shows a GroupWiseContactProperties for the selected contact. Dialog's tqparent is this instance void slotShowDetails(); void slotValidateSelection(); private: diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 28dd1a7d..08253705 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -1,6 +1,6 @@ ShowInvitationWidget - + ShowInvitationWidget @@ -19,15 +19,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -35,7 +35,7 @@ <p align="right">From:</p> - + textLabel3 @@ -43,7 +43,7 @@ <p align="right">Sent:</p> - + m_dateTime @@ -59,7 +59,7 @@ INVITE_DATE_TIME - + m_contactName @@ -69,7 +69,7 @@ - + m_message @@ -82,19 +82,19 @@ INVITE_MESSAGE - + WordBreak|AlignVCenter - + - layout14 + tqlayout14 unnamed - + textLabel6 @@ -112,7 +112,7 @@ Expanding - + 20 31 @@ -121,7 +121,7 @@ - + cb_dontShowAgain @@ -131,5 +131,5 @@ - + diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 09d0db3c..9dbdfc4a 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -57,11 +57,11 @@ #include #include -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"); +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"); 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]").arg(kapp->aboutData()->version()); + TQString version=i18n("Kopete IRC Plugin %1 [http://kopete.kde.org]").tqarg(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::Status)), - this, TQT_SLOT(engineStatusChanged(KIRC::Engine::Status))); + TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)), + this, TQT_SLOT(engineStatusChanged(KIRC::Engine::tqStatus))); 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").arg( hostName ); + m_network->name = i18n("Temporary Network - %1").tqarg( hostName ); m_network->description = i18n("Network imported from previous version of Kopete, or an IRC URI"); IRCHost *host = new IRCHost; @@ -204,12 +204,12 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_contactManager = new IRCContactManager(mNickName, this); setMyself( m_contactManager->mySelf() ); - setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) ); + setAccountLabel( TQString::tqfromLatin1("%1@%2").tqarg(mNickName,networkName) ); m_myServer = m_contactManager->myServer(); - m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString::null, 0, this, + m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, TQT_SLOT(slotJoinChannel()), this); - m_searchChannelAction = new KAction ( i18n("Search Channels..."), TQString::null, 0, this, + m_searchChannelAction = new KAction ( i18n("Search Channels..."), TQString(), 0, this, TQT_SLOT(slotSearchChannels()), 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:").arg(nick), + i18n("The nickname %1 is already in use. Please enter an alternate nickname:").tqarg(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").arg(nick), i18n("IRC Plugin")); + KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("The nickname %1 is already in use").tqarg(nick), i18n("IRC Plugin")); } void IRCAccount::setAltNick( const TQString &altNick ) { - configGroup()->writeEntry(TQString::fromLatin1( "altNick" ), altNick); + configGroup()->writeEntry(TQString::tqfromLatin1( "altNick" ), altNick); } const TQString IRCAccount::altNick() const { - return configGroup()->readEntry(TQString::fromLatin1("altNick")); + return configGroup()->readEntry(TQString::tqfromLatin1("altNick")); } void IRCAccount::setAutoShowServerWindow( bool show ) { autoShowServerWindow = show; - configGroup()->writeEntry(TQString::fromLatin1( "AutoShowServerWindow" ), autoShowServerWindow); + configGroup()->writeEntry(TQString::tqfromLatin1( "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("The network associated with this account, %1, no longer exists. Please" - " ensure that the account has a valid network. The account will not be enabled until you do so.").arg(network), - i18n("Problem Loading %1").arg( accountId() ), 0 ); + " ensure that the account has a valid network. The account will not be enabled until you do so.").tqarg(network), + i18n("Problem Loading %1").tqarg( 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::fromLatin1( "defaultPart" ), defaultPart ); + configGroup()->writeEntry( TQString::tqfromLatin1( "defaultPart" ), defaultPart ); } // FIXME: Move this to a dictionnary void IRCAccount::setDefaultQuit( const TQString &defaultQuit ) { - configGroup()->writeEntry( TQString::fromLatin1( "defaultQuit" ), defaultQuit ); + configGroup()->writeEntry( TQString::tqfromLatin1( "defaultQuit" ), defaultQuit ); } // FIXME: Move this to a dictionnary const TQString IRCAccount::defaultPart() const { - TQString partMsg = configGroup()->readEntry(TQString::fromLatin1("defaultPart")); + TQString partMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultPart")); if( partMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg( kapp->aboutData()->version() ); + return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg( kapp->aboutData()->version() ); return partMsg; } const TQString IRCAccount::defaultQuit() const { - TQString quitMsg = configGroup()->readEntry(TQString::fromLatin1("defaultQuit")); + TQString quitMsg = configGroup()->readEntry(TQString::tqfromLatin1("defaultQuit")); if( quitMsg.isEmpty() ) - return TQString::fromLatin1("Kopete %1 : http://kopete.kde.org").arg(kapp->aboutData()->version()); + return TQString::tqfromLatin1("Kopete %1 : http://kopete.kde.org").tqarg(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::fromLatin1("%1=%2").arg( it.key() ).arg( it.data() ) ); + val.append( TQString::tqfromLatin1("%1=%2").tqarg( it.key() ).tqarg( it.data() ) ); } configGroup()->writeEntry( "CustomCtcp", val ); @@ -416,7 +416,7 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages, KActionMenu *IRCAccount::actionMenu() { - TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() ); + TQString menuTitle = TQString::tqfromLatin1( " %1 <%2> " ).tqarg( accountId() ).tqarg( myself()->onlinetqStatus().description() ); KActionMenu *mActionMenu = Kopete::Account::actionMenu(); @@ -426,7 +426,7 @@ KActionMenu *IRCAccount::actionMenu() mActionMenu->popupMenu()->insertSeparator(); mActionMenu->insert(m_joinChannelAction); mActionMenu->insert(m_searchChannelAction); - mActionMenu->insert( new KAction ( i18n("Show Server Window"), TQString::null, 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); + mActionMenu->insert( new KAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); if( m_engine->isConnected() && m_engine->useSSL() ) { @@ -455,14 +455,14 @@ void IRCAccount::connectWithPassword(const TQString &password) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("The network associated with this account, %1, has no valid hosts. Please ensure that the account has a valid network.").arg(m_network->name), + i18n("The network associated with this account, %1, has no valid hosts. Please ensure that the account has a valid network.").tqarg(m_network->name), i18n("Network is Empty"), 0 ); } else if( currentHost == hosts.count() ) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Error, - i18n("Kopete could not connect to any of the servers in the network associated with this account (%1). Please try again later.").arg(m_network->name), + i18n("Kopete could not connect to any of the servers in the network associated with this account (%1). Please try again later.").tqarg(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...").arg( host->host ) ); + myServer()->appendMessage( i18n("Connecting to %1...").tqarg( 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::Status newStatus) +void IRCAccount::engineStatusChanged(KIRC::Engine::tqStatus newtqStatus) { kdDebug(14120) << k_funcinfo << endl; - mySelf()->updateStatus(); + mySelf()->updatetqStatus(); - switch (newStatus) + switch (newtqStatus) { case KIRC::Engine::Idle: // Do nothing. @@ -563,7 +563,7 @@ void IRCAccount::slotPerformOnConnectCommands() return; if (!autoConnect.isEmpty()) - Kopete::CommandHandler::commandHandler()->processMessage( TQString::fromLatin1("/join %1").arg(autoConnect), manager); + Kopete::CommandHandler::commandHandler()->processMessage( TQString::tqfromLatin1("/join %1").tqarg(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").arg( m_engine->currentHost() ), this, + i18n("Channel List for %1").tqarg( m_engine->currentHost() ), this, TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) ); } else @@ -653,17 +653,17 @@ void IRCAccount::slotShowServerWindow() bool IRCAccount::isConnected() { -// return ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline ); +// return ( myself()->onlinetqStatus().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()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) + myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) connect(); else if (status.status() == Kopete::OnlineStatus::Online && - myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + myself()->onlinetqStatus().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::fromLatin1("#"))) + else if (contactId.startsWith(TQString::tqfromLatin1("#"))) { c = static_cast(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 children = old->contacts(); - if (children.isEmpty()) + Kopete::ContactPtrList tqchildren = old->contacts(); + if (tqchildren.isEmpty()) Kopete::ContactList::self()->removeMetaContact( old ); } else if( c->metaContact()->isTemporary() ) @@ -749,7 +749,7 @@ void IRCAccount::slotJoinChannel() KLineEditDlg dlg( i18n("Please enter name of the channel you want to join:"), - TQString::null, + TQString(), Kopete::UI::Global::mainWidget() ); @@ -781,7 +781,7 @@ void IRCAccount::slotJoinChannel() } KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").arg(chan), + i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.").tqarg(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").arg(type).arg(messageReceived), InfoReply ); + appendMessage( i18n("CTCP %1 REPLY: %2").tqarg(type).tqarg(messageReceived), InfoReply ); } void IRCAccount::slotNoSuchNickname( const TQString &nick ) { if( KIRC::Entity::isChannel(nick) ) - appendMessage( i18n("The channel \"%1\" does not exist").arg(nick), UnknownReply ); + appendMessage( i18n("The channel \"%1\" does not exist").tqarg(nick), UnknownReply ); else - appendMessage( i18n("The nickname \"%1\" does not exist").arg(nick), UnknownReply ); + appendMessage( i18n("The nickname \"%1\" does not exist").tqarg(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::fromLatin1("irc_event"), message + Kopete::UI::Global::mainWidget()->winId(), TQString::tqfromLatin1("irc_event"), message ); } } diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h index 1aa4072e..a20ccc93 100644 --- a/kopete/protocols/irc/ircaccount.h +++ b/kopete/protocols/irc/ircaccount.h @@ -73,6 +73,7 @@ class IRCAccount friend class IRCProtocolHandler; Q_OBJECT + TQ_OBJECT public: static const TQString CONFIG_CODECMIB; @@ -100,8 +101,8 @@ public: Ignore = 5 }; - IRCAccount(IRCProtocol *p, const TQString &accountid, const TQString &autoConnect = TQString::null, - const TQString& networkName = TQString::null, const TQString &nickName = TQString::null); + IRCAccount(IRCProtocol *p, const TQString &accountid, const TQString &autoConnect = TQString(), + const TQString& networkName = TQString(), const TQString &nickName = TQString()); virtual ~IRCAccount(); void setNickName( const TQString & ); @@ -157,12 +158,12 @@ public slots: virtual KActionMenu *actionMenu(); - virtual void setAway( bool isAway, const TQString &awayMessage = TQString::null ); + virtual void setAway( bool isAway, const TQString &awayMessage = TQString() ); virtual bool isConnected(); /** Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); // Returns the KIRC engine instance KIRC::Engine *engine() const { return m_engine; } @@ -183,17 +184,17 @@ public slots: virtual void connectWithPassword( const TQString & ); virtual void disconnect(); - void quit( const TQString &quitMessage = TQString::null ); + void quit( const TQString &quitMessage = TQString() ); void listChannels(); void appendMessage( const TQString &message, MessageType type = Default ); protected: - virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ; + virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) ; private slots: - void engineStatusChanged(KIRC::Engine::Status newStatus); + void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus); void destroyed(IRCContact *contact); diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp index 6b19721c..85f2edfb 100644 --- a/kopete/protocols/irc/ircaddcontactpage.cpp +++ b/kopete/protocols/irc/ircaddcontactpage.cpp @@ -31,7 +31,7 @@ #include #include -IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddContactPage(parent, 0) +IRCAddContactPage::IRCAddContactPage( TQWidget *tqparent, IRCAccount *a ) : AddContactPage(tqparent, 0) { (new TQVBoxLayout(this))->setAutoAdd(true); ircdata = new ircAddUI(this); diff --git a/kopete/protocols/irc/ircaddcontactpage.h b/kopete/protocols/irc/ircaddcontactpage.h index 390cd829..100886b4 100644 --- a/kopete/protocols/irc/ircaddcontactpage.h +++ b/kopete/protocols/irc/ircaddcontactpage.h @@ -32,8 +32,9 @@ class ChannelList; class IRCAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - IRCAddContactPage(TQWidget *parent=0, IRCAccount* account = 0); + IRCAddContactPage(TQWidget *tqparent=0, IRCAccount* account = 0); ~IRCAddContactPage(); ircAddUI *ircdata; diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index cab2748b..1835bb4b 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; - updateStatus(); + updatetqStatus(); } 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) && onlineStatus() == m_protocol->m_ChannelStatusOnline ) - kircEngine()->writeMessage( TQString::fromLatin1("LIST %1").arg(m_nickName) ); + if( !manager(Kopete::Contact::CannotCreate) && onlinetqStatus() == m_protocol->m_ChannelStatusOnline ) + kircEngine()->writeMessage( TQString::tqfromLatin1("LIST %1").tqarg(m_nickName) ); else - setProperty( TQString::fromLatin1("channelMembers"), i18n("Members"), manager()->members().count() ); + setProperty( TQString::tqfromLatin1("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::fromLatin1("WHO %1").arg(m_nickName)); + engine->writeMessage(TQString::tqfromLatin1("WHO %1").tqarg(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) && - onlineStatus() == m_protocol->m_ChannelStatusOnline && + onlinetqStatus() == 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 &oldStatus) +void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus) { - Q_UNUSED(oldStatus); + Q_UNUSED(oldtqStatus); if (c == account()->myself()) { if (status.internalStatus() & IRCProtocol::Operator) { @@ -141,9 +141,9 @@ void IRCChannelContact::slotOnlineStatusChanged(Kopete::Contact *c, const Kopete } } -void IRCChannelContact::updateStatus() +void IRCChannelContact::updatetqStatus() { - KIRC::Engine::Status status = kircEngine()->status(); + KIRC::Engine::tqStatus status = kircEngine()->status(); switch (status) { case KIRC::Engine::Idle: @@ -200,7 +200,7 @@ void IRCChannelContact::namesList(const TQStringList &nicknames) void IRCChannelContact::endOfNames() { - setMode(TQString::null); + setMode(TQString()); slotUpdateInfo(); } @@ -251,7 +251,7 @@ void IRCChannelContact::slotAddNicknames() else if( firstChar == '+') status = m_protocol->m_UserStatusVoice; else - status = user->onlineStatus(); + status = user->onlinetqStatus(); 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.").arg(m_nickName), + i18n("Topic for %1 is set empty.").tqarg(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").arg(m_nickName).arg(mTopic), + i18n("Topic for %1 is %2").tqarg(m_nickName).tqarg(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) && - onlineStatus().status() == Kopete::OnlineStatus::Online) + onlinetqStatus().status() == Kopete::OnlineStatus::Online) { kdDebug() << k_funcinfo << "My nickname:" << m_nickName << endl; kdDebug() << k_funcinfo << "My manager:" << manager(Kopete::Contact::CannotCreate) << endl; @@ -329,7 +329,7 @@ void IRCChannelContact::slotIncomingUserIsAway( const TQString &nick, const TQSt if( nick.lower() == account->mySelf()->nickName().lower() ) { IRCUserContact *c = account->mySelf(); - if (manager() && manager()->members().contains(c)) + if (manager() && manager()->members().tqcontains(c)) { Kopete::OnlineStatus status = manager()->contactOnlineStatus(c); if (status == m_protocol->m_UserStatusOp) @@ -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").arg(m_nickName), + i18n("You have joined channel %1").tqarg(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 %1 joined channel %2").arg(nickname).arg(m_nickName), + i18n("User %1 joined channel %2").tqarg(nickname).tqarg(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" ).arg(nickKicked, nick, reason); + r = i18n( "%1 was kicked by %2. Reason: %3" ).tqarg(nickKicked, nick, reason); } else { - r = i18n( "%1 was kicked by %2." ).arg(nickKicked, nick); + r = i18n( "%1 was kicked by %2." ).tqarg(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" ).arg(m_nickName, nickKicked, reason); + r = i18n( "You were kicked from %1 by %2. Reason: %3" ).tqarg(m_nickName, nickKicked, reason); } else { - r = i18n( "You were kicked from %1 by %2." ).arg(m_nickName, nickKicked); + r = i18n( "You were kicked from %1 by %2." ).tqarg(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.").arg(m_nickName), + i18n("You must be a channel operator on %1 to do that.").tqarg(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").arg(nick).arg(newtopic), + i18n("%1 has changed the topic to: %2").tqarg(nick).tqarg(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").arg(nick).arg( + i18n("Topic set by %1 at %2").tqarg(nick).tqarg( 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,13 +503,13 @@ 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").arg(nick).arg(mode).arg(m_nickName), Kopete::Message::Internal, Kopete::Message::PlainText, CHAT_VIEW); + 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); msg.setImportance( Kopete::Message::Low); //set the importance manualy to low appendMessage(msg); bool inParams = false; bool modeEnabled = false; - TQString params = TQString::null; + TQString params = TQString(); for( uint i=0; i < mode.length(); i++ ) { switch( mode[i] ) @@ -564,7 +564,7 @@ void IRCChannelContact::failedChanBanned() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because you have been banned.").arg(m_nickName), + i18n("You can not join %1 because you have been banned.").tqarg(m_nickName), i18n("IRC Plugin") ); } @@ -572,14 +572,14 @@ void IRCChannelContact::failedChanInvite() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because it is set to invite only, and no one has invited you.").arg(m_nickName), i18n("IRC Plugin") ); + i18n("You can not join %1 because it is set to invite only, and no one has invited you.").tqarg(m_nickName), i18n("IRC Plugin") ); } void IRCChannelContact::failedChanFull() { manager()->deleteLater(); KMessageBox::error( Kopete::UI::Global::mainWidget(), - i18n("You can not join %1 because it has reached its user limit.").arg(m_nickName), + i18n("You can not join %1 because it has reached its user limit.").tqarg(m_nickName), i18n("IRC Plugin") ); } @@ -587,8 +587,8 @@ void IRCChannelContact::failedChankey() { bool ok; TQString diaPassword = KInputDialog::getText( i18n( "IRC Plugin" ), - i18n( "Please enter key for channel %1: ").arg(m_nickName), - TQString::null, + i18n( "Please enter key for channel %1: ").tqarg(m_nickName), + TQString(), &ok ); if ( !ok ) @@ -636,9 +636,9 @@ void IRCChannelContact::toggleMode( TQChar mode, bool enabled, bool update ) if( modeMap[mode] != enabled ) { if( enabled ) - setMode( TQString::fromLatin1("+") + mode ); + setMode( TQString::tqfromLatin1("+") + mode ); else - setMode( TQString::fromLatin1("-") + mode ); + setMode( TQString::tqfromLatin1("-") + mode ); } } @@ -717,9 +717,9 @@ void IRCChannelContact::slotHomepage() const TQString IRCChannelContact::caption() const { - TQString cap = TQString::fromLatin1("%1 @ %2").arg(m_nickName).arg(kircEngine()->currentHost()); + TQString cap = TQString::tqfromLatin1("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); if(!mTopic.isEmpty()) - cap.append( TQString::fromLatin1(" - %1").arg(Kopete::Message::unescape(mTopic)) ); + cap.append( TQString::tqfromLatin1(" - %1").tqarg(Kopete::Message::unescape(mTopic)) ); return cap; } diff --git a/kopete/protocols/irc/ircchannelcontact.h b/kopete/protocols/irc/ircchannelcontact.h index 0febd30b..67fa46c9 100644 --- a/kopete/protocols/irc/ircchannelcontact.h +++ b/kopete/protocols/irc/ircchannelcontact.h @@ -47,6 +47,7 @@ class IRCChannelContact friend class IRCSignalMapper; Q_OBJECT + TQ_OBJECT public: IRCChannelContact(IRCContactManager *, const TQString &channel, Kopete::MetaContact *metac); @@ -95,19 +96,19 @@ public: void newAction(const TQString &from, const TQString &action); public slots: - void updateStatus(); + void updatetqStatus(); /** * Sets the topic of this channel * @param topic The topic you want set */ - void setTopic( const TQString &topic = TQString::null ); + void setTopic( const TQString &topic = TQString() ); /** * Sets or unsets a mode on this channel * @param mode The full text of the mode change you want performed */ - void setMode( const TQString &mode = TQString::null ); + void setMode( const TQString &mode = TQString() ); void part(); void partAction(); @@ -127,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 &oldStatus); + void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus); private: KAction *actionJoin; diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 349fba60..93888b55 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -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::Status)), - this, TQT_SLOT(updateStatus())); + TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::tqStatus)), + this, TQT_SLOT(updatetqStatus())); engine->setCodec( m_nickName, codec() ); } @@ -94,8 +94,8 @@ KIRC::Engine *IRCContact::kircEngine() const bool IRCContact::isReachable() { - if (onlineStatus().status() != Kopete::OnlineStatus::Offline && - onlineStatus().status() != Kopete::OnlineStatus::Unknown) + if (onlinetqStatus().status() != Kopete::OnlineStatus::Offline && + onlinetqStatus().status() != Kopete::OnlineStatus::Unknown) return true; return false; @@ -103,15 +103,15 @@ bool IRCContact::isReachable() const TQString IRCContact::caption() const { - return TQString::null; + return TQString(); } /* const TQString IRCContact::formatedName() const { - return TQString::null; + return TQString(); } */ -void IRCContact::updateStatus() +void IRCContact::updatetqStatus() { } @@ -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::fromLatin1("Codec"), TQString::number(codec->mibEnum())); + metaContact()->setPluginData(m_protocol, TQString::tqfromLatin1("Codec"), TQString::number(codec->mibEnum())); } const TQTextCodec *IRCContact::codec() { - TQString codecId = metaContact()->pluginData(m_protocol, TQString::fromLatin1("Codec")); + TQString codecId = metaContact()->pluginData(m_protocol, TQString::tqfromLatin1("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\" ").arg(reason), Kopete::Message::RichText); + m_chatSession->removeContact(c, i18n("Quit: \"%1\" ").tqarg(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: // Hello
World - if (htmlString.find(TQString::fromLatin1(" -1) + if (htmlString.tqfind(TQString::tqfromLatin1(" -1) { - TQRegExp findTags( TQString::fromLatin1("(.*)") ); + TQRegExp findTags( TQString::tqfromLatin1("(.*)") ); 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::fromLatin1("color") ) + if( attribute == TQString::tqfromLatin1("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::fromLatin1("font-weight") && - value == TQString::fromLatin1("600") ) { + else if( attribute == TQString::tqfromLatin1("font-weight") && + value == TQString::tqfromLatin1("600") ) { // Bolding replacement.prepend( TQChar(0x02) ).append( TQChar(0x02) ); } - else if( attribute == TQString::fromLatin1("text-decoration") && - value == TQString::fromLatin1("underline") ) { + else if( attribute == TQString::tqfromLatin1("text-decoration") && + value == TQString::tqfromLatin1("underline") ) { replacement.prepend( TQChar(31) ).append( TQChar(31) ); } } @@ -363,7 +363,7 @@ bool IRCContact::isChatting(const Kopete::ChatSession *avoid) const for (TQValueList::Iterator it= sessions.begin(); it!=sessions.end() ; ++it) { if( (*it) != avoid && (*it)->account() == account && - (*it)->members().contains(this) ) + (*it)->members().tqcontains(this) ) { return true; } @@ -413,7 +413,7 @@ void IRCContact::receivedMessage( KIRC::Engine::ServerMessageType type, const KIRC::EntityPtrList &to, const TQString &msg) { - if (to.contains(m_entity)) + if (to.tqcontains(m_entity)) { IRCContact *fromContact = ircAccount()->getContact(from); Kopete::Message message(fromContact, manager()->members(), msg, Kopete::Message::Inbound, diff --git a/kopete/protocols/irc/irccontact.h b/kopete/protocols/irc/irccontact.h index 7a9fd169..823f23ae 100644 --- a/kopete/protocols/irc/irccontact.h +++ b/kopete/protocols/irc/irccontact.h @@ -61,10 +61,11 @@ class IRCContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: - IRCContact(IRCAccount *account, KIRC::EntityPtr entity, Kopete::MetaContact *metac, const TQString& icon = TQString::null); - IRCContact(IRCContactManager *contactManager, const TQString &nick, Kopete::MetaContact *metac, const TQString& icon = TQString::null); + IRCContact(IRCAccount *account, KIRC::EntityPtr entity, Kopete::MetaContact *metac, const TQString& icon = TQString()); + IRCContact(IRCContactManager *contactManager, const TQString &nick, Kopete::MetaContact *metac, const TQString& icon = TQString()); virtual ~IRCContact(); IRCAccount *ircAccount() const; @@ -120,7 +121,7 @@ signals: public slots: void setCodec( const TQTextCodec *codec ); - virtual void updateStatus(); + virtual void updatetqStatus(); protected slots: virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *); diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index fb49e08e..f304a2ed 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -260,7 +260,7 @@ void IRCContactManager::slotContactAdded( Kopete::MetaContact *contact ) void IRCContactManager::addToNotifyList(const TQString &nick) { - if (!m_NotifyList.contains(nick.lower())) + if (!m_NotifyList.tqcontains(nick.lower())) { m_NotifyList.append(nick); checkOnlineNotifyList(); @@ -269,7 +269,7 @@ void IRCContactManager::addToNotifyList(const TQString &nick) void IRCContactManager::removeFromNotifyList(const TQString &nick) { - if (m_NotifyList.contains(nick.lower())) + if (m_NotifyList.tqcontains(nick.lower())) m_NotifyList.remove(nick.lower()); } diff --git a/kopete/protocols/irc/irccontactmanager.h b/kopete/protocols/irc/irccontactmanager.h index 7ce8483c..0a0f558b 100644 --- a/kopete/protocols/irc/irccontactmanager.h +++ b/kopete/protocols/irc/irccontactmanager.h @@ -52,9 +52,10 @@ class TQTimer; * It manage the life cycle of all the @ref IRCServerContact, @ref IRCChannelContact and @ref IRCUserContact objects for the given account. */ class IRCContactManager - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: IRCContactManager(const TQString &nickName, IRCAccount *account, const char *name=0); diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index d9d5f8e2..182670d7 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -40,9 +40,9 @@ #include "ircaccount.h" #include "irccontact.h" -IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , KXMLGUIClient(parent) +IRCGUIClient::IRCGUIClient( Kopete::ChatSession *tqparent ) : TQObject(tqparent) , KXMLGUIClient(tqparent) { - Kopete::ContactPtrList members = parent->members(); + Kopete::ContactPtrList members = tqparent->members(); if( members.count() > 0 ) { m_user = static_cast( members.first() ); @@ -53,7 +53,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K setXMLFile("ircchatui.rc"); unplugActionList( "irccontactactionlist" ); - TQPtrList *actions = m_user->customContextMenuActions( parent ); + TQPtrList *actions = m_user->customContextMenuActions( tqparent ); plugActionList( "irccontactactionlist", *actions ); delete actions; */ @@ -62,7 +62,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K TQDomDocument doc = domDocument(); TQDomNode menu = doc.documentElement().firstChild().firstChild(); - TQPtrList *actions = m_user->customContextMenuActions( parent ); + TQPtrList *actions = m_user->customContextMenuActions( tqparent ); if( actions ) { for( KAction *a = actions->first(); a; a = actions->next() ) diff --git a/kopete/protocols/irc/ircguiclient.h b/kopete/protocols/irc/ircguiclient.h index fed65dd4..10d691ad 100644 --- a/kopete/protocols/irc/ircguiclient.h +++ b/kopete/protocols/irc/ircguiclient.h @@ -28,8 +28,9 @@ class IRCContact; class IRCGUIClient : public TQObject , public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - IRCGUIClient( Kopete::ChatSession *parent = 0 ); + IRCGUIClient( Kopete::ChatSession *tqparent = 0 ); ~IRCGUIClient(); private slots: diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 6112429b..a3182a14 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::fromLatin1("irc") ); + registerAsProtocolHandler( TQString::tqfromLatin1("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::fromLatin1("%1@%2:%3").arg( + TQString accountId = TQString::tqfromLatin1("%1@%2:%3").tqarg( user.loginName(), url.host(), TQString::number(port) @@ -104,18 +104,18 @@ void IRCProtocolHandler::handleURL( const KURL &url ) const newAccount->connect(); } -IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( IRCProtocolFactory::instance(), parent, name ), +IRCProtocol::IRCProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( IRCProtocolFactory::instance(), tqparent, name ), m_ServerStatusOnline(Kopete::OnlineStatus::Online, - 100, this, OnlineServer, TQString::null, i18n("Online")), + 100, this, OnlineServer, TQString(), i18n("Online")), m_ServerStatusOffline(Kopete::OnlineStatus::Offline, - 90, this, OfflineServer, TQString::null, i18n("Offline")), + 90, this, OfflineServer, TQString(), i18n("Offline")), m_ChannelStatusOnline(Kopete::OnlineStatus::Online, - 80, this, OnlineChannel, TQString::null, i18n("Online")), + 80, this, OnlineChannel, TQString(), i18n("Online")), m_ChannelStatusOffline(Kopete::OnlineStatus::Offline, - 70, this, OfflineChannel, TQString::null, i18n("Offline")), + 70, this, OfflineChannel, TQString(), i18n("Offline")), m_UserStatusOpVoice(Kopete::OnlineStatus::Online, 60, this, Online | Operator | Voiced, TQStringList::split(' ',"irc_voice irc_op"), i18n("Op")), @@ -136,7 +136,7 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList TQStringList::split(' ',"irc_voice contact_away_overlay"), i18n("Away")), m_UserStatusOnline(Kopete::OnlineStatus::Online, - 25, this, Online, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online), + 25, this, Online, TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online), m_UserStatusAway(Kopete::OnlineStatus::Away, 2, this, Online | Away, "contact_away_overlay", @@ -144,147 +144,147 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList m_UserStatusConnecting(Kopete::OnlineStatus::Connecting, 1, this, Connecting, "irc_connecting", i18n("Connecting")), m_UserStatusOffline(Kopete::OnlineStatus::Offline, - 0, this, Offline, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline), + 0, this, Offline, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline), m_StatusUnknown(Kopete::OnlineStatus::Unknown, - 999, this, 999, "status_unknown", i18n("Status not available")), + 999, this, 999, "status_unknown", i18n("tqStatus not available")), - propChannelTopic(TQString::fromLatin1("channelTopic"), i18n("Topic"), TQString::null, false, true ), - propChannelMembers(TQString::fromLatin1("channelMembers"), i18n("Members")), - propHomepage(TQString::fromLatin1("homePage"), i18n("Home Page")), + propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ), + propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")), + propHomepage(TQString::tqfromLatin1("homePage"), i18n("Home Page")), propLastSeen(Kopete::Global::Properties::self()->lastSeen()), - 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")) + 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")) { // kdDebug(14120) << k_funcinfo << endl; s_protocol = this; - //m_status = m_unknownStatus = m_Unknown; + //m_status = m_unknowntqStatus = m_Unknown; addAddressBookField("messaging/irc", Kopete::Plugin::MakeIndexField); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("raw"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("raw"), TQT_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /raw - Sends the text in raw form to the server."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quote"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quote"), TQT_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quote - Sends the text in quoted form to the server."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ctcp"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ctcp"), TQT_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ctcp - Send the CTCP message to nick."), 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ping"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ping"), TQT_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ping - Alias for /CTCP PING."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("motd"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("motd"), TQT_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /motd [] - Shows the message of the day for the current or the given server.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("list"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("list"), TQT_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /list - List the public channels on the server.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("join"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("join"), TQT_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /join <#channel 1> [] - Joins the specified channel."), 1, 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("topic"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("topic"), TQT_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /topic [] - Sets and/or displays the topic for the active channel.") ); //FIXME: Update help text - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whois"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whois"), TQT_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whois - Display whois info on this user."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whowas"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("whowas"), TQT_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whowas - Display whowas info on this user."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("who"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("who"), TQT_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /who - Display who info on this user/channel."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("query"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("query"), TQT_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /query [] - Open a private chat with this user."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("mode"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("mode"), TQT_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /mode - Set modes on the given channel."), 2 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("nick"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("nick"), TQT_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /nick - Change your nickname to the given one."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("me"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /me - Do something."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ame"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ame"), TQT_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ame - Do something in every open chat."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("kick"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("kick"), TQT_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /kick [] - Kick someone from the channel (requires operator status).") , 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ban"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("ban"), TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), - i18n("USAGE: /ban - Add someone to this channel's ban list. (requires operator status)."), + i18n("USAGE: /ban - Add someone to this channel's ban list. (requires operator status)."), 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("bannick"), - TQString::fromLatin1("ban %1!*@*"), - i18n("USAGE: /bannick - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("bannick"), + TQString::tqfromLatin1("ban %1!*@*"), + i18n("USAGE: /bannick - Add someone to this channel's ban list. Uses the hosttqmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("op"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("op"), TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /op [ <...>] - Give channel operator status to someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("deop"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("deop"), TQT_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /deop [ <...>]- Remove channel operator status from someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("voice"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("voice"), TQT_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /voice [ <...>]- Give channel voice status to someone (requires operator status)."), 1); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("devoice"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("devoice"), TQT_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /devoice [ <...>]- Remove channel voice status from someone (requires operator status)."), 1 ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quit"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("quit"), TQT_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quit [] - Disconnect from IRC, optionally leaving a message.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("part"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /part [] - Part from a channel, optionally leaving a message.") ); - Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("invite"), + Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::tqfromLatin1("invite"), TQT_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /invite [] - Invite a user to join a channel."), 1 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("j"), - TQString::fromLatin1("join %1"), + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("j"), + TQString::tqfromLatin1("join %1"), i18n("USAGE: /j <#channel 1> [] - Alias for JOIN."), Kopete::CommandHandler::SystemAlias, 1, 2 ); - Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("msg"), - TQString::fromLatin1("query %s"), - i18n("USAGE: /msg [] - Alias for QUERY ."), Kopete::CommandHandler::SystemAlias, 1 ); + Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::tqfromLatin1("msg"), + TQString::tqfromLatin1("query %s"), + i18n("USAGE: /msg [] - Alias for TQUERY ."), Kopete::CommandHandler::SystemAlias, 1 ); TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)), this, TQT_SLOT(slotMessageFilter(Kopete::Message &)) ); @@ -313,7 +313,7 @@ IRCProtocol::~IRCProtocol() delete m_protocolHandler; } -const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCStatus status ) const +const Kopete::OnlineStatus IRCProtocol::statusLookup( IRCtqStatus 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::fromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::fromLatin1("\\1") ); + messageText.tqreplace( TQRegExp( TQString::tqfromLatin1("(?![^<]+>)(#[^#\\s]+)(?![^<]+>)") ), TQString::tqfromLatin1("\\1") ); msg.setBody( messageText, Kopete::Message::RichText ); } @@ -391,7 +391,7 @@ TQPtrList *IRCProtocol::customChatWindowPopupActions( const Kopete::Mes { activeNode = n; activeAccount = static_cast( m.from()->account() ); - if( e.getAttribute( TQString::fromLatin1("type") ) == TQString::fromLatin1("IRCChannel") ) + if( e.getAttribute( TQString::tqfromLatin1("type") ) == TQString::tqfromLatin1("IRCChannel") ) return activeAccount->contactManager()->findChannel( e.innerText().string() )->customContextMenuActions(); } @@ -399,14 +399,14 @@ TQPtrList *IRCProtocol::customChatWindowPopupActions( const Kopete::Mes return 0L; } -AddContactPage *IRCProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) +AddContactPage *IRCProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) { - return new IRCAddContactPage(parent,static_cast(account)); + return new IRCAddContactPage(tqparent,static_cast(account)); } -KopeteEditAccountWidget *IRCProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *IRCProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new IRCEditAccountWidget(this, static_cast(account),parent); + return new IRCEditAccountWidget(this, static_cast(account),tqparent); } Kopete::Account *IRCProtocol::createNewAccount(const TQString &accountId) @@ -480,7 +480,7 @@ void IRCProtocol::slotCtcpCommand( const TQString &args, Kopete::ChatSession *ma { TQString user = args.section( ' ', 0, 0 ); TQString message = args.section( ' ', 1 ); - static_cast( manager->account() )->engine()->writeCtcpQueryMessage( user, TQString::null, message ); + static_cast( manager->account() )->engine()->writeCtcpQueryMessage( user, TQString(), message ); } } @@ -512,7 +512,7 @@ void IRCProtocol::slotTopicCommand( const TQString &args, Kopete::ChatSession *m else { static_cast(manager->account())->engine()-> - writeRawMessage(TQString::fromLatin1("TOPIC %1").arg(chan->nickName())); + writeRawMessage(TQString::tqfromLatin1("TOPIC %1").tqarg(chan->nickName())); } } else @@ -536,7 +536,7 @@ void IRCProtocol::slotJoinCommand( const TQString &arg, Kopete::ChatSession *man { static_cast( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .arg(args[0]), IRCAccount::ErrorReply ); + .tqarg(args[0]), IRCAccount::ErrorReply ); } } @@ -556,7 +556,7 @@ void IRCProtocol::slotInviteCommand( const TQString &args, Kopete::ChatSession * { static_cast( manager->account() )->appendMessage( i18n("\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'.") - .arg(argsList[1]), IRCAccount::ErrorReply ); + .tqarg(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( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("INVITE %1 %2").arg( argsList[0] ). + TQString::tqfromLatin1("INVITE %1 %2").tqarg( argsList[0] ). arg( c->nickName() ) ); } @@ -599,7 +599,7 @@ void IRCProtocol::slotQueryCommand( const TQString &args, Kopete::ChatSession *m else { static_cast( manager->account() )->appendMessage( - i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").arg(user), + i18n("\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or '&'.").tqarg(user), IRCAccount::ErrorReply ); } } @@ -614,7 +614,7 @@ void IRCProtocol::slotWhoCommand( const TQString &args, Kopete::ChatSession *man { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHO %1").arg( argsList.first() ) ); + TQString::tqfromLatin1("WHO %1").tqarg( argsList.first() ) ); static_cast( manager->account() )->setCurrentCommandSource( manager ); } @@ -622,7 +622,7 @@ void IRCProtocol::slotWhoWasCommand( const TQString &args, Kopete::ChatSession * { TQStringList argsList = Kopete::CommandHandler::parseArguments( args ); static_cast( manager->account() )->engine()->writeMessage( - TQString::fromLatin1("WHOWAS %1").arg( argsList.first() ) ); + TQString::tqfromLatin1("WHOWAS %1").tqarg( argsList.first() ) ); static_cast( 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( manager->account() )->engine()->mode( argsList.front(), - args.section( TQRegExp(TQString::fromLatin1("\\s+")), 1 ) ); + args.section( TQRegExp(TQString::tqfromLatin1("\\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::fromLatin1("\\s+")); + TQRegExp spaces(TQString::tqfromLatin1("\\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( members.first() ); if( chan && chan->locateUser( argsList.front() ) ) - chan->setMode( TQString::fromLatin1("+b %1").arg( argsList.front() ) ); + chan->setMode( TQString::tqfromLatin1("+b %1").tqarg( 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::fromLatin1("+o") ); + simpleModeChange( args, manager, TQString::tqfromLatin1("+o") ); } void IRCProtocol::slotDeopCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::fromLatin1("-o") ); + simpleModeChange( args, manager, TQString::tqfromLatin1("-o") ); } void IRCProtocol::slotVoiceCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::fromLatin1("+v") ); + simpleModeChange( args, manager, TQString::tqfromLatin1("+v") ); } void IRCProtocol::slotDevoiceCommand( const TQString &args, Kopete::ChatSession *manager ) { - simpleModeChange( args, manager, TQString::fromLatin1("-v") ); + simpleModeChange( args, manager, TQString::tqfromLatin1("-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::fromLatin1("%1 %2").arg( mode ).arg( *it ) ); + chan->setMode( TQString::tqfromLatin1("%1 %2").tqarg( mode ).tqarg( *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::fromLatin1("^[\\w-\\.]*$"), netConf ) ); + netConf->host->setValidator( new TQRegExpValidator( TQString::tqfromLatin1("^[\\w-\\.]*$"), TQT_TQOBJECT(netConf) ) ); netConf->upButton->setIconSet( SmallIconSet( "up" ) ); netConf->downButton->setIconSet( SmallIconSet( "down" ) ); @@ -807,7 +807,7 @@ void IRCProtocol::editNetworks( const TQString &networkName ) connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) - netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); + netConf->networkList->setSelected( netConf->networkList->tqfindItem( networkName ), true ); //slotUpdateNetworkConfig(); // unnecessary, setSelected emits selectionChanged @@ -827,7 +827,7 @@ void IRCProtocol::slotUpdateNetworkConfig() netConf->hostList->clear(); for( TQValueList::iterator it = net->hosts.begin(); it != net->hosts.end(); ++it ) - netConf->hostList->insertItem( (*it)->host + TQString::fromLatin1(":") + TQString::number((*it)->port) ); + netConf->hostList->insertItem( (*it)->host + TQString::tqfromLatin1(":") + 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::fromLatin1(":") + TQString::number( value ); + TQString entryText = m_uiCurrentHostSelection + TQString::tqfromLatin1(":") + 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("Are you sure you want to delete the network %1?
" "Any accounts which use this network will have to be modified.") - .arg(network), i18n("Deleting Network"), - KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) + .tqarg(network), i18n("Deleting Network"), + KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::tqfromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -944,15 +944,15 @@ void IRCProtocol::slotDeleteHost() TQString hostName = netConf->host->text(); if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(), i18n("Are you sure you want to delete the host %1?") - .arg(hostName), i18n("Deleting Host"), - KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue ) + .tqarg(hostName), i18n("Deleting Host"), + KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::tqfromLatin1("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::fromLatin1(":") + TQString::number(host->port); - TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); + TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); + TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); @@ -971,14 +971,14 @@ 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::fromLatin1( "New Network" ); - if ( m_networks.find( netName ) ) + TQString netName = TQString::tqfromLatin1( "New Network" ); + if ( m_networks.tqfind( netName ) ) { int newIdx = 1; do { - netName = TQString::fromLatin1( "New Network #%1" ).arg( newIdx++ ); + netName = TQString::tqfromLatin1( "New Network #%1" ).tqarg( newIdx++ ); } - while ( m_networks.find( netName ) && newIdx < 100 ); + while ( m_networks.tqfind( netName ) && newIdx < 100 ); if ( newIdx == 100 ) // pathological case return; } @@ -986,7 +986,7 @@ void IRCProtocol::slotNewNetwork() // and add it to the networks dict and list m_networks.insert( net->name, net ); netConf->networkList->insertItem( net->name ); - TQListBoxItem * justAdded = netConf->networkList->findItem( net->name ); + TQListBoxItem * justAdded = netConf->networkList->tqfindItem( net->name ); netConf->networkList->setSelected( justAdded, true ); netConf->networkList->setBottomItem( netConf->networkList->index( justAdded ) ); } @@ -1000,7 +1000,7 @@ void IRCProtocol::slotNewHost() TQString name = KInputDialog::getText( i18n("New Host"), i18n("Enter the hostname of the new server:"), - TQString::null, &ok, Kopete::UI::Global::mainWidget() ); + TQString(), &ok, Kopete::UI::Global::mainWidget() ); if ( ok ) { // dupe check @@ -1019,10 +1019,10 @@ void IRCProtocol::slotNewHost() IRCNetwork *net = m_networks[ netConf->networkList->currentText() ]; net->hosts.append( host ); // add it to the gui - TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port); + TQString entryText = host->host + TQString::tqfromLatin1(":") + TQString::number(host->port); netConf->hostList->insertItem( entryText ); // select it in the gui - TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); + TQListBoxItem * justAdded = netConf->hostList->tqfindItem( entryText ); netConf->hostList->setSelected( justAdded, true ); //netConf->hostList->setBottomItem( netConf->hostList->index( justAdded ) ); } @@ -1056,7 +1056,7 @@ void IRCProtocol::slotRenameNetwork() m_networks.remove( m_uiCurrentNetworkSelection ); m_networks.insert( net->name, net ); // ui - int idx = netConf->networkList->index( netConf->networkList->findItem( m_uiCurrentNetworkSelection ) ); + int idx = netConf->networkList->index( netConf->networkList->tqfindItem( m_uiCurrentNetworkSelection ) ); m_uiCurrentNetworkSelection = net->name; netConf->networkList->changeItem( net->name, idx ); // changes the selection!!! netConf->networkList->sort(); @@ -1190,7 +1190,7 @@ void IRCProtocol::slotMoveServerUp() if( !selectedNetwork || !selectedHost ) return; - TQValueList::iterator pos = selectedNetwork->hosts.find( selectedHost ); + TQValueList::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); if( pos != selectedNetwork->hosts.begin() ) { TQValueList::iterator lastPos = pos; @@ -1203,7 +1203,7 @@ void IRCProtocol::slotMoveServerUp() if( currentPos > 0 ) { netConf->hostList->removeItem( currentPos ); - TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port ); + TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + TQString::number( selectedHost->port ); netConf->hostList->insertItem( entryText, --currentPos ); netConf->hostList->setSelected( currentPos, true ); } @@ -1217,7 +1217,7 @@ void IRCProtocol::slotMoveServerDown() if( !selectedNetwork || !selectedHost ) return; - TQValueList::iterator pos = selectedNetwork->hosts.find( selectedHost ); + TQValueList::iterator pos = selectedNetwork->hosts.tqfind( selectedHost ); if( *pos != selectedNetwork->hosts.back() ) { TQValueList::iterator nextPos = selectedNetwork->hosts.remove( pos ); @@ -1228,7 +1228,7 @@ void IRCProtocol::slotMoveServerDown() if( currentPos < ( netConf->hostList->count() - 1 ) ) { netConf->hostList->removeItem( currentPos ); - TQString entryText = selectedHost->host + TQString::fromLatin1(":") + TQString::number( selectedHost->port ); + TQString entryText = selectedHost->host + TQString::tqfromLatin1(":") + 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 0151f900..61a810fd 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::fromLatin1("kopete_chatwindow") ); +static const TQString CHAT_VIEW( TQString::tqfromLatin1("kopete_chatwindow") ); /** * @author Nick Betcher @@ -64,9 +64,10 @@ static const TQString CHAT_VIEW( TQString::fromLatin1("kopete_chatwindow") ); class IRCProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - enum IRCStatus + enum IRCtqStatus { Offline = 1, //! An offline user. Connecting = 2, //! User that is connecting. @@ -81,11 +82,11 @@ public: OnlineServer = 32768 //! This server is online. }; - IRCProtocol( TQObject *parent, const char *name, const TQStringList &args ); + IRCProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); ~IRCProtocol(); /** Kopete::Protocol reimplementation */ - virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); + virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account); /** * Deserialize contact data @@ -93,7 +94,7 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual KopeteEditAccountWidget* createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account* createNewAccount(const TQString &accountId); @@ -104,7 +105,7 @@ public: /** * Maps the given IRC status to Kopete::OnlineStatus. */ - const Kopete::OnlineStatus statusLookup( IRCStatus status ) const; + const Kopete::OnlineStatus statusLookup( IRCtqStatus status ) const; const Kopete::OnlineStatus m_ServerStatusOnline; const Kopete::OnlineStatus m_ServerStatusOffline; @@ -145,7 +146,7 @@ public: TQDict &networks(){ return m_networks; } void addNetwork( IRCNetwork *network ); - void editNetworks( const TQString &networkName = TQString::null ); + void editNetworks( const TQString &networkName = TQString() ); signals: void networkConfigUpdated( const TQString &selectedNetwork ); diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 5be40dff..3200d72d 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*)) ); - updateStatus(); + updatetqStatus(); } -void IRCServerContact::updateStatus() +void IRCServerContact::updatetqStatus() { - KIRC::Engine::Status status = kircEngine()->status(); + KIRC::Engine::tqStatus status = kircEngine()->status(); switch( status ) { case KIRC::Engine::Idle: @@ -92,7 +92,7 @@ void IRCServerContact::updateStatus() const TQString IRCServerContact::caption() const { - return i18n("%1 @ %2").arg(ircAccount()->mySelf()->nickName() ).arg( + return i18n("%1 @ %2").tqarg(ircAccount()->mySelf()->nickName() ).tqarg( kircEngine()->currentHost().isEmpty() ? ircAccount()->networkName() : kircEngine()->currentHost() ); } @@ -147,21 +147,21 @@ void IRCServerContact::slotIncomingNotice( const TQString &orig, const TQString // Prefix missing. // NOTICE AUTH :*** Checking Ident - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg(kircEngine()->currentHost(), notice), + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg(kircEngine()->currentHost(), notice), IRCAccount::NoticeReply); } else { // :Global!service@rizon.net NOTICE foobar :[Logon News - Oct 12 2005] Due to growing problems ... // :somenick!~fooobar@somehostname.fi NOTICE foobar :hello - if (orig.contains('!')) { - ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").arg( + if (orig.tqcontains('!')) { + ircAccount()->appendMessage(i18n("NOTICE from %1 (%2): %3").tqarg( orig.section('!', 0, 0), orig.section('!', 1, 1), notice), IRCAccount::NoticeReply); } else { - ircAccount()->appendMessage(i18n("NOTICE from %1: %2").arg( + ircAccount()->appendMessage(i18n("NOTICE from %1: %2").tqarg( 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::fromLatin1("%1: %2").arg(channel).arg(message), IRCAccount::ErrorReply); + ircAccount()->appendMessage(TQString::tqfromLatin1("%1: %2").tqarg(channel).tqarg(message), IRCAccount::ErrorReply); } void IRCServerContact::appendMessage(Kopete::Message &msg) diff --git a/kopete/protocols/irc/ircservercontact.h b/kopete/protocols/irc/ircservercontact.h index 4d9e378d..b715a65b 100644 --- a/kopete/protocols/irc/ircservercontact.h +++ b/kopete/protocols/irc/ircservercontact.h @@ -45,6 +45,7 @@ class IRCServerContact : public IRCContact { Q_OBJECT + TQ_OBJECT public: // This class provides a Kopete::Contact for each server of a given IRC connection. @@ -60,7 +61,7 @@ class IRCServerContact virtual void slotSendMsg(Kopete::Message &message, Kopete::ChatSession *); private slots: - virtual void updateStatus(); + virtual void updatetqStatus(); void slotViewCreated( KopeteView* ); void slotDumpMessages(); diff --git a/kopete/protocols/irc/ircsignalhandler.h b/kopete/protocols/irc/ircsignalhandler.h index 57732e07..2571a897 100644 --- a/kopete/protocols/irc/ircsignalhandler.h +++ b/kopete/protocols/irc/ircsignalhandler.h @@ -45,11 +45,11 @@ * up the contact it is for, and call the function passed into the class by the * mapping function. * -* Since QObjects cannot be inside templates, the QMember classes that connect +* Since TQObjects cannot be inside templates, the TQMember classes that connect * to the slots are seperate. */ -/*** Pre-declare mapping types for the QObjects **/ +/*** Pre-declare mapping types for the TQObjects **/ struct IRCSignalMappingBase{}; struct IRCSignalMappingT : IRCSignalMappingBase @@ -81,12 +81,13 @@ TQObject members, these connect to the KIRC signals and call the Mapping functions when they emit. **/ -class QMember : public QObject +class TQMember : public TQObject { Q_OBJECT + TQ_OBJECT public: - QMember( IRCSignalMappingT *m, TQObject *p ) : TQObject( p ), mapping( m ){}; + TQMember( IRCSignalMappingT *m, TQObject *p ) : TQObject( p ), mapping( m ){}; public slots: void slotEmit( const TQString &id ) @@ -99,12 +100,13 @@ class QMember : public QObject IRCSignalMappingT *mapping; }; -class QMemberSingle : public QObject +class TQMemberSingle : public TQObject { Q_OBJECT + TQ_OBJECT public: - QMemberSingle( IRCSignalMappingSingleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} + TQMemberSingle( IRCSignalMappingSingleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} public slots: void slotEmit( const TQString &id, const TQString &arg ) @@ -117,12 +119,13 @@ class QMemberSingle : public QObject IRCSignalMappingSingleT *mapping; }; -class QMemberDouble : public QObject +class TQMemberDouble : public TQObject { Q_OBJECT + TQ_OBJECT public: - QMemberDouble( IRCSignalMappingDoubleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} + TQMemberDouble( IRCSignalMappingDoubleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} public slots: void slotEmit( const TQString &id, const TQString &arg, const TQString &arg2 ) @@ -135,12 +138,13 @@ class QMemberDouble : public QObject IRCSignalMappingDoubleT *mapping; }; -class QMemberTriple : public QObject +class TQMemberTriple : public TQObject { Q_OBJECT + TQ_OBJECT public: - QMemberTriple( IRCSignalMappingTripleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} + TQMemberTriple( IRCSignalMappingTripleT *m, TQObject *p ) : TQObject( p ), mapping( m ){} public slots: void slotEmit( const TQString &id, const TQString &arg, const TQString &arg2, const TQString &arg3 ) @@ -250,9 +254,10 @@ class IRCSignalMappingTriple : public IRCSignalMappingTripleT void (TClass::*method)(const TQString &,const TQString &,const TQString &); }; -class IRCSignalHandler : public QObject +class IRCSignalHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: IRCSignalHandler( IRCContactManager *manager ); @@ -288,7 +293,7 @@ class IRCSignalHandler : public QObject IRCSignalMappingT *mapping = new IRCSignalMapping( m, signal, method ); mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, - new QMember( mapping, this), + new TQMember( mapping, this), TQT_SLOT( slotEmit( const TQString &) ) ); } @@ -300,7 +305,7 @@ class IRCSignalHandler : public QObject IRCSignalMappingSingleT *mapping = new IRCSignalMappingSingle( m, signal, method ); mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, - new QMemberSingle( mapping, this), + new TQMemberSingle( mapping, this), TQT_SLOT( slotEmit( const TQString &, const TQString &) ) ); } @@ -312,7 +317,7 @@ class IRCSignalHandler : public QObject IRCSignalMappingDoubleT *mapping = new IRCSignalMappingDouble( m, signal, method ); mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, - new QMemberDouble( mapping, this), + new TQMemberDouble( mapping, this), TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &) ) ); } @@ -325,7 +330,7 @@ class IRCSignalHandler : public QObject IRCSignalMappingTripleT *mapping = new IRCSignalMappingTriple( m, signal, method ); mappings.append(mapping); TQObject::connect( static_cast( m->mySelf()->account() )->engine(), signal, - new QMemberTriple( mapping, this), + new TQMemberTriple( mapping, this), TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &,const TQString &) ) ); } diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index e579e94a..f4b5af10 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").arg(t->fileName())); +// kt->userAbort(i18n("User canceled transfer for file:%1").tqarg(t->fileName())); break; default: kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl; diff --git a/kopete/protocols/irc/irctransferhandler.h b/kopete/protocols/irc/irctransferhandler.h index 7847464c..d5a76bd4 100644 --- a/kopete/protocols/irc/irctransferhandler.h +++ b/kopete/protocols/irc/irctransferhandler.h @@ -34,9 +34,10 @@ class TransferHandler; } class IRCTransferHandler - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: static IRCTransferHandler *self(); diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 24e46c57..2c039e94 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(); - updateStatus(); + updatetqStatus(); } -void IRCUserContact::updateStatus() +void IRCUserContact::updatetqStatus() { //kdDebug(14120) << k_funcinfo << endl; - Kopete::OnlineStatus newStatus; + Kopete::OnlineStatus newtqStatus; switch (kircEngine()->status()) { case KIRC::Engine::Idle: - newStatus = m_protocol->m_UserStatusOffline; + newtqStatus = m_protocol->m_UserStatusOffline; break; case KIRC::Engine::Connecting: case KIRC::Engine::Authentifying: if (this == ircAccount()->mySelf()) - newStatus = m_protocol->m_UserStatusConnecting; + newtqStatus = m_protocol->m_UserStatusConnecting; else - newStatus = m_protocol->m_UserStatusOffline; + newtqStatus = m_protocol->m_UserStatusOffline; break; case KIRC::Engine::Connected: case KIRC::Engine::Closing: if (mInfo.away) - newStatus = m_protocol->m_UserStatusAway; + newtqStatus = m_protocol->m_UserStatusAway; else if (mInfo.online) - newStatus = m_protocol->m_UserStatusOnline; + newtqStatus = m_protocol->m_UserStatusOnline; break; default: - newStatus = m_protocol->m_StatusUnknown; + newtqStatus = m_protocol->m_StatusUnknown; } // Try hard not to emit several onlineStatusChanged() signals. @@ -105,31 +105,31 @@ void IRCUserContact::updateStatus() for( TQValueList::iterator it = channels.begin(); it != channels.end(); ++it ) { IRCChannelContact *channel = *it; - Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this); + Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this); - //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currentStatus.internalStatus() << endl; + //kdDebug(14120) << k_funcinfo << "iterating channel " << channel->nickName() << " internal status: " << currenttqStatus.internalStatus() << endl; - if( currentStatus.internalStatus() >= IRCProtocol::Online ) + if( currenttqStatus.internalStatus() >= IRCProtocol::Online ) { onlineStatusChanged = true; - if( !(currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusAway ) + if( !(currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusAway ) { - setOnlineStatus( newStatus ); + setOnlineStatus( newtqStatus ); //kdDebug(14120) << k_funcinfo << "was NOT away, but is now, channel " << channel->nickName() << endl; adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, AddBits); } - else if( (currentStatus.internalStatus() & IRCProtocol::Away) && newStatus == m_protocol->m_UserStatusOnline ) + else if( (currenttqStatus.internalStatus() & IRCProtocol::Away) && newtqStatus == m_protocol->m_UserStatusOnline ) { - setOnlineStatus( newStatus ); + setOnlineStatus( newtqStatus ); //kdDebug(14120) << k_funcinfo << "was away, but not anymore, channel " << channel->nickName() << endl; adjustInternalOnlineStatusBits(channel, IRCProtocol::Away, RemoveBits); } - else if( newStatus.internalStatus() < IRCProtocol::Away ) + else if( newtqStatus.internalStatus() < IRCProtocol::Away ) { //kdDebug(14120) << k_funcinfo << "offline or connecting?" << endl; - channel->manager()->setContactOnlineStatus( this, newStatus ); + channel->manager()->setContactOnlineStatus( this, newtqStatus ); } } } @@ -137,7 +137,7 @@ void IRCUserContact::updateStatus() if (!onlineStatusChanged) { //kdDebug(14120) << k_funcinfo << "setting status at last" << endl; - setOnlineStatus( newStatus ); + setOnlineStatus( newtqStatus ); } } @@ -147,7 +147,7 @@ void IRCUserContact::sendFile(const KURL &sourceURL, const TQString&, unsigned i //If the file location is null, then get it from a file open dialog if( !sourceURL.isValid() ) - filePath = KFileDialog::getOpenFileName(TQString::null, "*", 0l , i18n("Kopete File Transfer")); + filePath = KFileDialog::getOpenFileName(TQString(), "*", 0l , i18n("Kopete File Transfer")); else filePath = sourceURL.path(-1); @@ -162,10 +162,10 @@ void IRCUserContact::slotUserOffline() mInfo.online = false; mInfo.away = false; - updateStatus(); + updatetqStatus(); if( !metaContact()->isTemporary() ) - kircEngine()->writeMessage( TQString::fromLatin1("WHOWAS %1").arg(m_nickName) ); + kircEngine()->writeMessage( TQString::tqfromLatin1("WHOWAS %1").tqarg(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; - updateStatus(); + updatetqStatus(); } 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)").arg( m_nickName ).arg( reason ), + i18n("%1 is away (%2)").tqarg( m_nickName ).tqarg( 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; - updateStatus(); + updatetqStatus(); 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").arg(m_nickName).arg(kircEngine()->currentHost()); + return i18n("%1 @ %2").tqarg(m_nickName).tqarg(kircEngine()->currentHost()); } void IRCUserContact::slotOp() { - contactMode( TQString::fromLatin1("+o") ); + contactMode( TQString::tqfromLatin1("+o") ); } void IRCUserContact::slotDeop() { - contactMode( TQString::fromLatin1("-o") ); + contactMode( TQString::tqfromLatin1("-o") ); } void IRCUserContact::slotVoice() { - contactMode( TQString::fromLatin1("+v") ); + contactMode( TQString::tqfromLatin1("+v") ); } void IRCUserContact::slotDevoice() { - contactMode( TQString::fromLatin1("-v") ); + contactMode( TQString::tqfromLatin1("-v") ); } void IRCUserContact::slotBanHost() @@ -260,7 +260,7 @@ void IRCUserContact::slotBanHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@%1").arg(mInfo.hostName)); + kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@%1").tqarg(mInfo.hostName)); } void IRCUserContact::slotBanUserHost() @@ -284,7 +284,7 @@ void IRCUserContact::slotBanUserHostOnce() Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@%2").arg(mInfo.userName, mInfo.hostName)); + kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@%2").tqarg(mInfo.userName, mInfo.hostName)); } void IRCUserContact::slotBanDomain() @@ -310,7 +310,7 @@ void IRCUserContact::slotBanDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*@*.%1").arg(domain)); + kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*@*.%1").tqarg(domain)); } void IRCUserContact::slotBanUserDomain() @@ -336,21 +336,21 @@ void IRCUserContact::slotBanUserDomainOnce() TQString domain = mInfo.hostName.section('.', 1); - kircEngine()->mode(channelName, TQString::fromLatin1("+b *!*%1@*.%2").arg(mInfo.userName, domain)); + kircEngine()->mode(channelName, TQString::tqfromLatin1("+b *!*%1@*.%2").tqarg(mInfo.userName, domain)); } void IRCUserContact::slotKick() { Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->kick(m_nickName, channelName, TQString::null); + kircEngine()->kick(m_nickName, channelName, TQString()); } void IRCUserContact::contactMode(const TQString &mode) { Kopete::ContactPtrList members = mActiveManager->members(); TQString channelName = static_cast(members.first())->nickName(); - kircEngine()->mode(channelName, TQString::fromLatin1("%1 %2").arg(mode).arg(m_nickName)); + kircEngine()->mode(channelName, TQString::tqfromLatin1("%1 %2").tqarg(mode).tqarg(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( onlineStatus().status() == Kopete::OnlineStatus::Offline ) + if( onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) { - setProperty( m_protocol->propUserInfo, TQString::fromLatin1("%1@%2") - .arg(mInfo.userName).arg(mInfo.hostName) ); + setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2") + .tqarg(mInfo.userName).tqarg(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() || onlineStatus().status() == Kopete::OnlineStatus::Online - || onlineStatus().status() == Kopete::OnlineStatus::Away ) + if( metaContact()->isTemporary() || onlinetqStatus().status() == Kopete::OnlineStatus::Online + || onlinetqStatus().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
") - .arg(m_nickName) - .arg(mInfo.userName) - .arg(mInfo.hostName) - .arg(mInfo.realName); + .tqarg(m_nickName) + .tqarg(mInfo.userName) + .tqarg(mInfo.hostName) + .tqarg(mInfo.realName); if( mInfo.isIdentified ) - msg += i18n("%1 is authenticated with NICKSERV
").arg(m_nickName); + msg += i18n("%1 is authenticated with NICKSERV
").tqarg(m_nickName); if( mInfo.isOperator ) - msg += i18n("%1 is an IRC operator
").arg(m_nickName); + msg += i18n("%1 is an IRC operator
").tqarg(m_nickName); //Channels - msg += i18n("on channels %1
").arg(mInfo.channels.join(" ; ")); + msg += i18n("on channels %1
").tqarg(mInfo.channels.join(" ; ")); //Server - msg += i18n("on IRC via server %1 ( %2 )
").arg(mInfo.serverName).arg(mInfo.serverInfo); + msg += i18n("on IRC via server %1 ( %2 )
").tqarg(mInfo.serverName).tqarg(mInfo.serverInfo); //Idle TQString idleTime = formattedIdleTime(); - msg += i18n("idle: %2
").arg( idleTime.isEmpty() ? TQString::number(0) : idleTime ); + msg += i18n("idle: %2
").tqarg( 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") - .arg(m_nickName) - .arg(mInfo.userName) - .arg(mInfo.hostName) - .arg(mInfo.realName); + .tqarg(m_nickName) + .tqarg(mInfo.userName) + .tqarg(mInfo.hostName) + .tqarg(mInfo.realName); - msg += i18n("Last Online: %1\n").arg( + msg += i18n("Last Online: %1\n").tqarg( 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::fromLatin1("%1@%2") - .arg(mInfo.userName).arg(mInfo.hostName) ); + setProperty( m_protocol->propUserInfo, TQString::tqfromLatin1("%1@%2") + .tqarg(mInfo.userName).tqarg(mInfo.hostName) ); setProperty( m_protocol->propServer, mInfo.serverName ); setProperty( m_protocol->propChannels, mInfo.channels.join(" ") ); setProperty( m_protocol->propHops, TQString::number(mInfo.hops) ); @@ -504,7 +504,7 @@ void IRCUserContact::updateInfo() void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user, const TQString &host, const TQString &server, bool away, const TQString &flags, uint hops, const TQString &realName ) { - if( !mInfo.channels.contains( channel ) ) + if( !mInfo.channels.tqcontains( channel ) ) mInfo.channels.append( channel ); mInfo.userName = user; @@ -667,32 +667,32 @@ void IRCUserContact::slotIncomingModeChange( const TQString &channel, const TQSt void IRCUserContact::adjustInternalOnlineStatusBits(IRCChannelContact *channel, unsigned statusAdjustment, bitAdjustment adj) { - Kopete::OnlineStatus currentStatus = channel->manager()->contactOnlineStatus(this); - Kopete::OnlineStatus newStatus; + Kopete::OnlineStatus currenttqStatus = channel->manager()->contactOnlineStatus(this); + Kopete::OnlineStatus newtqStatus; if (adj == RemoveBits) { // If the bit is not set in the current internal status, stop here. - if ((currentStatus.internalStatus() & ~statusAdjustment) == currentStatus.internalStatus()) + if ((currenttqStatus.internalStatus() & ~statusAdjustment) == currenttqStatus.internalStatus()) return; - newStatus = m_protocol->statusLookup( - (IRCProtocol::IRCStatus)(currentStatus.internalStatus() & ~statusAdjustment) + newtqStatus = m_protocol->statusLookup( + (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() & ~statusAdjustment) ); } else if (adj == AddBits) { // If the bit is already set in the current internal status, stop here. - if ((currentStatus.internalStatus() | statusAdjustment) == currentStatus.internalStatus()) + if ((currenttqStatus.internalStatus() | statusAdjustment) == currenttqStatus.internalStatus()) return; - newStatus = m_protocol->statusLookup( - (IRCProtocol::IRCStatus)(currentStatus.internalStatus() | statusAdjustment) + newtqStatus = m_protocol->statusLookup( + (IRCProtocol::IRCtqStatus)(currenttqStatus.internalStatus() | statusAdjustment) ); } - channel->manager()->setContactOnlineStatus(this, newStatus); + channel->manager()->setContactOnlineStatus(this, newtqStatus); } 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 860f3972..269cd40c 100644 --- a/kopete/protocols/irc/ircusercontact.h +++ b/kopete/protocols/irc/ircusercontact.h @@ -61,6 +61,7 @@ struct IRCUserInfo class IRCUserContact : public IRCContact { Q_OBJECT + TQ_OBJECT public: // This class provides a Kopete::Contact for each user on the channel. @@ -93,7 +94,7 @@ public: public slots: /** \brief Updates online status for channels based on current internal status. */ - virtual void updateStatus(); + virtual void updatetqStatus(); 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 f7e4ee24..7bd9bfe8 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -21,7 +21,7 @@ #include "kcodecaction.h" KCodecAction::KCodecAction( const TQString &text, const KShortcut &cut, - TQObject *parent, const char *name ) : KSelectAction( text, "", cut, parent, name ) + TQObject *tqparent, const char *name ) : KSelectAction( text, "", cut, tqparent, name ) { TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( slotActivated( const TQString & ) ) ); @@ -70,7 +70,7 @@ TQStringList KCodecAction::supportedEncodings(bool usAscii) { TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); - if (mimeNames.find(mimeName) == mimeNames.end()) + if (mimeNames.tqfind(mimeName) == mimeNames.end()) { encodings.append(KGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); diff --git a/kopete/protocols/irc/kcodecaction.h b/kopete/protocols/irc/kcodecaction.h index 3ebd5f4d..1cd408ab 100644 --- a/kopete/protocols/irc/kcodecaction.h +++ b/kopete/protocols/irc/kcodecaction.h @@ -29,9 +29,10 @@ class KCodecAction : public KSelectAction { Q_OBJECT + TQ_OBJECT public: KCodecAction( const TQString &text, const KShortcut &cut = KShortcut(), - TQObject *parent = 0, const char *name = 0 ); + TQObject *tqparent = 0, const char *name = 0 ); void setCodec( const TQTextCodec *codec ); diff --git a/kopete/protocols/irc/ksparser.cpp b/kopete/protocols/irc/ksparser.cpp index f9029e84..ea7e72cd 100644 --- a/kopete/protocols/irc/ksparser.cpp +++ b/kopete/protocols/irc/ksparser.cpp @@ -33,22 +33,22 @@ KSParser KSParser::m_parser; const TQColor KSParser::IRC_Colors[17]= { - Qt::white, - Qt::black, - Qt::darkBlue, - Qt::darkGreen, - Qt::red, - Qt::darkRed, - Qt::darkMagenta, - Qt::darkYellow, - Qt::yellow, - Qt::green, - Qt::darkCyan, - Qt::cyan, - Qt::blue, - Qt::magenta, - Qt::darkGray, - Qt::gray, + TQt::white, + TQt::black, + TQt::darkBlue, + TQt::darkGreen, + TQt::red, + TQt::darkRed, + TQt::darkMagenta, + TQt::darkYellow, + TQt::yellow, + TQt::green, + TQt::darkCyan, + TQt::cyan, + TQt::blue, + TQt::magenta, + TQt::darkGray, + TQt::gray, TQColor() // default invalid color, must be the last }; @@ -117,17 +117,17 @@ TQCString KSParser::_parse(const TQCString &message) } else { - toAppend = popTag(TQString::fromLatin1("span")); + toAppend = popTag(TQString::tqfromLatin1("span")); } break; case 0x07: //System bell: ^G - KNotifyClient::beep( TQString::fromLatin1("IRC beep event received in a message") ); + KNotifyClient::beep( TQString::tqfromLatin1("IRC beep event received in a message") ); break; case '\t': // 0x09 - toAppend = TQString::fromLatin1("    "); + toAppend = TQString::tqfromLatin1("    "); break; case '\n': // 0x0D - toAppend= TQString::fromLatin1("
"); + toAppend= TQString::tqfromLatin1("
"); 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::fromLatin1("<"); + toAppend = TQString::tqfromLatin1("<"); break; case '>': - toAppend = TQString::fromLatin1(">"); + toAppend = TQString::tqfromLatin1(">"); break; default: if (cur < TQChar(' ')) // search for control characters - toAppend = TQString::fromLatin1("<%1>").arg(cur, 2, 16).upper(); + toAppend = TQString::tqfromLatin1("<%1>").tqarg(cur, 2, 16).upper(); else toAppend = TQStyleSheet::escape(cur); } @@ -178,10 +178,10 @@ TQString KSParser::pushTag(const TQString &tag, const TQString &attributes) { TQString res; m_tags.push(tag); - if(!m_attributes.contains(tag)) + if(!m_attributes.tqcontains(tag)) m_attributes.insert(tag, attributes); else if(!attributes.isEmpty()) - m_attributes.replace(tag, attributes); + m_attributes.tqreplace(tag, attributes); res.append("<" + tag); if(!m_attributes[tag].isEmpty()) res.append(" " + m_attributes[tag]); @@ -193,20 +193,20 @@ TQString KSParser::pushColorTag(const TQColor &fgColor, const TQColor &bgColor) TQString tagStyle; if (fgColor.isValid()) - tagStyle += TQString::fromLatin1("color:%1;").arg(fgColor.name()); + tagStyle += TQString::tqfromLatin1("color:%1;").tqarg(fgColor.name()); if (bgColor.isValid()) - tagStyle += TQString::fromLatin1("background-color:%1;").arg(bgColor.name()); + tagStyle += TQString::tqfromLatin1("background-color:%1;").tqarg(bgColor.name()); if(!tagStyle.isEmpty()) - tagStyle = TQString::fromLatin1("style=\"%1\"").arg(tagStyle); + tagStyle = TQString::tqfromLatin1("style=\"%1\"").tqarg(tagStyle); - return pushTag(TQString::fromLatin1("span"), tagStyle);; + return pushTag(TQString::tqfromLatin1("span"), tagStyle);; } TQString KSParser::popTag(const TQString &tag) { - if (!m_tags.contains(tag)) - return TQString::null; + if (!m_tags.tqcontains(tag)) + return TQString(); TQString res; TQValueStack savedTags; @@ -224,7 +224,7 @@ TQString KSParser::popTag(const TQString &tag) TQString KSParser::toggleTag(const TQString &tag) { - return m_attributes.contains(tag)?popTag(tag):pushTag(tag); + return m_attributes.tqcontains(tag)?popTag(tag):pushTag(tag); } TQString KSParser::popAll() diff --git a/kopete/protocols/irc/ksparser.h b/kopete/protocols/irc/ksparser.h index cc9d9dc4..a71ff175 100644 --- a/kopete/protocols/irc/ksparser.h +++ b/kopete/protocols/irc/ksparser.h @@ -36,7 +36,7 @@ private: KSParser(); TQCString _parse(const TQCString &); - TQString pushTag(const TQString &, const TQString & = TQString::null); + TQString pushTag(const TQString &, const TQString & = TQString()); TQString pushColorTag(const TQColor &fgColor, const TQColor &bgColor); TQString popTag(const TQString &); TQString toggleTag(const TQString &); diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 03936d5f..167d7a22 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -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::fromLatin1("[\\r\\n]*$") ); +const TQRegExp Engine::m_RemoveLinefeeds( TQString::tqfromLatin1("[\\r\\n]*$") ); -Engine::Engine(TQObject *parent, const char *name) - : TQObject(parent, TQString::fromLatin1("[KIRC::Engine]%1").arg(name).latin1()), +Engine::Engine(TQObject *tqparent, const char *name) + : TQObject(tqparent, TQString::tqfromLatin1("[KIRC::Engine]%1").tqarg(name).latin1()), m_status(Idle), m_FailedNickOnLogin(false), m_useSSL(false), @@ -64,7 +64,7 @@ Engine::Engine(TQObject *parent, const char *name) m_ctcpReplies(17, false), codecs(577,false) { - setUserName(TQString::null); + setUserName(TQString()); m_commands.setAutoDelete(true); m_ctcpQueries.setAutoDelete(true); @@ -74,9 +74,9 @@ Engine::Engine(TQObject *parent, const char *name) bindNumericReplies(); bindCtcp(); - 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."); + 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."); 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::setStatus(Engine::Status status) +void Engine::settqStatus(Engine::tqStatus status) { kdDebug(14120) << k_funcinfo << status << endl; if (m_status == status) return; -// Engine::Status oldStatus = m_status; +// Engine::tqStatus oldtqStatus = m_status; m_status = status; emit statusChanged(status); @@ -169,21 +169,21 @@ void Engine::setStatus(Engine::Status status) case Closing: m_sock->close(); m_sock->reset(); - setStatus(Idle); + settqStatus(Idle); break; case AuthentifyingFailed: - setStatus(Closing); + settqStatus(Closing); break; case Timeout: - setStatus(Closing); + settqStatus(Closing); break; case Disconnected: - setStatus(Closing); + settqStatus(Closing); break; } } -void Engine::connectToServer(const TQString &host, Q_UINT16 port, const TQString &nickname, bool useSSL ) +void Engine::connectToServer(const TQString &host, TQ_UINT16 port, const TQString &nickname, bool useSSL ) { setUseSSL(useSSL); @@ -195,28 +195,28 @@ void Engine::connectToServer(const TQString &host, Q_UINT16 port, const TQString kdDebug(14120) << "Sock status: " << m_sock->socketStatus() << endl; if( !m_sock->setAddress(m_Host, m_Port) ) - kdDebug(14120) << k_funcinfo << "setAddress failed. Status: " << m_sock->socketStatus() << endl; + kdDebug(14120) << k_funcinfo << "setAddress failed. tqStatus: " << m_sock->socketStatus() << endl; if( m_sock->startAsyncConnect() == 0 ) { - kdDebug(14120) << k_funcinfo << "Success!. Status: " << m_sock->socketStatus() << endl; - setStatus(Connecting); + kdDebug(14120) << k_funcinfo << "Success!. tqStatus: " << m_sock->socketStatus() << endl; + settqStatus(Connecting); } else { - kdDebug(14120) << k_funcinfo << "Failed. Status: " << m_sock->socketStatus() << endl; - setStatus(Disconnected); + kdDebug(14120) << k_funcinfo << "Failed. tqStatus: " << m_sock->socketStatus() << endl; + settqStatus(Disconnected); } } void Engine::slotConnected() { - setStatus(Authentifying); + settqStatus(Authentifying); } void Engine::slotConnectionClosed() { - setStatus(Disconnected); + settqStatus(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 - setStatus(Disconnected); + settqStatus(Disconnected); } } @@ -250,7 +250,7 @@ void Engine::setSourceString(const TQString &newString) void Engine::setUserName(const TQString &newName) { if(newName.isEmpty()) - m_Username = TQString::fromLatin1(getpwuid(getuid())->pw_name); + m_Username = TQString::tqfromLatin1(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::fromLatin1(getpwuid(getuid())->pw_gecos); + m_realName = TQString::tqfromLatin1(getpwuid(getuid())->pw_gecos); else m_realName = newName; m_realName.remove(m_RemoveLinefeeds); @@ -277,7 +277,7 @@ bool Engine::_bind(TQDict &dict, if (!mr) { mr = new MessageRedirector(this, minArgs, maxArgs, helpMessage); - dict.replace(command, mr); + dict.tqreplace(command, mr); } return mr->connect(object, member); @@ -443,7 +443,7 @@ bool Engine::invokeCtcpCommandOfMessage(const TQDict &map, Me kdDebug(14120) << "Method error for line:" << ctcpMsg.raw() << endl; writeCtcpErrorMessage(msg.prefix(), msg.ctcpRaw(), - TQString::fromLatin1("%1 internal error(s)").arg(errors.size())); + TQString::tqfromLatin1("%1 internal error(s)").tqarg(errors.size())); } else { diff --git a/kopete/protocols/irc/libkirc/kircengine.h b/kopete/protocols/irc/libkirc/kircengine.h index c39bbe6e..e086afc1 100644 --- a/kopete/protocols/irc/libkirc/kircengine.h +++ b/kopete/protocols/irc/libkirc/kircengine.h @@ -51,27 +51,28 @@ namespace KIRC * @author Jason Keirstead */ class Engine - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT -// Q_PROPERTY(TQUrl serverURL READ serverURL WRITE setServerURL) +// TQ_PROPERTY(TQUrl serverURL READ serverURL WRITE setServerURL) // Extracted from the base of the serverURL. -// Q_PROPERTY(bool useSSL); -// Q_PROPERTY(TQString user READ user); -// Q_PROPERTY(TQString password); -// Q_PROPERTY(TQString host READ host); -// Q_PROPERTY(int port READ host); +// TQ_PROPERTY(bool useSSL); +// TQ_PROPERTY(TQString user READ user); +// TQ_PROPERTY(TQString password); +// TQ_PROPERTY(TQString host READ host); +// TQ_PROPERTY(int port READ host); // Extracted from the query of the serverURL. -// Q_PROPERTY(bool reqsPasswd); -// Q_PROPERTY(TQString name); // real name -// Q_PROPERTY(TQStringList nickList READ nickList WRITE setNickList) -// Q_PROPERTY(TQString nick READ nick) -// Q_PROPERTY(TQStringList portList) +// TQ_PROPERTY(bool reqsPasswd); +// TQ_PROPERTY(TQString name); // real name +// TQ_PROPERTY(TQStringList nickList READ nickList WRITE setNickList) +// TQ_PROPERTY(TQString nick READ nick) +// TQ_PROPERTY(TQStringList portList) - Q_ENUMS(Status) + Q_ENUMS(tqStatus) public: enum Error @@ -83,7 +84,7 @@ public: MethodFailed }; - enum Status + enum tqStatus { Idle, Connecting, @@ -105,7 +106,7 @@ public: MessageOfTheDayCondensedMessage }; - Engine( TQObject *parent = 0, const char* name = 0 ); + Engine( TQObject *tqparent = 0, const char* name = 0 ); ~Engine(); // TQString nick() const; @@ -118,7 +119,7 @@ public: inline const TQString ¤tHost() const { return m_Host; }; - inline Q_UINT16 currentPort() + inline TQ_UINT16 currentPort() { return m_Port; } inline const TQString &nickName() const @@ -159,12 +160,12 @@ public: void setVersionString(const TQString &versionString); void setUserString(const TQString &userString); void setSourceString(const TQString &sourceString); - void connectToServer(const TQString &host, Q_UINT16 port, const TQString &nickname, bool useSSL = false); + void connectToServer(const TQString &host, TQ_UINT16 port, const TQString &nickname, bool useSSL = false); KExtendedSocket *socket() { return m_sock; }; - inline KIRC::Engine::Status status() const + inline KIRC::Engine::tqStatus status() const { return m_status; } inline bool isDisconnected() const @@ -174,7 +175,7 @@ public: { return m_status == Connected; } inline void setCodec( const TQString &nick, const TQTextCodec *codec ) - { codecs.replace( nick, codec ); } + { codecs.tqreplace( nick, codec ); } /* Custom CTCP replies handling */ inline TQString &customCtcp( const TQString &s ) @@ -191,16 +192,16 @@ public slots: void writeMessage(const TQString &message, const TQTextCodec *codec = 0 ); void writeMessage(const TQString &command, const TQStringList &args, - const TQString &suffix = TQString::null, const TQTextCodec *codec = 0); + const TQString &suffix = TQString(), const TQTextCodec *codec = 0); void writeCtcpMessage(const TQString &command, const TQString &to, const TQString &ctcpMessage); void writeCtcpMessage(const TQString &command, const TQString &to, const TQString &suffix, - const TQString &ctcpCommand, const TQStringList &ctcpArgs, const TQString &ctcpSuffix = TQString::null, + const TQString &ctcpCommand, const TQStringList &ctcpArgs, const TQString &ctcpSuffix = TQString(), bool emitRepliedCtcp = true); inline void writeCtcpQueryMessage(const TQString &to, const TQString &suffix, - const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString::null, + const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString(), bool emitRepliedCtcp = true) { return writeCtcpMessage("PRIVMSG", to, suffix, ctcpCommand, ctcpArgs, ctcpSuffix, emitRepliedCtcp); } @@ -208,42 +209,42 @@ public slots: { writeCtcpMessage("NOTICE", to, ctcpMessage); } inline void writeCtcpReplyMessage(const TQString &to, const TQString &suffix, - const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString::null, + const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString(), bool emitRepliedCtcp = true) { return writeCtcpMessage("NOTICE", to, suffix, ctcpCommand, ctcpArgs, ctcpSuffix, emitRepliedCtcp); } inline void writeCtcpErrorMessage(const TQString &to, const TQString &ctcpLine, const TQString &errorMsg, bool emitRepliedCtcp=true) - { return writeCtcpReplyMessage(to, TQString::null, "ERRMSG", ctcpLine, errorMsg, emitRepliedCtcp); } + { return writeCtcpReplyMessage(to, TQString(), "ERRMSG", ctcpLine, errorMsg, emitRepliedCtcp); } bool bind(const TQString &command, TQObject *object, const char *member, int minArgs = KIRC::MessageRedirector::Unknown, int maxArgs = KIRC::MessageRedirector::Unknown, - const TQString &helpMessage = TQString::null); + const TQString &helpMessage = TQString()); bool bind(int id, TQObject *object, const char *member, int minArgs = KIRC::MessageRedirector::Unknown, int maxArgs = KIRC::MessageRedirector::Unknown, - const TQString &helpMessage = TQString::null); + const TQString &helpMessage = TQString()); bool bindCtcpQuery(const TQString &command, TQObject *object, const char *member, int minArgs = KIRC::MessageRedirector::Unknown, int maxArgs = KIRC::MessageRedirector::Unknown, - const TQString &helpMessage = TQString::null); + const TQString &helpMessage = TQString()); bool bindCtcpReply(const TQString &command, TQObject *object, const char *member, int minArgs = KIRC::MessageRedirector::Unknown, int maxArgs = KIRC::MessageRedirector::Unknown, - const TQString &helpMessage = TQString::null); + const TQString &helpMessage = TQString()); - void away(bool isAway, const TQString &awayMessage = TQString::null); + void away(bool isAway, const TQString &awayMessage = TQString()); void ison(const TQStringList &nickList); void join(const TQString &name, const TQString &key); void kick(const TQString &user, const TQString &channel, const TQString &reason); void list(); void mode(const TQString &target, const TQString &mode); - void motd(const TQString &server = TQString::null); + void motd(const TQString &server = TQString()); void nick(const TQString &newNickname); void notice(const TQString &target, const TQString &message); void part(const TQString &name, const TQString &reason); @@ -259,7 +260,7 @@ public slots: void topic(const TQString &channel, const TQString &topic); void user(const TQString &newUsername, const TQString &hostname, const TQString &newRealname); - void user(const TQString &newUsername, Q_UINT8 mode, const TQString &newRealname); + void user(const TQString &newUsername, TQ_UINT8 mode, const TQString &newRealname); void whois(const TQString &user); @@ -274,7 +275,7 @@ public slots: void showInfoDialog(); signals: - void statusChanged(KIRC::Engine::Status newStatus); + void statusChanged(KIRC::Engine::tqStatus newtqStatus); void internalError(KIRC::Engine::Error, KIRC::Message &); void receivedMessage(KIRC::Message &); @@ -478,7 +479,7 @@ private: void bindNumericReplies(); void bindCtcp(); - void setStatus(KIRC::Engine::Status status); + void settqStatus(KIRC::Engine::tqStatus status); bool invokeCtcpCommandOfMessage(const TQDict &map, KIRC::Message &message); /* @@ -492,9 +493,9 @@ private: //Static regexes static const TQRegExp m_RemoveLinefeeds; - KIRC::Engine::Status m_status; + KIRC::Engine::tqStatus m_status; TQString m_Host; - Q_UINT16 m_Port; + TQ_UINT16 m_Port; // TQUrl serverURL; // TQUrl currentServerURL; diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp index 21a90676..f8c3dcca 100644 --- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp @@ -37,8 +37,8 @@ void Engine::bindCommands() bind("PING", this, TQT_SLOT(ping(KIRC::Message &)), 0, 0); bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0); bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1); - bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0); -// bind("SQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1); + bind("TQUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0); +// bind("STQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1); bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1); } @@ -46,30 +46,30 @@ void Engine::away(bool isAway, const TQString &awayMessage) { if(isAway) if( !awayMessage.isEmpty() ) - writeMessage("AWAY", TQString::null, awayMessage); + writeMessage("AWAY", TQString(), awayMessage); else - writeMessage("AWAY", TQString::null, TQString::fromLatin1("I'm away.")); + writeMessage("AWAY", TQString(), TQString::tqfromLatin1("I'm away.")); else - writeMessage("AWAY", TQString::null); + writeMessage("AWAY", TQString()); } // FIXME: Really handle this message void Engine::error(Message &) { - setStatus(Closing); + settqStatus(Closing); } void Engine::ison(const TQStringList &nickList) { if (!nickList.isEmpty()) { - TQString statement = TQString::fromLatin1("ISON"); + TQString statement = TQString::tqfromLatin1("ISON"); for (TQStringList::ConstIterator it = nickList.begin(); it != nickList.end(); ++it) { if ((statement.length()+(*it).length())>509) // 512(max buf)-2("\r\n")-1() { writeMessage(statement); - statement = TQString::fromLatin1("ISON ") + (*it); + statement = TQString::tqfromLatin1("ISON ") + (*it); } else statement.append(TQChar(' ') + (*it)); @@ -199,9 +199,9 @@ void Engine::quit(const TQString &reason, bool /*now*/) return; if (isConnected()) - writeMessage("QUIT", TQString::null, reason); + writeMessage("TQUIT", TQString(), reason); - setStatus(Closing); + settqStatus(Closing); } void Engine::quit(Message &msg) @@ -224,10 +224,10 @@ void Engine::user(const TQString &newUserName, const TQString &hostname, const T writeMessage("USER", TQStringList(m_Username) << hostname << m_Host, m_realName); } -void Engine::user(const TQString &newUserName, Q_UINT8 mode, const TQString &newRealName) +void Engine::user(const TQString &newUserName, TQ_UINT8 mode, const TQString &newRealName) { /* RFC2812: " " - * mode is a numeric value (from a bit mask). + * mode is a numeric value (from a bit tqmask). * 0x00 normal * 0x04 request +w * 0x08 request +i */ @@ -252,7 +252,7 @@ void Engine::topic(Message &msg) void Engine::list() { - writeMessage("LIST", TQString::null); + writeMessage("LIST", TQString()); } void Engine::motd(const TQString &server) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 7216dea7..83a4257c 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -72,7 +72,7 @@ void Engine::CtcpRequestCommand(const TQString &contact, const TQString &command { if(m_status == Connected) { - writeCtcpQueryMessage(contact, TQString::null, command); + writeCtcpQueryMessage(contact, TQString(), command); // emit ctcpCommandMessage( contact, command ); } } @@ -81,7 +81,7 @@ void Engine::CtcpRequest_action(const TQString &contact, const TQString &message { if(m_status == Connected) { - writeCtcpQueryMessage(contact, TQString::null, "ACTION", message); + writeCtcpQueryMessage(contact, TQString(), "ACTION", message); if( Entity::isChannel(contact) ) emit incomingAction(Kopete::Message::unescape(contact), Kopete::Message::unescape(m_Nickname), message); @@ -109,15 +109,15 @@ 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::fromLatin1("clientinfo") ]; + TQString clientinfo = customCtcpMap[ TQString::tqfromLatin1("clientinfo") ]; if (clientinfo.isNull()) - clientinfo = TQString::fromLatin1("The following commands are supported, but " + clientinfo = TQString::tqfromLatin1("The following commands are supported, but " "without sub-command help: VERSION, CLIENTINFO, USERINFO, TIME, SOURCE, PING," "ACTION."); - writeCtcpReplyMessage( msg.nickFromPrefix(), TQString::null, - msg.ctcpMessage().command(), TQString::null, clientinfo); + writeCtcpReplyMessage( msg.nickFromPrefix(), TQString(), + msg.ctcpMessage().command(), TQString(), clientinfo); } void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, uint port, Transfer::Type type) @@ -131,9 +131,9 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, { case Transfer::Chat: { - writeCtcpQueryMessage(nickname, TQString::null, - TQString::fromLatin1("DCC"), - TQStringList(TQString::fromLatin1("CHAT")) << TQString::fromLatin1("chat") << + writeCtcpQueryMessage(nickname, TQString(), + TQString::tqfromLatin1("DCC"), + TQStringList(TQString::tqfromLatin1("CHAT")) << TQString::tqfromLatin1("chat") << m_sock->localAddress()->nodeName() << TQString::number(port) ); break; @@ -143,8 +143,8 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, { TQFileInfo file(fileName); TQString noWhiteSpace = file.fileName(); - if (noWhiteSpace.contains(' ') > 0) - noWhiteSpace.replace(TQRegExp("\\s+"), "_"); + if (noWhiteSpace.tqcontains(' ') > 0) + noWhiteSpace.tqreplace(TQRegExp("\\s+"), "_"); TransferServer *server = TransferHandler::self()->createServer(this, nickname, type, fileName, file.size()); @@ -153,9 +153,9 @@ void Engine::CtcpRequest_dcc(const TQString &nickname, const TQString &fileName, kdDebug(14120) << "Starting DCC file outgoing transfer." << endl; - writeCtcpQueryMessage(nickname, TQString::null, - TQString::fromLatin1("DCC"), - TQStringList(TQString::fromLatin1("SEND")) << noWhiteSpace << ipNumber << + writeCtcpQueryMessage(nickname, TQString(), + TQString::tqfromLatin1("DCC"), + TQStringList(TQString::tqfromLatin1("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::fromLatin1("CHAT")) + if (dccCommand == TQString::tqfromLatin1("CHAT")) { // if(ctcpMsg.argsSize()!=4) return false; @@ -196,7 +196,7 @@ void Engine::CtcpQuery_dcc(Message &msg) Transfer::Chat ); } } - else if (dccCommand == TQString::fromLatin1("SEND")) + else if (dccCommand == TQString::tqfromLatin1("SEND")) { // if(ctcpMsg.argsSize()!=5) return false; @@ -253,11 +253,11 @@ void Engine::CtcpRequest_ping(const TQString &target) TQString timeReply; if( Entity::isChannel(target) ) - timeReply = TQString::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); + timeReply = TQString::tqfromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); else timeReply = TQString::number( time.tv_sec ); - writeCtcpQueryMessage( target, TQString::null, "PING", timeReply); + writeCtcpQueryMessage( target, TQString(), "PING", timeReply); } // else // ((MessageRedirector *)sender())->error("failed to get current time"); @@ -265,7 +265,7 @@ void Engine::CtcpRequest_ping(const TQString &target) void Engine::CtcpQuery_ping(Message &msg) { - writeCtcpReplyMessage( msg.nickFromPrefix(), TQString::null, + writeCtcpReplyMessage( msg.nickFromPrefix(), TQString(), msg.ctcpMessage().command(), msg.ctcpMessage().arg(0)); } @@ -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::fromLatin1("%1.%2").arg(time.tv_sec).arg(time.tv_usec); + TQString timeReply = TQString::tqfromLatin1("%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; @@ -284,7 +284,7 @@ void Engine::CtcpReply_ping(Message &msg) if (difference < 1) { diffString = TQString::number(difference); - diffString.remove((diffString.find('.') -1), 2); + diffString.remove((diffString.tqfind('.') -1), 2); diffString.truncate(3); diffString.append("milliseconds"); } @@ -293,12 +293,12 @@ void Engine::CtcpReply_ping(Message &msg) diffString = TQString::number(difference); TQString seconds = diffString.section('.', 0, 0); TQString millSec = diffString.section('.', 1, 1); - millSec.remove(millSec.find('.'), 1); + millSec.remove(millSec.tqfind('.'), 1); millSec.truncate(3); - diffString = TQString::fromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); + diffString = TQString::tqfromLatin1("%1 seconds, %2 milliseconds").arg(seconds).arg(millSec); } - emit incomingCtcpReply(TQString::fromLatin1("PING"), msg.nickFromPrefix(), diffString); + emit incomingCtcpReply(TQString::tqfromLatin1("PING"), msg.nickFromPrefix(), diffString); } // else // ((MessageRedirector *)sender())->error("failed to get current time"); @@ -306,36 +306,36 @@ void Engine::CtcpReply_ping(Message &msg) void Engine::CtcpQuery_source(Message &msg) { - writeCtcpReplyMessage(msg.nickFromPrefix(), TQString::null, + writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(), msg.ctcpMessage().command(), m_SourceString); } void Engine::CtcpQuery_time(Message &msg) { - writeCtcpReplyMessage(msg.nickFromPrefix(), TQString::null, - msg.ctcpMessage().command(), TQDateTime::currentDateTime().toString(), - TQString::null, false); + writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(), + msg.ctcpMessage().command(), TQDateTime::tqcurrentDateTime().toString(), + TQString(), false); } void Engine::CtcpQuery_userinfo(Message &msg) { - TQString userinfo = customCtcpMap[ TQString::fromLatin1("userinfo") ]; + TQString userinfo = customCtcpMap[ TQString::tqfromLatin1("userinfo") ]; if (userinfo.isNull()) userinfo = m_UserString; - writeCtcpReplyMessage(msg.nickFromPrefix(), TQString::null, - msg.ctcpMessage().command(), TQString::null, userinfo); + writeCtcpReplyMessage(msg.nickFromPrefix(), TQString(), + msg.ctcpMessage().command(), TQString(), userinfo); } void Engine::CtcpRequest_version(const TQString &target) { - writeCtcpQueryMessage(target, TQString::null, "VERSION"); + writeCtcpQueryMessage(target, TQString(), "VERSION"); } void Engine::CtcpQuery_version(Message &msg) { - TQString response = customCtcpMap[ TQString::fromLatin1("version") ]; + TQString response = customCtcpMap[ TQString::tqfromLatin1("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 67d3a842..3d7b896b 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); - setStatus(Connected); + settqStatus(Connected); } /* 002: ":Your host is , running version " diff --git a/kopete/protocols/irc/libkirc/kircentity.cpp b/kopete/protocols/irc/libkirc/kircentity.cpp index ded35fe5..2086ab9d 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::fromLatin1("^([^\\s,:!@]+)(?:(?:!([^\\s,:!@]+))?(?:@([^\\s,!@]+)))?$")); +const TQRegExp Entity::sm_userRegExp(TQString::tqfromLatin1("^([^\\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::fromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$")); +const TQRegExp Entity::sm_userStrictRegExp(TQString::tqfromLatin1("^([^\\s,:!@]+)!([^\\s,:!@]+)@([^\\s,:!@]+)$")); -const TQRegExp Entity::sm_channelRegExp( TQString::fromLatin1("^[#!+&][^\\s,]+$") ); +const TQRegExp Entity::sm_channelRegExp( TQString::tqfromLatin1("^[#!+&][^\\s,]+$") ); Entity::Entity(const TQString &, const Type type) : TQObject(0, "KIRC::Entity"), @@ -70,7 +70,7 @@ TQString Entity::host() const return userHost(); default: kdDebug(14121) << k_funcinfo << "No host defined for type:" << m_type; - return TQString::null; + return TQString(); } } diff --git a/kopete/protocols/irc/libkirc/kircentity.h b/kopete/protocols/irc/libkirc/kircentity.h index 1878a406..a8dc8fff 100644 --- a/kopete/protocols/irc/libkirc/kircentity.h +++ b/kopete/protocols/irc/libkirc/kircentity.h @@ -37,6 +37,7 @@ class Entity public KShared { Q_OBJECT + TQ_OBJECT public: enum Type @@ -87,7 +88,7 @@ private: static const TQRegExp sm_channelRegExp; KIRC::Entity::Type m_type; - QString m_name; + TQString m_name; // peer ip address if the entity is a User. TQString m_address; diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 73a1e53f..0c1d3ef0 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -34,7 +34,7 @@ TQRegExp Message::m_IRCNumericCommand("^\\d{1,3}$"); // TODO: This regexp parsing is no good. It's slower than it needs to be, and // is not codec-safe since TQString requires a codec. NEed to parse this with -// our own parsing class that operates on the raw QCStrings +// our own parsing class that operates on the raw TQCStrings TQRegExp Message::m_IRCCommandType1( "^(?::([^ ]+) )?([A-Za-z]+|\\d{1,3})((?: [^ :][^ ]*)*) ?(?: :(.*))?$"); // Extra end arg space check -------------------------^ @@ -99,14 +99,14 @@ void Message::writeRawMessage(Engine *engine, const TQTextCodec *codec, const TQ return; } - TQString txt = str + TQString::fromLatin1("\r\n"); + TQString txt = str + TQString::tqfromLatin1("\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::fromLatin1("(%1 bytes) >> %2").arg(wrote).arg(str) << endl; + kdDebug(14121) << TQString::tqfromLatin1("(%1 bytes) >> %2").tqarg(wrote).tqarg(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::fromLatin1(" :") + suffix; + msg = msg.stripWhiteSpace() + TQString::tqfromLatin1(" :") + 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::fromLatin1(" :") + ctcpSuffix; + ctcpMsg += TQString::tqfromLatin1(" :") + ctcpSuffix; writeMessage(engine, codec, command, to, suffix + TQChar(0x01) + ctcpQuote(ctcpMsg) + TQChar(0x01)); } @@ -158,7 +158,7 @@ Message Message::parse(Engine *engine, const TQTextCodec *codec, bool *parseSucc if (engine->socket()->canReadLine()) { TQCString raw(engine->socket()->bytesAvailable()+1); - Q_LONG length = engine->socket()->readLine(raw.data(), raw.count()); + TQ_LONG length = engine->socket()->readLine(raw.data(), raw.count()); if( length > -1 ) { @@ -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.at(length-2) = '\0'; + raw.tqat(length-2) = '\0'; } if (length > 2 && raw.at(length-3) == '\r') { - raw.at(length-3) = '\0'; + raw.tqat(length-3) = '\0'; } kdDebug(14121) << "<< " << raw << endl; @@ -201,10 +201,10 @@ TQString Message::quote(const TQString &str) { TQString tmp = str; TQChar q('\020'); - tmp.replace(q, q+TQString(q)); - tmp.replace(TQChar('\r'), q+TQString::fromLatin1("r")); - tmp.replace(TQChar('\n'), q+TQString::fromLatin1("n")); - tmp.replace(TQChar('\0'), q+TQString::fromLatin1("0")); + tmp.tqreplace(q, q+TQString(q)); + tmp.tqreplace(TQChar('\r'), q+TQString::tqfromLatin1("r")); + tmp.tqreplace(TQChar('\n'), q+TQString::tqfromLatin1("n")); + tmp.tqreplace(TQChar('\0'), q+TQString::tqfromLatin1("0")); return tmp; } @@ -216,13 +216,13 @@ TQString Message::unquote(const TQString &str) char b[3] = { 020, 020, '\0' }; const char b2[2] = { 020, '\0' }; - tmp.replace( b, b2 ); + tmp.tqreplace( b, b2 ); b[1] = 'r'; - tmp.replace( b, "\r"); + tmp.tqreplace( b, "\r"); b[1] = 'n'; - tmp.replace( b, "\n"); + tmp.tqreplace( b, "\n"); b[1] = '0'; - tmp.replace( b, "\0"); + tmp.tqreplace( b, "\0"); return tmp; } @@ -230,16 +230,16 @@ TQString Message::unquote(const TQString &str) TQString Message::ctcpQuote(const TQString &str) { TQString tmp = str; - tmp.replace( TQChar('\\'), TQString::fromLatin1("\\\\")); - tmp.replace( (char)1, TQString::fromLatin1("\\1")); + tmp.tqreplace( TQChar('\\'), TQString::tqfromLatin1("\\\\")); + tmp.tqreplace( (char)1, TQString::tqfromLatin1("\\1")); return tmp; } TQString Message::ctcpUnquote(const TQString &str) { TQString tmp = str; - tmp.replace("\\\\", "\\"); - tmp.replace("\\1", "\1" ); + tmp.tqreplace("\\\\", "\\"); + tmp.tqreplace("\\1", "\1" ); return tmp; } @@ -276,7 +276,7 @@ bool Message::matchForIRCRegExp(TQRegExp ®exp, const TQTextCodec *codec, cons msg.m_ctcpMessage = new Message(); msg.m_ctcpMessage->m_raw = codec->fromUnicode(ctcpUnquote(msg.m_ctcpRaw)); - int space = ctcpRaw.find(' '); + int space = ctcpRaw.tqfind(' '); if (!matchForIRCRegExp(msg.m_ctcpMessage->m_raw, codec, *msg.m_ctcpMessage)) { TQCString command; @@ -296,7 +296,7 @@ bool Message::matchForIRCRegExp(TQRegExp ®exp, const TQTextCodec *codec, cons msg.m_suffix = Kopete::Message::decodeString( KSParser::parse(suffix), codec ); } else - msg.m_suffix = TQString::null; + msg.m_suffix = TQString(); return true; } return false; @@ -311,13 +311,13 @@ void Message::decodeAgain( const TQTextCodec *codec ) TQString Message::toString() const { if( !isValid() ) - return TQString::null; + return TQString(); TQString msg = m_command; for (TQStringList::ConstIterator it = m_args.begin(); it != m_args.end(); ++it) msg += TQChar(' ') + *it; if (!m_suffix.isNull()) - msg += TQString::fromLatin1(" :") + m_suffix; + msg += TQString::tqfromLatin1(" :") + m_suffix; return msg; } diff --git a/kopete/protocols/irc/libkirc/kircmessage.h b/kopete/protocols/irc/libkirc/kircmessage.h index 02631bbf..80dcfa79 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.h +++ b/kopete/protocols/irc/libkirc/kircmessage.h @@ -57,7 +57,7 @@ public: static void writeCtcpMessage(KIRC::Engine *engine, const TQTextCodec *codec, const TQString &command, const TQString &to, const TQString &suffix, - const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString::null ); + const TQString &ctcpCommand, const TQStringList &ctcpArgs = TQStringList(), const TQString &ctcpSuffix = TQString() ); Message(); Message(const KIRC::Message &obj); @@ -112,7 +112,7 @@ public: inline const TQString &command() const { return m_command; } - /** \brief The number of command arguments this message contains. + /** \brief The number of command arguments this message tqcontains. */ inline size_t argsSize() const { return m_args.size(); } diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index 2e1d0b4c..ae9854f1 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.arg(0) == m_Nickname || - msg.arg(0) == m_PendingNick || - msg.arg(0) == TQString::fromLatin1("*") + msg.tqarg(0) == m_Nickname || + msg.tqarg(0) == m_PendingNick || + msg.tqarg(0) == TQString::tqfromLatin1("*") ) ) ) diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.h b/kopete/protocols/irc/libkirc/kircmessageredirector.h index 24a2f9af..e6fbda80 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.h +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.h @@ -29,9 +29,10 @@ class Engine; class Message; class MessageRedirector - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { @@ -42,7 +43,7 @@ public: MessageRedirector(KIRC::Engine *engine, int argsSize_min = KIRC::MessageRedirector::Unknown, int argsSize_max = KIRC::MessageRedirector::Unknown, - const TQString &helpMessage = TQString::null); + const TQString &helpMessage = TQString()); /** * Connects the given object member signal/slot to this message redirector. diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index af7d8948..198009a3 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -28,21 +28,21 @@ using namespace KIRC; Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Type type, - TQObject *parent, const char *name ) - : TQObject( parent, name ), + TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), - m_file(0), m_fileName(TQString::null), m_fileSize(0), m_fileSizeCur(0), m_fileSizeAck(0), + m_file(0), m_fileName(TQString()), m_fileSize(0), m_fileSizeCur(0), m_fileSizeAck(0), m_receivedBytes(0), m_receivedBytesLimit(0), m_sentBytes(0), m_sentBytesLimit(0) { } Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, // put this in a TQVariant ? - TQObject *parent, const char *name ) - : TQObject( parent, name ), + TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ? + TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), @@ -52,11 +52,11 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress } Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress - TQHostAddress hostAdress, Q_UINT16 port, // put this in a TQVariant ? + TQHostAddress hostAdress, TQ_UINT16 port, // put this in a TQVariant ? Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, // put this in a TQVariant ? - TQObject *parent, const char *name ) - : TQObject( parent, name ), + TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ? + TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(0), m_initiated(false), @@ -68,8 +68,8 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress /* Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress Transfer::Type type, TQVariant properties, - TQObject *parent, const char *name ) - : TQObject( parent, name ), + TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_engine(engine), m_nick(nick), m_type(type), m_socket(properties[socket]), m_initiated(false), @@ -94,11 +94,11 @@ Transfer::~Transfer() // m_file is automatically closed on destroy. } -Transfer::Status Transfer::status() const +Transfer::tqStatus Transfer::status() const { if(m_socket) { -// return (Transfer::Status)m_socket->socketStatus(); +// return (Transfer::tqStatus)m_socket->socketStatus(); return Connected; } return Error_NoSocket; @@ -310,7 +310,7 @@ void Transfer::readyReadFileOutgoing() kdDebug(14121) << k_funcinfo << "Available bytes:" << m_socket->bytesAvailable() << endl; bool hadData = false; - Q_UINT32 fileSizeAck = 0; + TQ_UINT32 fileSizeAck = 0; // if (m_socket->bytesAvailable() >= sizeof(fileSizeAck)) // BUGGY: bytesAvailable() that allways return 0 on unbuffered sockets. { @@ -334,7 +334,7 @@ void Transfer::writeFileOutgoing() m_bufferLength = m_file.readBlock(m_buffer, sizeof(m_buffer)); if (m_bufferLength > 0) { - Q_UINT32 read = m_socket->writeBlock(m_buffer, m_bufferLength); // should check written == read + TQ_UINT32 read = m_socket->writeBlock(m_buffer, m_bufferLength); // should check written == read // if(read != m_buffer_length) // buffer is not cleared still @@ -348,7 +348,7 @@ void Transfer::writeFileOutgoing() } } -void Transfer::checkFileTransferEnd(Q_UINT32 fileSizeAck) +void Transfer::checkFileTransferEnd(TQ_UINT32 fileSizeAck) { kdDebug(14121) << k_funcinfo << "Acknowledged:" << fileSizeAck << endl; diff --git a/kopete/protocols/irc/libkirc/kirctransfer.h b/kopete/protocols/irc/libkirc/kirctransfer.h index 36d8de32..3794e744 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.h +++ b/kopete/protocols/irc/libkirc/kirctransfer.h @@ -34,9 +34,10 @@ namespace KIRC class Engine; class Transfer - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Type { @@ -46,7 +47,7 @@ public: FileIncoming }; - enum Status { + enum tqStatus { Error_NoSocket = -2, Error = -1, Idle = 0, @@ -58,39 +59,39 @@ public: public: Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress Type type = Unknown, - TQObject *parent = 0L, const char *name = 0L ); + TQObject *tqparent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, - TQHostAddress peer_address, Q_UINT16 peer_port, + TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, - TQObject *parent = 0L, const char *name = 0L ); + TQObject *tqparent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, - TQObject *parent = 0L, const char *name = 0L ); + TQString fileName, TQ_UINT32 fileSize, + TQObject *tqparent = 0L, const char *name = 0L ); Transfer( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, - TQHostAddress peer_address, Q_UINT16 peer_port, + TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, - TQObject *parent = 0L, const char *name = 0L ); + TQString fileName, TQ_UINT32 fileSize, + TQObject *tqparent = 0L, const char *name = 0L ); /* For a file transfer properties are: KExntendedSocket *socket or - QHostAddress peerAddress - Q_UINT16 peerPort + TQHostAddress peerAddress + TQ_UINT16 peerPort for determining the socket. - QString fileName - Q_UINT32 fileSize + TQString fileName + TQ_UINT32 fileSize for detemining the file propeties. *//* Transfer( KIRC *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, TQVariant properties, - TQObject *parent = 0L, const char *name = 0L ); + TQObject *tqparent = 0L, const char *name = 0L ); */ ~Transfer(); @@ -100,7 +101,7 @@ public: { return m_nick; } Type type() const { return m_type; } - Status status() const; + tqStatus status() const; /* Start the transfer. * If not connected connect to client. @@ -133,8 +134,8 @@ signals: void fileSizeCurrent( unsigned int ); void fileSizeAcknowledge( unsigned int ); -// void received(Q_UINT32); -// void sent(Q_UINT32); +// void received(TQ_UINT32); +// void sent(TQ_UINT32); void abort(TQString); @@ -155,35 +156,35 @@ protected slots: protected: // void emitSignals(); - void checkFileTransferEnd( Q_UINT32 fileSizeAck ); + void checkFileTransferEnd( TQ_UINT32 fileSizeAck ); KIRC::Engine * m_engine; - QString m_nick; + TQString m_nick; Type m_type; KExtendedSocket *m_socket; bool m_initiated; // Text member data - QTextStream m_socket_textStream; + TQTextStream m_socket_textStream; // TQTextCodec * m_socket_codec; // File member data - QFile m_file; - QString m_fileName; - Q_UINT32 m_fileSize; - Q_UINT32 /*usize_t*/ m_fileSizeCur; - Q_UINT32 /*usize_t*/ m_fileSizeAck; - QDataStream m_socketDataStream; + TQFile m_file; + TQString m_fileName; + TQ_UINT32 m_fileSize; + TQ_UINT32 /*usize_t*/ m_fileSizeCur; + TQ_UINT32 /*usize_t*/ m_fileSizeAck; + TQDataStream m_socketDataStream; char m_buffer[1024]; int m_bufferLength; // Data transfer measures - Q_UINT32 m_receivedBytes; - Q_UINT32 m_receivedBytesLimit; + TQ_UINT32 m_receivedBytes; + TQ_UINT32 m_receivedBytesLimit; - Q_UINT32 m_sentBytes; - Q_UINT32 m_sentBytesLimit; + TQ_UINT32 m_sentBytes; + TQ_UINT32 m_sentBytesLimit; }; } diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp index c6c2185e..3a5ef27c 100644 --- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp @@ -43,7 +43,7 @@ TransferServer *TransferHandler::server() return m_server; } -TransferServer *TransferHandler::server( Q_UINT16 port, int backlog ) +TransferServer *TransferHandler::server( TQ_UINT16 port, int backlog ) { // if( m_server ) // m_server->terminate(); @@ -56,7 +56,7 @@ TransferServer *TransferHandler::server( Q_UINT16 port, int backlog ) TransferServer *TransferHandler::createServer(Engine *engine, TQString m_userName, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize) + TQString fileName, TQ_UINT32 fileSize) { TransferServer *server = new TransferServer(engine, m_userName, type, fileName, fileSize, this); transferServerCreated(server); @@ -65,9 +65,9 @@ TransferServer *TransferHandler::createServer(Engine *engine, TQString m_userNam Transfer *TransferHandler::createClient( Engine *engine, TQString nick,// TQString nick_peer_adress, - TQHostAddress peer_address, Q_UINT16 peer_port, + TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize ) + TQString fileName, TQ_UINT32 fileSize ) { Transfer *client = new Transfer( engine, nick,// TQString nick_peer_adress, diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.h b/kopete/protocols/irc/libkirc/kirctransferhandler.h index dc02754c..34516f15 100644 --- a/kopete/protocols/irc/libkirc/kirctransferhandler.h +++ b/kopete/protocols/irc/libkirc/kirctransferhandler.h @@ -32,25 +32,26 @@ namespace KIRC { class TransferHandler - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: static TransferHandler *self(); TransferServer *server(); - TransferServer *server( Q_UINT16 port, int backlog = 1 ); + TransferServer *server( TQ_UINT16 port, int backlog = 1 ); TransferServer *createServer(KIRC::Engine *engine, TQString m_userName, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize); + TQString fileName, TQ_UINT32 fileSize); Transfer *createClient( KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, - TQHostAddress peer_address, Q_UINT16 peer_port, + TQHostAddress peer_address, TQ_UINT16 peer_port, Transfer::Type type, - TQString file = TQString::null, Q_UINT32 fileSize = 0 ); + TQString file = TQString(), TQ_UINT32 fileSize = 0 ); // void registerServer( DCCServer * ); // TQPtrList getRegisteredServers(); diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp index 1fbe1629..ee9e38c1 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp @@ -25,16 +25,16 @@ using namespace KIRC; /* -TransferServer::TransferServer( TQObject *parent, const char *name ) - : TQObject( parent, name ), +TransferServer::TransferServer( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), m_socket( 0 ), m_port( 0 ), m_backlog( 1 ) { } */ -TransferServer::TransferServer(Q_UINT16 port, int backlog, TQObject *parent, const char *name) - : TQObject( parent, name ), +TransferServer::TransferServer(TQ_UINT16 port, int backlog, TQObject *tqparent, const char *name) + : TQObject( tqparent, name ), m_socket( 0 ), m_port( port ), m_backlog( backlog ) @@ -43,9 +43,9 @@ TransferServer::TransferServer(Q_UINT16 port, int backlog, TQObject *parent, con TransferServer::TransferServer(Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, - TQObject *parent, const char *name) - : TQObject( parent, name ), + TQString fileName, TQ_UINT32 fileSize, + TQObject *tqparent, const char *name) + : TQObject( tqparent, name ), m_socket(0), m_port(0), m_backlog(1), @@ -104,7 +104,7 @@ bool TransferServer::initServer() return (m_socket->socketStatus() != KExtendedSocket::error); } -bool TransferServer::initServer( Q_UINT16 port, int backlog ) +bool TransferServer::initServer( TQ_UINT16 port, int backlog ) { if (m_socket) { diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.h b/kopete/protocols/irc/libkirc/kirctransferserver.h index 80031859..a84000e2 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.h +++ b/kopete/protocols/irc/libkirc/kirctransferserver.h @@ -31,17 +31,18 @@ namespace KIRC { class TransferServer - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: -// TransferServer(TQObject *parent = 0, const char *name = 0); - TransferServer(Q_UINT16 port, int backlog = 1, TQObject *parent = 0, const char *name = 0); +// TransferServer(TQObject *tqparent = 0, const char *name = 0); + TransferServer(TQ_UINT16 port, int backlog = 1, TQObject *tqparent = 0, const char *name = 0); TransferServer(KIRC::Engine *engine, TQString nick,// TQString nick_peer_adress, Transfer::Type type, - TQString fileName, Q_UINT32 fileSize, - TQObject *parent = 0, const char *name = 0); + TQString fileName, TQ_UINT32 fileSize, + TQObject *tqparent = 0, const char *name = 0); ~TransferServer(); @@ -50,7 +51,7 @@ public: protected: bool initServer(); - bool initServer( Q_UINT16 port, int backlog = 1 ); + bool initServer( TQ_UINT16 port, int backlog = 1 ); signals: void incomingNewTransfer(Transfer *transfer); @@ -61,15 +62,15 @@ protected slots: private: KExtendedSocket * m_socket; - Q_UINT16 m_port; + TQ_UINT16 m_port; int m_backlog; // The following will be deprecated ... KIRC::Engine * m_engine; - QString m_nick; + TQString m_nick; Transfer::Type m_type; - QString m_fileName; - Q_UINT32 m_fileSize; + TQString m_fileName; + TQ_UINT32 m_fileSize; // by // TQPtrList m_pendingTransfers; // TQPtrList m_activeTransfers; diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index afe78fed..f14f1a3e 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -73,10 +73,10 @@ KSSLSocket::~KSSLSocket() delete d; } -Q_LONG KSSLSocket::readBlock( char* data, Q_ULONG maxLen ) +TQ_LONG KSSLSocket::readBlock( char* data, TQ_ULONG maxLen ) { //Re-implemented because KExtSocket doesn't use this when not in buffered mode - Q_LONG retval = consumeReadBuffer(maxLen, data); + TQ_LONG retval = consumeReadBuffer(maxLen, data); if( retval == 0 ) { @@ -101,12 +101,16 @@ int KSSLSocket::peekBlock( char* data, uint maxLen ) return consumeReadBuffer(maxLen, data, false); } -Q_LONG KSSLSocket::writeBlock( const char* data, Q_ULONG len ) +TQ_LONG KSSLSocket::writeBlock( const char* data, TQ_ULONG len ) { return d->kssl->write( data, len ); } +#ifdef USE_QT4 +qint64 KSSLSocket::bytesAvailable() const +#else // USE_QT4 int KSSLSocket::bytesAvailable() const +#endif // USE_QT4 { if( socketStatus() < connected ) return -2; @@ -202,14 +206,14 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data ) bool KSSLSocket::hasMetaData( const TQString &key ) { - return d->metaData.contains(key); + return d->metaData.tqcontains(key); } TQString KSSLSocket::metaData( const TQString &key ) { - if( d->metaData.contains(key) ) + if( d->metaData.tqcontains(key) ) return d->metaData[key]; - return TQString::null; + return TQString(); } /* @@ -322,7 +326,7 @@ int KSSLSocket::verifyCertificate() setMetaData("ssl_action", "accept"); } - // Since we're the parent, we need to teach the child. + // Since we're the tqparent, we need to teach the child. setMetaData("ssl_parent_ip", ourIp ); setMetaData("ssl_parent_cert", pc.toString()); @@ -368,7 +372,7 @@ int KSSLSocket::verifyCertificate() "does not match the one the " "certificate was issued to."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.arg(ourHost), + msg.tqarg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); @@ -378,7 +382,7 @@ int KSSLSocket::verifyCertificate() TQString msg = i18n("The server certificate failed the " "authenticity test (%1)."); result = messageBox( KIO::SlaveBase::WarningYesNoCancel, - msg.arg(ourHost), + msg.tqarg(ourHost), i18n("Server Authentication"), i18n("&Details"), i18n("Co&ntinue") ); diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h index 79e3b70b..795941cc 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.h +++ b/kopete/protocols/irc/libkirc/ksslsocket.h @@ -29,15 +29,20 @@ class KSSLSocketPrivate; class KSSLSocket : public KExtendedSocket { Q_OBJECT + TQ_OBJECT public: KSSLSocket(); ~KSSLSocket(); - Q_LONG readBlock( char* data, Q_ULONG maxLen ); - Q_LONG writeBlock( const char* data, Q_ULONG len ); + TQ_LONG readBlock( char* data, TQ_ULONG maxLen ); + TQ_LONG writeBlock( const char* data, TQ_ULONG len ); int peekBlock( char *data, uint maxLen ); +#ifdef USE_QT4 + qint64 bytesAvailable() const; +#else // USE_QT4 int bytesAvailable() const; +#endif // USE_QT4 void showInfoDialog(); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index ea085db8..67916d4d 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -41,16 +41,16 @@ class ChannelListItem : public KListViewItem { public: - ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ); + ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ); virtual int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: - KListView *parentList; + KListView *tqparentList; }; -ChannelListItem::ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : - KListViewItem( parent, parent->lastItem() ), parentList( parent ) +ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) : + KListViewItem( tqparent, tqparent->lastItem() ), tqparentList( tqparent ) { setText(0, arg1); setText(1, arg2); @@ -81,11 +81,11 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum // set the alternate cell background colour if necessary TQColorGroup _cg = cg; if (isAlternate()) - if (listView()->viewport()->backgroundMode()==Qt::FixedColor) + if (listView()->viewport()->backgroundMode()==TQt::FixedColor) _cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); else _cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); - // PASTED FROM QLISTVIEWITEM + // PASTED FROM TQLISTVIEWITEM { TQPainter *p = &paint; @@ -97,7 +97,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum // any text we render is done by the Components, not by this class, so make sure we've nothing to write TQString t; - // removed text truncating code from Qt - we do that differently, further on + // removed text truncating code from TQt - we do that differently, further on int marg = lv->itemMargin(); int r = marg; @@ -106,20 +106,20 @@ 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->colorGroup().brush( crole ) ) + if ( _cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), _cg.brush( crole ) ); else { // all copied from TQListView::paintEmptyArea //lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); - TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and QHeader + TQStyleOption opt( lv->sortColumn(), 0 ); // ### hack; in 3.1, add a property in TQListView and TQHeader TQStyle::SFlags how = TQStyle::Style_Default; if ( lv->isEnabled() ) how |= TQStyle::Style_Enabled; - lv->style().drawComplexControl( TQStyle::CC_ListView, - p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(), + lv->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView, + p, lv, TQRect( 0, 0, width, height() ), lv->tqcolorGroup(), how, TQStyle::SC_ListView, TQStyle::SC_None, opt ); } @@ -130,20 +130,20 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum (column == 0 || lv->allColumnsShowFocus()) ) { p->fillRect( r - marg, 0, width - r + marg, height(), _cg.brush( TQColorGroup::Highlight ) ); - // removed text pen setting code from Qt + // removed text pen setting code from TQt } - // removed icon drawing code from Qt + // removed icon drawing code from TQt // draw the tree gubbins if ( multiLinesEnabled() && column == 0 && isOpen() && childCount() ) { int textheight = fm.size( align, t ).height() + 2 * lv->itemMargin(); - textheight = QMAX( textheight, TQApplication::globalStrut().height() ); + textheight = TQMAX( textheight, TQApplication::globalStrut().height() ); if ( textheight % 2 > 0 ) textheight++; if ( textheight < height() ) { int w = lv->treeStepSize() / 2; - lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv, + lv->tqstyle().tqdrawComplexControl( 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, @@ -165,26 +165,26 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum p->drawPixmap( 0, 0, back ); } -ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) - : TQWidget( parent ), m_engine( engine ) +ChannelList::ChannelList( TQWidget* tqparent, KIRC::Engine *engine ) + : TQWidget( tqparent ), m_engine( engine ) { ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout"); - layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2"); + tqlayout72_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout72_2"); textLabel1_2 = new TQLabel( this, "textLabel1_2" ); - layout72_2->addWidget( textLabel1_2 ); + tqlayout72_2->addWidget( textLabel1_2 ); channelSearch = new TQLineEdit( this, "channelSearch" ); - layout72_2->addWidget( channelSearch ); + tqlayout72_2->addWidget( channelSearch ); numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" ); numUsers->setSuffix( i18n(" members") ); - layout72_2->addWidget( numUsers ); + tqlayout72_2->addWidget( numUsers ); mSearchButton = new TQPushButton( this, "mSearchButton" ); - layout72_2->addWidget( mSearchButton ); - ChannelListLayout->addLayout( layout72_2 ); + tqlayout72_2->addWidget( mSearchButton ); + ChannelListLayout->addLayout( tqlayout72_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::Status) ), - this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); + connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::tqStatus) ), + this, TQT_SLOT( slotStatusChanged(KIRC::Engine::tqStatus) ) ); show(); } @@ -242,9 +242,9 @@ void ChannelList::slotItemSelected( TQListViewItem *i ) emit channelSelected( i->text(0) ); } -void ChannelList::slotStatusChanged(KIRC::Engine::Status newStatus) +void ChannelList::slotStatusChanged(KIRC::Engine::tqStatus newtqStatus) { - switch(newStatus) { + switch(newtqStatus) { case KIRC::Engine::Connected: this->reset(); break; @@ -309,13 +309,13 @@ void ChannelList::search() void ChannelList::slotChannelListed( const TQString &channel, uint users, const TQString &topic ) { checkSearchResult( channel, users, topic ); - channelCache.insert( channel, QPair< uint, TQString >( users, topic ) ); + channelCache.insert( channel, TQPair< uint, TQString >( users, topic ) ); } void ChannelList::checkSearchResult( const TQString &channel, uint users, const TQString &topic ) { if( ( mUsers == 0 || mUsers <= users ) && - ( mSearch.isEmpty() || channel.contains( mSearch, false ) || topic.contains( mSearch, false ) ) + ( mSearch.isEmpty() || channel.tqcontains( mSearch, false ) || topic.tqcontains( mSearch, false ) ) ) { new ChannelListItem( mChannelList, channel, TQString::number(users), topic ); diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h index 229bf4c6..d907efcb 100644 --- a/kopete/protocols/irc/ui/channellist.h +++ b/kopete/protocols/irc/ui/channellist.h @@ -35,12 +35,13 @@ class TQSpinBox; class TQListViewItem; class ChannelList - : public QWidget + : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ChannelList( TQWidget *parent, KIRC::Engine *engine ); + ChannelList( TQWidget *tqparent, KIRC::Engine *engine ); public slots: void search(); @@ -57,7 +58,7 @@ class ChannelList void slotChannelListed( const TQString & channel, uint users, const TQString & topic ); void slotListEnd(); void slotSearchCache(); - void slotStatusChanged( KIRC::Engine::Status ); + void slotStatusChanged( KIRC::Engine::tqStatus ); private: void checkSearchResult( const TQString & channel, uint users, const TQString & topic ); @@ -68,13 +69,13 @@ class ChannelList TQPushButton* mSearchButton; KListView* mChannelList; TQVBoxLayout* ChannelListLayout; - TQHBoxLayout* layout72_2; + TQHBoxLayout* tqlayout72_2; KIRC::Engine *m_engine; bool mSearching; TQString mSearch; uint mUsers; - TQMap< TQString, QPair< uint, TQString > > channelCache; - TQMap< TQString, QPair< uint, TQString > >::const_iterator cacheIterator; + TQMap< TQString, TQPair< uint, TQString > > channelCache; + TQMap< TQString, TQPair< uint, TQString > >::const_iterator cacheIterator; }; #endif diff --git a/kopete/protocols/irc/ui/channellistdialog.h b/kopete/protocols/irc/ui/channellistdialog.h index 9dcb0cbb..e97316b9 100644 --- a/kopete/protocols/irc/ui/channellistdialog.h +++ b/kopete/protocols/irc/ui/channellistdialog.h @@ -26,6 +26,7 @@ class ChannelListDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ChannelListDialog(KIRC::Engine *engine, const TQString &caption, TQObject *target, const char* slotJoinChan); diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index f1025112..ae2c0740 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -1,6 +1,6 @@ ircAddUI - + ircAddUI @@ -22,11 +22,11 @@ 6 - + tabWidget3 - + tab @@ -43,15 +43,15 @@ 6 - + - layout70 + tqlayout70 unnamed - + TextLabel1 @@ -68,7 +68,7 @@ The name of the IRC contact or channel you would like to add. You may type simply the text of a person's nickname, or you may type a channel name, preceded by a pound sign ('#'). - + addID @@ -81,14 +81,14 @@ - + textLabel3 <i>(for example: joe_bob or #somechannel)</i> - + AlignVCenter|AlignRight @@ -102,7 +102,7 @@ Expanding - + 20 110 @@ -111,7 +111,7 @@ - + tab @@ -122,7 +122,7 @@ unnamed - + hbox @@ -134,8 +134,8 @@ - QHBox -

qhbox.h
+ TQHBox +
tqhbox.h
-1 -1 @@ -159,5 +159,5 @@ addID tabWidget3 - + diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index 682e9be9..c5827342 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -1,6 +1,6 @@ IRCEditAccountBase - + IRCEditAccountBase @@ -30,7 +30,7 @@ unnamed - + tabWidget2 @@ -42,7 +42,7 @@ 0 - + tab @@ -63,14 +63,14 @@ Expanding - + 20 150 - + textLabel3 @@ -82,7 +82,7 @@ 0 - + 32767 32767 @@ -91,11 +91,11 @@ <p><b>Note:</b> Most IRC servers do not require a password, and only a nickname is required to connect</p> - + WordBreak|AlignTop - + groupBox59 @@ -112,7 +112,7 @@ unnamed - + textLabel4 @@ -126,7 +126,7 @@ This is the name that everyone will see everytime you say something - + textLabel1_2 @@ -140,7 +140,7 @@ When the nickname is already in use when connecting, this name will be used instead - + mNickName @@ -159,7 +159,7 @@ The alias you would like to use on IRC. You may change this once online with the /nick command. - + mAltNickname @@ -175,7 +175,7 @@ mPasswordWidget - + m_realNameLabel @@ -186,7 +186,7 @@ m_realNameLineEdit - + textLabel5 @@ -200,7 +200,7 @@ The username you would prefer to use on IRC, if your system does not have identd support. Leave blank to use your system account name. - + mUserName @@ -222,7 +222,7 @@ The username you would prefer to use on IRC, if your system does not have identd support. Leave blank to use your system account name. - + m_realNameLineEdit @@ -248,7 +248,7 @@ - + TabPage @@ -259,23 +259,23 @@ unnamed - + - layout21 + tqlayout21 unnamed - + - layout19 + tqlayout19 unnamed - + description @@ -293,7 +293,7 @@ Expanding - + 161 20 @@ -302,20 +302,20 @@ - + - layout20 + tqlayout20 unnamed - + network - + editButton @@ -333,7 +333,7 @@ Expanding - + 392 20 @@ -342,7 +342,7 @@ - + textLabel1_3 @@ -355,7 +355,7 @@ - + groupBox1 @@ -374,7 +374,7 @@ unnamed - + preferSSL @@ -382,7 +382,7 @@ &Prefer SSL-based connections - + autoConnect @@ -393,15 +393,15 @@ If you check that case, the account will not be connected when you press the "Connect All" button, or at startup even if you selected to automatically connect at startup - + - layout25 + tqlayout25 unnamed - + textLabel1_2_2 @@ -412,7 +412,7 @@ charset - + charset @@ -427,7 +427,7 @@ Expanding - + 141 20 @@ -438,7 +438,7 @@ - + groupBox5 @@ -449,7 +449,7 @@ unnamed - + textLabel1 @@ -460,7 +460,7 @@ partMessage - + textLabel2 @@ -471,7 +471,7 @@ quitMessage - + partMessage @@ -482,7 +482,7 @@ The message you want people to see when you part a channel without giving a reason. Leave this field blank to use the Kopete default message. - + quitMessage @@ -505,7 +505,7 @@ Expanding - + 20 150 @@ -514,7 +514,7 @@ - + tab @@ -525,7 +525,7 @@ unnamed - + groupBox7 @@ -536,7 +536,7 @@ unnamed - + autoShowAnonWindows @@ -544,7 +544,7 @@ Auto-show anonymous windows - + autoShowServerWindow @@ -552,15 +552,15 @@ Auto-show the server window - + - layout19 + tqlayout19 unnamed - + textLabel1_4 @@ -568,7 +568,7 @@ Server messages: - + textLabel4_3 @@ -576,7 +576,7 @@ Server notices: - + Active Window @@ -609,7 +609,7 @@ 1 - + Active Window @@ -644,15 +644,15 @@ - + - layout23 + tqlayout23 unnamed - + textLabel3_3 @@ -660,7 +660,7 @@ Error messages: - + Active Window @@ -690,7 +690,7 @@ informationReplies - + textLabel2_2 @@ -698,7 +698,7 @@ Information replies: - + Active Window @@ -732,7 +732,7 @@ - + groupBox6 @@ -744,7 +744,7 @@ 0 - + 0 130 @@ -807,15 +807,15 @@ You can use this dialog to add custom replies for when people send CTCP requests to you. You can also use this dialog to override the built-in replies for VERSION, USERINFO, and CLIENTINFO. - + - layout153 + tqlayout153 unnamed - + textLabel3_2 @@ -826,12 +826,12 @@ newCTCP - + newCTCP - + textLabel4_2 @@ -842,12 +842,12 @@ newReply - + newReply - + addReply @@ -859,7 +859,7 @@ - + groupBox60 @@ -871,7 +871,7 @@ 0 - + 0 130 @@ -884,15 +884,15 @@ unnamed - + - layout29 + tqlayout29 unnamed - + commandEdit @@ -905,7 +905,7 @@ - + addButton @@ -1015,7 +1015,7 @@ commandEdit addButton - + klistview.h diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 06e2f166..6717bb21 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -46,8 +46,8 @@ #include #include -IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, TQWidget *parent, const char * ) - : IRCEditAccountBase(parent), KopeteEditAccountWidget(ident) +IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident, TQWidget *tqparent, const char * ) + : IRCEditAccountBase(tqparent), KopeteEditAccountWidget(ident) { mProtocol = proto; @@ -91,9 +91,9 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident new TQListViewItem( ctcpList, it.key(), it.data() ); } - mUserName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^\\s]*$"), mUserName ) ); - mNickName->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mNickName ) ); - mAltNickname->setValidator( new TQRegExpValidator( TQString::fromLatin1("^[^#+&][^\\s]*$"), mAltNickname ) ); + 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) ) ); charset->insertStringList( KCodecAction::supportedEncodings() ); @@ -122,7 +122,7 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident connect( IRCProtocol::protocol(), TQT_SIGNAL( networkConfigUpdated( const TQString & ) ), this, TQT_SLOT( slotUpdateNetworks( const TQString & ) ) ); - slotUpdateNetworks( TQString::null ); + slotUpdateNetworks( TQString() ); } IRCEditAccountWidget::~IRCEditAccountWidget() @@ -212,9 +212,9 @@ TQString IRCEditAccountWidget::generateAccountId( const TQString &network ) TQString nextId = network; uint accountNumber = 1; - while( config->hasGroup( TQString("Account_%1_%2").arg( m_protocol->pluginId() ).arg( nextId ) ) ) + while( config->hasGroup( TQString("Account_%1_%2").tqarg( m_protocol->pluginId() ).tqarg( nextId ) ) ) { - nextId = TQString::fromLatin1("%1_%2").arg( network ).arg( ++accountNumber ); + nextId = TQString::tqfromLatin1("%1_%2").tqarg( network ).tqarg( ++accountNumber ); } kdDebug( 14120 ) << k_funcinfo << " ID IS: " << nextId << endl; return nextId; @@ -227,7 +227,7 @@ Kopete::Account *IRCEditAccountWidget::apply() if( !account() ) { - setAccount( new IRCAccount( mProtocol, generateAccountId(networkName), TQString::null, networkName, nickName ) ); + setAccount( new IRCAccount( mProtocol, generateAccountId(networkName), TQString(), networkName, nickName ) ); } else diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.h b/kopete/protocols/irc/ui/irceditaccountwidget.h index bd9718f3..025dc5fb 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.h +++ b/kopete/protocols/irc/ui/irceditaccountwidget.h @@ -29,9 +29,10 @@ class TQListViewItem; class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *parent=0, const char *name=0); + IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *, TQWidget *tqparent=0, const char *name=0); ~IRCEditAccountWidget(); IRCAccount *account(); diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui index d1000e37..2a00f1bb 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ b/kopete/protocols/irc/ui/networkconfig.ui @@ -1,6 +1,6 @@ NetworkConfig - + NetworkConfig @@ -19,12 +19,12 @@ unnamed - + description - + textLabel10 @@ -43,7 +43,7 @@ description - + groupBox2 @@ -65,7 +65,7 @@ unnamed - + hostList @@ -84,7 +84,7 @@ The IRC servers associated with this network. Use the up and down buttons to alter the order in which connections are attempted. - + password @@ -95,7 +95,7 @@ Most IRC servers do not require a password - + textLabel6 @@ -106,7 +106,7 @@ port - + port @@ -120,7 +120,7 @@ 6667 - + textLabel4 @@ -131,7 +131,7 @@ password - + textLabel5 @@ -142,7 +142,7 @@ host - + host @@ -153,7 +153,7 @@ - + useSSL @@ -164,7 +164,7 @@ Check this to enable SSL for this connection - + removeHost @@ -180,7 +180,7 @@ &Remove - + newHost @@ -206,14 +206,14 @@ Expanding - + 210 20 - + downButton @@ -240,14 +240,14 @@ Expanding - + 20 151 - + upButton @@ -266,7 +266,7 @@ - + cancelButton @@ -274,7 +274,7 @@ &Cancel - + saveButton @@ -282,7 +282,7 @@ &Save - + newNetwork @@ -290,7 +290,7 @@ Ne&w - + networkList @@ -313,14 +313,14 @@ Expanding - + 260 20 - + renameNetwork @@ -328,7 +328,7 @@ Rena&me... - + removeNetwork @@ -370,13 +370,13 @@ saveButton cancelButton - + accepted() rejected() - - + + accept() reject() - - + + diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networkconfig.ui.h index 30f9654e..183ba57f 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui.h +++ b/kopete/protocols/irc/ui/networkconfig.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index bb1c0f2e..f3583f0e 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -87,12 +87,12 @@ -JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountId, const char *name) - :Kopete::PasswordedAccount ( parent, accountId, 0, name ) +JabberAccount::JabberAccount (JabberProtocol * tqparent, const TQString & accountId, const char *name) + :Kopete::PasswordedAccount ( tqparent, accountId, 0, name ) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Instantiating new account " << accountId << endl; - m_protocol = parent; + m_protocol = tqparent; m_jabberClient = 0L; @@ -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::Status ( "", "", 5, true ); + m_initialPresence = XMPP::tqStatus ( "", "", 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::Status & ) ), - this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); + 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 ( 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::Status ("connecting", "", 0, true) ); + setPresence( XMPP::tqStatus ("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::Status xmppStatus = m_protocol->kosToStatus( status, reason); + XMPP::tqStatus xmpptqStatus = m_protocol->kosTotqStatus( status, reason); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmppStatus.setIsAvailable( false ); + xmpptqStatus.setIsAvailable( false ); kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD" << endl; - disconnect (Manual, xmppStatus); + disconnect (Manual, xmpptqStatus); 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 = xmppStatus; + m_initialPresence = xmpptqStatus; connect ( status ); } else { - setPresence ( xmppStatus ); + setPresence ( xmpptqStatus ); } } @@ -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::Status ("", "", 0, false) ); - m_initialPresence = XMPP::Status ("", "", 5, true); + setPresence ( XMPP::tqStatus ("", "", 0, false) ); + m_initialPresence = XMPP::tqStatus ("", "", 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::Status &status ) +void JabberAccount::disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &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").arg(errorCondition); + errorText = i18n("There was an error in the protocol stream: %1").tqarg(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").arg(errorCondition); + errorText = i18n("There was a connection error: %1").tqarg(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").arg(errorCondition); + errorText = i18n("There was a negotiation error: %1").tqarg(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").arg(errorCondition); + errorText = i18n("There was a Transport Layer Security (TLS) error: %1").tqarg(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").arg(errorCondition); + errorText = i18n("There was an error authenticating with the server: %1").tqarg(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").arg(errorCondition); + errorText = i18n("There was an error in the security layer: %1").tqarg(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").arg(errorCondition); + errorText = i18n("Could not bind a resource: %1").tqarg(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").arg(server)); + i18n("Connection problem with Jabber server %1").tqarg(server)); } @@ -1015,27 +1015,27 @@ void JabberAccount::slotCSError ( int error ) } /* Set presence (usually called by dialog widget). */ -void JabberAccount::setPresence ( const XMPP::Status &status ) +void JabberAccount::setPresence ( const XMPP::tqStatus &status ) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "tqStatus: " << status.show () << ", Reason: " << status.status () << endl; // fetch input status - XMPP::Status newStatus = status; + XMPP::tqStatus newtqStatus = status; // TODO: Check if Caps is enabled // Send entity capabilities if( client() ) { - newStatus.setCapsNode( client()->capsNode() ); - newStatus.setCapsVersion( client()->capsVersion() ); - newStatus.setCapsExt( client()->capsExt() ); + newtqStatus.setCapsNode( client()->capsNode() ); + newtqStatus.setCapsVersion( client()->capsVersion() ); + newtqStatus.setCapsExt( client()->capsExt() ); } // make sure the status gets the correct priority - newStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); + newtqStatus.setPriority ( configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::Jid jid ( myself()->contactId () ); - XMPP::Resource newResource ( resource (), newStatus ); + XMPP::Resource newResource ( resource (), newtqStatus ); // update our resource in the resource pool resourcePool()->addResource ( jid, newResource ); @@ -1057,7 +1057,7 @@ void JabberAccount::setPresence ( const XMPP::Status &status ) XMPP::JT_Presence * task = new XMPP::JT_Presence ( client()->rootTask ()); - task->pres ( newStatus ); + task->pres ( newtqStatus ); task->go ( true ); } else @@ -1103,7 +1103,7 @@ void JabberAccount::slotSubscription (const XMPP::Jid & jid, const TQString & ty hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ; Kopete::UI::ContactAddedNotifyDialog *dialog= - new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString::null,this, hideFlags ); + new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString(),this, hideFlags ); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); @@ -1184,11 +1184,11 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact if(dialog->added()) { - Kopete::MetaContact *parentContact=dialog->addContact(); - if(parentContact) + Kopete::MetaContact *tqparentContact=dialog->addContact(); + if(tqparentContact) { TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); @@ -1196,7 +1196,7 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact // XMPP::Jid jid ( contactId ); item.setJid ( jid ); - item.setName ( parentContact->displayName() ); + item.setName ( tqparentContact->displayName() ); item.setGroups ( groupNames ); // add the new contact to our roster. @@ -1299,11 +1299,11 @@ void JabberAccount::slotContactUpdated (const XMPP::RosterItem & item) */ if ( !item.ask().isEmpty () ) { - contact->setProperty ( protocol()->propAuthorizationStatus, i18n ( "Waiting for authorization" ) ); + contact->setProperty ( protocol()->propAuthorizationtqStatus, i18n ( "Waiting for authorization" ) ); } else { - contact->removeProperty ( protocol()->propAuthorizationStatus ); + contact->removeProperty ( protocol()->propAuthorizationtqStatus ); } } 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::Status & status) +void JabberAccount::slotGroupChatPresence (const XMPP::Jid & jid, const XMPP::tqStatus & 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.").arg(jid.node())); + int result = KPasswordDialog::getPassword(password, i18n("A password is required to join the room %1.").tqarg(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").arg(jid.node(), jid.resource()), + TQString nickname = KInputDialog::getText(i18n("Error trying to join %1 : nickname %2 is already in use").tqarg(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").arg(jid.node()), + i18n ("You can't join the room %1 because you were banned").tqarg(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").arg(jid.node()), + i18n ("You can't join the room %1 because the maximum users has been reached").tqarg(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.").arg(from) ); +// //KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Information, TQString("Received a voice session invitation from %1.").tqarg(from) ); // JingleVoiceSessionDialog *voiceDialog = new JingleVoiceSessionDialog( static_cast(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").arg( accountLabel() ), + "And you will never be able to connect to this account with any client").tqarg( 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").arg(task->statusString()), + i18n ("An error occured when trying to remove the account:\n%1").tqarg(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 fd1dfc0f..3d174639 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -57,9 +57,10 @@ class VoiceCaller; class JabberAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: - JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L); + JabberAccount (JabberProtocol * tqparent, const TQString & accountID, const char *name = 0L); ~JabberAccount (); /* Returns the action menu for this account. */ @@ -146,9 +147,9 @@ public slots: void disconnect ( Kopete::Account::DisconnectReason reason ); /* Disconnect with a reason, and status */ - void disconnect( Kopete::Account::DisconnectReason reason, XMPP::Status &status ); + void disconnect( Kopete::Account::DisconnectReason reason, XMPP::tqStatus &status ); /* Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); void addTransport( JabberTransport *tr , const TQString &jid); void removeTransport( const TQString &jid ); @@ -167,12 +168,12 @@ protected: * method should have the "dirty" flag set. * * This method should simply be used to intantiate the new contact, everything else - * (updating the GUI, parenting to meta contact, etc.) is being taken care of. + * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param parentContact The metacontact to add this contact to + * @param tqparentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); @@ -198,13 +199,13 @@ private: void cleanup (); /* Initial presence to set after connecting. */ - XMPP::Status m_initialPresence; + XMPP::tqStatus 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::Status &status ); + void setPresence ( const XMPP::tqStatus &status ); /** * Returns if a connection attempt is currently in progress. @@ -256,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::Status &status ); + void slotGroupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &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 cffc65f9..a380d3c4 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()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You cannot see each others' status." ) ); break; case XMPP::Subscription::To: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You can see this contact's status but they cannot see your status." ) ); break; case XMPP::Subscription::From: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "This contact can see your status but you cannot see their status." ) ); break; case XMPP::Subscription::Both: - setProperty ( protocol()->propSubscriptionStatus, + setProperty ( protocol()->propSubscriptiontqStatus, i18n ( "You can see each others' status." ) ); break; } @@ -164,7 +164,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) // find all groups our contact is in but that are not in the server side roster for ( unsigned i = 0; i < metaContact()->groups().count (); i++ ) { - if ( item.groups().find ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) + if ( item.groups().tqfind ( metaContact()->groups().at(i)->displayName () ) == item.groups().end () ) groupsToRemoveFrom.append ( metaContact()->groups().at ( i ) ); } @@ -193,7 +193,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) * risk removing the contact from the visible contact list. In this * case, we need to make sure at least the top level group stays. */ - if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.contains ( Kopete::Group::topLevel () ) ) ) + if ( ( groupsToAddTo.count () == 0 ) && ( groupsToRemoveFrom.tqcontains ( Kopete::Group::topLevel () ) ) ) { groupsToRemoveFrom.remove ( Kopete::Group::topLevel () ); } @@ -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(reevaluateStatus())); + TQTimer::singleShot(0, this, TQT_SLOT(reevaluatetqStatus())); } @@ -295,7 +295,7 @@ void JabberBaseContact::updateResourceList () setProperty ( protocol()->propAvailableResources, resourceListStr ); } -void JabberBaseContact::reevaluateStatus () +void JabberBaseContact::reevaluatetqStatus () { 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::fromLatin1 (",")); + serializedData["groups"] = mRosterItem.groups ().join (TQString::tqfromLatin1 (",")); } 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::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); } @@ -630,9 +630,9 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard ) TQImage contactPhoto; TQString fullJid = mRosterItem.jid().full(); - TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.replace(TQRegExp("[./~]"),"-") +".png"); + TQString finalPhotoPath = locateLocal("appdata", "jabberphotos/" + fullJid.tqreplace(TQRegExp("[./~]"),"-") +".png"); - // photo() is a QByteArray + // photo() is a TQByteArray if ( !vCard.photo().isEmpty() ) { kdDebug( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Contact has a photo embedded into his vCard." << endl; diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index ef9b7416..c3453344 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -35,6 +35,7 @@ class JabberBaseContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT friend class JabberAccount; /* Friends can touch each other's private parts. */ public: @@ -157,7 +158,7 @@ public slots: * whenever a resource is added, removed, or * changed in the resource pool. */ - void reevaluateStatus (); + void reevaluatetqStatus (); protected: /** diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 661f0974..39011f81 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -26,7 +26,7 @@ #include "xmpp_tasks.h" -JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) +JabberBookmarks::JabberBookmarks(JabberAccount *tqparent) : TQObject(tqparent) , m_account(tqparent) { connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); } @@ -96,7 +96,7 @@ void JabberBookmarks::slotReceivedBookmarks( ) void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) { - if(m_conferencesJID.contains(jid.full()) || !m_account->isConnected()) + if(m_conferencesJID.tqcontains(jid.full()) || !m_account->isConnected()) { return; } @@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid) m_conferencesJID += jid.full(); } -KAction * JabberBookmarks::bookmarksAction(TQObject *parent) +KAction * JabberBookmarks::bookmarksAction(TQObject *tqparent) { - KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); + KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , tqparent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 31675b50..55165a1e 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -33,14 +33,15 @@ class KAction; * There is one instance of that class by accounts. * @author Olivier Goffart */ -class JabberBookmarks : public QObject +class JabberBookmarks : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - JabberBookmarks(JabberAccount *parent); + JabberBookmarks(JabberAccount *tqparent); ~JabberBookmarks(){} /** @@ -52,7 +53,7 @@ class JabberBookmarks : public QObject /** * return an action that will be added in the jabber popup menu */ - KAction *bookmarksAction(TQObject * parent); + KAction *bookmarksAction(TQObject * tqparent); private slots: void accountConnected(); void slotReceivedBookmarks(); diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index 1021757d..4629eef2 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -24,8 +24,8 @@ #include #include "jabberprotocol.h" -JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ ) - : ByteStream ( parent ) +JabberByteStream::JabberByteStream ( TQObject *tqparent, const char */*name*/ ) + : ByteStream ( tqparent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Instantiating new Jabber byte stream." << endl; diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index 882d3007..0bc2e204 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -31,9 +31,10 @@ class JabberByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - JabberByteStream ( TQObject *parent = 0, const char *name = 0 ); + JabberByteStream ( TQObject *tqparent = 0, const char *name = 0 ); ~JabberByteStream (); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 9d9dd770..eb5efabf 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -113,11 +113,11 @@ TQStringList JabberCapabilitiesManager::CapabilitiesInformation::jids() const { TQStringList jids; - TQValueList >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); + TQValueList >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); for( ; it != itEnd; ++it) { TQString jid( (*it).first ); - if( !jids.contains(jid) ) + if( !jids.tqcontains(jid) ) jids.push_back(jid); } @@ -143,12 +143,12 @@ void JabberCapabilitiesManager::CapabilitiesInformation::reset() void JabberCapabilitiesManager::CapabilitiesInformation::removeAccount(JabberAccount *account) { - TQValueList >::Iterator it = m_jids.begin(); + TQValueList >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) { if( (*it).second == account) { - TQValueList >::Iterator otherIt = it; + TQValueList >::Iterator otherIt = it; it++; m_jids.remove(otherIt); } @@ -161,9 +161,9 @@ void JabberCapabilitiesManager::CapabilitiesInformation::removeAccount(JabberAcc void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, JabberAccount* account) { - QPair jidAccountPair(jid.full(),account); + TQPair jidAccountPair(jid.full(),account); - if( !m_jids.contains(jidAccountPair) ) + if( !m_jids.tqcontains(jidAccountPair) ) { m_jids.push_back(jidAccountPair); updateLastSeen(); @@ -172,14 +172,14 @@ void JabberCapabilitiesManager::CapabilitiesInformation::addJid(const Jid& jid, void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& jid) { - kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).replace('%',"%%") << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Unregistering " << TQString(jid.full()).tqreplace('%',"%%") << endl; - TQValueList >::Iterator it = m_jids.begin(); + TQValueList >::Iterator it = m_jids.begin(); while( it != m_jids.end() ) { if( (*it).first == jid.full() ) { - TQValueList >::Iterator otherIt = it; + TQValueList >::Iterator otherIt = it; it++; m_jids.remove(otherIt); } @@ -190,11 +190,11 @@ void JabberCapabilitiesManager::CapabilitiesInformation::removeJid(const Jid& ji } } -QPair JabberCapabilitiesManager::CapabilitiesInformation::nextJid(const Jid& jid, const Task* t) +TQPair JabberCapabilitiesManager::CapabilitiesInformation::nextJid(const Jid& jid, const Task* t) { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Looking for next JID" << endl; - TQValueList >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); + TQValueList >::ConstIterator it = m_jids.constBegin(), itEnd = m_jids.constEnd(); for( ; it != itEnd; ++it) { if( (*it).first == jid.full() && (*it).second->client()->rootTask() == t) @@ -204,18 +204,18 @@ QPair JabberCapabilitiesManager::CapabilitiesInformation::ne { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "No more JIDs" << endl; - return QPair(Jid(),0L); + return TQPair(Jid(),0L); } else if( (*it).second->isConnected() ) { //qDebug("caps.cpp: Account isn't active"); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Account isn't connected." << endl; - return QPair( (*it).first,(*it).second ); + return TQPair( (*it).first,(*it).second ); } } } - return QPair(Jid(),0L); + return TQPair(Jid(),0L); } void JabberCapabilitiesManager::CapabilitiesInformation::setDiscovered(bool value) @@ -240,7 +240,7 @@ void JabberCapabilitiesManager::CapabilitiesInformation::setFeatures(const TQStr void JabberCapabilitiesManager::CapabilitiesInformation::updateLastSeen() { - m_lastSeen = TQDate::currentDate(); + m_lastSeen = TQDate::tqcurrentDate(); } 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::Status &status ) +void JabberCapabilitiesManager::updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &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").arg(TQString(jid.full()).replace('%',"%%")).arg(node + "#" + (*newCapsIt).extensions()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << TQString("Sending disco request to %1, node=%2").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(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").arg(TQString(jid.full()).replace('%',"%%")).arg(node).arg(version) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Illegal caps info from %1: node=%2, ver=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(node).tqarg(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").arg(TQString(jid.full()).replace('%',"%%")).arg(discoInfo->node()).arg(discoInfo->success()) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Disco response from %1, node=%2, success=%3").tqarg(TQString(jid.full()).tqreplace('%',"%%")).tqarg(discoInfo->node()).tqarg(discoInfo->success()) << endl; TQStringList tokens = TQStringList::split("#",discoInfo->node()); @@ -483,10 +483,10 @@ void JabberCapabilitiesManager::discoRequestFinished() } else { - QPair jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->parent()); + TQPair jidAccountPair = d->capabilitiesInformationMap[capabilities].nextJid(jid,discoInfo->tqparent()); if( jidAccountPair.second ) { - kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").arg(TQString(jidAccountPair.first.full()).replace('%',"%%")) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Falling back on %1.").tqarg(TQString(jidAccountPair.first.full()).tqreplace('%',"%%")) << 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'").arg(jidCapabilities.node()).arg(node) << endl; + kdDebug(JABBER_DEBUG_GLOBAL) << TQString("Current client node '%1' does not match response '%2'").tqarg(jidCapabilities.node()).tqarg(node) << endl; //for (unsigned int i = 0; i < item.features().list().count(); i++) // printf(" Feature: %s\n",item.features().list()[i].latin1()); @@ -563,7 +563,7 @@ void JabberCapabilitiesManager::loadCachedInformation() bool JabberCapabilitiesManager::capabilitiesEnabled(const Jid &jid) const { - return d->jidCapabilitiesMap.contains( jid.full() ); + return d->jidCapabilitiesMap.tqcontains( jid.full() ); } XMPP::Features JabberCapabilitiesManager::features(const Jid& jid) const @@ -599,7 +599,7 @@ TQString JabberCapabilitiesManager::clientName(const Jid& jid) const if (name.startsWith("www.")) name = name.right(name.length() - 4); - int cut_pos = name.find("."); + int cut_pos = name.tqfind("."); if (cut_pos != -1) { name = name.left(cut_pos); } @@ -646,7 +646,7 @@ void JabberCapabilitiesManager::saveInformation() } TQTextStream textStream; - textStream.setDevice(&capsFile); + textStream.setDevice(TQT_TQIODEVICE(&capsFile)); textStream.setEncoding(TQTextStream::UnicodeUTF8); textStream << doc.toString(); textStream.unsetDevice(); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h index a783188f..f314d760 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h @@ -33,9 +33,10 @@ class JabberAccount; * @author Michaël Larouche * @author Remko Troncon */ -class JabberCapabilitiesManager : public QObject +class JabberCapabilitiesManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Construct @@ -80,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::Status object. + * passing a XMPP::tqStatus object. * * @param jid JID that capabilities was updated. - * @param status The XMPP::Status that contain the caps. + * @param status The XMPP::tqStatus that contain the caps. */ - void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::Status &status); + void updateCapabilities(JabberAccount *account, const XMPP::Jid &jid, const XMPP::tqStatus &status); private slots: /** @@ -182,7 +183,7 @@ private: void removeAccount(JabberAccount* acc); void removeJid(const Jid&); void addJid(const Jid&, JabberAccount*); - QPair nextJid(const Jid&, const Task*); + TQPair nextJid(const Jid&, const Task*); void setDiscovered(bool); void setPendingRequests(int); @@ -200,7 +201,7 @@ private: int m_pendingRequests; TQStringList m_features; DiscoItem::Identities m_identities; - TQValueList > m_jids; + TQValueList > m_jids; TQDate m_lastSeen; }; diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index dbe35ab6..38ea726f 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -117,8 +117,8 @@ void JabberChatSession::slotUpdateDisplayName () if ( !mResource.isEmpty () ) jid.setResource ( mResource ); - TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") - .arg( chatMembers.first()->onlineStatus().description() ); + TQString statusText = i18n("a contact's online status in tqparenthesis.", " (%1)") + .tqarg( chatMembers.first()->onlinetqStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); else @@ -225,7 +225,7 @@ void JabberChatSession::slotSendTypingNotification ( bool typing ) // create JID for us as sender XMPP::Jid fromJid = static_cast(myself())->rosterItem().jid(); - fromJid.setResource ( account()->configGroup()->readEntry( "Resource", TQString::null ) ); + fromJid.setResource ( account()->configGroup()->readEntry( "Resource", TQString() ) ); kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Sending out typing notification (" << typing << ") to all chat members." << endl; @@ -253,7 +253,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -270,7 +270,7 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -286,16 +286,16 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat { TQString xhtmlBody = message.escapedBody(); - // According to JEP-0071 8.9 it is only RECOMMANDED to replace \n with
+ // According to JEP-0071 8.9 it is only RECOMMANDED to tqreplace \n with
// which mean that some implementation (gaim 2 beta) may still think that \n are linebreak. // and considered the fact that KTextEditor generate a well indented XHTML, we need to remove all \n from it // see Bug 121627 // Anyway, theses client that do like that are *WRONG* considreded the example of jep-71 where there are lot of // linebreak that are not interpreted. - Olivier 2006-31-03 - xhtmlBody.replace("\n",""); + xhtmlBody.tqreplace("\n",""); //  is not a valid XML entity - xhtmlBody.replace(" " , " "); + xhtmlBody.tqreplace(" " , " "); // Remove trailing line break xhtmlBody.remove( TQRegExp( "
$" ) ); @@ -358,4 +358,4 @@ void JabberChatSession::slotMessageSent ( Kopete::Message &message, Kopete::Chat #include "jabberchatsession.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; replace-tabs off; space-indent off; +// kate: tab-width 4; tqreplace-tabs off; space-indent off; diff --git a/kopete/protocols/jabber/jabberchatsession.h b/kopete/protocols/jabber/jabberchatsession.h index edd36772..564523de 100644 --- a/kopete/protocols/jabber/jabberchatsession.h +++ b/kopete/protocols/jabber/jabberchatsession.h @@ -35,6 +35,7 @@ class TQString; class JabberChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 41157aaa..99a768fc 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -157,7 +157,7 @@ void JabberClient::cleanUp () d->currentPenaltyTime = 0; d->jid = XMPP::Jid (); - d->password = TQString::null; + d->password = TQString(); setForceTLS ( false ); setUseSSL ( false ); @@ -171,9 +171,9 @@ void JabberClient::cleanUp () setFileTransfersEnabled ( false ); setS5BServerPort ( 8010 ); - setClientName ( TQString::null ); - setClientVersion ( TQString::null ); - setOSName ( TQString::null ); + setClientName ( TQString() ); + setClientVersion ( TQString() ); + setOSName ( TQString() ); setTimeZone ( "UTC", 0 ); @@ -272,7 +272,7 @@ void JabberClient::addS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.contains ( *it ) ) + if ( !newList.tqcontains ( *it ) ) newList.append ( *it ); } @@ -284,7 +284,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) { TQStringList newList; - TQStringList::iterator it = d->s5bAddressList.find ( address ); + TQStringList::iterator it = d->s5bAddressList.tqfind ( address ); if ( it != d->s5bAddressList.end () ) { d->s5bAddressList.remove ( it ); @@ -300,7 +300,7 @@ void JabberClient::removeS5BServerAddress ( const TQString &address ) // now filter the list without dupes for ( TQStringList::Iterator it = d->s5bAddressList.begin (); it != d->s5bAddressList.end (); ++it ) { - if ( !newList.contains ( *it ) ) + if ( !newList.tqcontains ( *it ) ) newList.append ( *it ); } @@ -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 Status &) ), - this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); + 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 ( 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::Status &reason ) +void JabberClient::disconnect( XMPP::tqStatus &reason ) { if ( d->jabberClient ) { @@ -823,12 +823,12 @@ void JabberClient::leaveGroupChat ( const TQString &host, const TQString &room ) } -void JabberClient::setGroupChatStatus( const TQString & host, const TQString & room, const XMPP::Status & status ) +void JabberClient::setGroupChattqStatus( const TQString & host, const TQString & room, const XMPP::tqStatus & status ) { - client()->groupChatSetStatus( host, room, status); + client()->groupChatSettqStatus( host, room, status); } -void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::Status & status ) +void JabberClient::changeGroupChatNick( const TQString & host, const TQString & room, const TQString & nick, const XMPP::tqStatus & status ) { client()->groupChatChangeNick( host, room, nick, status ); } @@ -859,8 +859,8 @@ void JabberClient::slotPsiDebug ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); emit debugMessage ( "Psi: " + msg ); @@ -870,8 +870,8 @@ void JabberClient::slotIncomingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); emit debugMessage ( "XML IN: " + msg ); @@ -881,8 +881,8 @@ void JabberClient::slotOutgoingXML ( const TQString & _msg ) { TQString msg = _msg; - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); - msg = msg.replace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); + msg = msg.tqreplace( TQRegExp( "[^<]*\n" ), "[Filtered]\n" ); emit debugMessage ( "XML OUT: " + msg ); @@ -1112,7 +1112,7 @@ void JabberClient::slotGroupChatLeft ( const Jid &jid ) } -void JabberClient::slotGroupChatPresence ( const Jid &jid, const Status &status) +void JabberClient::slotGroupChatPresence ( const Jid &jid, const tqStatus &status) { emit groupChatPresence ( jid, status ); diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h index 4db2975f..05324824 100644 --- a/kopete/protocols/jabber/jabberclient.h +++ b/kopete/protocols/jabber/jabberclient.h @@ -54,10 +54,11 @@ class JabberConnector; * @brief Provides a Jabber client * @author Till Gerken */ -class JabberClient : public QObject +class JabberClient : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -95,7 +96,7 @@ public: * Disconnect from Jabber server with reason * @param reason The reason for disconnecting */ - void disconnect (XMPP::Status &reason); + void disconnect (XMPP::tqStatus &reason); /** * Returns if this instance is connected to a server. @@ -213,7 +214,7 @@ public: * @param flag Whether to enable file transfers. * @param localAddress Local address to receive file transfers at. Will be determined automatically if not specified. */ - void setFileTransfersEnabled ( bool flag, const TQString &localAddress = TQString::null ); + void setFileTransfersEnabled ( bool flag, const TQString &localAddress = TQString() ); /** * Returns the address of the local interface. @@ -378,11 +379,11 @@ public: /** * change the status of a group chat */ - void setGroupChatStatus(const TQString &host, const TQString &room, const XMPP::Status &); + void setGroupChattqStatus(const TQString &host, const TQString &room, const XMPP::tqStatus &); /** * change the nick in a group chat */ - void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::Status &status =XMPP::Status()); + void changeGroupChatNick(const TQString &host, const TQString &room, const TQString &nick, const XMPP::tqStatus &status =XMPP::tqStatus()); /** * Send a message. @@ -491,7 +492,7 @@ signals: /** * A presence to a group chat has been signalled. */ - void groupChatPresence ( const XMPP::Jid &jid, const XMPP::Status &status ); + void groupChatPresence ( const XMPP::Jid &jid, const XMPP::tqStatus &status ); /** * An error was encountered joining or processing a group chat. @@ -589,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 Status & status); + void slotGroupChatPresence (const Jid & jid, const tqStatus & status); void slotGroupChatError (const Jid & jid, int error, const TQString & reason); /* Incoming subscription request. */ diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index 8fdc3e84..4653803f 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -22,8 +22,8 @@ #include "jabberbytestream.h" #include "jabberprotocol.h" -JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) - : XMPP::Connector ( parent ) +JabberConnector::JabberConnector ( TQObject *tqparent, const char */*name*/ ) + : XMPP::Connector ( tqparent ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl; @@ -107,7 +107,7 @@ void JabberConnector::done () } -void JabberConnector::setOptHostPort ( const TQString &host, Q_UINT16 port ) +void JabberConnector::setOptHostPort ( const TQString &host, TQ_UINT16 port ) { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl; diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index b7ee533a..e6f12988 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -33,9 +33,10 @@ class JabberConnector : public XMPP::Connector { Q_OBJECT + TQ_OBJECT public: - JabberConnector ( TQObject *parent = 0, const char *name = 0 ); + JabberConnector ( TQObject *tqparent = 0, const char *name = 0 ); ~JabberConnector (); @@ -43,7 +44,7 @@ public: ByteStream *stream () const; void done (); - void setOptHostPort ( const TQString &host, Q_UINT16 port ); + void setOptHostPort ( const TQString &host, TQ_UINT16 port ); void setOptSSL ( bool ); void setOptProbe ( bool ); @@ -55,7 +56,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; JabberByteStream *mByteStream; diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 840f9cf3..119a6f6e 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -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()->onlineStatus().isDefinitelyOnline() ) + if ( account()->myself()->onlinetqStatus().isDefinitelyOnline() ) { slotGetTimedVCard (); } @@ -170,7 +170,7 @@ TQPtrList *JabberContact::customContextMenuActions () // if the contact is online, display the resources we have for it, // otherwise disable the menu - if (onlineStatus ().status () == Kopete::OnlineStatus::Offline) + if (onlinetqStatus ().status () == Kopete::OnlineStatus::Offline) { actionSelectResource->setEnabled ( false ); } @@ -213,7 +213,7 @@ TQPtrList *JabberContact::customContextMenuActions () * and the resources' respective status icons for the rest. */ TQIconSet iconSet ( !i ? - protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); + protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.tqfind(*it) ).iconFor ( account () )); actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); @@ -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 : \" %1 \"
" ).arg(TQStyleSheet::escape(message.body())); + i18n( "The original message is : \" %1 \"
" ).tqarg(TQStyleSheet::escape(message.body())); TQString mes=i18n("%1 invited you to join the conference %2
%3
" "If you want to accept and join, just enter your nickname and press ok
" "If you want to decline, press cancel") - .arg(message.from().full(), room , originalBody); + .tqarg(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.").arg(metaContact()->displayName()), + i18n("%1 has ended their participation in the chat session.").tqarg(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()->onlineStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlinetqStatus().isDefinitelyOnline () ) { return; } @@ -440,13 +440,13 @@ void JabberContact::slotCheckVCard () // avoid warning if key does not exist in configuration file if ( cacheDateString.isNull () ) - cacheDate = TQDateTime::currentDateTime().addDays ( -2 ); + cacheDate = TQDateTime::tqcurrentDateTime().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::currentDateTime () ) ) + if ( !mVCardUpdateInProgress && ( cacheDate.addDays ( 1 ) < TQDateTime::tqcurrentDateTime () ) ) { 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()->onlineStatus().isDefinitelyOnline () ) + if ( !account()->myself()->onlinetqStatus().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::currentDateTime().toString ( Qt::ISODate ) ); + setProperty ( protocol()->propVCardCacheTimeStamp, TQDateTime::tqcurrentDateTime().toString ( Qt::ISODate ) ); } mVCardUpdateInProgress = false; @@ -527,7 +527,7 @@ void JabberContact::slotGotVCard () } -void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newStatus, const Kopete::OnlineStatus &oldStatus ) +void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &newtqStatus, const Kopete::OnlineStatus &oldtqStatus ) { /* @@ -541,13 +541,13 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl * to query its activity after we are already connected. */ - if ( onlineStatus().isDefinitelyOnline () ) + if ( onlinetqStatus().isDefinitelyOnline () ) { // Kopete already deals with lastSeen if the contact is online return; } - if ( ( oldStatus.status () == Kopete::OnlineStatus::Connecting ) && newStatus.isDefinitelyOnline () ) + if ( ( oldtqStatus.status () == Kopete::OnlineStatus::Connecting ) && newtqStatus.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 ( onlineStatus().isDefinitelyOnline () ) + if ( onlinetqStatus().isDefinitelyOnline () ) { // Kopete already deals with setting lastSeen if the contact is online return; } - if ( account()->myself()->onlineStatus().isDefinitelyOnline () ) + if ( account()->myself()->onlinetqStatus().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::currentDateTime().addSecs ( -task->seconds () ) ); + setProperty ( protocol()->propLastSeen, TQDateTime(TQDateTime::tqcurrentDateTime().addSecs ( -task->seconds () ))); if( !task->message().isEmpty() ) { setProperty( protocol()->propAwayMessage, task->message() ); @@ -732,7 +732,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) ); // Scale and crop the picture. - contactPhoto = contactPhoto.smoothScale( 96, 96, TQImage::ScaleMin ); + contactPhoto = contactPhoto.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(contactPhoto.width() < contactPhoto.height()) contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 96, 96); @@ -741,7 +741,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -751,7 +751,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) ); // Scale and crop the picture. - contactPhoto = contactPhoto.smoothScale( 32, 32, TQImage::ScaleMin ); + contactPhoto = contactPhoto.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(contactPhoto.width() < contactPhoto.height()) contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 32, 32); @@ -760,7 +760,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -776,7 +776,7 @@ void JabberContact::setPhoto( const TQString &photoPath ) // Use the cropped/scaled image now. if(!contactPhoto.save(newLocation, "PNG")) - newPhotoPath = TQString::null; + newPhotoPath = TQString(); else newPhotoPath = newLocation; } @@ -795,7 +795,7 @@ void JabberContact::slotChatSessionDeleted ( TQObject *sender ) JabberChatSession *manager = static_cast(sender); - mManagers.remove ( mManagers.find ( manager ) ); + mManagers.remove ( mManagers.tqfind ( manager ) ); } @@ -1015,7 +1015,7 @@ void JabberContact::sendFile ( const KURL &sourceURL, const TQString &/*fileName // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); @@ -1110,7 +1110,7 @@ void JabberContact::slotSelectResource () } -void JabberContact::sendPresence ( const XMPP::Status status ) +void JabberContact::sendPresence ( const XMPP::tqStatus status ) { if ( !account()->isConnected () ) @@ -1119,15 +1119,15 @@ void JabberContact::sendPresence ( const XMPP::Status status ) return; } - XMPP::Status newStatus = status; + XMPP::tqStatus newtqStatus = status; // honour our priority - if(newStatus.isAvailable()) - newStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); + if(newtqStatus.isAvailable()) + newtqStatus.setPriority ( account()->configGroup()->readNumEntry ( "Priority", 5 ) ); XMPP::JT_Presence * task = new XMPP::JT_Presence ( account()->client()->rootTask () ); - task->pres ( bestAddress (), newStatus); + task->pres ( bestAddress (), newtqStatus); task->go ( true ); } @@ -1136,7 +1136,7 @@ void JabberContact::sendPresence ( const XMPP::Status status ) void JabberContact::slotStatusOnline () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow(""); sendPresence ( status ); @@ -1146,7 +1146,7 @@ void JabberContact::slotStatusOnline () void JabberContact::slotStatusChatty () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("chat"); sendPresence ( status ); @@ -1156,7 +1156,7 @@ void JabberContact::slotStatusChatty () void JabberContact::slotStatusAway () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("away"); sendPresence ( status ); @@ -1166,7 +1166,7 @@ void JabberContact::slotStatusAway () void JabberContact::slotStatusXA () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("xa"); sendPresence ( status ); @@ -1176,7 +1176,7 @@ void JabberContact::slotStatusXA () void JabberContact::slotStatusDND () { - XMPP::Status status; + XMPP::tqStatus status; status.setShow ("dnd"); sendPresence ( status ); @@ -1187,7 +1187,7 @@ void JabberContact::slotStatusDND () void JabberContact::slotStatusInvisible () { - XMPP::Status status; + XMPP::tqStatus status; status.setIsAvailable( false ); sendPresence ( status ); @@ -1298,8 +1298,8 @@ void JabberContact::slotDiscoFinished( ) XMPP::RosterItem ri = rosterItem(); Kopete::MetaContact *mc=metaContact(); - JabberAccount *parentAccount=account(); - Kopete::OnlineStatus status=onlineStatus(); + JabberAccount *tqparentAccount=account(); + Kopete::OnlineStatus status=onlinetqStatus(); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << ri.jid().full() << " is not a contact but a gateway - " << this << endl; @@ -1315,7 +1315,7 @@ void JabberContact::slotDiscoFinished( ) Kopete::ContactList::self()->removeMetaContact( mc ); //we need to create the transport when 'this' is already deleted, so transport->myself() will not conflict with it - JabberTransport *transport = new JabberTransport( parentAccount , ri , tr_type ); + JabberTransport *transport = new JabberTransport( tqparentAccount , ri , tr_type ); if(!Kopete::AccountManager::self()->registerAccount( transport )) return; transport->myself()->setOnlineStatus( status ); //push back the online status diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index 6c88318b..ce40be30 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -34,6 +34,7 @@ class JabberContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -95,7 +96,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); /** * Update the vCard on the server. @@ -227,7 +228,7 @@ private: /** * Sends a presence packet to this contact */ - void sendPresence ( const XMPP::Status status ); + void sendPresence ( const XMPP::tqStatus status ); /** * This variable keeps a list of message managers. diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 43724d28..369cb9d9 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -93,7 +93,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, JabberTransport *transport=0l; TQString legacyId; //find if the contact should be added to a transport. - if(mAccount->transports().contains(contact.jid().domain())) + if(mAccount->transports().tqcontains(contact.jid().domain())) { transport=mAccount->transports()[contact.jid().domain()]; legacyId=transport->legacyId( contact.jid() ); @@ -222,7 +222,7 @@ void JabberContactPool::slotContactDestroyed ( Kopete::Contact *contact ) else { //this is a legacy contact. we have no way to get the real Jid at this point, we can only guess it. - TQString contactId= contact->contactId().replace('@','%') + "@" + contact->account()->myself()->contactId(); + TQString contactId= contact->contactId().tqreplace('@','%') + "@" + contact->account()->myself()->contactId(); mAccount->resourcePool()->removeAllResources ( XMPP::Jid ( contactId ) ) ; } diff --git a/kopete/protocols/jabber/jabbercontactpool.h b/kopete/protocols/jabber/jabbercontactpool.h index 419061fd..e6bb1a88 100644 --- a/kopete/protocols/jabber/jabbercontactpool.h +++ b/kopete/protocols/jabber/jabbercontactpool.h @@ -33,10 +33,11 @@ class JabberTransport; /** * @author Till Gerken */ -class JabberContactPool : public QObject +class JabberContactPool : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -105,9 +106,10 @@ private: }; -class JabberContactPoolItem : QObject +class JabberContactPoolItem : TQObject { Q_OBJECT + TQ_OBJECT public: JabberContactPoolItem ( JabberBaseContact *contact ); ~JabberContactPoolItem (); diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index 00d8be18..d49d846c 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -137,8 +137,8 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf mLocalFile.setName ( fileName ); bool couldOpen = false; - Q_LLONG offset = 0; - Q_LLONG length = 0; + TQ_LLONG offset = 0; + TQ_LLONG length = 0; mBytesTransferred = 0; mBytesToTransfer = mXMPPTransfer->fileSize (); diff --git a/kopete/protocols/jabber/jabberfiletransfer.h b/kopete/protocols/jabber/jabberfiletransfer.h index 851d5688..2a5e4810 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.h +++ b/kopete/protocols/jabber/jabberfiletransfer.h @@ -27,10 +27,11 @@ namespace Kopete { class Transfer; } namespace Kopete { class FileTransferInfo; } class JabberBaseContact; -class JabberFileTransfer : public QObject +class JabberFileTransfer : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -64,8 +65,8 @@ private: Kopete::Transfer *mKopeteTransfer; TQFile mLocalFile; int mTransferId; - Q_LLONG mBytesTransferred; - Q_LLONG mBytesToTransfer; + TQ_LLONG mBytesTransferred; + TQ_LLONG mBytesToTransfer; }; diff --git a/kopete/protocols/jabber/jabberformlineedit.cpp b/kopete/protocols/jabber/jabberformlineedit.cpp index 991d4a56..235faffe 100644 --- a/kopete/protocols/jabber/jabberformlineedit.cpp +++ b/kopete/protocols/jabber/jabberformlineedit.cpp @@ -17,8 +17,8 @@ #include "jabberformlineedit.h" -JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):TQLineEdit (value, - parent, +JabberFormLineEdit::JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):TQLineEdit (value, + tqparent, name) { @@ -38,7 +38,7 @@ JabberFormLineEdit::~JabberFormLineEdit () { } -JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent, const char *name):KPasswordEdit(parent, name) +JabberFormPasswordEdit::JabberFormPasswordEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent, const char *name):KPasswordEdit(tqparent, name) { setText(value); diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index 179a8844..8ed1defc 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -28,11 +28,14 @@ *@author Till Gerken */ -class JabberFormLineEdit:public QLineEdit +class JabberFormLineEdit:public TQLineEdit { - Q_OBJECT public: - JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); + Q_OBJECT + TQ_OBJECT + +public: + JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); ~JabberFormLineEdit (); public slots:void slotGatherData (XMPP::Form & form); @@ -46,8 +49,11 @@ class JabberFormLineEdit:public QLineEdit class JabberFormPasswordEdit:public KPasswordEdit { - Q_OBJECT public: - JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); + Q_OBJECT + TQ_OBJECT + +public: + JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * tqparent = 0, const char *name = 0); public slots:void slotGatherData (XMPP::Form & form); diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 3344f802..08fd3cfe 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -22,7 +22,7 @@ #include "jabberformlineedit.h" #include "jabberformtranslator.h" -JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * parent, const char *name):TQWidget (parent, name) +JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent, const char *name):TQWidget (tqparent, name) { /* Copy basic form values. */ privForm.setJid (form.jid ()); @@ -31,12 +31,12 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * emptyForm = privForm; - /* Add instructions to layout. */ + /* Add instructions to tqlayout. */ TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4); TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel"); - label->setAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); - label->setSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Fixed, true); + label->tqsetAlignment (int (TQLabel::WordBreak | TQLabel::AlignVCenter)); + label->tqsetSizePolicy(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 875594df..1718ec4b 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -27,13 +27,14 @@ *@author Till Gerken */ -class JabberFormTranslator:public QWidget +class JabberFormTranslator:public TQWidget { Q_OBJECT + TQ_OBJECT public: - JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0); + JabberFormTranslator (const XMPP::Form & form, TQWidget * tqparent = 0, const char *name = 0); ~JabberFormTranslator (); XMPP::Form & resultData (); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index e098fdad..ff5ae32c 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -89,7 +89,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: jabberMessage.setSubject ( message.subject () ); jabberMessage.setTimeStamp ( message.timestamp () ); - if ( message.plainBody().find ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) + if ( message.plainBody().tqfind ( "-----BEGIN PGP MESSAGE-----" ) != -1 ) { /* * This message is encrypted, so we need to set @@ -106,7 +106,7 @@ void JabberGroupChatManager::slotMessageSent ( Kopete::Message &message, Kopete: // remove PGP header and footer from message encryptedBody.truncate ( encryptedBody.length () - TQString("-----END PGP MESSAGE-----").length () - 2 ); - encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.find ( "\n\n" ) - 2 ); + encryptedBody = encryptedBody.right ( encryptedBody.length () - encryptedBody.tqfind ( "\n\n" ) - 2 ); // assign payload to message jabberMessage.setXEncrypted ( encryptedBody ); @@ -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").arg( mRoomJid.userHost() ) ); + jabberMessage.setBody( i18n("You have been invited to %1").tqarg( mRoomJid.userHost() ) ); // send the message account()->client()->sendMessage ( jabberMessage ); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.h b/kopete/protocols/jabber/jabbergroupchatmanager.h index 0891ae01..fb92ba40 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.h +++ b/kopete/protocols/jabber/jabbergroupchatmanager.h @@ -33,6 +33,7 @@ class TQString; class JabberGroupChatManager : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: JabberGroupChatManager ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index 4cc9d628..7ddf4041 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -296,7 +296,7 @@ void JabberGroupContact::sendFile ( const KURL &sourceURL, const TQString &/*fil // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); @@ -345,8 +345,8 @@ void JabberGroupContact::slotStatusChanged( ) } //TODO: away message - XMPP::Status newStatus = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); - account()->client()->setGroupChatStatus( rosterItem().jid().host() , rosterItem().jid().user() , newStatus ); + XMPP::tqStatus newtqStatus = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); + account()->client()->setGroupChattqStatus( rosterItem().jid().host() , rosterItem().jid().user() , newtqStatus ); } 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 %1" ).arg(rosterItem().jid().userHost()), + i18n( "Please enter the new nick name you want to have on the room %1" ).tqarg(rosterItem().jid().userHost()), mNick, &ok ); if ( !ok || !account()->isConnected()) return; mNick=futureNewNickName; - XMPP::Status status = account()->protocol()->kosToStatus( account()->myself()->onlineStatus() ); + XMPP::tqStatus status = account()->protocol()->kosTotqStatus( account()->myself()->onlinetqStatus() ); account()->client()->changeGroupChatNick( rosterItem().jid().host() , rosterItem().jid().user() , mNick , status); } diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h index 7cbd4f36..46bdad2a 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.h +++ b/kopete/protocols/jabber/jabbergroupcontact.h @@ -27,6 +27,7 @@ class JabberGroupContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -70,7 +71,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index ca71b472..e9bae4c1 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -150,7 +150,7 @@ void JabberGroupMemberContact::sendFile ( const KURL &sourceURL, const TQString // if the file location is null, then get it from a file open dialog if ( !sourceURL.isValid () ) - filePath = KFileDialog::getOpenFileName( TQString::null , "*", 0L, i18n ( "Kopete File Transfer" ) ); + filePath = KFileDialog::getOpenFileName( TQString() , "*", 0L, i18n ( "Kopete File Transfer" ) ); else filePath = sourceURL.path(-1); diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h index 2936a5f8..cddc0a58 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.h +++ b/kopete/protocols/jabber/jabbergroupmembercontact.h @@ -28,6 +28,7 @@ class JabberGroupMemberContact : public JabberBaseContact { Q_OBJECT + TQ_OBJECT public: @@ -64,7 +65,7 @@ public slots: * a nondeterminate file size (such as over a socket) */ virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); private slots: /** diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index df8dba7d..c88b8841 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -69,14 +69,14 @@ typedef KGenericFactory JabberProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_jabber, JabberProtocolFactory( "kopete_jabber" ) ) -JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) -: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), +JabberProtocol::JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &) +: Kopete::Protocol( JabberProtocolFactory::instance(), tqparent, name ), JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ), - JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), + JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage), JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage), JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage), - JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), + JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString(), i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, JabberInvisible, "contact_invisible_overlay", i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible), JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting", i18n("Connecting")), propLastSeen(Kopete::Global::Properties::self()->lastSeen()), @@ -90,34 +90,34 @@ 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()), - propSubscriptionStatus("jabberSubscriptionStatus", i18n ("Subscription"), TQString::null, true, false), - propAuthorizationStatus("jabberAuthorizationStatus", i18n ("Authorization Status"), TQString::null, true, false), + propSubscriptiontqStatus("jabberSubscriptiontqStatus", i18n ("Subscription"), TQString(), true, false), + propAuthorizationtqStatus("jabberAuthorizationtqStatus", i18n ("Authorization tqStatus"), TQString(), true, false), propAvailableResources("jabberAvailableResources", i18n ("Available Resources"), "jabber_chatty", false, true), - propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString::null, true, false, true), + propVCardCacheTimeStamp("jabberVCardCacheTimeStamp", i18n ("vCard Cache Timestamp"), TQString(), true, false, true), propPhoto(Kopete::Global::Properties::self()->photo()), - propJid("jabberVCardJid", i18n("Jabber ID"), TQString::null, true, false), - propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString::null, true, false), - propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString::null, true, false), - propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString::null, true, false), - propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString::null, true, false), - propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString::null, true, false), - propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString::null, true, false), - propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString::null, true, false), - propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString::null, true, false), - propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString::null, true, false), - propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString::null, true, false), - propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString::null, true, false), - propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString::null, true, false), - propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString::null, true, false), - propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString::null, true, false), - propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString::null, true, false), - propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString::null, true, false), - propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString::null, true, false), - propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString::null, true, false), - propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString::null, true, false), - propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString::null, true, false), - propAbout("jabberVCardAbout", i18n("About"), TQString::null, true, false) + propJid("jabberVCardJid", i18n("Jabber ID"), TQString(), true, false), + propBirthday("jabberVCardBirthday", i18n("Birthday"), TQString(), true, false), + propTimezone("jabberVCardTimezone", i18n("Timezone"), TQString(), true, false), + propHomepage("jabberVCardHomepage", i18n("Homepage"), TQString(), true, false), + propCompanyName("jabberVCardCompanyName", i18n("Company name"), TQString(), true, false), + propCompanyDepartement("jabberVCardCompanyDepartement", i18n("Company Departement"), TQString(), true, false), + propCompanyPosition("jabberVCardCompanyPosition", i18n("Company Position"), TQString(), true, false), + propCompanyRole("jabberVCardCompanyRole", i18n("Company Role"), TQString(), true, false), + propWorkStreet("jabberVCardWorkStreet", i18n("Work Street"), TQString(), true, false), + propWorkExtAddr("jabberVCardWorkExtAddr", i18n("Work Extra Address"), TQString(), true, false), + propWorkPOBox("jabberVCardWorkPOBox", i18n("Work PO Box"), TQString(), true, false), + propWorkCity("jabberVCardWorkCity", i18n("Work City"), TQString(), true, false), + propWorkPostalCode("jabberVCardWorkPostalCode", i18n("Work Postal Code"), TQString(), true, false), + propWorkCountry("jabberVCardWorkCountry", i18n("Work Country"), TQString(), true, false), + propWorkEmailAddress("jabberVCardWorkEmailAddress", i18n("Work Email Address"), TQString(), true, false), + propHomeStreet("jabberVCardHomeStreet", i18n("Home Street"), TQString(), true, false), + propHomeExtAddr("jabberVCardHomeExt", i18n("Home Extra Address"), TQString(), true, false), + propHomePOBox("jabberVCardHomePOBox", i18n("Home PO Box"), TQString(), true, false), + propHomeCity("jabberVCardHomeCity", i18n("Home City"), TQString(), true, false), + propHomePostalCode("jabberVCardHomePostalCode", i18n("Home Postal Code"), TQString(), true, false), + propHomeCountry("jabberVCardHomeCountry", i18n("Home Country"), TQString(), true, false), + propPhoneFax("jabberVCardPhoneFax", i18n("Fax"), TQString(), true, false), + propAbout("jabberVCardAbout", i18n("About"), TQString(), true, false) { @@ -155,18 +155,18 @@ JabberProtocol::~JabberProtocol () -AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * parent, Kopete::Account * i) +AddContactPage *JabberProtocol::createAddContactWidget (TQWidget * tqparent, Kopete::Account * i) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Create Add Contact Widget\n" << endl; - return new JabberAddContactPage (i, parent); + return new JabberAddContactPage (i, tqparent); } -KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * parent) +KopeteEditAccountWidget *JabberProtocol::createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent) { kdDebug (JABBER_DEBUG_GLOBAL) << "[Jabber Protocol] Edit Account Widget\n" << endl; JabberAccount *ja=dynamic_cast < JabberAccount * >(account); if(ja || !account) - return new JabberEditAccountWidget (this,ja , parent); + return new JabberEditAccountWidget (this,ja , tqparent); else { JabberTransport *transport = dynamic_cast < JabberTransport * >(account); @@ -185,7 +185,7 @@ Kopete::Account *JabberProtocol::createNewAccount (const TQString & accountId) if( Kopete::AccountManager::self()->findAccount( pluginId() , accountId ) ) return 0L; //the account may already exist if greated just above - int slash=accountId.find('/'); + int slash=accountId.tqfind('/'); if(slash>=0) { TQString realAccountId=accountId.left(slash); @@ -304,42 +304,42 @@ Kopete::Contact *JabberProtocol::deserializeContact (Kopete::MetaContact * metaC return account->contacts()[contactId]; } -XMPP::Status JabberProtocol::kosToStatus( const Kopete::OnlineStatus & status , const TQString & message ) +XMPP::tqStatus JabberProtocol::kosTotqStatus( const Kopete::OnlineStatus & status , const TQString & message ) { - XMPP::Status xmppStatus ( "", message ); + XMPP::tqStatus xmpptqStatus ( "", message ); if( status.status() == Kopete::OnlineStatus::Offline ) { - xmppStatus.setIsAvailable( false ); + xmpptqStatus.setIsAvailable( false ); } switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmppStatus.setShow ( "chat" ); + xmpptqStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmppStatus.setShow ( "" ); + xmpptqStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmppStatus.setShow ( "away" ); + xmpptqStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmppStatus.setShow ( "xa" ); + xmpptqStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmppStatus.setShow ( "dnd" ); + xmpptqStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmppStatus.setIsInvisible ( true ); + xmpptqStatus.setIsInvisible ( true ); break; } - return xmppStatus; + return xmpptqStatus; } #include "jabberprotocol.moc" diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 35c8cdbc..696d572b 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -39,30 +39,31 @@ namespace XMPP { class Resource; - class Status; + class tqStatus; } class JabberContact; -class dlgJabberStatus; +class dlgJabbertqStatus; class dlgJabberSendRaw; class JabberCapabilitiesManager; class JabberProtocol:public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: /** * Object constructor and destructor */ - JabberProtocol (TQObject * parent, const char *name, const TQStringList &); + JabberProtocol (TQObject * tqparent, const char *name, const TQStringList &); ~JabberProtocol (); /** * Creates the "add contact" dialog specific to this protocol */ - virtual AddContactPage *createAddContactWidget (TQWidget * parent, Kopete::Account * i); - virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * parent); + virtual AddContactPage *createAddContactWidget (TQWidget * tqparent, Kopete::Account * i); + virtual KopeteEditAccountWidget *createEditAccountWidget (Kopete::Account * account, TQWidget * tqparent); virtual Kopete::Account *createNewAccount (const TQString & accountId); /** @@ -94,8 +95,8 @@ public: const Kopete::ContactPropertyTmpl propWorkPhone; const Kopete::ContactPropertyTmpl propWorkMobilePhone; const Kopete::ContactPropertyTmpl propNickName; - const Kopete::ContactPropertyTmpl propSubscriptionStatus; - const Kopete::ContactPropertyTmpl propAuthorizationStatus; + const Kopete::ContactPropertyTmpl propSubscriptiontqStatus; + const Kopete::ContactPropertyTmpl propAuthorizationtqStatus; const Kopete::ContactPropertyTmpl propAvailableResources; const Kopete::ContactPropertyTmpl propVCardCacheTimeStamp; const Kopete::ContactPropertyTmpl propPhoto; @@ -140,9 +141,9 @@ public: Kopete::OnlineStatus resourceToKOS ( const XMPP::Resource &resource ); /** - * Convert an online status to a XMPP::Status + * Convert an online status to a XMPP::tqStatus */ - XMPP::Status kosToStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); + XMPP::tqStatus kosTotqStatus( const Kopete::OnlineStatus & status, const TQString& message=TQString() ); /** * Return the Entity Capabilities(JEP-0115) manager instance. diff --git a/kopete/protocols/jabber/jabberresource.cpp b/kopete/protocols/jabber/jabberresource.cpp index 04b7d9f3..a971e1c8 100644 --- a/kopete/protocols/jabber/jabberresource.cpp +++ b/kopete/protocols/jabber/jabberresource.cpp @@ -18,7 +18,7 @@ #include "jabberresource.h" -// Qt includes +// TQt includes #include // KDE includes diff --git a/kopete/protocols/jabber/jabberresource.h b/kopete/protocols/jabber/jabberresource.h index b29129be..5f274668 100644 --- a/kopete/protocols/jabber/jabberresource.h +++ b/kopete/protocols/jabber/jabberresource.h @@ -35,9 +35,10 @@ class Jid; class Features; } -class JabberResource : public QObject +class JabberResource : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp index 19492790..4c84d535 100644 --- a/kopete/protocols/jabber/jabberresourcepool.cpp +++ b/kopete/protocols/jabber/jabberresourcepool.cpp @@ -32,7 +32,7 @@ * for a given JID can be found. It's an empty offline * resource. */ -XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::Status ( "", "", 0, false ) ); +XMPP::Resource JabberResourcePool::EmptyResource ( "", XMPP::tqStatus ( "", "", 0, false ) ); class JabberResourcePool::Private { @@ -95,7 +95,7 @@ void JabberResourcePool::notifyRelevantContacts ( const XMPP::Jid &jid ) for(JabberBaseContact *mContact = list.first (); mContact; mContact = list.next ()) { - mContact->reevaluateStatus (); + mContact->reevaluatetqStatus (); } } diff --git a/kopete/protocols/jabber/jabberresourcepool.h b/kopete/protocols/jabber/jabberresourcepool.h index 7378cbe0..1f892d24 100644 --- a/kopete/protocols/jabber/jabberresourcepool.h +++ b/kopete/protocols/jabber/jabberresourcepool.h @@ -29,9 +29,10 @@ class JabberAccount; * @author Till Gerken * @author Michaël Larouche */ -class JabberResourcePool : public QObject +class JabberResourcePool : public TQObject { Q_OBJECT + TQ_OBJECT public: static XMPP::Resource EmptyResource; diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 26d16b28..a081a8db 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -38,11 +38,11 @@ #include "xmpp_tasks.h" -JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) - : Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() ) +JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) + : Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() ) { m_status=Creating; - m_account = parentAccount; + m_account = tqparentAccount; m_account->addTransport( this,item.jid().bare() ); JabberContact *myContact = m_account->contactPool()->addContact ( item , Kopete::ContactList::self()->myself(), false ); @@ -88,11 +88,11 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros m_status=Normal; } -JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId ) - : Kopete::Account ( parentAccount->protocol(), _accountId ) +JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId ) + : Kopete::Account ( tqparentAccount->protocol(), _accountId ) { m_status=Creating; - m_account = parentAccount; + m_account = tqparentAccount; const TQString contactJID_s = configGroup()->readEntry("GatewayJID"); @@ -123,11 +123,11 @@ JabberTransport::~JabberTransport () KActionMenu *JabberTransport::actionMenu () { - KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); + KActionMenu *menu = new KActionMenu( accountId(), myself()->onlinetqStatus().iconFor( this ), this ); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); - menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) + menu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).tqarg( accountLabel(), nick ) ); TQPtrList *customActions = myself()->customContextMenuActions( ); @@ -203,44 +203,44 @@ void JabberTransport::setOnlineStatus( const Kopete::OnlineStatus& status , con return; } - XMPP::Status xmppStatus ( "", reason ); + XMPP::tqStatus xmpptqStatus ( "", reason ); switch ( status.internalStatus () ) { case JabberProtocol::JabberFreeForChat: - xmppStatus.setShow ( "chat" ); + xmpptqStatus.setShow ( "chat" ); break; case JabberProtocol::JabberOnline: - xmppStatus.setShow ( "" ); + xmpptqStatus.setShow ( "" ); break; case JabberProtocol::JabberAway: - xmppStatus.setShow ( "away" ); + xmpptqStatus.setShow ( "away" ); break; case JabberProtocol::JabberXA: - xmppStatus.setShow ( "xa" ); + xmpptqStatus.setShow ( "xa" ); break; case JabberProtocol::JabberDND: - xmppStatus.setShow ( "dnd" ); + xmpptqStatus.setShow ( "dnd" ); break; case JabberProtocol::JabberInvisible: - xmppStatus.setIsInvisible ( true ); + xmpptqStatus.setIsInvisible ( true ); break; } if ( !isConnected () ) { // we are not connected yet, so connect now - m_initialPresence = xmppStatus; + m_initialPresence = xmpptqStatus; connect (); } else { - setPresence ( xmppStatus ); + setPresence ( xmpptqStatus ); } #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").arg(task->statusString()), + i18n ("An error occured when trying to remove the transport:\n%1").tqarg(task->statusString()), i18n ("Jabber Service Unregistration")); */ //we don't really care, we remove everithing anyway. @@ -298,7 +298,7 @@ TQString JabberTransport::legacyId( const XMPP::Jid & jid ) if(jid.node().isEmpty()) return TQString(); TQString node = jid.node(); - return node.replace("%","@"); + return node.tqreplace("%","@"); } void JabberTransport::jabberAccountRemoved( ) @@ -328,7 +328,7 @@ void JabberTransport::eatContacts( ) { XMPP::RosterItem item=contact->rosterItem(); Kopete::MetaContact *mc=contact->metaContact(); - Kopete::OnlineStatus status = contact->onlineStatus(); + Kopete::OnlineStatus status = contact->onlinetqStatus(); 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 605f5cc4..e03be173 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -40,29 +40,30 @@ class JabberProtocol; class JabberTransport : public Kopete::Account { Q_OBJECT + TQ_OBJECT public: /** * constructor called when the transport is created by info from server (i.e not when loading kopete) - * @param parentAccount is the parent jabber account. + * @param tqparentAccount is the tqparent jabber account. * @param item is the roster item of the gateway * @param gateway_type eg: "msn" or "icq" only used when the account is not loaded from config file for determining the icon */ - JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); + JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); /** * constructor called when the transport is loaded from config - * @param parentAccount is the parent jabber account. + * @param tqparentAccount is the tqparent jabber account. * @param accountId is the accountId */ - JabberTransport (JabberAccount * parentAccount, const TQString &accountId ); + JabberTransport (JabberAccount * tqparentAccount, const TQString &accountId ); ~JabberTransport (); /** Returns the action menu for this account. */ virtual KActionMenu *actionMenu (); - /** the parent account */ + /** the tqparent account */ JabberAccount *account() const { return m_account; } @@ -79,8 +80,8 @@ public: virtual bool removeAccount(); - enum TransportStatus { Normal , Creating, Removing , AccountRemoved }; - TransportStatus transportStatus() { return m_status; }; + enum TransporttqStatus { Normal , Creating, Removing , AccountRemoved }; + TransporttqStatus transporttqStatus() { return m_status; }; /** * return the legacyId conrresponding to the jid @@ -91,7 +92,7 @@ public: public slots: /* Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); /** * the account has been unregistered. @@ -122,16 +123,16 @@ protected: * method should have the "dirty" flag set. * * This method should simply be used to intantiate the new contact, everything else - * (updating the GUI, parenting to meta contact, etc.) is being taken care of. + * (updating the GUI, tqparenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param parentContact The metacontact to add this contact to + * @param tqparentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); private: JabberAccount *m_account; - TransportStatus m_status; + TransporttqStatus m_status; }; diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index b1cbd666..4698ca5d 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -60,11 +60,11 @@ JingleSessionManager manage the JingleSession pointers. Do not delete it in user * JingleSessionManager(JabberAccount *) -* public slots: +* public Q_SLOTS: * JingleSession *createSession(const QString &sessionType, const JidList &peers); * void removeSession(JingleSession *); -signals: +Q_SIGNALS: * void incomingSession(const QString &sessionType, JingleSession *session); JingleSession @@ -89,10 +89,10 @@ Base class for Jingle session. A session is a // Return Session XML namespace * virtual QString sessionType() = 0; -protected slots: +protected Q_SLOTS: void sendStanza(const QString &stanza) { account()->client->send(stanza); -signals: +Q_SIGNALS: void accepted(); void declined(); void terminated(); @@ -105,7 +105,7 @@ Hold the PhoneSessionClient object. connect(account()->client(),SIGNAL(xmlIncoming(const QString&)),SLOT(receiveStanza(const QString&))); -private slots: +private Q_SLOTS: void receiveStanza(const QString &stanza); VoiceConversationDialog diff --git a/kopete/protocols/jabber/jingle/jinglesession.h b/kopete/protocols/jabber/jingle/jinglesession.h index a9d73440..ad5d68a7 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.h +++ b/kopete/protocols/jabber/jingle/jinglesession.h @@ -29,9 +29,10 @@ class JabberAccount; * * @author Michaël Larouche */ -class JingleSession : public QObject +class JingleSession : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList JidList; diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index 54fc7274..766da28e 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -14,7 +14,7 @@ * * ************************************************************************* */ -// libjingle before everything else to not clash with Qt +// libjingle before everything else to not clash with TQt #define POSIX #include "talk/xmpp/constants.h" #include "talk/base/sigslot.h" @@ -55,8 +55,8 @@ class JingleSessionManager; class JingleSessionManager::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleSessionManager *parent) - : sessionManager(parent) + SlotsProxy(JingleSessionManager *tqparent) + : sessionManager(tqparent) {} void OnSignalingRequest() diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.h b/kopete/protocols/jabber/jingle/jinglesessionmanager.h index f9bb82b9..2ec3ef46 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h @@ -36,9 +36,10 @@ class JabberAccount; * @brief Manage Jingle sessions. * @author Michaël Larouche */ -class JingleSessionManager : public QObject +class JingleSessionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList JidList; diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index 12e4b93d..344071c6 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -41,29 +41,29 @@ // ---------------------------------------------------------------------------- -class JingleIQResponder : public XMPP::Task +class JingleITQResponder : public XMPP::Task { public: - JingleIQResponder(XMPP::Task *); - ~JingleIQResponder(); + JingleITQResponder(XMPP::Task *); + ~JingleITQResponder(); bool take(const TQDomElement &); }; /** - * \class JingleIQResponder + * \class JingleITQResponder * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleIQResponder::JingleIQResponder(Task *parent) :Task(parent) +JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) { } -JingleIQResponder::~JingleIQResponder() +JingleITQResponder::~JingleITQResponder() { } -bool JingleIQResponder::take(const TQDomElement &e) +bool JingleITQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; @@ -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").arg(jid.full())); + qDebug(TQString("Removing unterminated call to %1").tqarg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -123,8 +123,8 @@ void JingleClientSlots::callDestroyed(cricket::Call *call) void JingleClientSlots::sendStanza(cricket::SessionClient*, const buzz::XmlElement *stanza) { TQString st(stanza->Str().c_str()); - st.replace("cli:iq","iq"); - st.replace(":cli=","="); + st.tqreplace("cli:iq","iq"); + st.tqreplace(":cli=","="); fprintf(stderr,"bling\n"); voiceCaller_->sendStanza(st.latin1()); fprintf(stderr,"blong\n"); @@ -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)").arg(state)); + qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").tqarg(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)").arg(jid.full())); + qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(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").arg(jid)); + qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").tqarg(jid)); if (jid.isEmpty()) { qWarning("jinglevoicecaller.cpp: Empty JID"); return; @@ -230,7 +230,7 @@ void JingleVoiceCaller::initialize() phone_client_->SignalSendStanza.connect(slots_, &JingleClientSlots::sendStanza); // IQ Responder - new JingleIQResponder(account()->client()->rootTask()); + new JingleITQResponder(account()->client()->rootTask()); // Listen to incoming packets connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&))); @@ -266,12 +266,12 @@ JingleVoiceCaller::~JingleVoiceCaller() bool JingleVoiceCaller::calling(const Jid& jid) { - return calls_.contains(jid.full()); + return calls_.tqcontains(jid.full()); } void JingleVoiceCaller::call(const Jid& jid) { - qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); + qDebug(TQString("jinglevoicecaller.cpp: Calling %1").tqarg(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").arg(j.full())); + qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").tqarg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -316,7 +316,7 @@ void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) { qDebug("jinglevoicecaller.cpp: Registering call\n"); kdDebug(14000) << k_funcinfo << jid.full() << endl; - if (!calls_.contains(jid.full())) { + if (!calls_.tqcontains(jid.full())) { calls_[jid.full()] = call; } // else { @@ -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").arg(j.full())); + qDebug(TQString("JingleVoiceCaller: Removing call to %1").tqarg(j.full())); calls_.remove(j.full()); } @@ -340,7 +340,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) if (doc.documentElement().tagName() == "presence") { Jid from = Jid(doc.documentElement().attribute("from")); TQString type = doc.documentElement().attribute("type"); - if (type == "unavailable" && calls_.contains(from.full())) { + if (type == "unavailable" && calls_.tqcontains(from.full())) { qDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); emit terminated(from); @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) // Spread the word if (ok) { - qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); + qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").tqarg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.h b/kopete/protocols/jabber/jingle/jinglevoicecaller.h index 50070289..e29eaf16 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h @@ -31,6 +31,7 @@ class JingleCallSlots; class JingleVoiceCaller : public VoiceCaller { Q_OBJECT + TQ_OBJECT friend class JingleClientSlots; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 91fa1a77..3f3bd6ca 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -// libjingle before everything else to not clash with Qt +// libjingle before everything else to not clash with TQt #define POSIX #include "talk/xmpp/constants.h" #include "talk/base/sigslot.h" @@ -38,7 +38,7 @@ #include "jinglevoicesession.h" #include "jinglesessionmanager.h" -// Qt includes +// TQt includes #include // KDE includes @@ -68,14 +68,14 @@ static bool hasPeer(const JingleVoiceSession::JidList &jidList, const XMPP::Jid //BEGIN SlotsProxy /** * This class is used to receive signals from libjingle, - * which is are not compatible with Qt signals. + * which is are not compatible with TQt signals. * So it's a proxy between JingeVoiceSession(qt)<->linjingle class. */ class JingleVoiceSession::SlotsProxy : public sigslot::has_slots<> { public: - SlotsProxy(JingleVoiceSession *parent) - : voiceSession(parent) + SlotsProxy(JingleVoiceSession *tqparent) + : voiceSession(tqparent) {} void OnCallCreated(cricket::Call* call) @@ -93,7 +93,7 @@ public: XMPP::Jid jid(session->remote_address().c_str()); // Do nothing if the session do not contain a peers. - //if( !voiceSession->peers().contains(jid) ) + //if( !voiceSession->peers().tqcontains(jid) ) if( !hasPeer(voiceSession->peers(), jid) ) return; @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").tqarg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} @@ -142,8 +142,8 @@ public: void OnSendingStanza(cricket::SessionClient*, const buzz::XmlElement *buzzStanza) { TQString irisStanza(buzzStanza->Str().c_str()); - irisStanza.replace("cli:iq","iq"); - irisStanza.replace(":cli=","="); + irisStanza.tqreplace("cli:iq","iq"); + irisStanza.tqreplace(":cli=","="); voiceSession->sendStanza(irisStanza); } @@ -152,30 +152,30 @@ private: }; //END SlotsProxy -//BEGIN JingleIQResponder -class JingleVoiceSession::JingleIQResponder : public XMPP::Task +//BEGIN JingleITQResponder +class JingleVoiceSession::JingleITQResponder : public XMPP::Task { public: - JingleIQResponder(XMPP::Task *); - ~JingleIQResponder(); + JingleITQResponder(XMPP::Task *); + ~JingleITQResponder(); bool take(const TQDomElement &); }; /** - * \class JingleIQResponder + * \class JingleITQResponder * \brief A task that responds to jingle candidate queries with an empty reply. */ -JingleVoiceSession::JingleIQResponder::JingleIQResponder(Task *parent) :Task(parent) +JingleVoiceSession::JingleITQResponder::JingleITQResponder(Task *tqparent) :Task(tqparent) { } -JingleVoiceSession::JingleIQResponder::~JingleIQResponder() +JingleVoiceSession::JingleITQResponder::~JingleITQResponder() { } -bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e) +bool JingleVoiceSession::JingleITQResponder::take(const TQDomElement &e) { if(e.tagName() != "iq") return false; @@ -189,7 +189,7 @@ bool JingleVoiceSession::JingleIQResponder::take(const TQDomElement &e) return false; } -//END JingleIQResponder +//END JingleITQResponder class JingleVoiceSession::Private { @@ -226,7 +226,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe // Listen to incoming packets connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&))); - new JingleIQResponder(account->client()->rootTask()); + new JingleITQResponder(account->client()->rootTask()); } JingleVoiceSession::~JingleVoiceSession() diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.h b/kopete/protocols/jabber/jingle/jinglevoicesession.h index 2769d351..0089a1bf 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h @@ -38,6 +38,7 @@ class JingleSession; class JingleVoiceSession : public JingleSession { Q_OBJECT + TQ_OBJECT public: typedef TQValueList JidList; @@ -64,7 +65,7 @@ private: class SlotsProxy; SlotsProxy *slotsProxy; - class JingleIQResponder; + class JingleITQResponder; }; #endif diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index b017cdfd..d5086a1a 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -16,7 +16,7 @@ */ #include "jinglevoicesessiondialog.h" -// Qt includes +// TQt includes #include #include #include @@ -40,11 +40,11 @@ using namespace XMPP; -JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent, const char *name) - : JingleVoiceSessionDialogBase(parent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) +JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent, const char *name) + : JingleVoiceSessionDialogBase(tqparent, name), m_session(caller), m_peerJid(peerJid), m_sessionState(Incoming) { TQString contactJid = m_peerJid.full(); - setCaption( i18n("Voice session with %1").arg(contactJid) ); + setCaption( i18n("Voice session with %1").tqarg(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 ); } - labelSessionStatus->setText( i18n("Incoming Session...") ); + labelSessiontqStatus->setText( i18n("Incoming Session...") ); buttonAccept->setEnabled(true); buttonDecline->setEnabled(true); } @@ -95,7 +95,7 @@ void JingleVoiceSessionDialog::setContactInformation(JabberContact *contact) void JingleVoiceSessionDialog::start() { - labelSessionStatus->setText( i18n("Waiting for other peer...") ); + labelSessiontqStatus->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() { - labelSessionStatus->setText( i18n("Session accepted.") ); + labelSessiontqStatus->setText( i18n("Session accepted.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(true); @@ -118,7 +118,7 @@ void JingleVoiceSessionDialog::slotAcceptClicked() void JingleVoiceSessionDialog::slotDeclineClicked() { - labelSessionStatus->setText( i18n("Session declined.") ); + labelSessiontqStatus->setText( i18n("Session declined.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); @@ -131,7 +131,7 @@ void JingleVoiceSessionDialog::slotDeclineClicked() void JingleVoiceSessionDialog::slotTerminateClicked() { - labelSessionStatus->setText( i18n("Session terminated.") ); + labelSessiontqStatus->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) ) { - labelSessionStatus->setText( i18n("Session in progress.") ); + labelSessiontqStatus->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) ) { - labelSessionStatus->setText( i18n("Session accepted.") ); + labelSessiontqStatus->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) ) { - labelSessionStatus->setText( i18n("Session declined.") ); + labelSessiontqStatus->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) ) { - labelSessionStatus->setText( i18n("Session terminated.") ); + labelSessiontqStatus->setText( i18n("Session terminated.") ); buttonAccept->setEnabled(false); buttonDecline->setEnabled(false); buttonTerminate->setEnabled(false); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index 1a911bae..e782af03 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -30,10 +30,11 @@ class VoiceCaller; class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase { Q_OBJECT + TQ_OBJECT public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; - JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *parent = 0, const char *name = 0); + JingleVoiceSessionDialog(const Jid &peerJid, VoiceCaller *caller, TQWidget *tqparent = 0, const char *name = 0); ~JingleVoiceSessionDialog(); public slots: diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui index 0dc9ab35..c6349007 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui @@ -1,6 +1,6 @@ JingleVoiceSessionDialogBase - + JingleVoiceSessionDialogBase @@ -19,17 +19,17 @@ unnamed - + - layout8 + tqlayout8 unnamed - + - layout5 + tqlayout5 @@ -45,14 +45,14 @@ Expanding - + 16 20 - + textLabel1 @@ -70,7 +70,7 @@ Expanding - + 20 20 @@ -79,9 +79,9 @@ - + - layout4 + tqlayout4 @@ -97,14 +97,14 @@ Expanding - + 16 20 - + labelContactPhoto @@ -116,7 +116,7 @@ 0 - + 128 128 @@ -136,7 +136,7 @@ Expanding - + 16 20 @@ -145,9 +145,9 @@ - + - layout7 + tqlayout7 @@ -163,14 +163,14 @@ Expanding - + 40 20 - + labelDisplayName @@ -188,7 +188,7 @@ Expanding - + 40 20 @@ -209,7 +209,7 @@ Expanding - + 20 16 @@ -230,9 +230,9 @@ Horizontal - + - layout1 + tqlayout1 @@ -248,7 +248,7 @@ Expanding - + 40 20 @@ -298,7 +298,7 @@ Expanding - + 40 20 @@ -307,15 +307,15 @@ - + - layout3 + tqlayout3 unnamed - + textLabel4 @@ -323,9 +323,9 @@ Current status: - + - labelSessionStatus + labelSessiontqStatus @@ -351,7 +351,7 @@ Expanding - + 20 16 @@ -360,7 +360,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp index 571f9ff6..f37bc6d6 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.cpp @@ -23,8 +23,8 @@ #define JINGLE_NS "http://www.google.com/session" -JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *parent) - : Task(parent) +JingleWatchSessionTask::JingleWatchSessionTask(XMPP::Task *tqparent) + : Task(tqparent) {} JingleWatchSessionTask::~JingleWatchSessionTask() diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 09dbdbce..0b53280e 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -21,13 +21,14 @@ /** * This task watch for incoming Jingle session and notify manager. - * It is declared in the header to be "moc"-able. + * It is declared in the header to be "tqmoc"-able. */ class JingleWatchSessionTask : public XMPP::Task { Q_OBJECT + TQ_OBJECT public: - JingleWatchSessionTask(XMPP::Task *parent); + JingleWatchSessionTask(XMPP::Task *tqparent); ~JingleWatchSessionTask(); bool take(const TQDomElement &element); diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro index 53c8e293..8482614c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro +++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro @@ -88,7 +88,7 @@ SOURCES += \ $$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \ $$JINGLE_CPP/talk/session/phone/voicechannel.cc -#contains(DEFINES, HAVE_PORTAUDIO) { +#tqcontains(DEFINES, HAVE_PORTAUDIO) { # SOURCES += \ # $$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc #} @@ -128,11 +128,11 @@ SOURCES += \ $$JINGLE_CPP/talk/third_party/mediastreamer/mswrite.c \ $$JINGLE_CPP/talk/third_party/mediastreamer/sndcard.c -contains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { +tqcontains(DEFINES, HAVE_ALSA_ASOUNDLIB_H) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/alsacard.c } -contains(DEFINES, HAVE_PORTAUDIO) { +tqcontains(DEFINES, HAVE_PORTAUDIO) { SOURCES += $$JINGLE_CPP/talk/third_party/mediastreamer/portaudiocard.c } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc index e0ec1b90..63130db3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc @@ -24,7 +24,7 @@ static const string::size_type np = string::npos; const string Base64::Base64Table( // 0000000000111111111122222222223333333333444444444455555555556666 // 0123456789012345678901234567890123456789012345678901234567890123 - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); // Decode Table gives the index of any valid base64 character in the Base64 table] // 65 == A, 97 == a, 48 == 0, 43 == +, 47 == / diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h index b21be2f1..5f191beb 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h @@ -178,8 +178,8 @@ inline void Assert(bool result, const char * function, const char * file, int li #endif // !ENABLE_DEBUG -#define COMPILE_TIME_ASSERT(expr) char CTA_UNIQUE_NAME[expr] -#define CTA_UNIQUE_NAME MAKE_NAME(__LINE__) +#define COMPILE_TIME_ASSERT(expr) char CTA_UNITQUE_NAME[expr] +#define CTA_UNITQUE_NAME MAKE_NAME(__LINE__) #define CTA_MAKE_NAME(line) MAKE_NAME2(line) #define CTA_MAKE_NAME2(line) constraint_ ## line diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc index f10489f7..38e22c2e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc @@ -66,7 +66,7 @@ void MessageQueueManager::Add(MessageQueue *message_queue) { void MessageQueueManager::Remove(MessageQueue *message_queue) { CritScope cs(&crit_); std::vector::iterator iter; - iter = std::find(message_queues_.begin(), message_queues_.end(), message_queue); + iter = std::tqfind(message_queues_.begin(), message_queues_.end(), message_queue); if (iter != message_queues_.end()) message_queues_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h index 9b35b9af..cf8917d9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h @@ -25,8 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __MESSAGEQUEUE_H__ -#define __MESSAGEQUEUE_H__ +#ifndef __MESSAGETQUEUE_H__ +#define __MESSAGETQUEUE_H__ #include "talk/base/basictypes.h" #include "talk/base/criticalsection.h" @@ -162,4 +162,4 @@ protected: } // namespace cricket -#endif // __MESSAGEQUEUE_H__ +#endif // __MESSAGETQUEUE_H__ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc index 21b3a08f..2ea7530f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc @@ -60,7 +60,7 @@ const double kLog2 = 0.693147180559945309417; const double kLambda = kLog2 / kHalfLife; // assume so-so quality unless data says otherwise -const double kDefaultQuality = cricket::QUALITY_FAIR; +const double kDefaultQuality = cricket::TQUALITY_FAIR; typedef std::map StrMap; @@ -261,7 +261,7 @@ void NetworkManager::GetNetworks(std::vector& result) { CreateNetworks(list); for (uint32 i = 0; i < list.size(); ++i) { - NetworkMap::iterator iter = networks_.find(list[i]->name()); + NetworkMap::iterator iter = networks_.tqfind(list[i]->name()); Network* network; if (iter == networks_.end()) { @@ -313,12 +313,12 @@ Network::Network(const std::string& name, uint32 ip) } void Network::StartSession(NetworkSession* session) { - assert(std::find(sessions_.begin(), sessions_.end(), session) == sessions_.end()); + assert(std::tqfind(sessions_.begin(), sessions_.end(), session) == sessions_.end()); sessions_.push_back(session); } void Network::StopSession(NetworkSession* session) { - SessionList::iterator iter = std::find(sessions_.begin(), sessions_.end(), session); + SessionList::iterator iter = std::tqfind(sessions_.begin(), sessions_.end(), session); if (iter != sessions_.end()) sessions_.erase(iter); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h index 2cc9128a..5f7d7216 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.h @@ -127,9 +127,9 @@ public: }; -const double QUALITY_BAD = 3.0; -const double QUALITY_FAIR = 3.35; -const double QUALITY_GOOD = 3.7; +const double TQUALITY_BAD = 3.0; +const double TQUALITY_FAIR = 3.35; +const double TQUALITY_GOOD = 3.7; } // namespace cricket diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h index 446516b8..b621185b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h @@ -5,7 +5,7 @@ // License: Public domain. You are free to use this code however you like, with the proviso that // the author takes on no responsibility or liability for any use. // -// QUICK DOCUMENTATION +// TQUICK DOCUMENTATION // // (see also the full documentation at http://sigslot.sourceforge.net/) // diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h index d4a49d96..7c240802 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socket.h @@ -84,7 +84,7 @@ #define ENOTEMPTY WSAENOTEMPTY #define EPROCLIM WSAEPROCLIM #define EUSERS WSAEUSERS -#define EDQUOT WSAEDQUOT +#define EDTQUOT WSAEDTQUOT #define ESTALE WSAESTALE #define EREMOTE WSAEREMOTE #undef EACCES diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc index f57043e3..5cdc4743 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc @@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, std::string A2 = method + ":" + uri; std::string middle; - if (args.find("qop") != args.end()) { + if (args.tqfind("qop") != args.end()) { args["qop"] = "auth"; middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"]; } else { @@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, ss << ", realm=" << Quote(args["realm"]); ss << ", nonce=" << Quote(args["nonce"]); ss << ", uri=" << Quote(uri); - if (args.find("qop") != args.end()) { + if (args.tqfind("qop") != args.end()) { ss << ", qop=" << args["qop"]; ss << ", nc=" << ncount; ss << ", cnonce=" << Quote(cnonce); } ss << ", response=\"" << dig_response << "\""; - if (args.find("opaque") != args.end()) { + if (args.tqfind("opaque") != args.end()) { ss << ", opaque=" << Quote(args["opaque"]); } response = ss.str(); @@ -418,14 +418,14 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, out_buf_desc.pBuffers = &out_sec; const ULONG NEG_FLAGS_DEFAULT = - //ISC_REQ_ALLOCATE_MEMORY - ISC_REQ_CONFIDENTIALITY - //| ISC_REQ_EXTENDED_ERROR - //| ISC_REQ_INTEGRITY - | ISC_REQ_REPLAY_DETECT - | ISC_REQ_SEQUENCE_DETECT - //| ISC_REQ_STREAM - //| ISC_REQ_USE_SUPPLIED_CREDS + //ISC_RETQ_ALLOCATE_MEMORY + ISC_RETQ_CONFIDENTIALITY + //| ISC_RETQ_EXTENDED_ERROR + //| ISC_RETQ_INTEGRITY + | ISC_RETQ_REPLAY_DETECT + | ISC_RETQ_SEQUENCE_DETECT + //| ISC_RETQ_STREAM + //| ISC_RETQ_USE_SUPPLIED_CREDS ; TimeStamp lifetime; @@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len, size_t len = password.GetLength()+1; char * sensitive = new char[len]; password.CopyTo(sensitive, true); - std::string::size_type pos = username.find('\\'); + std::string::size_type pos = username.tqfind('\\'); if (pos == std::string::npos) { auth_id.UserLength = static_cast( _min(sizeof(userbuf) - 1, username.size())); @@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { const char * direction = (input ? " << " : " >> "); std::string str(data, len); while (!str.empty()) { - std::string::size_type pos = str.find('\n'); + std::string::size_type pos = str.tqfind('\n'); std::string substr = str; if (pos == std::string::npos) { substr = str; @@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) { } // Filter out any private data - std::string::size_type pos_private = substr.find("Email"); + std::string::size_type pos_private = substr.tqfind("Email"); if (pos_private == std::string::npos) { - pos_private = substr.find("Passwd"); + pos_private = substr.tqfind("Passwd"); } if (pos_private == std::string::npos) { LOG(level_) << label_ << direction << substr; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index a5a94941..41ae9068 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -32,9 +32,9 @@ namespace buzz { -Task::Task(Task * parent) : +Task::Task(Task * tqparent) : state_(STATE_INIT), - parent_(parent), + tqparent_(tqparent), blocked_(false), done_(false), aborted_(false), @@ -42,9 +42,9 @@ Task::Task(Task * parent) : error_(false), child_error_(false), start_time_(0) { - runner_ = ((parent == NULL) ? (TaskRunner *)this : parent->GetRunner()); - if (parent_ != NULL) { - parent_->AddChild(this); + runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); + if (tqparent_ != NULL) { + tqparent_->AddChild(this); } } @@ -194,12 +194,12 @@ int Task::Process(int state) { void Task::AddChild(Task * child) { - children_.insert(child); + tqchildren_.insert(child); } bool Task::AllChildrenDone() { - for (ChildSet::iterator it = children_.begin(); it != children_.end(); ++it) { + for (ChildSet::iterator it = tqchildren_.begin(); it != tqchildren_.end(); ++it) { if (!(*it)->IsDone()) return false; } @@ -213,8 +213,8 @@ Task::AnyChildError() { void Task::AbortAllChildren() { - if (children_.size() > 0) { - ChildSet copy = children_; + if (tqchildren_.size() > 0) { + ChildSet copy = tqchildren_; for (ChildSet::iterator it = copy.begin(); it != copy.end(); ++it) { (*it)->Abort(true); // Note we do not wake } @@ -224,14 +224,14 @@ Task::AbortAllChildren() { void Task::Stop() { AbortAllChildren(); // No need to wake because we're either awake or in abort - parent_->OnChildStopped(this); + tqparent_->OnChildStopped(this); } void Task::OnChildStopped(Task * child) { if (child->HasError()) child_error_ = true; - children_.erase(child); + tqchildren_.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 5a486198..553d04fb 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 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 +// (3) Finally it helps manage tqparent tasks and tqchildren. If a tqparent +// task gets aborted, all the tqchildren tasks are too. The nice thing +// about this, for example, is if you have one tqparent 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 children are aborted and get deleted. +// When the tqparent task goes to STATE_DONE, the task engine will make +// sure all those tqchildren are aborted and get deleted. // // Notice that Task has a few built-in states, e.g., // @@ -103,7 +103,7 @@ class RootTask; class Task { public: - Task(Task * parent); + Task(Task * tqparent); virtual ~Task() {} void Start(); @@ -115,14 +115,14 @@ public: unsigned long long ElapsedTime(); virtual void Poll() {} - Task * GetParent() { return parent_; } + Task * GetParent() { return tqparent_; } TaskRunner * GetRunner() { return runner_; } - virtual Task * GetParent(int code) { return parent_->GetParent(code); } + virtual Task * GetParent(int code) { return tqparent_->GetParent(code); } // Called from outside to stop task without any more callbacks void Abort(bool nowake = false); - // For managing children + // For managing tqchildren bool AllChildrenDone(); bool AnyChildError(); @@ -153,7 +153,7 @@ protected: virtual int ProcessStart() = 0; virtual int ProcessResponse() { return STATE_DONE; } - // for managing children (if any) + // for managing tqchildren (if any) void AddChild(Task * child); void AbortAllChildren(); @@ -162,7 +162,7 @@ private: void OnChildStopped(Task * child); int state_; - Task * parent_; + Task * tqparent_; TaskRunner * runner_; bool blocked_; bool done_; @@ -172,9 +172,9 @@ private: bool child_error_; unsigned long long start_time_; - // for managing children + // for managing tqchildren typedef std::set ChildSet; - ChildSet children_; + ChildSet tqchildren_; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc index b5ecc55e..43728eb7 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 children silently! + // this kills and deletes tqchildren 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 6d818932..e781b03d 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* DescribeStatus(buzz::Status::Show show, const std::string& desc) { +const char* DescribetqStatus(buzz::tqStatus::Show show, const std::string& desc) { switch (show) { - 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"; + 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"; delault: return "offline"; } } @@ -320,11 +320,11 @@ void CallClient::InitPresence() { this, &CallClient::OnStatusUpdate); presence_push_->Start(); - buzz::Status my_status; + buzz::tqStatus my_status; my_status.set_jid(xmpp_client_->jid()); my_status.set_available(true); my_status.set_invisible(false); - my_status.set_show(buzz::Status::SHOW_ONLINE); + my_status.set_show(buzz::tqStatus::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::Status& status) { +void CallClient::OnStatusUpdate(const buzz::tqStatus& status) { RosterItem item; item.jid = status.jid(); item.show = status.show(); @@ -350,19 +350,19 @@ void CallClient::OnStatusUpdate(const buzz::Status& status) { (*roster_)[key] = item; } else { Console()->Printf("Removing from roster: %s", key.c_str()); - RosterMap::iterator iter = roster_->find(key); + RosterMap::iterator iter = roster_->tqfind(key); if (iter != roster_->end()) roster_->erase(iter); } } void CallClient::PrintRoster() { - Console()->Printf("Roster contains %d callable", roster_->size()); + Console()->Printf("Roster tqcontains %d callable", roster_->size()); RosterMap::iterator iter = roster_->begin(); while (iter != roster_->end()) { Console()->Printf("%s - %s", iter->second.jid.BareJid().Str().c_str(), - DescribeStatus(iter->second.show, iter->second.status)); + DescribetqStatus(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 d35a6114..24ce1545 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 Status; +class tqStatus; } namespace cricket { @@ -43,7 +43,7 @@ class Call; struct RosterItem { buzz::Jid jid; - buzz::Status::Show show; + buzz::tqStatus::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::Status& status); + void OnStatusUpdate(const buzz::tqStatus& 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 a55af89e..7fd68120 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc @@ -42,33 +42,33 @@ bool ToString(const T &t, return !oss.fail(); } -XmppReturnStatus -PresenceOutTask::Send(const Status & s) { +XmppReturntqStatus +PresenceOutTask::Send(const tqStatus & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - stanza_.reset(TranslateStatus(s)); + stanza_.reset(TranslatetqStatus(s)); return XMPP_RETURN_OK; } -XmppReturnStatus -PresenceOutTask::SendDirected(const Jid & j, const Status & s) { +XmppReturntqStatus +PresenceOutTask::SendDirected(const Jid & j, const tqStatus & s) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - XmlElement * presence = TranslateStatus(s); - presence->AddAttr(QN_TO, j.Str()); + XmlElement * presence = TranslatetqStatus(s); + presence->AddAttr(TQN_TO, j.Str()); stanza_.reset(presence); return XMPP_RETURN_OK; } -XmppReturnStatus PresenceOutTask::SendProbe(const Jid & jid) { +XmppReturntqStatus PresenceOutTask::SendProbe(const Jid & jid) { if (GetState() != STATE_INIT) return XMPP_RETURN_BADSTATE; - XmlElement * presence = new XmlElement(QN_PRESENCE); - presence->AddAttr(QN_TO, jid.Str()); - presence->AddAttr(QN_TYPE, "probe"); + XmlElement * presence = new XmlElement(TQN_PRESENCE); + presence->AddAttr(TQN_TO, jid.Str()); + presence->AddAttr(TQN_TYPE, "probe"); stanza_.reset(presence); return XMPP_RETURN_OK; @@ -82,48 +82,48 @@ PresenceOutTask::ProcessStart() { } XmlElement * -PresenceOutTask::TranslateStatus(const Status & s) { - XmlElement * result = new XmlElement(QN_PRESENCE); +PresenceOutTask::TranslatetqStatus(const tqStatus & s) { + XmlElement * result = new XmlElement(TQN_PRESENCE); if (!s.available()) { - result->AddAttr(QN_TYPE, STR_UNAVAILABLE); + result->AddAttr(TQN_TYPE, STR_UNAVAILABLE); } else { if (s.invisible()) { - result->AddAttr(QN_TYPE, STR_INVISIBLE); + result->AddAttr(TQN_TYPE, STR_INVISIBLE); } - if (s.show() != Status::SHOW_ONLINE && s.show() != Status::SHOW_OFFLINE) { - result->AddElement(new XmlElement(QN_SHOW)); + if (s.show() != tqStatus::SHOW_ONLINE && s.show() != tqStatus::SHOW_OFFLINE) { + result->AddElement(new XmlElement(TQN_SHOW)); switch (s.show()) { default: result->AddText(STR_SHOW_AWAY, 1); break; - case Status::SHOW_XA: + case tqStatus::SHOW_XA: result->AddText(STR_SHOW_XA, 1); break; - case Status::SHOW_DND: + case tqStatus::SHOW_DND: result->AddText(STR_SHOW_DND, 1); break; - case Status::SHOW_CHAT: + case tqStatus::SHOW_CHAT: result->AddText(STR_SHOW_CHAT, 1); break; } } - result->AddElement(new XmlElement(QN_STATUS)); + result->AddElement(new XmlElement(TQN_STATUS)); result->AddText(s.status(), 1); std::string pri; ToString(s.priority(), &pri); - result->AddElement(new XmlElement(QN_PRIORITY)); + result->AddElement(new XmlElement(TQN_PRIORITY)); result->AddText(pri, 1); if (s.know_capabilities() && s.is_google_client()) { - result->AddElement(new XmlElement(QN_CAPS_C, true)); - result->AddAttr(QN_NODE, GOOGLE_CLIENT_NODE, 1); - result->AddAttr(QN_VER, s.version(), 1); - result->AddAttr(QN_EXT, s.phone_capability() ? "voice-v1" : "", 1); + result->AddElement(new XmlElement(TQN_CAPS_C, true)); + result->AddAttr(TQN_NODE, GOOGLE_CLIENT_NODE, 1); + result->AddAttr(TQN_VER, s.version(), 1); + result->AddAttr(TQN_EXT, s.phone_capability() ? "voice-v1" : "", 1); } // Put the delay mark on the presence according to JEP-0091 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 2b65a553..7307a522 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.h @@ -28,16 +28,16 @@ namespace buzz { class PresenceOutTask : public XmppTask { public: - PresenceOutTask(Task * parent) : XmppTask(parent) {} + PresenceOutTask(Task * tqparent) : XmppTask(tqparent) {} virtual ~PresenceOutTask() {} - XmppReturnStatus Send(const Status & s); - XmppReturnStatus SendDirected(const Jid & j, const Status & s); - XmppReturnStatus SendProbe(const Jid& jid); + XmppReturntqStatus Send(const tqStatus & s); + XmppReturntqStatus SendDirected(const Jid & j, const tqStatus & s); + XmppReturntqStatus SendProbe(const Jid& jid); virtual int ProcessStart(); private: - XmlElement * TranslateStatus(const Status & s); + XmlElement * TranslatetqStatus(const tqStatus & s); scoped_ptr 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 03f6c6c1..ee14fe94 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc @@ -48,7 +48,7 @@ IsXmlSpace(int ch) { static bool ListContainsToken(const std::string & list, const std::string & token) { - size_t i = list.find(token); + size_t i = list.tqfind(token); if (i == std::string::npos || token.empty()) return false; bool boundary_before = (i == 0 || IsXmlSpace(list[i - 1])); @@ -59,9 +59,9 @@ ListContainsToken(const std::string & list, const std::string & token) { bool PresencePushTask::HandleStanza(const XmlElement * stanza) { - if (stanza->Name() != QN_PRESENCE) + if (stanza->Name() != TQN_PRESENCE) return false; - if (stanza->HasAttr(QN_TYPE) && stanza->Attr(QN_TYPE) != STR_UNAVAILABLE) + if (stanza->HasAttr(TQN_TYPE) && stanza->Attr(TQN_TYPE) != STR_UNAVAILABLE) return false; QueueStanza(stanza); return true; @@ -77,17 +77,17 @@ PresencePushTask::ProcessStart() { const XmlElement * stanza = NextStanza(); if (stanza == NULL) return STATE_BLOCKED; - Status s; + tqStatus s; - s.set_jid(Jid(stanza->Attr(QN_FROM))); + s.set_jid(Jid(stanza->Attr(TQN_FROM))); - if (stanza->Attr(QN_TYPE) == STR_UNAVAILABLE) { + if (stanza->Attr(TQN_TYPE) == STR_UNAVAILABLE) { s.set_available(false); SignalStatusUpdate(s); } else { s.set_available(true); - const XmlElement * status = stanza->FirstNamed(QN_STATUS); + const XmlElement * status = stanza->FirstNamed(TQN_STATUS); if (status != NULL) { s.set_status(status->BodyText()); @@ -104,7 +104,7 @@ PresencePushTask::ProcessStart() { } } - const XmlElement * priority = stanza->FirstNamed(QN_PRIORITY); + const XmlElement * priority = stanza->FirstNamed(TQN_PRIORITY); if (priority != NULL) { int pri; if (FromString(priority->BodyText(), &pri)) { @@ -112,33 +112,33 @@ PresencePushTask::ProcessStart() { } } - const XmlElement * show = stanza->FirstNamed(QN_SHOW); + const XmlElement * show = stanza->FirstNamed(TQN_SHOW); if (show == NULL || show->FirstChild() == NULL) { - s.set_show(Status::SHOW_ONLINE); + s.set_show(tqStatus::SHOW_ONLINE); } else { if (show->BodyText() == "away") { - s.set_show(Status::SHOW_AWAY); + s.set_show(tqStatus::SHOW_AWAY); } else if (show->BodyText() == "xa") { - s.set_show(Status::SHOW_XA); + s.set_show(tqStatus::SHOW_XA); } else if (show->BodyText() == "dnd") { - s.set_show(Status::SHOW_DND); + s.set_show(tqStatus::SHOW_DND); } else if (show->BodyText() == "chat") { - s.set_show(Status::SHOW_CHAT); + s.set_show(tqStatus::SHOW_CHAT); } else { - s.set_show(Status::SHOW_ONLINE); + s.set_show(tqStatus::SHOW_ONLINE); } } - const XmlElement * caps = stanza->FirstNamed(QN_CAPS_C); + const XmlElement * caps = stanza->FirstNamed(TQN_CAPS_C); if (caps != NULL) { - std::string node = caps->Attr(QN_NODE); - std::string ver = caps->Attr(QN_VER); - std::string exts = caps->Attr(QN_EXT); + std::string node = caps->Attr(TQN_NODE); + std::string ver = caps->Attr(TQN_VER); + std::string exts = caps->Attr(TQN_EXT); s.set_know_capabilities(true); 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 77459647..2ed5ac46 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.h @@ -30,9 +30,9 @@ namespace buzz { class PresencePushTask : public XmppTask { public: - PresencePushTask(Task * parent) : XmppTask(parent, XmppEngine::HL_TYPE) {} + PresencePushTask(Task * tqparent) : XmppTask(tqparent, XmppEngine::HL_TYPE) {} virtual int ProcessStart(); - sigslot::signal1SignalStatusUpdate; + sigslot::signal1SignalStatusUpdate; 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 cab9312f..0677932b 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 Status { +class tqStatus { public: - Status() : + tqStatus() : pri_(0), show_(SHOW_NONE), available_(false), @@ -39,7 +39,7 @@ public: is_google_client_(false), feedback_probation_(false) {}; - ~Status() {} + ~tqStatus() {} // 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 Status & new_value) { + void UpdateWith(const tqStatus & new_value) { if (!new_value.know_capabilities()) { bool k = know_capabilities(); bool i = is_google_client(); @@ -105,36 +105,36 @@ public: } } - bool HasQuietStatus() const { + bool HasQuiettqStatus() const { if (status_.empty()) return false; - return !(QuietStatus().empty()); + return !(QuiettqStatus().empty()); } // Knowledge of other clients' silly automatic status strings - // Don't show these. - std::string QuietStatus() const { - if (jid_.resource().find("Psi") != std::string::npos) { + std::string QuiettqStatus() const { + if (jid_.resource().tqfind("Psi") != std::string::npos) { if (status_ == "Online" || - status_.find("Auto Status") != std::string::npos) + status_.tqfind("Auto tqStatus") != std::string::npos) return STR_EMPTY; } - if (jid_.resource().find("Gaim") != std::string::npos) { + if (jid_.resource().tqfind("Gaim") != std::string::npos) { if (status_ == "Sorry, I ran out for a bit!") return STR_EMPTY; } - return TrimStatus(status_); + return TrimtqStatus(status_); } - std::string ExplicitStatus() const { - std::string result = QuietStatus(); + std::string ExplicittqStatus() const { + std::string result = QuiettqStatus(); if (result.empty()) { - result = ShowStatus(); + result = ShowtqStatus(); } return result; } - std::string ShowStatus() const { + std::string ShowtqStatus() const { std::string result; if (!available()) { result = "Offline"; @@ -159,7 +159,7 @@ public: return result; } - static std::string TrimStatus(const std::string & st) { + static std::string TrimtqStatus(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/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc index 66191f12..492559ae 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc @@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism( std::vector::const_iterator it; // a token is the weakest auth - 15s, service-limited, so prefer it. - it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN"); if (it != mechanisms.end()) return "X-GOOGLE-TOKEN"; // a cookie is the next weakest - 14 days - it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE"); if (it != mechanisms.end()) return "X-GOOGLE-COOKIE"; @@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism( // as a last resort, use plain authentication if (jid_.domain() != "google.com") { - it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); + it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it != mechanisms.end()) return "PLAIN"; } 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 7d966fb3..40e694e2 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::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) { +buzz::XmppReturntqStatus 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 fd6f88bb..0314b2fd 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::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza); + buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza); private: buzz::XmppClient *client_; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc index eb53efeb..d07e2e5d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc @@ -381,7 +381,7 @@ bool P2PSocket::CreateConnections(const Candidate &remote_candidate, } if ((origin_port != NULL) && - find(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { + tqfind(ports_.begin(), ports_.end(), origin_port) == ports_.end()) { if (CreateConnection(origin_port, remote_candidate, origin_port, readable)) created = true; } @@ -783,7 +783,7 @@ void P2PSocket::OnConnectionDestroyed(Connection *connection) { // Remove this connection from the list. std::vector::iterator iter = - find(connections_.begin(), connections_.end(), connection); + tqfind(connections_.begin(), connections_.end(), connection); assert(iter != connections_.end()); connections_.erase(iter); @@ -807,7 +807,7 @@ void P2PSocket::OnPortDestroyed(Port* port) { assert(worker_thread_ == Thread::Current()); // Remove this port from the list (if we didn't drop it already). - std::vector::iterator iter = find(ports_.begin(), ports_.end(), port); + std::vector::iterator iter = tqfind(ports_.begin(), ports_.end(), port); if (iter != ports_.end()) ports_.erase(iter); @@ -843,7 +843,7 @@ const std::vector& P2PSocket::connections() { // Set options on ourselves is simply setting options on all of our available // port objects. int P2PSocket::SetOption(Socket::Option opt, int value) { - OptionMap::iterator it = options_.find(opt); + OptionMap::iterator it = options_.tqfind(opt); if (it == options_.end()) { options_.insert(std::make_pair(opt, value)); } else if (it->second == value) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc index 14549b5b..c9272597 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc @@ -171,7 +171,7 @@ Port::~Port() { } Connection* Port::GetConnection(const SocketAddress& remote_addr) { - AddressMap::const_iterator iter = connections_.find(remote_addr); + AddressMap::const_iterator iter = connections_.tqfind(remote_addr); if (iter != connections_.end()) return iter->second; else @@ -449,7 +449,7 @@ void Port::Start() { } void Port::OnConnectionDestroyed(Connection* conn) { - AddressMap::iterator iter = connections_.find(conn->remote_candidate().address()); + AddressMap::iterator iter = connections_.tqfind(conn->remote_candidate().address()); assert(iter != connections_.end()); connections_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc index bb52a1d5..002033dc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc @@ -105,14 +105,14 @@ RelayServer::~RelayServer() { void RelayServer::AddInternalSocket(AsyncPacketSocket* socket) { assert(internal_sockets_.end() == - std::find(internal_sockets_.begin(), internal_sockets_.end(), socket)); + std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket)); internal_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnInternalPacket); } void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::find(internal_sockets_.begin(), internal_sockets_.end(), socket); + std::tqfind(internal_sockets_.begin(), internal_sockets_.end(), socket); assert(iter != internal_sockets_.end()); internal_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -120,14 +120,14 @@ void RelayServer::RemoveInternalSocket(AsyncPacketSocket* socket) { void RelayServer::AddExternalSocket(AsyncPacketSocket* socket) { assert(external_sockets_.end() == - std::find(external_sockets_.begin(), external_sockets_.end(), socket)); + std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket)); external_sockets_.push_back(socket); socket->SignalReadPacket.connect(this, &RelayServer::OnExternalPacket); } void RelayServer::RemoveExternalSocket(AsyncPacketSocket* socket) { SocketList::iterator iter = - std::find(external_sockets_.begin(), external_sockets_.end(), socket); + std::tqfind(external_sockets_.begin(), external_sockets_.end(), socket); assert(iter != external_sockets_.end()); external_sockets_.erase(iter); socket->SignalReadPacket.disconnect(this); @@ -143,7 +143,7 @@ void RelayServer::OnInternalPacket( // If this did not come from an existing connection, it should be a STUN // allocate request. - ConnectionMap::iterator piter = connections_.find(ap); + ConnectionMap::iterator piter = connections_.tqfind(ap); if (piter == connections_.end()) { HandleStunAllocate(bytes, size, ap, socket); return; @@ -186,7 +186,7 @@ void RelayServer::OnExternalPacket( assert(!ap.destination().IsAny()); // If this connection already exists, then forward the traffic. - ConnectionMap::iterator piter = connections_.find(ap); + ConnectionMap::iterator piter = connections_.tqfind(ap); if (piter != connections_.end()) { // TODO: Check the HMAC. RelayServerConnection* ext_conn = piter->second; @@ -220,7 +220,7 @@ void RelayServer::OnExternalPacket( // TODO: Check the HMAC. // The binding should already be present. - BindingMap::iterator biter = bindings_.find(username); + BindingMap::iterator biter = bindings_.tqfind(username); if (biter == bindings_.end()) { // TODO: Turn this back on. This is the sign of a client bug. //std::cerr << "Dropping packet: no binding with username" << std::endl; @@ -299,7 +299,7 @@ void RelayServer::HandleStunAllocate( RelayServerBinding* binding; - BindingMap::iterator biter = bindings_.find(username); + BindingMap::iterator biter = bindings_.tqfind(username); if (biter != bindings_.end()) { binding = biter->second; @@ -453,18 +453,18 @@ void RelayServer::HandleStunSend( } void RelayServer::AddConnection(RelayServerConnection* conn) { - assert(connections_.find(conn->addr_pair()) == connections_.end()); + assert(connections_.tqfind(conn->addr_pair()) == connections_.end()); connections_[conn->addr_pair()] = conn; } void RelayServer::RemoveConnection(RelayServerConnection* conn) { - ConnectionMap::iterator iter = connections_.find(conn->addr_pair()); + ConnectionMap::iterator iter = connections_.tqfind(conn->addr_pair()); assert(iter != connections_.end()); connections_.erase(iter); } void RelayServer::RemoveBinding(RelayServerBinding* binding) { - BindingMap::iterator iter = bindings_.find(binding->username()); + BindingMap::iterator iter = bindings_.tqfind(binding->username()); assert(iter != bindings_.end()); bindings_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc index 4c1c09d9..d146d63c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc @@ -63,7 +63,7 @@ Session *SessionManager::CreateSession(const std::string &name, const SessionID& void SessionManager::DestroySession(Session *session) { if (session != NULL) { - std::map::iterator it = session_map_.find(session->id()); + std::map::iterator it = session_map_.tqfind(session->id()); if (it != session_map_.end()) { SignalSessionDestroy(session); session_map_.erase(it); @@ -74,7 +74,7 @@ void SessionManager::DestroySession(Session *session) { Session *SessionManager::GetSession(const SessionID& id) { // If the id isn't present, the [] operator will make a NULL entry - std::map::iterator it = session_map_.find(id); + std::map::iterator it = session_map_.tqfind(id); if (it != session_map_.end()) return (*it).second; return NULL; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc index 2f0d67b8..e0257451 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc @@ -109,7 +109,7 @@ void SocketManager::DestroySocket_w(P2PSocket *socket) { // Only if socket exists CritScope cs(&critSM_); std::vector::iterator it; - it = std::find(sockets_.begin(), sockets_.end(), socket); + it = std::tqfind(sockets_.begin(), sockets_.end(), socket); if (it == sockets_.end()) return; sockets_.erase(it); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc index 14d64735..34a62547 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc @@ -59,14 +59,14 @@ void StunRequestManager::Send(StunRequest* request) { void StunRequestManager::SendDelayed(StunRequest* request, int delay) { request->set_manager(this); - assert(requests_.find(request->id()) == requests_.end()); + assert(requests_.tqfind(request->id()) == requests_.end()); requests_[request->id()] = request; thread_->PostDelayed(delay, request, MSG_STUN_SEND, NULL); } void StunRequestManager::Remove(StunRequest* request) { assert(request->manager() == this); - RequestMap::iterator iter = requests_.find(request->id()); + RequestMap::iterator iter = requests_.tqfind(request->id()); if (iter != requests_.end()) { assert(iter->second == request); requests_.erase(iter); @@ -84,7 +84,7 @@ void StunRequestManager::Clear() { } bool StunRequestManager::CheckResponse(StunMessage* msg) { - RequestMap::iterator iter = requests_.find(msg->transaction_id()); + RequestMap::iterator iter = requests_.tqfind(msg->transaction_id()); if (iter == requests_.end()) return false; @@ -113,7 +113,7 @@ bool StunRequestManager::CheckResponse(const char* data, size_t size) { std::string id; id.append(data + 4, 16); - RequestMap::iterator iter = requests_.find(id); + RequestMap::iterator iter = requests_.tqfind(id); if (iter == requests_.end()) return false; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc index 5192595c..42c4a876 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc @@ -372,7 +372,7 @@ void BasicPortAllocatorSession::AddAllocatedPort(Port* port, void BasicPortAllocatorSession::OnAddressReady(Port *port) { assert(Thread::Current() == network_thread_); - std::vector::iterator it = std::find(ports_.begin(), ports_.end(), port); + std::vector::iterator it = std::tqfind(ports_.begin(), ports_.end(), port); assert(it != ports_.end()); assert(!it->ready); it->ready = true; @@ -418,7 +418,7 @@ void BasicPortAllocatorSession::OnProtocolEnabled(AllocationSequence * seq, Prot void BasicPortAllocatorSession::OnPortDestroyed(Port* port) { assert(Thread::Current() == network_thread_); std::vector::iterator iter = - find(ports_.begin(), ports_.end(), port); + tqfind(ports_.begin(), ports_.end(), port); assert(iter != ports_.end()); ports_.erase(iter); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc index 09b38a52..668309f8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc @@ -31,7 +31,7 @@ #include "talk/p2p/client/sessionclient.h" #include "talk/p2p/base/helpers.h" #include "talk/base/logging.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/constants.h" #include "talk/xmllite/xmlprinter.h" #include @@ -74,25 +74,25 @@ namespace cricket { #endif const std::string NS_GOOGLESESSION("http://www.google.com/session"); -const buzz::QName QN_GOOGLESESSION_SESSION(true, NS_GOOGLESESSION, "session"); -const buzz::QName QN_GOOGLESESSION_CANDIDATE(true, NS_GOOGLESESSION, "candidate"); -const buzz::QName QN_GOOGLESESSION_TARGET(true, NS_GOOGLESESSION, "target"); -const buzz::QName QN_GOOGLESESSION_COOKIE(true, NS_GOOGLESESSION, "cookie"); -const buzz::QName QN_GOOGLESESSION_REGARDING(true, NS_GOOGLESESSION, "regarding"); - -const buzz::QName QN_TYPE(true, buzz::STR_EMPTY, "type"); -const buzz::QName QN_ID(true, buzz::STR_EMPTY, "id"); -const buzz::QName QN_INITIATOR(true, buzz::STR_EMPTY, "initiator"); -const buzz::QName QN_NAME(true, buzz::STR_EMPTY, "name"); -const buzz::QName QN_PORT(true, buzz::STR_EMPTY, "port"); -const buzz::QName QN_NETWORK(true, buzz::STR_EMPTY, "network"); -const buzz::QName QN_GENERATION(true, buzz::STR_EMPTY, "generation"); -const buzz::QName QN_ADDRESS(true, buzz::STR_EMPTY, "address"); -const buzz::QName QN_USERNAME(true, buzz::STR_EMPTY, "username"); -const buzz::QName QN_PASSWORD(true, buzz::STR_EMPTY, "password"); -const buzz::QName QN_PREFERENCE(true, buzz::STR_EMPTY, "preference"); -const buzz::QName QN_PROTOCOL(true, buzz::STR_EMPTY, "protocol"); -const buzz::QName QN_KEY(true, buzz::STR_EMPTY, "key"); +const buzz::TQName TQN_GOOGLESESSION_SESSION(true, NS_GOOGLESESSION, "session"); +const buzz::TQName TQN_GOOGLESESSION_CANDIDATE(true, NS_GOOGLESESSION, "candidate"); +const buzz::TQName TQN_GOOGLESESSION_TARGET(true, NS_GOOGLESESSION, "target"); +const buzz::TQName TQN_GOOGLESESSION_COOKIE(true, NS_GOOGLESESSION, "cookie"); +const buzz::TQName TQN_GOOGLESESSION_REGARDING(true, NS_GOOGLESESSION, "regarding"); + +const buzz::TQName TQN_TYPE(true, buzz::STR_EMPTY, "type"); +const buzz::TQName TQN_ID(true, buzz::STR_EMPTY, "id"); +const buzz::TQName TQN_INITIATOR(true, buzz::STR_EMPTY, "initiator"); +const buzz::TQName TQN_NAME(true, buzz::STR_EMPTY, "name"); +const buzz::TQName TQN_PORT(true, buzz::STR_EMPTY, "port"); +const buzz::TQName TQN_NETWORK(true, buzz::STR_EMPTY, "network"); +const buzz::TQName TQN_GENERATION(true, buzz::STR_EMPTY, "generation"); +const buzz::TQName TQN_ADDRESS(true, buzz::STR_EMPTY, "address"); +const buzz::TQName TQN_USERNAME(true, buzz::STR_EMPTY, "username"); +const buzz::TQName TQN_PASSWORD(true, buzz::STR_EMPTY, "password"); +const buzz::TQName TQN_PREFERENCE(true, buzz::STR_EMPTY, "preference"); +const buzz::TQName TQN_PROTOCOL(true, buzz::STR_EMPTY, "protocol"); +const buzz::TQName TQN_KEY(true, buzz::STR_EMPTY, "key"); class XmlCookie: public SessionMessage::Cookie { public: @@ -140,21 +140,21 @@ void SessionClient::OnSessionDestroySlot(Session *session) { bool SessionClient::IsClientStanza(const buzz::XmlElement *stanza) { // Is it a IQ set stanza? - if (stanza->Name() != buzz::QN_IQ) + if (stanza->Name() != buzz::TQN_IQ) return false; - if (stanza->Attr(buzz::QN_TYPE) != buzz::STR_SET) + if (stanza->Attr(buzz::TQN_TYPE) != buzz::STR_SET) return false; // Make sure it has the right child element const buzz::XmlElement* element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); if (element == NULL) return false; // Is it one of the allowed types? std::string type; - if (element->HasAttr(QN_TYPE)) { - type = element->Attr(QN_TYPE); + if (element->HasAttr(TQN_TYPE)) { + type = element->Attr(TQN_TYPE); if (type != "initiate" && type != "accept" && type != "modify" && type != "candidates" && type != "reject" && type != "redirect" && type != "terminate") { @@ -163,7 +163,7 @@ bool SessionClient::IsClientStanza(const buzz::XmlElement *stanza) { } // Does this client own the session description namespace? - buzz::QName qn_session_desc(GetSessionDescriptionName(), "description"); + buzz::TQName qn_session_desc(GetSessionDescriptionName(), "description"); const buzz::XmlElement* description = element->FirstNamed(qn_session_desc); if (type == "initiate" || type == "accept" || type == "modify") { if (description == NULL) @@ -200,9 +200,9 @@ bool SessionClient::ParseIncomingMessage(const buzz::XmlElement *stanza, SessionMessage& message) { // Parse stanza into SessionMessage const buzz::XmlElement* element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type == "initiate" || type == "accept" || type == "modify") { ParseInitiateAcceptModify(stanza, message); } else if (type == "candidates") { @@ -219,20 +219,20 @@ bool SessionClient::ParseIncomingMessage(const buzz::XmlElement *stanza, } void SessionClient::ParseHeader(const buzz::XmlElement *stanza, SessionMessage &message) { - if (stanza->HasAttr(buzz::QN_FROM)) - message.set_from(stanza->Attr(buzz::QN_FROM)); - if (stanza->HasAttr(buzz::QN_TO)) - message.set_to(stanza->Attr(buzz::QN_TO)); + if (stanza->HasAttr(buzz::TQN_FROM)) + message.set_from(stanza->Attr(buzz::TQN_FROM)); + if (stanza->HasAttr(buzz::TQN_TO)) + message.set_to(stanza->Attr(buzz::TQN_TO)); const buzz::XmlElement *element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); - if (element->HasAttr(QN_ID)) - message.session_id().set_id_str(element->Attr(QN_ID)); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); + if (element->HasAttr(TQN_ID)) + message.session_id().set_id_str(element->Attr(TQN_ID)); - if (element->HasAttr(QN_INITIATOR)) - message.session_id().set_initiator(element->Attr(QN_INITIATOR)); + if (element->HasAttr(TQN_INITIATOR)) + message.session_id().set_initiator(element->Attr(TQN_INITIATOR)); - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type == "initiate") { message.set_type(SessionMessage::TYPE_INITIATE); } else if (type == "accept") { @@ -258,8 +258,8 @@ void SessionClient::ParseInitiateAcceptModify(const buzz::XmlElement *stanza, Se // Parse session description const buzz::XmlElement *session - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); - buzz::QName qn_session_desc(GetSessionDescriptionName(), "description"); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); + buzz::TQName qn_session_desc(GetSessionDescriptionName(), "description"); const buzz::XmlElement* desc_elem = session->FirstNamed(qn_session_desc); const SessionDescription *description = NULL; if (desc_elem) @@ -275,10 +275,10 @@ void SessionClient::ParseCandidates(const buzz::XmlElement *stanza, SessionMessa // Parse candidates and session description std::vector candidates; const buzz::XmlElement *element - = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); const buzz::XmlElement *child = element->FirstElement(); while (child != NULL) { - if (child->Name() == QN_GOOGLESESSION_CANDIDATE) { + if (child->Name() == TQN_GOOGLESESSION_CANDIDATE) { Candidate candidate; if (ParseCandidate(child, &candidate)) candidates.push_back(candidate); @@ -297,20 +297,20 @@ void SessionClient::ParseRejectTerminate(const buzz::XmlElement *stanza, Session bool SessionClient::ParseCandidate(const buzz::XmlElement *child, Candidate* candidate) { // Check for all of the required attributes. - if (!child->HasAttr(QN_NAME) || - !child->HasAttr(QN_ADDRESS) || - !child->HasAttr(QN_PORT) || - !child->HasAttr(QN_USERNAME) || - !child->HasAttr(QN_PREFERENCE) || - !child->HasAttr(QN_PROTOCOL) || - !child->HasAttr(QN_GENERATION)) { + if (!child->HasAttr(TQN_NAME) || + !child->HasAttr(TQN_ADDRESS) || + !child->HasAttr(TQN_PORT) || + !child->HasAttr(TQN_USERNAME) || + !child->HasAttr(TQN_PREFERENCE) || + !child->HasAttr(TQN_PROTOCOL) || + !child->HasAttr(TQN_GENERATION)) { LOG(LERROR) << "Candidate missing required attribute"; return false; } SocketAddress address; - address.SetIP(child->Attr(QN_ADDRESS)); - std::istringstream ist(child->Attr(QN_PORT)); + address.SetIP(child->Attr(TQN_ADDRESS)); + std::istringstream ist(child->Attr(TQN_PORT)); int port; ist >> port; address.SetPort(port); @@ -338,12 +338,12 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, } } - candidate->set_name(child->Attr(QN_NAME)); + candidate->set_name(child->Attr(TQN_NAME)); candidate->set_address(address); - candidate->set_username(child->Attr(QN_USERNAME)); - candidate->set_preference_str(child->Attr(QN_PREFERENCE)); - candidate->set_protocol(child->Attr(QN_PROTOCOL)); - candidate->set_generation_str(child->Attr(QN_GENERATION)); + candidate->set_username(child->Attr(TQN_USERNAME)); + candidate->set_preference_str(child->Attr(TQN_PREFERENCE)); + candidate->set_protocol(child->Attr(TQN_PROTOCOL)); + candidate->set_generation_str(child->Attr(TQN_GENERATION)); // Check that the username is not too long and does not use any bad chars. if (candidate->username().size() > kMaxUsernameSize) { @@ -356,12 +356,12 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, } // Look for the non-required attributes. - if (child->HasAttr(QN_PASSWORD)) - candidate->set_password(child->Attr(QN_PASSWORD)); - if (child->HasAttr(QN_TYPE)) - candidate->set_type(child->Attr(QN_TYPE)); - if (child->HasAttr(QN_NETWORK)) - candidate->set_network_name(child->Attr(QN_NETWORK)); + if (child->HasAttr(TQN_PASSWORD)) + candidate->set_password(child->Attr(TQN_PASSWORD)); + if (child->HasAttr(TQN_TYPE)) + candidate->set_type(child->Attr(TQN_TYPE)); + if (child->HasAttr(TQN_NETWORK)) + candidate->set_network_name(child->Attr(TQN_NETWORK)); return true; } @@ -369,15 +369,15 @@ bool SessionClient::ParseCandidate(const buzz::XmlElement *child, void SessionClient::ParseRedirect(const buzz::XmlElement *stanza, SessionMessage &message) { // Pull the standard header pieces out ParseHeader(stanza, message); - const buzz::XmlElement *session = stanza->FirstNamed(QN_GOOGLESESSION_SESSION); + const buzz::XmlElement *session = stanza->FirstNamed(TQN_GOOGLESESSION_SESSION); // Parse the target and cookie. - const buzz::XmlElement* target = session->FirstNamed(QN_GOOGLESESSION_TARGET); + const buzz::XmlElement* target = session->FirstNamed(TQN_GOOGLESESSION_TARGET); if (target) - message.set_redirect_target(target->Attr(QN_NAME)); + message.set_redirect_target(target->Attr(TQN_NAME)); - const buzz::XmlElement* cookie = session->FirstNamed(QN_GOOGLESESSION_COOKIE); + const buzz::XmlElement* cookie = session->FirstNamed(TQN_GOOGLESESSION_COOKIE); if (cookie) message.set_redirect_cookie(new XmlCookie(cookie)); } @@ -415,58 +415,58 @@ void SessionClient::OnOutgoingMessage(Session *session, const SessionMessage &me } buzz::XmlElement *SessionClient::TranslateHeader(const SessionMessage &message) { - buzz::XmlElement *result = new buzz::XmlElement(buzz::QN_IQ); - result->AddAttr(buzz::QN_TO, message.to()); - result->AddAttr(buzz::QN_TYPE, buzz::STR_SET); - buzz::XmlElement *session = new buzz::XmlElement(QN_GOOGLESESSION_SESSION, true); + buzz::XmlElement *result = new buzz::XmlElement(buzz::TQN_IQ); + result->AddAttr(buzz::TQN_TO, message.to()); + result->AddAttr(buzz::TQN_TYPE, buzz::STR_SET); + buzz::XmlElement *session = new buzz::XmlElement(TQN_GOOGLESESSION_SESSION, true); result->AddElement(session); switch (message.type()) { case SessionMessage::TYPE_INITIATE: - session->AddAttr(QN_TYPE, "initiate"); + session->AddAttr(TQN_TYPE, "initiate"); break; case SessionMessage::TYPE_ACCEPT: - session->AddAttr(QN_TYPE, "accept"); + session->AddAttr(TQN_TYPE, "accept"); break; case SessionMessage::TYPE_MODIFY: - session->AddAttr(QN_TYPE, "modify"); + session->AddAttr(TQN_TYPE, "modify"); break; case SessionMessage::TYPE_CANDIDATES: - session->AddAttr(QN_TYPE, "candidates"); + session->AddAttr(TQN_TYPE, "candidates"); break; case SessionMessage::TYPE_REJECT: - session->AddAttr(QN_TYPE, "reject"); + session->AddAttr(TQN_TYPE, "reject"); break; case SessionMessage::TYPE_REDIRECT: - session->AddAttr(QN_TYPE, "redirect"); + session->AddAttr(TQN_TYPE, "redirect"); break; case SessionMessage::TYPE_TERMINATE: - session->AddAttr(QN_TYPE, "terminate"); + session->AddAttr(TQN_TYPE, "terminate"); break; } - session->AddAttr(QN_ID, message.session_id().id_str()); - session->AddAttr(QN_INITIATOR, message.session_id().initiator()); + session->AddAttr(TQN_ID, message.session_id().id_str()); + session->AddAttr(TQN_INITIATOR, message.session_id().initiator()); return result; } buzz::XmlElement *SessionClient::TranslateCandidate(const Candidate &candidate) { - buzz::XmlElement *result = new buzz::XmlElement(QN_GOOGLESESSION_CANDIDATE); - result->AddAttr(QN_NAME, candidate.name()); - result->AddAttr(QN_ADDRESS, candidate.address().IPAsString()); - result->AddAttr(QN_PORT, candidate.address().PortAsString()); - result->AddAttr(QN_USERNAME, candidate.username()); - result->AddAttr(QN_PASSWORD, candidate.password()); - result->AddAttr(QN_PREFERENCE, candidate.preference_str()); - result->AddAttr(QN_PROTOCOL, candidate.protocol()); - result->AddAttr(QN_TYPE, candidate.type()); - result->AddAttr(QN_NETWORK, candidate.network_name()); - result->AddAttr(QN_GENERATION, candidate.generation_str()); + buzz::XmlElement *result = new buzz::XmlElement(TQN_GOOGLESESSION_CANDIDATE); + result->AddAttr(TQN_NAME, candidate.name()); + result->AddAttr(TQN_ADDRESS, candidate.address().IPAsString()); + result->AddAttr(TQN_PORT, candidate.address().PortAsString()); + result->AddAttr(TQN_USERNAME, candidate.username()); + result->AddAttr(TQN_PASSWORD, candidate.password()); + result->AddAttr(TQN_PREFERENCE, candidate.preference_str()); + result->AddAttr(TQN_PROTOCOL, candidate.protocol()); + result->AddAttr(TQN_TYPE, candidate.type()); + result->AddAttr(TQN_NETWORK, candidate.network_name()); + result->AddAttr(TQN_GENERATION, candidate.generation_str()); return result; } buzz::XmlElement *SessionClient::TranslateInitiateAcceptModify(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); // Candidates assert(message.candidates().size() == 0); @@ -490,7 +490,7 @@ buzz::XmlElement *SessionClient::TranslateInitiateAcceptModify(const SessionMess buzz::XmlElement *SessionClient::TranslateCandidates(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); // Candidates std::vector::const_iterator it; @@ -508,24 +508,24 @@ buzz::XmlElement *SessionClient::TranslateRejectTerminate(const SessionMessage & buzz::XmlElement *SessionClient::TranslateRedirect(const SessionMessage &message) { // Header info common to all message types buzz::XmlElement *result = TranslateHeader(message); - buzz::XmlElement *session = result->FirstNamed(QN_GOOGLESESSION_SESSION); + buzz::XmlElement *session = result->FirstNamed(TQN_GOOGLESESSION_SESSION); assert(message.candidates().size() == 0); assert(message.description() == NULL); assert(message.redirect_target().size() > 0); - buzz::XmlElement* target = new buzz::XmlElement(QN_GOOGLESESSION_TARGET); - target->AddAttr(QN_NAME, message.redirect_target()); + buzz::XmlElement* target = new buzz::XmlElement(TQN_GOOGLESESSION_TARGET); + target->AddAttr(TQN_NAME, message.redirect_target()); session->AddElement(target); - buzz::XmlElement* cookie = new buzz::XmlElement(QN_GOOGLESESSION_COOKIE); + buzz::XmlElement* cookie = new buzz::XmlElement(TQN_GOOGLESESSION_COOKIE); session->AddElement(cookie); // If the message does not have a redirect cookie, then this is a redirect // initiated by us. We will automatically add a regarding cookie. if (message.redirect_cookie() == NULL) { - buzz::XmlElement* regarding = new buzz::XmlElement(QN_GOOGLESESSION_REGARDING); - regarding->AddAttr(QN_NAME, GetJid().BareJid().Str()); + buzz::XmlElement* regarding = new buzz::XmlElement(TQN_GOOGLESESSION_REGARDING); + regarding->AddAttr(TQN_NAME, GetJid().BareJid().Str()); cookie->AddElement(regarding); } else { const buzz::XmlElement* cookie_elem = diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc index 31b12e92..7a79d044 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc @@ -56,7 +56,7 @@ Session *Call::InitiateSession(const buzz::Jid &jid) { void Call::AcceptSession(Session *session) { std::vector::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Accept(session_client_->CreateAcceptSessionDescription(session->remote_description())); @@ -64,7 +64,7 @@ void Call::AcceptSession(Session *session) { void Call::RedirectSession(Session *session, const buzz::Jid &to) { std::vector::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Redirect(to.Str()); @@ -72,16 +72,16 @@ void Call::RedirectSession(Session *session, const buzz::Jid &to) { void Call::RejectSession(Session *session) { std::vector::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); assert(it != sessions_.end()); if (it != sessions_.end()) session->Reject(); } void Call::TerminateSession(Session *session) { - assert(std::find(sessions_.begin(), sessions_.end(), session) != sessions_.end()); + assert(std::tqfind(sessions_.begin(), sessions_.end(), session) != sessions_.end()); std::vector::iterator it; - it = std::find(sessions_.begin(), sessions_.end(), session); + it = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it != sessions_.end()) (*it)->Terminate(); } @@ -127,14 +127,14 @@ void Call::AddSession(Session *session) { void Call::RemoveSession(Session *session) { // Remove session from list std::vector::iterator it_session; - it_session = std::find(sessions_.begin(), sessions_.end(), session); + it_session = std::tqfind(sessions_.begin(), sessions_.end(), session); if (it_session == sessions_.end()) return; sessions_.erase(it_session); // Destroy session channel std::map::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = it_channel->second; channel_map_.erase(it_channel); @@ -149,7 +149,7 @@ void Call::RemoveSession(Session *session) { } VoiceChannel* Call::GetChannel(Session* session) { - std::map::iterator it = channel_map_.find(session->id()); + std::map::iterator it = channel_map_.tqfind(session->id()); assert(it != channel_map_.end()); return it->second; } @@ -184,7 +184,7 @@ void Call::Join(Call *call, bool enable) { // Move channel std::map::iterator it_channel; - it_channel = call->channel_map_.find(session->id()); + it_channel = call->channel_map_.tqfind(session->id()); if (it_channel != call->channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; call->channel_map_.erase(it_channel); @@ -196,7 +196,7 @@ void Call::Join(Call *call, bool enable) { void Call::StartConnectionMonitor(Session *session, int cms) { std::map::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalConnectionMonitor.connect(this, &Call::OnConnectionMonitor); @@ -206,7 +206,7 @@ void Call::StartConnectionMonitor(Session *session, int cms) { void Call::StopConnectionMonitor(Session *session) { std::map::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopConnectionMonitor(); @@ -216,7 +216,7 @@ void Call::StopConnectionMonitor(Session *session) { void Call::StartAudioMonitor(Session *session, int cms) { std::map::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->SignalAudioMonitor.connect(this, &Call::OnAudioMonitor); @@ -226,7 +226,7 @@ void Call::StartAudioMonitor(Session *session, int cms) { void Call::StopAudioMonitor(Session *session) { std::map::iterator it_channel; - it_channel = channel_map_.find(session->id()); + it_channel = channel_map_.tqfind(session->id()); if (it_channel != channel_map_.end()) { VoiceChannel *channel = (*it_channel).second; channel->StopAudioMonitor(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc index 98634b12..e5e6758d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc @@ -119,7 +119,7 @@ void ChannelManager::DestroyVoiceChannel_w(VoiceChannel *voice_channel) { CritScope cs(&crit_); // Destroy voice channel. assert(initialized_); - std::vector::iterator it = std::find(channels_.begin(), + std::vector::iterator it = std::tqfind(channels_.begin(), channels_.end(), voice_channel); assert(it != channels_.end()); if (it == channels_.end()) 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 f3244c54..8456a90f 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::SetPlayout(bool playout) { - play_ = playout; +void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) { + play_ = ptqlayout; } 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 0c00be75..2639c7ac 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 SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); 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 db2f9654..4a2e4560 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 SetPlayout(bool playout) = 0; + virtual void SetPtqlayout(bool ptqlayout) = 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/mediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h index fa07d2ec..fe6f0f6c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediaengine.h @@ -50,7 +50,7 @@ class MediaEngine { bool operator <(const Codec& c) const { return preference > c.preference; } }; - // Bitmask flags for options that may be supported by the media engine implementation + // Bittqmask flags for options that may be supported by the media engine implementation enum MediaEngineOptions { AUTO_GAIN_CONTROL = 1 << 1, }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc index 7f2ff11f..a8f0a511 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc @@ -30,16 +30,16 @@ #include "talk/base/logging.h" #include "talk/session/receiver.h" #include "talk/session/phone/phonesessionclient.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace { const std::string NS_PHONE("http://www.google.com/session/phone"); const std::string NS_EMPTY(""); -const buzz::QName QN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); -const buzz::QName QN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); -const buzz::QName QN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); -const buzz::QName QN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); +const buzz::TQName TQN_PHONE_DESCRIPTION(true, NS_PHONE, "description"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE(true, NS_PHONE, "payload-type"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_ID(true, NS_EMPTY, "id"); +const buzz::TQName TQN_PHONE_PAYLOADTYPE_NAME(true, NS_EMPTY, "name"); } @@ -116,19 +116,19 @@ bool PhoneSessionClient::FindMediaCodec(MediaEngine* me, const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buzz::XmlElement *element) { PhoneSessionDescription* desc = new PhoneSessionDescription(); - const buzz::XmlElement* payload_type = element->FirstNamed(QN_PHONE_PAYLOADTYPE); + const buzz::XmlElement* payload_type = element->FirstNamed(TQN_PHONE_PAYLOADTYPE); int num_payload_types = 0; while (payload_type) { - if (payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_ID) && - payload_type->HasAttr(QN_PHONE_PAYLOADTYPE_NAME)) { - int id = atoi(payload_type->Attr(QN_PHONE_PAYLOADTYPE_ID).c_str()); + if (payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_ID) && + payload_type->HasAttr(TQN_PHONE_PAYLOADTYPE_NAME)) { + int id = atoi(payload_type->Attr(TQN_PHONE_PAYLOADTYPE_ID).c_str()); int pref = 0; - std::string name = payload_type->Attr(QN_PHONE_PAYLOADTYPE_NAME); + std::string name = payload_type->Attr(TQN_PHONE_PAYLOADTYPE_NAME); desc->AddCodec(MediaEngine::Codec(id, name, 0)); } - payload_type = payload_type->NextNamed(QN_PHONE_PAYLOADTYPE); + payload_type = payload_type->NextNamed(TQN_PHONE_PAYLOADTYPE); num_payload_types += 1; } @@ -145,16 +145,16 @@ const SessionDescription *PhoneSessionClient::CreateSessionDescription(const buz buzz::XmlElement *PhoneSessionClient::TranslateSessionDescription(const SessionDescription *_session_desc) { const PhoneSessionDescription* session_desc = static_cast(_session_desc); - buzz::XmlElement* description = new buzz::XmlElement(QN_PHONE_DESCRIPTION, true); + buzz::XmlElement* description = new buzz::XmlElement(TQN_PHONE_DESCRIPTION, true); for (size_t i = 0; i < session_desc->codecs().size(); ++i) { - buzz::XmlElement* payload_type = new buzz::XmlElement(QN_PHONE_PAYLOADTYPE, true); + buzz::XmlElement* payload_type = new buzz::XmlElement(TQN_PHONE_PAYLOADTYPE, true); char buf[32]; sprintf(buf, "%d", session_desc->codecs()[i].id); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_ID, buf); + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_ID, buf); - payload_type->AddAttr(QN_PHONE_PAYLOADTYPE_NAME, + payload_type->AddAttr(TQN_PHONE_PAYLOADTYPE_NAME, session_desc->codecs()[i].name.c_str()); description->AddElement(payload_type); @@ -202,7 +202,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { // Remove it from calls_ map and delete - std::map::iterator it = calls_.find(call->id()); + std::map::iterator it = calls_.tqfind(call->id()); if (it != calls_.end()) calls_.erase(it); @@ -212,7 +212,7 @@ void PhoneSessionClient::DestroyCall(Call *call) { void PhoneSessionClient::OnSessionDestroy(Session *session) { // Find the call this session is in, remove it - std::map::iterator it = session_map_.find(session->id()); + std::map::iterator it = session_map_.tqfind(session->id()); assert(it != session_map_.end()); if (it != session_map_.end()) { Call *call = (*it).second; 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 b65c9a20..90092283 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc @@ -25,7 +25,7 @@ #define SAMPLE_RATE 1 // Speex settings -//#define SPEEX_QUALITY 8 +//#define SPEEX_TQUALITY 8 // ORTP settings #define MAX_RTP_SIZE 1500 // From mediastreamer @@ -65,8 +65,8 @@ PortAudioMediaChannel::PortAudioMediaChannel() : mute_(false), play_(false), str speex_decoder_ctl(speex_dec_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_); speex_frame_ = new float[speex_frame_size_]; - // int quality = SPEEX_QUALITY; - // speex_encoder_ctl(state, SPEEX_SET_QUALITY, &quality); + // int quality = SPEEX_TQUALITY; + // speex_encoder_ctl(state, SPEEX_SET_TQUALITY, &quality); // Initialize ORTP socket struct sockaddr_in sockaddr; @@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len) } } -void PortAudioMediaChannel::SetPlayout(bool playout) +void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout) { if (!stream_) return; - if (play_ && !playout) { + if (play_ && !ptqlayout) { 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::SetPlayout(bool playout) } play_ = false; } - else if (!play_ && playout) { + else if (!play_ && ptqlayout) { 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 95c39a1a..89922e77 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 SetPlayout(bool playout); + virtual void SetPtqlayout(bool ptqlayout); 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 58e1db60..c55ef287 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_->SetPlayout(false); + channel_->SetPtqlayout(false); channel_->SetSend(false); } else { if (muted_) { channel_->SetSend(false); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } else { channel_->SetSend(true); - channel_->SetPlayout(true); + channel_->SetPtqlayout(true); } } } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h index a5326893..5b75af3c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/receiver.h @@ -36,8 +36,8 @@ namespace cricket { class Receiver : public buzz::XmppTask { public: - Receiver(Task *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_TYPE) { + Receiver(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_TYPE) { session_client_ = session_client; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h index 9dc5384c..5f67d58b 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/sessionsendtask.h @@ -45,8 +45,8 @@ namespace cricket { // session_client is guaranteed to outlive the xmpp session. class SessionSendTask : public buzz::XmppTask { public: - SessionSendTask(Task *parent, SessionClient *session_client) - : buzz::XmppTask(parent, buzz::XmppEngine::HL_SINGLE), + SessionSendTask(Task *tqparent, SessionClient *session_client) + : buzz::XmppTask(tqparent, buzz::XmppEngine::HL_SINGLE), session_client_(session_client), timed_out_(false) { } @@ -54,7 +54,7 @@ public: void Send(const buzz::XmlElement* stanza) { assert(stanza_.get() == NULL); stanza_.reset(new buzz::XmlElement(*stanza)); - stanza_->SetAttr(buzz::QN_ID, task_id()); + stanza_->SetAttr(buzz::TQN_ID, task_id()); } protected: @@ -81,7 +81,7 @@ protected: if (next == NULL) return STATE_BLOCKED; - if (next->Attr(buzz::QN_TYPE) == "result") { + if (next->Attr(buzz::TQN_TYPE) == "result") { return STATE_DONE; } else { session_client_->OnFailedSend(stanza_.get(), next); @@ -90,10 +90,10 @@ protected: } virtual bool HandleStanza(const buzz::XmlElement *stanza) { - if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::QN_TO)), task_id())) + if (!MatchResponseIq(stanza, buzz::Jid(stanza_->Attr(buzz::TQN_TO)), task_id())) return false; - if (stanza->Attr(buzz::QN_TYPE) == "result" || - stanza->Attr(buzz::QN_TYPE) == "error") { + if (stanza->Attr(buzz::TQN_TYPE) == "result" || + stanza->Attr(buzz::TQN_TYPE) == "error") { QueueStanza(stanza); return true; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c index 24cc5a3f..6d8868d6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.c @@ -279,7 +279,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(SIG_BLOCK,&set,NULL); err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) { if (err!=-EPIPE){ @@ -289,7 +289,7 @@ int __alsa_card_read(AlsaCard *obj,char *buf,int bsize) err=snd_pcm_readi(obj->read_handle,buf,bsize/obj->frame_size); if (err<0) g_warning("alsa_card_read: snd_pcm_readi() failed:%s.",snd_strerror(err)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(SIG_UNBLOCK,&set,NULL); return err*obj->frame_size; } @@ -322,7 +322,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(SIG_BLOCK,&set,NULL); if ((err=snd_pcm_writei(obj->write_handle,buf,size/obj->frame_size))<0){ if (err!=-EPIPE){ g_warning("alsa_card_write: snd_pcm_writei() failed:%s.",snd_strerror(err)); @@ -332,7 +332,7 @@ int __alsa_card_write(AlsaCard *obj,char *buf,int size) if (err<0) g_warning("alsa_card_write: Error writing sound buffer (size=%i):%s",size,snd_strerror(err)); } - sigprocmask(SIG_UNBLOCK,&set,NULL); + sigproctqmask(SIG_UNBLOCK,&set,NULL); return err; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h index 1d7ba3a0..9ee33ef4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/alsacard.h @@ -27,7 +27,7 @@ #include struct _AlsaCard { - SndCard parent; + SndCard tqparent; gchar *pcmdev; gchar *mixdev; snd_pcm_t *read_handle; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h index 3f5ad16f..30128191 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/g711common.h @@ -44,14 +44,14 @@ static inline int val_seg(int val) static inline unsigned char s16_to_alaw(int pcm_val) { - int mask; + int tqmask; int seg; unsigned char aval; if (pcm_val >= 0) { - mask = 0xD5; + tqmask = 0xD5; } else { - mask = 0x55; + tqmask = 0x55; pcm_val = -pcm_val; if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -64,7 +64,7 @@ static inline unsigned char s16_to_alaw(int pcm_val) seg = val_seg(pcm_val); aval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); } - return aval ^ mask; + return aval ^ tqmask; } /* @@ -119,16 +119,16 @@ static inline int alaw_to_s16(unsigned char a_val) static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit range) */ { - int mask; + int tqmask; int seg; unsigned char uval; if (pcm_val < 0) { pcm_val = 0x84 - pcm_val; - mask = 0x7f; + tqmask = 0x7f; } else { pcm_val += 0x84; - mask = 0xff; + tqmask = 0xff; } if (pcm_val > 0x7fff) pcm_val = 0x7fff; @@ -141,7 +141,7 @@ static inline unsigned char s16_to_ulaw(int pcm_val) /* 2's complement (16-bit r * and complement the code word. */ uval = (seg << 4) | ((pcm_val >> (seg + 3)) & 0x0f); - return uval ^ mask; + return uval ^ tqmask; } /* diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c index 8a636c99..fe98df74 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/hpuxsndcard.c @@ -194,7 +194,7 @@ void hpux_snd_card_set_level(HpuxSndCard *obj,gint way,gint a) g_warning("hpux_snd_card_set_level: unsupported command."); return; } - gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_WRONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_SET_GAINS,&gain); @@ -210,7 +210,7 @@ gint hpux_snd_card_get_level(HpuxSndCard *obj,gint way) int p=0,mix_fd,error; g_return_if_fail(obj->mixdev_name!=NULL); - gain.channel_mask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; + gain.channel_tqmask=AUDIO_CHANNEL_RIGHT|AUDIO_CHANNEL_LEFT; mix_fd = open(obj->mixdev_name, O_RDONLY); g_return_if_fail(mix_fd>0); error=ioctl(mix_fd,AUDIO_GET_GAINS,&gain); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h index 0118e035..ae6f1c7c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/jackcard.h @@ -54,7 +54,7 @@ typedef struct { struct _JackCard { - SndCard parent; + SndCard tqparent; jack_client_t *client; gboolean jack_running; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c index e83eb8dc..d243bf76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.c @@ -81,7 +81,7 @@ static gint compare(gconstpointer a, gconstpointer b) static GList *g_list_append_if_new(GList *l,gpointer data) { GList *res=l; - if (g_list_find(res,data)==NULL) + if (g_list_tqfind(res,data)==NULL) res=g_list_append(res,data); return(res); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h index c10d76fd..9e13459e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass { /* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h index 66e9fa63..d76f2f62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass { /* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSALAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h index 8fbce4a0..dd8d330c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h @@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass { /* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h index e2130625..3fad63e3 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h @@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass { /* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSGSMEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h index 8f61778b..af1ecc7c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h @@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass { /* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10DecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h index e72539ec..af900445 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h @@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass { /* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSLPC10EncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h index 6e038368..6e516db5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass { /* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h index b302b339..0192984e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass { /* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h index 55008939..71a04d3a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h @@ -57,7 +57,7 @@ struct _MSAVDecoderClass { /* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVDecoderClass MSAVDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h index b703a396..23da59f6 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h @@ -58,7 +58,7 @@ struct _MSAVEncoderClass { /* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSAVEncoderClass MSAVEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h index 9b7c438b..2e03e525 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h @@ -44,7 +44,7 @@ typedef struct _MSCopyClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSCopyClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c index 623a3682..84859fda 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c @@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj) void ms_fdispatcher_class_init(MSFdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"fdispatcher"); - parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; - parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; - parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; - parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"fdispatcher"); + tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS; + tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS; + tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h index 4aea7e95..a50c5637 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h @@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass { /* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSFdispatcherClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c index cb69904c..c73081a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.c @@ -130,7 +130,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) if ((m1_q!=-1) && (m2_q!=-1)){ /* link with queues */ ms_trace("m1_q=%i , m2_q=%i",m1_q,m2_q); - return ms_filter_link(m1,m1_q,m2,m2_q,LINK_QUEUE); + return ms_filter_link(m1,m1_q,m2,m2_q,LINK_TQUEUE); } if ((m1_f!=-1) && (m2_f!=-1)){ /* link with queues */ @@ -146,7 +146,7 @@ int ms_filter_add_link(MSFilter *m1, MSFilter *m2) * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * This function links two MSFilter object between them. It must be used to make chains of filters. * All data outgoing from pin1 of m1 will go to the input pin2 of m2. @@ -165,7 +165,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype g_message("ms_filter_add_link: %s,%i -> %s,%i",m1->klass->name,pin1,m2->klass->name,pin2); switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 able to accept more queues connections ?*/ g_return_val_if_fail(m1->qoutputsmax_qoutputs,-EMLINK); g_return_val_if_fail(m2->qinputsmax_qinputs,-EMLINK); @@ -244,7 +244,7 @@ int ms_filter_link(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2, int linktype * @pin1: The pin number on @m1. * @m2: A #MSFilter object. * @pin2: The pin number on @m2. - * @linktype: Type of connection, it may be #LINK_QUEUE, #LINK_FIFOS. + * @linktype: Type of connection, it may be #LINK_TQUEUE, #LINK_FIFOS. * * Unlink @pin1 of filter @m1 from @pin2 of filter @m2. @linktype specifies what type of connection is removed. * @@ -254,7 +254,7 @@ int ms_filter_unlink(MSFilter *m1, gint pin1, MSFilter *m2,gint pin2,gint linkty { switch(linktype) { - case LINK_QUEUE: + case LINK_TQUEUE: /* Are filter m1 and m2 valid with their inputs and outputs ?*/ g_return_val_if_fail(m1->outqueues!=NULL,-EFAULT); g_return_val_if_fail(m2->inqueues!=NULL,-EFAULT); @@ -321,7 +321,7 @@ gint ms_filter_remove_links(MSFilter *m1, MSFilter *m2) if (rmf==m2){ j=find_iq(rmf,qo); if (j==-1) g_error("Could not find input queue: impossible case."); - ms_filter_unlink(m1,i,m2,j,LINK_QUEUE); + ms_filter_unlink(m1,i,m2,j,LINK_TQUEUE); removed=0; } } @@ -419,7 +419,7 @@ GList *filter_list=NULL; void ms_filter_register(MSFilterInfo *info) { gpointer tmp; - tmp=g_list_find(filter_list,info); + tmp=g_list_tqfind(filter_list,info); if (tmp==NULL) filter_list=g_list_append(filter_list,(gpointer)info); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h index 89f91ad8..60c87411 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfilter.h @@ -98,7 +98,7 @@ typedef struct _MSFilterClass void (*destroy)(MSFilter *filter); guint attributes; #define FILTER_HAS_FIFOS (0x0001) -#define FILTER_HAS_QUEUES (0x0001<<1) +#define FILTER_HAS_TQUEUES (0x0001<<1) #define FILTER_IS_SOURCE (0x0001<<2) #define FILTER_IS_SINK (0x0001<<3) #define FILTER_CAN_SYNC (0x0001<<4) @@ -151,7 +151,7 @@ void ms_filter_destroy(MSFilter *f); #define LINK_DEFAULT 0 #define LINK_FIFO 1 -#define LINK_QUEUE 2 +#define LINK_TQUEUE 2 #define MSFILTER_VERSION(a,b,c) (((a)<<2)|((b)<<1)|(c)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h index a3d0a326..035a80fd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h @@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass { /* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCDecoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h index b072e430..6995022c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h @@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass { /* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSILBCEncoderClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h index a6c9e9e8..7af095f8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h @@ -38,7 +38,7 @@ typedef struct _MSNoSync typedef struct _MSNoSyncClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSNoSyncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h index e359f271..78fa91ad 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h @@ -53,7 +53,7 @@ struct _MSOssReadClass { /* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSSoundReadClass parent_class; + MSSoundReadClass tqparent_class; }; typedef struct _MSOssReadClass MSOssReadClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h index 024eebb4..21abb2a1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h @@ -52,7 +52,7 @@ struct _MSOssWriteClass { /* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSSoundWriteClass parent_class; + MSSoundWriteClass tqparent_class; }; typedef struct _MSOssWriteClass MSOssWriteClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c index b924b0dd..20051b62 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c @@ -43,22 +43,22 @@ void ms_qdispatcher_init(MSQdispatcher *obj) MS_FILTER(obj)->inqueues=obj->q_inputs; MS_FILTER(obj)->outqueues=obj->q_outputs; - memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_INPUTS); - memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_QDISPATCHER_MAX_OUTPUTS); + memset(obj->q_inputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_INPUTS); + memset(obj->q_outputs,0,sizeof(MSQueue*)*MS_TQDISPATCHER_MAX_OUTPUTS); } void ms_qdispatcher_class_init(MSQdispatcherClass *klass) { - MSFilterClass *parent_class=MS_FILTER_CLASS(klass); - ms_filter_class_init(parent_class); - ms_filter_class_set_name(parent_class,"qdispatcher"); - parent_class->max_qinputs=MS_QDISPATCHER_MAX_INPUTS; - parent_class->max_qoutputs=MS_QDISPATCHER_MAX_OUTPUTS; + MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass); + ms_filter_class_init(tqparent_class); + ms_filter_class_set_name(tqparent_class,"qdispatcher"); + tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS; + tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS; - parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; - parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; + tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; + tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; } @@ -77,7 +77,7 @@ void ms_qdispatcher_process(MSQdispatcher *obj) MSMessage *m1,*m2; while ( (m1=ms_queue_get(inq))!=NULL){ /* dispatch incoming messages to output queues */ - for (i=0;iq_outputs[i]; if (outq!=NULL){ m2=ms_message_dup(m1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h index 054440d1..66e80902 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h @@ -19,36 +19,36 @@ */ -#ifndef MSQDISPATCHER_H -#define MSQDISPATCHER_H +#ifndef MSTQDISPATCHER_H +#define MSTQDISPATCHER_H #include "msfilter.h" /*this is the class that implements a qdispatcher filter*/ -#define MS_QDISPATCHER_MAX_INPUTS 1 -#define MS_QDISPATCHER_MAX_OUTPUTS 5 +#define MS_TQDISPATCHER_MAX_INPUTS 1 +#define MS_TQDISPATCHER_MAX_OUTPUTS 5 typedef struct _MSQdispatcher { /* the MSQdispatcher derivates from MSFilter, so the MSFilter object MUST be the first of the MSQdispatcher object in order to the object mechanism to work*/ MSFilter filter; - MSQueue *q_inputs[MS_QDISPATCHER_MAX_INPUTS]; - MSQueue *q_outputs[MS_QDISPATCHER_MAX_OUTPUTS]; + MSQueue *q_inputs[MS_TQDISPATCHER_MAX_INPUTS]; + MSQueue *q_outputs[MS_TQDISPATCHER_MAX_OUTPUTS]; } MSQdispatcher; typedef struct _MSQdispatcherClass { /* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSQdispatcherClass; /* PUBLIC */ -#define MS_QDISPATCHER(filter) ((MSQdispatcher*)(filter)) -#define MS_QDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) +#define MS_TQDISPATCHER(filter) ((MSQdispatcher*)(filter)) +#define MS_TQDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass)) MSFilter * ms_qdispatcher_new(void); /* FOR INTERNAL USE*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h index 7094b088..ee8e1f44 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MSQUEUE_H -#define MSQUEUE_H +#ifndef MSTQUEUE_H +#define MSTQUEUE_H #include "msbuffer.h" diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h index b695f7da..a40f4fa0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h @@ -55,7 +55,7 @@ typedef struct _MSReadClass { /* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSReadClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h index a090afbf..715cdf3c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h @@ -59,7 +59,7 @@ struct _MSRingPlayerClass { /* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRingPlayerClass MSRingPlayerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h index 0f36c379..e9fd7937 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h @@ -55,7 +55,7 @@ struct _MSRtpRecvClass { /* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpRecvClass MSRtpRecvClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h index 96889964..56728f16 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h @@ -59,7 +59,7 @@ struct _MSRtpSendClass { /* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSRtpSendClass MSRtpSendClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h index 0ce08618..b19c7e74 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h @@ -36,7 +36,7 @@ struct _MSSdlOut { - MSFilter parent; + MSFilter tqparent; MSQueue *input[2]; gint width,height; const gchar *format; @@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut; struct _MSSdlOutClass { - MSFilterClass parent_class; + MSFilterClass tqparent_class; }; typedef struct _MSSdlOutClass MSSdlOutClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h index 9c5512b0..31349250 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h @@ -38,7 +38,7 @@ struct _MSSoundReadClass { /* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundRead *, gint devid); void (*start)(MSSoundRead *); void (*stop)(MSSoundRead*); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h index 8c1bab2d..e8fae0d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h @@ -38,7 +38,7 @@ struct _MSSoundWriteClass { /* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSSoundWrite *, gint devid); void (*start)(MSSoundWrite *); void (*stop)(MSSoundWrite*); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h index 370af69e..9c7f7fc4 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h @@ -27,7 +27,7 @@ struct _MSSpeexDec { - MSFilter parent; + MSFilter tqparent; MSQueue *inq[1]; /* speex has an input q because it can be variable bit rate */ MSFifo *outf[1]; void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexDec MSSpeexDec; struct _MSSpeexDecClass { - MSFilterClass parent; + MSFilterClass tqparent; }; typedef struct _MSSpeexDecClass MSSpeexDecClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h index f63edfcd..2325ba23 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.h @@ -27,7 +27,7 @@ struct _MSSpeexEnc { - MSFilter parent; + MSFilter tqparent; MSFifo *inf[1]; MSQueue *outq[1]; /* speex has an output q because it can be variable bit rate */ void *speex_state; @@ -42,7 +42,7 @@ typedef struct _MSSpeexEnc MSSpeexEnc; struct _MSSpeexEncClass { - MSFilterClass parent; + MSFilterClass tqparent; }; typedef struct _MSSpeexEncClass MSSpeexEncClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h index 3fe11350..b245ab86 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h @@ -42,7 +42,7 @@ typedef struct _MSTimer typedef struct _MSTimerClass { /* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/ - MSSyncClass parent_class; + MSSyncClass tqparent_class; } MSTimerClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h index a61719ea..105e2603 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h @@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass so the MSFilter class MUST be the first of the MSTrueSpechDecoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechDecoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h index 78024946..2637d3ac 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h @@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass so the MSFilter class MUST be the first of the MSTrueSpechEncoder class in order for the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; Win32CodecDriver* driver; } MSTrueSpeechEncoderClass; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h index ecd8eb32..2b4f7bd2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msutils.h @@ -50,8 +50,8 @@ #define VIDEO_SIZE_CIF_W 352 #define VIDEO_SIZE_CIF_H 288 -#define VIDEO_SIZE_QCIF_W 176 -#define VIDEO_SIZE_QCIF_H 144 +#define VIDEO_SIZE_TQCIF_W 176 +#define VIDEO_SIZE_TQCIF_H 144 #define VIDEO_SIZE_4CIF_W 704 #define VIDEO_SIZE_4CIF_H 576 #define VIDEO_SIZE_MAX_W VIDEO_SIZE_4CIF_W diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h index 3dc5ee04..e289ccc8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h @@ -27,7 +27,7 @@ struct _MSV4l { - MSVideoSource parent; + MSVideoSource tqparent; int fd; char *device; struct video_capability cap; @@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l; struct _MSV4lClass { - MSVideoSourceClass parent_class; + MSVideoSourceClass tqparent_class; }; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h index 897b239e..2189a6df 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h @@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass { /* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; gint (*set_device)(MSVideoSource *s, const gchar *name); void (*start)(MSVideoSource *s); void (*stop)(MSVideoSource *s); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h index 8492a09d..55081793 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h @@ -45,7 +45,7 @@ typedef struct _MSWriteClass { /* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSWriteClass; /* PUBLIC */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h index 0f1e09ab..6413c682 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.h @@ -27,7 +27,7 @@ #define OSS_CARD_BUFFERS 3 struct _OssCard { - SndCard parent; + SndCard tqparent; gchar *dev_name; /* /dev/dsp0 for example */ gchar *mixdev_name; /* /dev/mixer0 for example */ gint fd; /* the file descriptor of the open soundcard, 0 if not open*/ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h index 2ffc6cd1..caf906df 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/portaudiocard.h @@ -24,7 +24,7 @@ typedef struct _PortAudioCard { - SndCard parent; + SndCard tqparent; PortAudioStream* stream; char *out_buffer, *out_buffer_read, *out_buffer_write, *out_buffer_end; char *in_buffer, *in_buffer_read, *in_buffer_write, *in_buffer_end; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c index 80e07682..1ac35d9c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/ortp.c @@ -101,7 +101,7 @@ void ortp_scheduler_init() sigset_t set; sigemptyset(&set); sigaddset(&set,SIGALRM); - sigprocmask(SIG_BLOCK,&set,NULL); + sigproctqmask(SIG_BLOCK,&set,NULL); #endif /* __hpux */ if (!g_thread_supported()) g_thread_init(NULL); __ortp_scheduler=rtp_scheduler_new(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h index 625d2111..f67409d8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtp.h @@ -26,7 +26,7 @@ -#define RTP_MAX_RQ_SIZE 100 /* max number of packet allowed to be enqueued */ +#define RTP_MAX_RTQ_SIZE 100 /* max number of packet allowed to be enqueued */ #define IPMAXLEN 20 #define UDP_MAX_SIZE 65536 diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c index de6b2e7d..a73aa121 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.c @@ -104,7 +104,7 @@ rtp_session_init (RtpSession * session, gint mode) { memset (session, 0, sizeof (RtpSession)); session->lock = g_mutex_new (); - session->rtp.max_rq_size = RTP_MAX_RQ_SIZE; + session->rtp.max_rq_size = RTP_MAX_RTQ_SIZE; session->mode = mode; if ((mode == RTP_SESSION_RECVONLY) || (mode == RTP_SESSION_SENDRECV)) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h index e7702000..81554a06 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h @@ -177,7 +177,7 @@ struct _RtpSession RtpSessionMode mode; struct _RtpScheduler *sched; guint32 flags; - gint mask_pos; /* the position in the scheduler mask of RtpSession */ + gint tqmask_pos; /* the position in the scheduler tqmask of RtpSession */ gpointer user_data; /* telephony events extension */ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c index 17ff6748..2ea733ac 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c @@ -148,7 +148,7 @@ gpointer rtp_scheduler_schedule(gpointer psched) g_mutex_unlock(sched->lock); /* now while the scheduler is going to sleep, the other threads can compute their - result mask and see if they have to leave, or to wait for next tick*/ + result tqmask and see if they have to leave, or to wait for next tick*/ //g_message("scheduler: sleeping."); timer->timer_do(); sched->time_+=sched->timer_inc; @@ -174,10 +174,10 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session) if (sched->max_sessions==0){ g_error("rtp_scheduler_add_session: max_session=0 !"); } - /* find a free pos in the session mask*/ + /* find a free pos in the session tqmask*/ for (i=0;imax_sessions;i++){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ - session->mask_pos=i; + session->tqmask_pos=i; session_set_set(&sched->all_sessions,session); /* make a new session scheduled not blockable if it has not started*/ if (session->flags & RTP_SESSION_RECV_NOT_STARTED) @@ -229,7 +229,7 @@ void rtp_scheduler_remove_session(RtpScheduler *sched, RtpSession *session) } } rtp_session_unset_flag(session,RTP_SESSION_IN_SCHEDULER); - /* delete the bit in the mask */ + /* delete the bit in the tqmask */ session_set_clr(&sched->all_sessions,session); rtp_scheduler_unlock(sched); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h index 91cde6a9..106f1fcd 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h @@ -29,15 +29,15 @@ struct _RtpScheduler { RtpSession *list; /* list of scheduled sessions*/ - SessionSet all_sessions; /* mask of scheduled sessions */ - gint all_max; /* the highest pos in the all mask */ - SessionSet r_sessions; /* mask of sessions that have a recv event */ + SessionSet all_sessions; /* tqmask of scheduled sessions */ + gint all_max; /* the highest pos in the all tqmask */ + SessionSet r_sessions; /* tqmask of sessions that have a recv event */ gint r_max; - SessionSet w_sessions; /* mask of sessions that have a send event */ + SessionSet w_sessions; /* tqmask of sessions that have a send event */ gint w_max; - SessionSet e_sessions; /* mask of session that have error event */ + SessionSet e_sessions; /* tqmask of session that have error event */ gint e_max; - gint max_sessions; /* the number of position in the masks */ + gint max_sessions; /* the number of position in the tqmasks */ /* GMutex *unblock_select_mutex; */ GCond *unblock_select_cond; GMutex *lock; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c index 7b5ad921..bea1a7c9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c @@ -60,27 +60,27 @@ void session_set_destroy(SessionSet *set) gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, SessionSet *result_set) { - guint32 *mask1,*mask2,*mask3; + guint32 *tqmask1,*tqmask2,*tqmask3; gint i=0; gint j,ret=0; - mask1=(guint32*)&sched_set->rtpset; - mask2=(guint32*)&user_set->rtpset; - mask3=(guint32*)&result_set->rtpset; + tqmask1=(guint32*)&sched_set->rtpset; + tqmask2=(guint32*)&user_set->rtpset; + tqmask3=(guint32*)&result_set->rtpset; while(i>j) & 1){ + if ( ((*tqmask3)>>j) & 1){ ret++; } } } i+=32; - mask1++; - mask2++; - mask3++; + tqmask1++; + tqmask2++; + tqmask3++; } //printf("session_set_and: ret=%i\n",ret); return ret; @@ -116,12 +116,12 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors) SessionSet temp; RtpScheduler *sched=ortp_get_scheduler(); - /*lock the scheduler to not read the masks while they are being modified by the scheduler*/ + /*lock the scheduler to not read the tqmasks while they are being modified by the scheduler*/ rtp_scheduler_lock(sched); while(1){ - /* computes the SessionSet intersection (in the other words mask intersection) between - the mask given by the user and scheduler masks */ + /* computes the SessionSet intersection (in the other words tqmask intersection) between + the tqmask given by the user and scheduler tqmasks */ if (recvs!=NULL){ bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp); if (bits>0){ diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h index 623b9d10..b4a0b904 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h @@ -45,7 +45,7 @@ typedef fd_set ortp_fd_set; do { \ unsigned int __i; \ ortp_fd_set *__arr = (s); \ - for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_mask); ++__i) \ + for (__i = 0; __i < sizeof (ortp_fd_set) / sizeof (ortp__fd_tqmask); ++__i) \ ORTP__FDS_BITS (__arr)[__i] = 0; \ } while (0) #define ORTP_FD_SET(d, s) (ORTP__FDS_BITS (s)[ORTP__FDELT(d)] |= ORTP__FDMASK(d)) @@ -55,22 +55,22 @@ typedef fd_set ortp_fd_set; /* The fd_set member is required to be an array of longs. */ -typedef long int ortp__fd_mask; +typedef long int ortp__fd_tqmask; /* Number of bits per word of `fd_set' (some code assumes this is 32). */ #define ORTP__FD_SETSIZE 1024 /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ -#define ORTP__NFDBITS (8 * sizeof (ortp__fd_mask)) +#define ORTP__NFDBITS (8 * sizeof (ortp__fd_tqmask)) #define ORTP__FDELT(d) ((d) / ORTP__NFDBITS) -#define ORTP__FDMASK(d) ((ortp__fd_mask) 1 << ((d) % ORTP__NFDBITS)) +#define ORTP__FDMASK(d) ((ortp__fd_tqmask) 1 << ((d) % ORTP__NFDBITS)) /* fd_set for select and pselect. */ typedef struct { - ortp__fd_mask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; + ortp__fd_tqmask fds_bits[ORTP__FD_SETSIZE / ORTP__NFDBITS]; # define ORTP__FDS_BITS(set) ((set)->fds_bits) } ortp_fd_set; @@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet; SessionSet * session_set_new(); #define session_set_init(ss) ORTP_FD_ZERO(&(ss)->rtpset) -#define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset) -#define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset) -#define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset) +#define session_set_set(ss,rtpsession) ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset) +#define session_set_is_set(ss,rtpsession) ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset) +#define session_set_clr(ss,rtpsession) ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset) #define session_set_copy(dest,src) memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set)) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc index 626cfa96..ccb08884 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc @@ -28,14 +28,14 @@ #include #include "talk/base/common.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlconstants.h" //#define new TRACK_NEW namespace buzz { -static int QName_Hash(const std::string & ns, const char * local) { +static int TQName_Hash(const std::string & ns, const char * local) { int result = ns.size() * 101; while (*local) { result *= 19; @@ -46,20 +46,20 @@ static int QName_Hash(const std::string & ns, const char * local) { } static const int bits = 9; -static QName::Data * get_qname_table() { - static QName::Data qname_table[1 << bits]; +static TQName::Data * get_qname_table() { + static TQName::Data qname_table[1 << bits]; return qname_table; } -static QName::Data * +static TQName::Data * AllocateOrFind(const std::string & ns, const char * local) { - int index = QName_Hash(ns, local); + int index = TQName_Hash(ns, local); int increment = index >> (bits - 1) | 1; - QName::Data * qname_table = get_qname_table(); + TQName::Data * qname_table = get_qname_table(); for (;;) { index &= ((1 << bits) - 1); if (!qname_table[index].Occupied()) { - return new QName::Data(ns, local); + return new TQName::Data(ns, local); } if (qname_table[index].localPart_ == local && qname_table[index].namespace_ == ns) { @@ -70,11 +70,11 @@ AllocateOrFind(const std::string & ns, const char * local) { } } -static QName::Data * +static TQName::Data * Add(const std::string & ns, const char * local) { - int index = QName_Hash(ns, local); + int index = TQName_Hash(ns, local); int increment = index >> (bits - 1) | 1; - QName::Data * qname_table = get_qname_table(); + TQName::Data * qname_table = get_qname_table(); for (;;) { index &= ((1 << bits) - 1); if (!qname_table[index].Occupied()) { @@ -93,25 +93,25 @@ Add(const std::string & ns, const char * local) { } } -QName::~QName() { +TQName::~TQName() { data_->Release(); } -QName::QName() : data_(QN_EMPTY.data_) { +TQName::TQName() : data_(TQN_EMPTY.data_) { data_->AddRef(); } -QName::QName(bool add, const std::string & ns, const char * local) : +TQName::TQName(bool add, const std::string & ns, const char * local) : data_(add ? Add(ns, local) : AllocateOrFind(ns, local)) {} -QName::QName(bool add, const std::string & ns, const std::string & local) : +TQName::TQName(bool add, const std::string & ns, const std::string & local) : data_(add ? Add(ns, local.c_str()) : AllocateOrFind(ns, local.c_str())) {} -QName::QName(const std::string & ns, const char * local) : +TQName::TQName(const std::string & ns, const char * local) : data_(AllocateOrFind(ns, local)) {} static std::string -QName_LocalPart(const std::string & name) { +TQName_LocalPart(const std::string & name) { size_t i = name.rfind(':'); if (i == std::string::npos) return name; @@ -119,19 +119,19 @@ QName_LocalPart(const std::string & name) { } static std::string -QName_Namespace(const std::string & name) { +TQName_Namespace(const std::string & name) { size_t i = name.rfind(':'); if (i == std::string::npos) return STR_EMPTY; return name.substr(0, i); } -QName::QName(const std::string & mergedOrLocal) : - data_(AllocateOrFind(QName_Namespace(mergedOrLocal), - QName_LocalPart(mergedOrLocal).c_str())) {} +TQName::TQName(const std::string & mergedOrLocal) : + data_(AllocateOrFind(TQName_Namespace(mergedOrLocal), + TQName_LocalPart(mergedOrLocal).c_str())) {} std::string -QName::Merged() const { +TQName::Merged() const { if (data_->namespace_ == STR_EMPTY) return data_->localPart_; @@ -143,14 +143,14 @@ QName::Merged() const { } bool -QName::operator==(const QName & other) const { +TQName::operator==(const TQName & other) const { return other.data_ == data_ || data_->localPart_ == other.data_->localPart_ && data_->namespace_ == other.data_->namespace_; } int -QName::Compare(const QName & other) const { +TQName::Compare(const TQName & other) const { if (data_ == other.data_) return 0; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h index b1bcec61..dff04cd9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h @@ -33,30 +33,30 @@ namespace buzz { -class QName +class TQName { public: - explicit QName(); - QName(const QName & qname) : data_(qname.data_) { data_->AddRef(); } - explicit QName(bool add, const std::string & ns, const char * local); - explicit QName(bool add, const std::string & ns, const std::string & local); - explicit QName(const std::string & ns, const char * local); - explicit QName(const std::string & mergedOrLocal); - QName & operator=(const QName & qn) { + explicit TQName(); + TQName(const TQName & qname) : data_(qname.data_) { data_->AddRef(); } + explicit TQName(bool add, const std::string & ns, const char * local); + explicit TQName(bool add, const std::string & ns, const std::string & local); + explicit TQName(const std::string & ns, const char * local); + explicit TQName(const std::string & mergedOrLocal); + TQName & operator=(const TQName & qn) { qn.data_->AddRef(); data_->Release(); data_ = qn.data_; return *this; } - ~QName(); + ~TQName(); const std::string & Namespace() const { return data_->namespace_; } const std::string & LocalPart() const { return data_->localPart_; } std::string Merged() const; - int Compare(const QName & other) const; - bool operator==(const QName & other) const; - bool operator!=(const QName & other) const { return !operator==(other); } - bool operator<(const QName & other) const { return Compare(other) < 0; } + int Compare(const TQName & other) const; + bool operator==(const TQName & other) const; + bool operator!=(const TQName & other) const { return !operator==(other); } + bool operator<(const TQName & other) const { return Compare(other) < 0; } class Data { public: diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc index 313c4013..7b1b10f0 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc @@ -53,8 +53,8 @@ XmlBuilder::Reset() { XmlElement * XmlBuilder::BuildElement(XmlParseContext * pctx, const char * name, const char ** atts) { - QName tagName(pctx->ResolveQName(name, false)); - if (tagName == QN_EMPTY) + TQName tagName(pctx->ResolveTQName(name, false)); + if (tagName == TQN_EMPTY) return NULL; XmlElement * pelNew = new XmlElement(tagName); @@ -62,11 +62,11 @@ XmlBuilder::BuildElement(XmlParseContext * pctx, if (!*atts) return pelNew; - std::set seenNonlocalAtts; + std::set seenNonlocalAtts; while (*atts) { - QName attName(pctx->ResolveQName(*atts, true)); - if (attName == QN_EMPTY) { + TQName attName(pctx->ResolveTQName(*atts, true)); + if (attName == TQN_EMPTY) { delete pelNew; return NULL; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc index d3619a92..a021f67a 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc @@ -32,7 +32,7 @@ #include "talk/base/common.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlparser.h" #include "talk/xmllite/xmlbuilder.h" #include "talk/xmllite/xmlprinter.h" @@ -42,8 +42,8 @@ namespace buzz { -const QName QN_EMPTY(true, STR_EMPTY, STR_EMPTY); -const QName QN_XMLNS(true, STR_EMPTY, STR_XMLNS); +const TQName TQN_EMPTY(true, STR_EMPTY, STR_EMPTY); +const TQName TQN_XMLNS(true, STR_EMPTY, STR_XMLNS); XmlChild::~XmlChild() { @@ -82,7 +82,7 @@ XmlText::AddText(const std::string & text) { XmlText::~XmlText() { } -XmlElement::XmlElement(const QName & name) : +XmlElement::XmlElement(const TQName & name) : name_(name), pFirstAttr_(NULL), pLastAttr_(NULL), @@ -109,7 +109,7 @@ XmlElement::XmlElement(const XmlElement & elt) : } pLastAttr_ = newAttr; - // copy children + // copy tqchildren XmlChild * pChild; XmlChild ** ppLast = &pFirstChild_; XmlChild * newChild = NULL; @@ -127,9 +127,9 @@ XmlElement::XmlElement(const XmlElement & elt) : } -XmlElement::XmlElement(const QName & name, bool useDefaultNs) : +XmlElement::XmlElement(const TQName & name, bool useDefaultNs) : name_(name), - pFirstAttr_(useDefaultNs ? new XmlAttr(QN_XMLNS, name.Namespace()) : NULL), + pFirstAttr_(useDefaultNs ? new XmlAttr(TQN_XMLNS, name.Namespace()) : NULL), pLastAttr_(pFirstAttr_), pFirstChild_(NULL), pLastChild_(NULL) { @@ -173,11 +173,11 @@ XmlElement::SetBodyText(const std::string & text) { } } -const QName & +const TQName & XmlElement::FirstElementName() const { const XmlElement * element = FirstElement(); if (element == NULL) - return QN_EMPTY; + return TQN_EMPTY; return element->Name(); } @@ -187,7 +187,7 @@ XmlElement::FirstAttr() { } const std::string & -XmlElement::Attr(const QName & name) const { +XmlElement::Attr(const TQName & name) const { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -197,7 +197,7 @@ XmlElement::Attr(const QName & name) const { } bool -XmlElement::HasAttr(const QName & name) const { +XmlElement::HasAttr(const TQName & name) const { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -207,7 +207,7 @@ XmlElement::HasAttr(const QName & name) const { } void -XmlElement::SetAttr(const QName & name, const std::string & value) { +XmlElement::SetAttr(const TQName & name, const std::string & value) { XmlAttr * pattr; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { if (pattr->name_ == name) @@ -226,7 +226,7 @@ XmlElement::SetAttr(const QName & name, const std::string & value) { } void -XmlElement::ClearAttr(const QName & name) { +XmlElement::ClearAttr(const TQName & name) { XmlAttr * pattr; XmlAttr *pLastAttr = NULL; for (pattr = pFirstAttr_; pattr; pattr = pattr->pNextAttr_) { @@ -291,7 +291,7 @@ XmlElement::NextWithNamespace(const std::string & ns) { } XmlElement * -XmlElement::FirstNamed(const QName & name) { +XmlElement::FirstNamed(const TQName & name) { XmlChild * pChild; for (pChild = pFirstChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -301,7 +301,7 @@ XmlElement::FirstNamed(const QName & name) { } XmlElement * -XmlElement::NextNamed(const QName & name) { +XmlElement::NextNamed(const TQName & name) { XmlChild * pChild; for (pChild = pNextChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -311,7 +311,7 @@ XmlElement::NextNamed(const QName & name) { } const std::string & -XmlElement::TextNamed(const QName & name) const { +XmlElement::TextNamed(const TQName & name) const { XmlChild * pChild; for (pChild = pFirstChild_; pChild; pChild = pChild->pNextChild_) { if (!pChild->IsText() && pChild->AsElement()->Name() == name) @@ -352,7 +352,7 @@ XmlElement::RemoveChildAfter(XmlChild * pPredecessor) { } void -XmlElement::AddAttr(const QName & name, const std::string & value) { +XmlElement::AddAttr(const TQName & name, const std::string & value) { ASSERT(!HasAttr(name)); XmlAttr ** pprev = pLastAttr_ ? &(pLastAttr_->pNextAttr_) : &pFirstAttr_; @@ -360,7 +360,7 @@ XmlElement::AddAttr(const QName & name, const std::string & value) { } void -XmlElement::AddAttr(const QName & name, const std::string & value, +XmlElement::AddAttr(const TQName & name, const std::string & value, int depth) { XmlElement * element = this; while (depth--) { @@ -426,7 +426,7 @@ XmlElement::AddElement(XmlElement *pelChild, int depth) { } void -XmlElement::ClearNamedChildren(const QName & name) { +XmlElement::ClearNamedChildren(const TQName & name) { XmlChild * prev_child = NULL; XmlChild * next_child; XmlChild * child; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h index 06545d89..2c9fc860 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h @@ -31,12 +31,12 @@ #include #include #include "talk/base/scoped_ptr.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace buzz { -extern const QName QN_EMPTY; -extern const QName QN_XMLNS; +extern const TQName TQN_EMPTY; +extern const TQName TQN_XMLNS; class XmlChild; @@ -116,11 +116,11 @@ friend class XmlElement; public: XmlAttr * NextAttr() const { return pNextAttr_; } - const QName & Name() const { return name_; } + const TQName & Name() const { return name_; } const std::string & Value() const { return value_; } private: - explicit XmlAttr(const QName & name, const std::string & value) : + explicit XmlAttr(const TQName & name, const std::string & value) : pNextAttr_(NULL), name_(name), value_(value) { @@ -132,24 +132,24 @@ private: } XmlAttr * pNextAttr_; - QName name_; + TQName name_; std::string value_; }; class XmlElement : public XmlChild { public: - explicit XmlElement(const QName & name); - explicit XmlElement(const QName & name, bool useDefaultNs); + explicit XmlElement(const TQName & name); + explicit XmlElement(const TQName & name, bool useDefaultNs); explicit XmlElement(const XmlElement & elt); virtual ~XmlElement(); - const QName & Name() const { return name_; } + const TQName & Name() const { return name_; } const std::string & BodyText() const; void SetBodyText(const std::string & text); - const QName & FirstElementName() const; + const TQName & FirstElementName() const; XmlAttr * FirstAttr(); const XmlAttr * FirstAttr() const @@ -157,10 +157,10 @@ public: //! Attr will return STR_EMPTY if the attribute isn't there: //! use HasAttr to test presence of an attribute. - const std::string & Attr(const QName & name) const; - bool HasAttr(const QName & name) const; - void SetAttr(const QName & name, const std::string & value); - void ClearAttr(const QName & name); + const std::string & Attr(const TQName & name) const; + bool HasAttr(const TQName & name) const; + void SetAttr(const TQName & name, const std::string & value); + void ClearAttr(const TQName & name); XmlChild * FirstChild(); const XmlChild * FirstChild() const @@ -182,15 +182,15 @@ public: const XmlElement * NextWithNamespace(const std::string & ns) const { return const_cast(this)->NextWithNamespace(ns); } - XmlElement * FirstNamed(const QName & name); - const XmlElement * FirstNamed(const QName & name) const + XmlElement * FirstNamed(const TQName & name); + const XmlElement * FirstNamed(const TQName & name) const { return const_cast(this)->FirstNamed(name); } - XmlElement * NextNamed(const QName & name); - const XmlElement * NextNamed(const QName & name) const + XmlElement * NextNamed(const TQName & name); + const XmlElement * NextNamed(const TQName & name) const { return const_cast(this)->NextNamed(name); } - const std::string & TextNamed(const QName & name) const; + const std::string & TextNamed(const TQName & name) const; void InsertChildAfter(XmlChild * pPredecessor, XmlChild * pNewChild); void RemoveChildAfter(XmlChild * pPredecessor); @@ -200,9 +200,9 @@ public: void AddText(const std::string & text, int depth); void AddElement(XmlElement * pelChild); void AddElement(XmlElement * pelChild, int depth); - void AddAttr(const QName & name, const std::string & value); - void AddAttr(const QName & name, const std::string & value, int depth); - void ClearNamedChildren(const QName & name); + void AddAttr(const TQName & name, const std::string & value); + void AddAttr(const TQName & name, const std::string & value, int depth); + void ClearNamedChildren(const TQName & name); void ClearChildren(); static XmlElement * ForStr(const std::string & str); @@ -216,7 +216,7 @@ protected: virtual XmlText * AsTextImpl() const; private: - QName name_; + TQName name_; XmlAttr * pFirstAttr_; XmlAttr * pLastAttr_; XmlChild * pFirstChild_; diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc index 4dcb6490..570a8be5 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc @@ -116,7 +116,7 @@ XmlnsStack::PrefixForNs(const std::string & ns, bool isattr) { } std::string -XmlnsStack::FormatQName(const QName & name, bool isAttr) { +XmlnsStack::FormatTQName(const TQName & name, bool isAttr) { std::string prefix(PrefixForNs(name.Namespace(), isAttr).first); if (prefix == STR_EMPTY) return name.LocalPart(); @@ -170,7 +170,7 @@ static std::string SuggestPrefix(const std::string & ns) { if (last - first > 4) last = first + 3; std::string candidate(AsciiLower(ns.substr(first, last - first))); - if (candidate.find("xml") != 0) + if (candidate.tqfind("xml") != 0) return candidate; break; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h index 299ec1ce..6fd7665c 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h @@ -31,7 +31,7 @@ #include #include "talk/base/scoped_ptr.h" #include "talk/base/stl_decl.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" namespace buzz { @@ -50,7 +50,7 @@ public: bool PrefixMatchesNs(const std::string & prefix, const std::string & ns); std::pair PrefixForNs(const std::string & ns, bool isAttr); std::pair AddNewPrefix(const std::string & ns, bool isAttr); - std::string FormatQName(const QName & name, bool isAttr); + std::string FormatTQName(const TQName & name, bool isAttr); private: diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc index f2b56778..41cadb84 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc @@ -212,29 +212,29 @@ XmlParser::ParseContext::EndElement() { xmlnsstack_.PopFrame(); } -QName -XmlParser::ParseContext::ResolveQName(const char *qname, bool isAttr) { +TQName +XmlParser::ParseContext::ResolveTQName(const char *qname, bool isAttr) { const char *c; for (c = qname; *c; ++c) { if (*c == ':') { const std::string * result; result = xmlnsstack_.NsForPrefix(std::string(qname, c - qname)); if (result == NULL) - return QN_EMPTY; + return TQN_EMPTY; const char * localname = c + 1; - return QName(*result, localname); + return TQName(*result, localname); } } if (isAttr) { - return QName(STR_EMPTY, qname); + return TQName(STR_EMPTY, qname); } const std::string * result; result = xmlnsstack_.NsForPrefix(STR_EMPTY); if (result == NULL) - return QN_EMPTY; + return TQN_EMPTY; - return QName(*result, qname); + return TQName(*result, qname); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h index 760802e4..8e2e4b5f 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.h @@ -43,7 +43,7 @@ class XmlParser; class XmlParseContext { public: - virtual QName ResolveQName(const char * qname, bool isAttr) = 0; + virtual TQName ResolveTQName(const char * qname, bool isAttr) = 0; virtual void RaiseError(XML_Error err) = 0; }; @@ -80,7 +80,7 @@ private: public: ParseContext(XmlParser * parser); virtual ~ParseContext(); - virtual QName ResolveQName(const char * qname, bool isAttr); + virtual TQName ResolveTQName(const char * qname, bool isAttr); virtual void RaiseError(XML_Error err) { if (!raised_) raised_ = err; } XML_Error RaisedError() { return raised_; } void Reset(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc index 892e2ebb..8e36ac02 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc @@ -79,7 +79,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { // first go through attrs of pel to add xmlns definitions const XmlAttr * pattr; for (pattr = element->FirstAttr(); pattr; pattr = pattr->NextAttr()) { - if (pattr->Name() == QN_XMLNS) + if (pattr->Name() == TQN_XMLNS) xmlnsStack_.AddXmlns(STR_EMPTY, pattr->Value()); else if (pattr->Name().Namespace() == NS_XMLNS) xmlnsStack_.AddXmlns(pattr->Name().LocalPart(), @@ -104,11 +104,11 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { } // print the element name - *pout_ << '<' << xmlnsStack_.FormatQName(element->Name(), false); + *pout_ << '<' << xmlnsStack_.FormatTQName(element->Name(), false); // and the attributes for (pattr = element->FirstAttr(); pattr; pattr = pattr->NextAttr()) { - *pout_ << ' ' << xmlnsStack_.FormatQName(pattr->Name(), true) << "=\""; + *pout_ << ' ' << xmlnsStack_.FormatTQName(pattr->Name(), true) << "=\""; PrintQuotedValue(pattr->Value()); *pout_ << '"'; } @@ -123,7 +123,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { i += 2; } - // now the children + // now the tqchildren const XmlChild * pchild = element->FirstChild(); if (pchild == NULL) @@ -137,7 +137,7 @@ XmlPrinterImpl::PrintElement(const XmlElement * element) { PrintElement(pchild->AsElement()); pchild = pchild->NextChild(); } - *pout_ << "Name(), false) << '>'; + *pout_ << "Name(), false) << '>'; } xmlnsStack_.PopFrame(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc index b2c833f7..18987e7d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc @@ -29,7 +29,7 @@ #include "talk/base/basicdefs.h" #include "talk/xmllite/xmlconstants.h" #include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/constants.h" namespace buzz { @@ -135,131 +135,131 @@ const std::string STR_GOOGLEMAIL_COM("googlemail.com"); const std::string STR_DEFAULT_DOMAIN("default.talk.google.com"); const std::string STR_X("x"); -const QName QN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); -const QName QN_STREAM_FEATURES(true, NS_STREAM, "features"); -const QName QN_STREAM_ERROR(true, NS_STREAM, "error"); - -const QName QN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); -const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); -const QName QN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); -const QName QN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); -const QName QN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); -const QName QN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); -const QName QN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); -const QName QN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); -const QName QN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); -const QName QN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); -const QName QN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); -const QName QN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); -const QName QN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); -const QName QN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); -const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); -const QName QN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); -const QName QN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); -const QName QN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); -const QName QN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); -const QName QN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); -const QName QN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); -const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); -const QName QN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); -const QName QN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); -const QName QN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); - -const QName QN_TLS_STARTTLS(true, NS_TLS, "starttls"); -const QName QN_TLS_REQUIRED(true, NS_TLS, "required"); -const QName QN_TLS_PROCEED(true, NS_TLS, "proceed"); -const QName QN_TLS_FAILURE(true, NS_TLS, "failure"); - -const QName QN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); -const QName QN_SASL_MECHANISM(true, NS_SASL, "mechanism"); -const QName QN_SASL_AUTH(true, NS_SASL, "auth"); -const QName QN_SASL_CHALLENGE(true, NS_SASL, "challenge"); -const QName QN_SASL_RESPONSE(true, NS_SASL, "response"); -const QName QN_SASL_ABORT(true, NS_SASL, "abort"); -const QName QN_SASL_SUCCESS(true, NS_SASL, "success"); -const QName QN_SASL_FAILURE(true, NS_SASL, "failure"); -const QName QN_SASL_ABORTED(true, NS_SASL, "aborted"); -const QName QN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); -const QName QN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); -const QName QN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); -const QName QN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); -const QName QN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); -const QName QN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); - -const QName QN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); -const QName QN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); - -const QName QN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); -const QName QN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); -const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); -const QName QN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); -const QName QN_STANZA_GONE(true, NS_STANZA, "gone"); -const QName QN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); -const QName QN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); -const QName QN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); -const QName QN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); -const QName QN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); -const QName QN_STANZA_PAYMENT_REQUIRED(true, NS_STANZA, "payment-required"); -const QName QN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); -const QName QN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); -const QName QN_STANZA_REGISTRATION_REQUIRED(true, NS_STANZA, "registration-required"); -const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); -const QName QN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); -const QName QN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); -const QName QN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); -const QName QN_STANZA_SUBSCRIPTION_REQUIRED(true, NS_STANZA, "subscription-required"); -const QName QN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); -const QName QN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); -const QName QN_STANZA_TEXT(true, NS_STANZA, "text"); - -const QName QN_BIND_BIND(true, NS_BIND, "bind"); -const QName QN_BIND_RESOURCE(true, NS_BIND, "resource"); -const QName QN_BIND_JID(true, NS_BIND, "jid"); - -const QName QN_MESSAGE(true, NS_CLIENT, "message"); -const QName QN_BODY(true, NS_CLIENT, "body"); -const QName QN_SUBJECT(true, NS_CLIENT, "subject"); -const QName QN_THREAD(true, NS_CLIENT, "thread"); -const QName QN_PRESENCE(true, NS_CLIENT, "presence"); -const QName QN_SHOW(true, NS_CLIENT, "show"); -const QName QN_STATUS(true, NS_CLIENT, "status"); -const QName QN_LANG(true, NS_CLIENT, "lang"); -const QName QN_PRIORITY(true, NS_CLIENT, "priority"); -const QName QN_IQ(true, NS_CLIENT, "iq"); -const QName QN_ERROR(true, NS_CLIENT, "error"); - -const QName QN_SERVER_MESSAGE(true, NS_SERVER, "message"); -const QName QN_SERVER_BODY(true, NS_SERVER, "body"); -const QName QN_SERVER_SUBJECT(true, NS_SERVER, "subject"); -const QName QN_SERVER_THREAD(true, NS_SERVER, "thread"); -const QName QN_SERVER_PRESENCE(true, NS_SERVER, "presence"); -const QName QN_SERVER_SHOW(true, NS_SERVER, "show"); -const QName QN_SERVER_STATUS(true, NS_SERVER, "status"); -const QName QN_SERVER_LANG(true, NS_SERVER, "lang"); -const QName QN_SERVER_PRIORITY(true, NS_SERVER, "priority"); -const QName QN_SERVER_IQ(true, NS_SERVER, "iq"); -const QName QN_SERVER_ERROR(true, NS_SERVER, "error"); - -const QName QN_SESSION_SESSION(true, NS_SESSION, "session"); - -const QName QN_PRIVACY_QUERY(true, NS_PRIVACY, "query"); -const QName QN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); -const QName QN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); -const QName QN_PRIVACY_LIST(true, NS_PRIVACY, "list"); -const QName QN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); -const QName QN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); -const QName QN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); -const QName QN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); -const QName QN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); - -const QName QN_ROSTER_QUERY(true, NS_ROSTER, "query"); -const QName QN_ROSTER_ITEM(true, NS_ROSTER, "item"); -const QName QN_ROSTER_GROUP(true, NS_ROSTER, "group"); - -const QName QN_VCARD_QUERY(true, NS_VCARD, "vCard"); -const QName QN_VCARD_FN(true, NS_VCARD, "FN"); - -const QName QN_XML_LANG(true, NS_XML, "lang"); +const TQName TQN_STREAM_STREAM(true, NS_STREAM, STR_STREAM); +const TQName TQN_STREAM_FEATURES(true, NS_STREAM, "features"); +const TQName TQN_STREAM_ERROR(true, NS_STREAM, "error"); + +const TQName TQN_XSTREAM_BAD_FORMAT(true, NS_XSTREAM, "bad-format"); +const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX(true, NS_XSTREAM, "bad-namespace-prefix"); +const TQName TQN_XSTREAM_CONFLICT(true, NS_XSTREAM, "conflict"); +const TQName TQN_XSTREAM_CONNECTION_TIMEOUT(true, NS_XSTREAM, "connection-timeout"); +const TQName TQN_XSTREAM_HOST_GONE(true, NS_XSTREAM, "host-gone"); +const TQName TQN_XSTREAM_HOST_UNKNOWN(true, NS_XSTREAM, "host-unknown"); +const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING(true, NS_XSTREAM, "improper-addressing"); +const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR(true, NS_XSTREAM, "internal-server-error"); +const TQName TQN_XSTREAM_INVALID_FROM(true, NS_XSTREAM, "invalid-from"); +const TQName TQN_XSTREAM_INVALID_ID(true, NS_XSTREAM, "invalid-id"); +const TQName TQN_XSTREAM_INVALID_NAMESPACE(true, NS_XSTREAM, "invalid-namespace"); +const TQName TQN_XSTREAM_INVALID_XML(true, NS_XSTREAM, "invalid-xml"); +const TQName TQN_XSTREAM_NOT_AUTHORIZED(true, NS_XSTREAM, "not-authorized"); +const TQName TQN_XSTREAM_POLICY_VIOLATION(true, NS_XSTREAM, "policy-violation"); +const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED(true, NS_XSTREAM, "remote-connection-failed"); +const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT(true, NS_XSTREAM, "resource-constraint"); +const TQName TQN_XSTREAM_RESTRICTED_XML(true, NS_XSTREAM, "restricted-xml"); +const TQName TQN_XSTREAM_SEE_OTHER_HOST(true, NS_XSTREAM, "see-other-host"); +const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN(true, NS_XSTREAM, "system-shutdown"); +const TQName TQN_XSTREAM_UNDEFINED_CONDITION(true, NS_XSTREAM, "undefined-condition"); +const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING(true, NS_XSTREAM, "unsupported-encoding"); +const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE(true, NS_XSTREAM, "unsupported-stanza-type"); +const TQName TQN_XSTREAM_UNSUPPORTED_VERSION(true, NS_XSTREAM, "unsupported-version"); +const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED(true, NS_XSTREAM, "xml-not-well-formed"); +const TQName TQN_XSTREAM_TEXT(true, NS_XSTREAM, "text"); + +const TQName TQN_TLS_STARTTLS(true, NS_TLS, "starttls"); +const TQName TQN_TLS_RETQUIRED(true, NS_TLS, "required"); +const TQName TQN_TLS_PROCEED(true, NS_TLS, "proceed"); +const TQName TQN_TLS_FAILURE(true, NS_TLS, "failure"); + +const TQName TQN_SASL_MECHANISMS(true, NS_SASL, "mechanisms"); +const TQName TQN_SASL_MECHANISM(true, NS_SASL, "mechanism"); +const TQName TQN_SASL_AUTH(true, NS_SASL, "auth"); +const TQName TQN_SASL_CHALLENGE(true, NS_SASL, "challenge"); +const TQName TQN_SASL_RESPONSE(true, NS_SASL, "response"); +const TQName TQN_SASL_ABORT(true, NS_SASL, "abort"); +const TQName TQN_SASL_SUCCESS(true, NS_SASL, "success"); +const TQName TQN_SASL_FAILURE(true, NS_SASL, "failure"); +const TQName TQN_SASL_ABORTED(true, NS_SASL, "aborted"); +const TQName TQN_SASL_INCORRECT_ENCODING(true, NS_SASL, "incorrect-encoding"); +const TQName TQN_SASL_INVALID_AUTHZID(true, NS_SASL, "invalid-authzid"); +const TQName TQN_SASL_INVALID_MECHANISM(true, NS_SASL, "invalid-mechanism"); +const TQName TQN_SASL_MECHANISM_TOO_WEAK(true, NS_SASL, "mechanism-too-weak"); +const TQName TQN_SASL_NOT_AUTHORIZED(true, NS_SASL, "not-authorized"); +const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE(true, NS_SASL, "temporary-auth-failure"); + +const TQName TQN_DIALBACK_RESULT(true, NS_DIALBACK, "result"); +const TQName TQN_DIALBACK_VERIFY(true, NS_DIALBACK, "verify"); + +const TQName TQN_STANZA_BAD_REQUEST(true, NS_STANZA, "bad-request"); +const TQName TQN_STANZA_CONFLICT(true, NS_STANZA, "conflict"); +const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED(true, NS_STANZA, "feature-not-implemented"); +const TQName TQN_STANZA_FORBIDDEN(true, NS_STANZA, "forbidden"); +const TQName TQN_STANZA_GONE(true, NS_STANZA, "gone"); +const TQName TQN_STANZA_INTERNAL_SERVER_ERROR(true, NS_STANZA, "internal-server-error"); +const TQName TQN_STANZA_ITEM_NOT_FOUND(true, NS_STANZA, "item-not-found"); +const TQName TQN_STANZA_JID_MALFORMED(true, NS_STANZA, "jid-malformed"); +const TQName TQN_STANZA_NOT_ACCEPTABLE(true, NS_STANZA, "not-acceptable"); +const TQName TQN_STANZA_NOT_ALLOWED(true, NS_STANZA, "not-allowed"); +const TQName TQN_STANZA_PAYMENT_RETQUIRED(true, NS_STANZA, "payment-required"); +const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE(true, NS_STANZA, "recipient-unavailable"); +const TQName TQN_STANZA_REDIRECT(true, NS_STANZA, "redirect"); +const TQName TQN_STANZA_REGISTRATION_RETQUIRED(true, NS_STANZA, "registration-required"); +const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND(true, NS_STANZA, "remote-server-not-found"); +const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT(true, NS_STANZA, "remote-server-timeout"); +const TQName TQN_STANZA_RESOURCE_CONSTRAINT(true, NS_STANZA, "resource-constraint"); +const TQName TQN_STANZA_SERVICE_UNAVAILABLE(true, NS_STANZA, "service-unavailable"); +const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED(true, NS_STANZA, "subscription-required"); +const TQName TQN_STANZA_UNDEFINED_CONDITION(true, NS_STANZA, "undefined-condition"); +const TQName TQN_STANZA_UNEXPECTED_REQUEST(true, NS_STANZA, "unexpected-request"); +const TQName TQN_STANZA_TEXT(true, NS_STANZA, "text"); + +const TQName TQN_BIND_BIND(true, NS_BIND, "bind"); +const TQName TQN_BIND_RESOURCE(true, NS_BIND, "resource"); +const TQName TQN_BIND_JID(true, NS_BIND, "jid"); + +const TQName TQN_MESSAGE(true, NS_CLIENT, "message"); +const TQName TQN_BODY(true, NS_CLIENT, "body"); +const TQName TQN_SUBJECT(true, NS_CLIENT, "subject"); +const TQName TQN_THREAD(true, NS_CLIENT, "thread"); +const TQName TQN_PRESENCE(true, NS_CLIENT, "presence"); +const TQName TQN_SHOW(true, NS_CLIENT, "show"); +const TQName TQN_STATUS(true, NS_CLIENT, "status"); +const TQName TQN_LANG(true, NS_CLIENT, "lang"); +const TQName TQN_PRIORITY(true, NS_CLIENT, "priority"); +const TQName TQN_IQ(true, NS_CLIENT, "iq"); +const TQName TQN_ERROR(true, NS_CLIENT, "error"); + +const TQName TQN_SERVER_MESSAGE(true, NS_SERVER, "message"); +const TQName TQN_SERVER_BODY(true, NS_SERVER, "body"); +const TQName TQN_SERVER_SUBJECT(true, NS_SERVER, "subject"); +const TQName TQN_SERVER_THREAD(true, NS_SERVER, "thread"); +const TQName TQN_SERVER_PRESENCE(true, NS_SERVER, "presence"); +const TQName TQN_SERVER_SHOW(true, NS_SERVER, "show"); +const TQName TQN_SERVER_STATUS(true, NS_SERVER, "status"); +const TQName TQN_SERVER_LANG(true, NS_SERVER, "lang"); +const TQName TQN_SERVER_PRIORITY(true, NS_SERVER, "priority"); +const TQName TQN_SERVER_IQ(true, NS_SERVER, "iq"); +const TQName TQN_SERVER_ERROR(true, NS_SERVER, "error"); + +const TQName TQN_SESSION_SESSION(true, NS_SESSION, "session"); + +const TQName TQN_PRIVACY_TQUERY(true, NS_PRIVACY, "query"); +const TQName TQN_PRIVACY_ACTIVE(true, NS_PRIVACY, "active"); +const TQName TQN_PRIVACY_DEFAULT(true, NS_PRIVACY, "default"); +const TQName TQN_PRIVACY_LIST(true, NS_PRIVACY, "list"); +const TQName TQN_PRIVACY_ITEM(true, NS_PRIVACY, "item"); +const TQName TQN_PRIVACY_IQ(true, NS_PRIVACY, "iq"); +const TQName TQN_PRIVACY_MESSAGE(true, NS_PRIVACY, "message"); +const TQName TQN_PRIVACY_PRESENCE_IN(true, NS_PRIVACY, "presence-in"); +const TQName TQN_PRIVACY_PRESENCE_OUT(true, NS_PRIVACY, "presence-out"); + +const TQName TQN_ROSTER_TQUERY(true, NS_ROSTER, "query"); +const TQName TQN_ROSTER_ITEM(true, NS_ROSTER, "item"); +const TQName TQN_ROSTER_GROUP(true, NS_ROSTER, "group"); + +const TQName TQN_VCARD_TQUERY(true, NS_VCARD, "vCard"); +const TQName TQN_VCARD_FN(true, NS_VCARD, "FN"); + +const TQName TQN_XML_LANG(true, NS_XML, "lang"); const std::string STR_TYPE("type"); const std::string STR_ID("id"); @@ -268,26 +268,26 @@ const std::string STR_JID("jid"); const std::string STR_SUBSCRIPTION("subscription"); const std::string STR_ASK("ask"); -const QName QN_ENCODING(true, STR_EMPTY, STR_ENCODING); -const QName QN_VERSION(true, STR_EMPTY, STR_VERSION); -const QName QN_TO(true, STR_EMPTY, "to"); -const QName QN_FROM(true, STR_EMPTY, "from"); -const QName QN_TYPE(true, STR_EMPTY, "type"); -const QName QN_ID(true, STR_EMPTY, "id"); -const QName QN_CODE(true, STR_EMPTY, "code"); -const QName QN_NAME(true, STR_EMPTY, "name"); -const QName QN_VALUE(true, STR_EMPTY, "value"); -const QName QN_ACTION(true, STR_EMPTY, "action"); -const QName QN_ORDER(true, STR_EMPTY, "order"); -const QName QN_MECHANISM(true, STR_EMPTY, "mechanism"); -const QName QN_ASK(true, STR_EMPTY, "ask"); -const QName QN_JID(true, STR_EMPTY, "jid"); -const QName QN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); -const QName QN_SOURCE(true, STR_EMPTY, "source"); - -const QName QN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); -const QName QN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); -const QName QN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); +const TQName TQN_ENCODING(true, STR_EMPTY, STR_ENCODING); +const TQName TQN_VERSION(true, STR_EMPTY, STR_VERSION); +const TQName TQN_TO(true, STR_EMPTY, "to"); +const TQName TQN_FROM(true, STR_EMPTY, "from"); +const TQName TQN_TYPE(true, STR_EMPTY, "type"); +const TQName TQN_ID(true, STR_EMPTY, "id"); +const TQName TQN_CODE(true, STR_EMPTY, "code"); +const TQName TQN_NAME(true, STR_EMPTY, "name"); +const TQName TQN_VALUE(true, STR_EMPTY, "value"); +const TQName TQN_ACTION(true, STR_EMPTY, "action"); +const TQName TQN_ORDER(true, STR_EMPTY, "order"); +const TQName TQN_MECHANISM(true, STR_EMPTY, "mechanism"); +const TQName TQN_ASK(true, STR_EMPTY, "ask"); +const TQName TQN_JID(true, STR_EMPTY, "jid"); +const TQName TQN_SUBSCRIPTION(true, STR_EMPTY, "subscription"); +const TQName TQN_SOURCE(true, STR_EMPTY, "source"); + +const TQName TQN_XMLNS_CLIENT(true, NS_XMLNS, STR_CLIENT); +const TQName TQN_XMLNS_SERVER(true, NS_XMLNS, STR_SERVER); +const TQName TQN_XMLNS_STREAM(true, NS_XMLNS, STR_STREAM); // Presence const std::string STR_SHOW_AWAY("away"); @@ -303,29 +303,29 @@ const std::string STR_UNSUBSCRIBED("unsubscribed"); // JEP 0030 -const QName QN_NODE(true, STR_EMPTY, "node"); -const QName QN_CATEGORY(true, STR_EMPTY, "category"); -const QName QN_VAR(true, STR_EMPTY, "var"); +const TQName TQN_NODE(true, STR_EMPTY, "node"); +const TQName TQN_CATEGORY(true, STR_EMPTY, "category"); +const TQName TQN_VAR(true, STR_EMPTY, "var"); const std::string NS_DISCO_INFO("http://jabber.org/protocol/disco#info"); const std::string NS_DISCO_ITEMS("http://jabber.org/protocol/disco#items"); -const QName QN_DISCO_INFO_QUERY(true, NS_DISCO_INFO, "query"); -const QName QN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); -const QName QN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); +const TQName TQN_DISCO_INFO_TQUERY(true, NS_DISCO_INFO, "query"); +const TQName TQN_DISCO_IDENTITY(true, NS_DISCO_INFO, "identity"); +const TQName TQN_DISCO_FEATURE(true, NS_DISCO_INFO, "feature"); -const QName QN_DISCO_ITEMS_QUERY(true, NS_DISCO_ITEMS, "query"); -const QName QN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); +const TQName TQN_DISCO_ITEMS_TQUERY(true, NS_DISCO_ITEMS, "query"); +const TQName TQN_DISCO_ITEM(true, NS_DISCO_ITEMS, "item"); // JEP 0115 const std::string NS_CAPS("http://jabber.org/protocol/caps"); -const QName QN_CAPS_C(true, NS_CAPS, "c"); -const QName QN_VER(true, STR_EMPTY, "ver"); -const QName QN_EXT(true, STR_EMPTY, "ext"); +const TQName TQN_CAPS_C(true, NS_CAPS, "c"); +const TQName TQN_VER(true, STR_EMPTY, "ver"); +const TQName TQN_EXT(true, STR_EMPTY, "ext"); // JEP 0091 Delayed Delivery const std::string kNSDelay("jabber:x:delay"); -const QName kQnDelayX(true, kNSDelay, "x"); -const QName kQnStamp(true, STR_EMPTY, "stamp"); +const TQName kQnDelayX(true, kNSDelay, "x"); +const TQName kQnStamp(true, STR_EMPTY, "stamp"); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h index b05af965..00ff8e8d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h @@ -29,7 +29,7 @@ #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ #include -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmpp/jid.h" @@ -108,152 +108,152 @@ extern const std::string STR_DEFAULT_DOMAIN; extern const std::string STR_UNAVAILABLE; extern const std::string STR_INVISIBLE; -extern const QName QN_STREAM_STREAM; -extern const QName QN_STREAM_FEATURES; -extern const QName QN_STREAM_ERROR; - -extern const QName QN_XSTREAM_BAD_FORMAT; -extern const QName QN_XSTREAM_BAD_NAMESPACE_PREFIX; -extern const QName QN_XSTREAM_CONFLICT; -extern const QName QN_XSTREAM_CONNECTION_TIMEOUT; -extern const QName QN_XSTREAM_HOST_GONE; -extern const QName QN_XSTREAM_HOST_UNKNOWN; -extern const QName QN_XSTREAM_IMPROPER_ADDRESSIING; -extern const QName QN_XSTREAM_INTERNAL_SERVER_ERROR; -extern const QName QN_XSTREAM_INVALID_FROM; -extern const QName QN_XSTREAM_INVALID_ID; -extern const QName QN_XSTREAM_INVALID_NAMESPACE; -extern const QName QN_XSTREAM_INVALID_XML; -extern const QName QN_XSTREAM_NOT_AUTHORIZED; -extern const QName QN_XSTREAM_POLICY_VIOLATION; -extern const QName QN_XSTREAM_REMOTE_CONNECTION_FAILED; -extern const QName QN_XSTREAM_RESOURCE_CONSTRAINT; -extern const QName QN_XSTREAM_RESTRICTED_XML; -extern const QName QN_XSTREAM_SEE_OTHER_HOST; -extern const QName QN_XSTREAM_SYSTEM_SHUTDOWN; -extern const QName QN_XSTREAM_UNDEFINED_CONDITION; -extern const QName QN_XSTREAM_UNSUPPORTED_ENCODING; -extern const QName QN_XSTREAM_UNSUPPORTED_STANZA_TYPE; -extern const QName QN_XSTREAM_UNSUPPORTED_VERSION; -extern const QName QN_XSTREAM_XML_NOT_WELL_FORMED; -extern const QName QN_XSTREAM_TEXT; - -extern const QName QN_TLS_STARTTLS; -extern const QName QN_TLS_REQUIRED; -extern const QName QN_TLS_PROCEED; -extern const QName QN_TLS_FAILURE; - -extern const QName QN_SASL_MECHANISMS; -extern const QName QN_SASL_MECHANISM; -extern const QName QN_SASL_AUTH; -extern const QName QN_SASL_CHALLENGE; -extern const QName QN_SASL_RESPONSE; -extern const QName QN_SASL_ABORT; -extern const QName QN_SASL_SUCCESS; -extern const QName QN_SASL_FAILURE; -extern const QName QN_SASL_ABORTED; -extern const QName QN_SASL_INCORRECT_ENCODING; -extern const QName QN_SASL_INVALID_AUTHZID; -extern const QName QN_SASL_INVALID_MECHANISM; -extern const QName QN_SASL_MECHANISM_TOO_WEAK; -extern const QName QN_SASL_NOT_AUTHORIZED; -extern const QName QN_SASL_TEMPORARY_AUTH_FAILURE; - -extern const QName QN_DIALBACK_RESULT; -extern const QName QN_DIALBACK_VERIFY; - -extern const QName QN_STANZA_BAD_REQUEST; -extern const QName QN_STANZA_CONFLICT; -extern const QName QN_STANZA_FEATURE_NOT_IMPLEMENTED; -extern const QName QN_STANZA_FORBIDDEN; -extern const QName QN_STANZA_GONE; -extern const QName QN_STANZA_INTERNAL_SERVER_ERROR; -extern const QName QN_STANZA_ITEM_NOT_FOUND; -extern const QName QN_STANZA_JID_MALFORMED; -extern const QName QN_STANZA_NOT_ACCEPTABLE; -extern const QName QN_STANZA_NOT_ALLOWED; -extern const QName QN_STANZA_PAYMENT_REQUIRED; -extern const QName QN_STANZA_RECIPIENT_UNAVAILABLE; -extern const QName QN_STANZA_REDIRECT; -extern const QName QN_STANZA_REGISTRATION_REQUIRED; -extern const QName QN_STANZA_REMOTE_SERVER_NOT_FOUND; -extern const QName QN_STANZA_REMOTE_SERVER_TIMEOUT; -extern const QName QN_STANZA_RESOURCE_CONSTRAINT; -extern const QName QN_STANZA_SERVICE_UNAVAILABLE; -extern const QName QN_STANZA_SUBSCRIPTION_REQUIRED; -extern const QName QN_STANZA_UNDEFINED_CONDITION; -extern const QName QN_STANZA_UNEXPECTED_REQUEST; -extern const QName QN_STANZA_TEXT; - -extern const QName QN_BIND_BIND; -extern const QName QN_BIND_RESOURCE; -extern const QName QN_BIND_JID; - -extern const QName QN_MESSAGE; -extern const QName QN_BODY; -extern const QName QN_SUBJECT; -extern const QName QN_THREAD; -extern const QName QN_PRESENCE; -extern const QName QN_SHOW; -extern const QName QN_STATUS; -extern const QName QN_LANG; -extern const QName QN_PRIORITY; -extern const QName QN_IQ; -extern const QName QN_ERROR; - -extern const QName QN_SERVER_MESSAGE; -extern const QName QN_SERVER_BODY; -extern const QName QN_SERVER_SUBJECT; -extern const QName QN_SERVER_THREAD; -extern const QName QN_SERVER_PRESENCE; -extern const QName QN_SERVER_SHOW; -extern const QName QN_SERVER_STATUS; -extern const QName QN_SERVER_LANG; -extern const QName QN_SERVER_PRIORITY; -extern const QName QN_SERVER_IQ; -extern const QName QN_SERVER_ERROR; - -extern const QName QN_SESSION_SESSION; - -extern const QName QN_PRIVACY_QUERY; -extern const QName QN_PRIVACY_ACTIVE; -extern const QName QN_PRIVACY_DEFAULT; -extern const QName QN_PRIVACY_LIST; -extern const QName QN_PRIVACY_ITEM; -extern const QName QN_PRIVACY_IQ; -extern const QName QN_PRIVACY_MESSAGE; -extern const QName QN_PRIVACY_PRESENCE_IN; -extern const QName QN_PRIVACY_PRESENCE_OUT; - -extern const QName QN_ROSTER_QUERY; -extern const QName QN_ROSTER_ITEM; -extern const QName QN_ROSTER_GROUP; - -extern const QName QN_VCARD_QUERY; -extern const QName QN_VCARD_FN; - -extern const QName QN_XML_LANG; - -extern const QName QN_ENCODING; -extern const QName QN_VERSION; -extern const QName QN_TO; -extern const QName QN_FROM; -extern const QName QN_TYPE; -extern const QName QN_ID; -extern const QName QN_CODE; -extern const QName QN_NAME; -extern const QName QN_VALUE; -extern const QName QN_ACTION; -extern const QName QN_ORDER; -extern const QName QN_MECHANISM; -extern const QName QN_ASK; -extern const QName QN_JID; -extern const QName QN_SUBSCRIPTION; - - -extern const QName QN_XMLNS_CLIENT; -extern const QName QN_XMLNS_SERVER; -extern const QName QN_XMLNS_STREAM; +extern const TQName TQN_STREAM_STREAM; +extern const TQName TQN_STREAM_FEATURES; +extern const TQName TQN_STREAM_ERROR; + +extern const TQName TQN_XSTREAM_BAD_FORMAT; +extern const TQName TQN_XSTREAM_BAD_NAMESPACE_PREFIX; +extern const TQName TQN_XSTREAM_CONFLICT; +extern const TQName TQN_XSTREAM_CONNECTION_TIMEOUT; +extern const TQName TQN_XSTREAM_HOST_GONE; +extern const TQName TQN_XSTREAM_HOST_UNKNOWN; +extern const TQName TQN_XSTREAM_IMPROPER_ADDRESSIING; +extern const TQName TQN_XSTREAM_INTERNAL_SERVER_ERROR; +extern const TQName TQN_XSTREAM_INVALID_FROM; +extern const TQName TQN_XSTREAM_INVALID_ID; +extern const TQName TQN_XSTREAM_INVALID_NAMESPACE; +extern const TQName TQN_XSTREAM_INVALID_XML; +extern const TQName TQN_XSTREAM_NOT_AUTHORIZED; +extern const TQName TQN_XSTREAM_POLICY_VIOLATION; +extern const TQName TQN_XSTREAM_REMOTE_CONNECTION_FAILED; +extern const TQName TQN_XSTREAM_RESOURCE_CONSTRAINT; +extern const TQName TQN_XSTREAM_RESTRICTED_XML; +extern const TQName TQN_XSTREAM_SEE_OTHER_HOST; +extern const TQName TQN_XSTREAM_SYSTEM_SHUTDOWN; +extern const TQName TQN_XSTREAM_UNDEFINED_CONDITION; +extern const TQName TQN_XSTREAM_UNSUPPORTED_ENCODING; +extern const TQName TQN_XSTREAM_UNSUPPORTED_STANZA_TYPE; +extern const TQName TQN_XSTREAM_UNSUPPORTED_VERSION; +extern const TQName TQN_XSTREAM_XML_NOT_WELL_FORMED; +extern const TQName TQN_XSTREAM_TEXT; + +extern const TQName TQN_TLS_STARTTLS; +extern const TQName TQN_TLS_RETQUIRED; +extern const TQName TQN_TLS_PROCEED; +extern const TQName TQN_TLS_FAILURE; + +extern const TQName TQN_SASL_MECHANISMS; +extern const TQName TQN_SASL_MECHANISM; +extern const TQName TQN_SASL_AUTH; +extern const TQName TQN_SASL_CHALLENGE; +extern const TQName TQN_SASL_RESPONSE; +extern const TQName TQN_SASL_ABORT; +extern const TQName TQN_SASL_SUCCESS; +extern const TQName TQN_SASL_FAILURE; +extern const TQName TQN_SASL_ABORTED; +extern const TQName TQN_SASL_INCORRECT_ENCODING; +extern const TQName TQN_SASL_INVALID_AUTHZID; +extern const TQName TQN_SASL_INVALID_MECHANISM; +extern const TQName TQN_SASL_MECHANISM_TOO_WEAK; +extern const TQName TQN_SASL_NOT_AUTHORIZED; +extern const TQName TQN_SASL_TEMPORARY_AUTH_FAILURE; + +extern const TQName TQN_DIALBACK_RESULT; +extern const TQName TQN_DIALBACK_VERIFY; + +extern const TQName TQN_STANZA_BAD_REQUEST; +extern const TQName TQN_STANZA_CONFLICT; +extern const TQName TQN_STANZA_FEATURE_NOT_IMPLEMENTED; +extern const TQName TQN_STANZA_FORBIDDEN; +extern const TQName TQN_STANZA_GONE; +extern const TQName TQN_STANZA_INTERNAL_SERVER_ERROR; +extern const TQName TQN_STANZA_ITEM_NOT_FOUND; +extern const TQName TQN_STANZA_JID_MALFORMED; +extern const TQName TQN_STANZA_NOT_ACCEPTABLE; +extern const TQName TQN_STANZA_NOT_ALLOWED; +extern const TQName TQN_STANZA_PAYMENT_RETQUIRED; +extern const TQName TQN_STANZA_RECIPIENT_UNAVAILABLE; +extern const TQName TQN_STANZA_REDIRECT; +extern const TQName TQN_STANZA_REGISTRATION_RETQUIRED; +extern const TQName TQN_STANZA_REMOTE_SERVER_NOT_FOUND; +extern const TQName TQN_STANZA_REMOTE_SERVER_TIMEOUT; +extern const TQName TQN_STANZA_RESOURCE_CONSTRAINT; +extern const TQName TQN_STANZA_SERVICE_UNAVAILABLE; +extern const TQName TQN_STANZA_SUBSCRIPTION_RETQUIRED; +extern const TQName TQN_STANZA_UNDEFINED_CONDITION; +extern const TQName TQN_STANZA_UNEXPECTED_REQUEST; +extern const TQName TQN_STANZA_TEXT; + +extern const TQName TQN_BIND_BIND; +extern const TQName TQN_BIND_RESOURCE; +extern const TQName TQN_BIND_JID; + +extern const TQName TQN_MESSAGE; +extern const TQName TQN_BODY; +extern const TQName TQN_SUBJECT; +extern const TQName TQN_THREAD; +extern const TQName TQN_PRESENCE; +extern const TQName TQN_SHOW; +extern const TQName TQN_STATUS; +extern const TQName TQN_LANG; +extern const TQName TQN_PRIORITY; +extern const TQName TQN_IQ; +extern const TQName TQN_ERROR; + +extern const TQName TQN_SERVER_MESSAGE; +extern const TQName TQN_SERVER_BODY; +extern const TQName TQN_SERVER_SUBJECT; +extern const TQName TQN_SERVER_THREAD; +extern const TQName TQN_SERVER_PRESENCE; +extern const TQName TQN_SERVER_SHOW; +extern const TQName TQN_SERVER_STATUS; +extern const TQName TQN_SERVER_LANG; +extern const TQName TQN_SERVER_PRIORITY; +extern const TQName TQN_SERVER_IQ; +extern const TQName TQN_SERVER_ERROR; + +extern const TQName TQN_SESSION_SESSION; + +extern const TQName TQN_PRIVACY_TQUERY; +extern const TQName TQN_PRIVACY_ACTIVE; +extern const TQName TQN_PRIVACY_DEFAULT; +extern const TQName TQN_PRIVACY_LIST; +extern const TQName TQN_PRIVACY_ITEM; +extern const TQName TQN_PRIVACY_IQ; +extern const TQName TQN_PRIVACY_MESSAGE; +extern const TQName TQN_PRIVACY_PRESENCE_IN; +extern const TQName TQN_PRIVACY_PRESENCE_OUT; + +extern const TQName TQN_ROSTER_TQUERY; +extern const TQName TQN_ROSTER_ITEM; +extern const TQName TQN_ROSTER_GROUP; + +extern const TQName TQN_VCARD_TQUERY; +extern const TQName TQN_VCARD_FN; + +extern const TQName TQN_XML_LANG; + +extern const TQName TQN_ENCODING; +extern const TQName TQN_VERSION; +extern const TQName TQN_TO; +extern const TQName TQN_FROM; +extern const TQName TQN_TYPE; +extern const TQName TQN_ID; +extern const TQName TQN_CODE; +extern const TQName TQN_NAME; +extern const TQName TQN_VALUE; +extern const TQName TQN_ACTION; +extern const TQName TQN_ORDER; +extern const TQName TQN_MECHANISM; +extern const TQName TQN_ASK; +extern const TQName TQN_JID; +extern const TQName TQN_SUBSCRIPTION; + + +extern const TQName TQN_XMLNS_CLIENT; +extern const TQName TQN_XMLNS_SERVER; +extern const TQName TQN_XMLNS_STREAM; // Presence extern const std::string STR_SHOW_AWAY; @@ -269,31 +269,31 @@ extern const std::string STR_UNSUBSCRIBED; // JEP 0030 -extern const QName QN_NODE; -extern const QName QN_CATEGORY; -extern const QName QN_VAR; +extern const TQName TQN_NODE; +extern const TQName TQN_CATEGORY; +extern const TQName TQN_VAR; extern const std::string NS_DISCO_INFO; extern const std::string NS_DISCO_ITEMS; -extern const QName QN_DISCO_INFO_QUERY; -extern const QName QN_DISCO_IDENTITY; -extern const QName QN_DISCO_FEATURE; +extern const TQName TQN_DISCO_INFO_TQUERY; +extern const TQName TQN_DISCO_IDENTITY; +extern const TQName TQN_DISCO_FEATURE; -extern const QName QN_DISCO_ITEMS_QUERY; -extern const QName QN_DISCO_ITEM; +extern const TQName TQN_DISCO_ITEMS_TQUERY; +extern const TQName TQN_DISCO_ITEM; // JEP 0115 extern const std::string NS_CAPS; -extern const QName QN_CAPS_C; -extern const QName QN_VER; -extern const QName QN_EXT; +extern const TQName TQN_CAPS_C; +extern const TQName TQN_VER; +extern const TQName TQN_EXT; // JEP 0091 Delayed Delivery extern const std::string kNSDelay; -extern const QName kQnDelayX; -extern const QName kQnStamp; +extern const TQName kQnDelayX; +extern const TQName kQnStamp; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc index b742e03a..48a89504 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc @@ -56,13 +56,13 @@ Jid::Jid(const std::string & jid_string) { } // First find the slash and slice of that part - size_t slash = jid_string.find('/'); + size_t slash = jid_string.tqfind('/'); std::string resource_name = (slash == std::string::npos ? STR_EMPTY : jid_string.substr(slash + 1)); // Now look for the node std::string node_name; - size_t at = jid_string.find('@'); + size_t at = jid_string.tqfind('@'); size_t domain_begin; if (at < slash && at != std::string::npos) { node_name = jid_string.substr(0, at); @@ -80,13 +80,13 @@ Jid::Jid(const std::string & jid_string) { // avoid allocating these constants repeatedly std::string domain_name; - if (domain_length == 9 && jid_string.find("gmail.com", domain_begin) == domain_begin) { + if (domain_length == 9 && jid_string.tqfind("gmail.com", domain_begin) == domain_begin) { domain_name = STR_GMAIL_COM; } - else if (domain_length == 14 && jid_string.find("googlemail.com", domain_begin) == domain_begin) { + else if (domain_length == 14 && jid_string.tqfind("googlemail.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLEMAIL_COM; } - else if (domain_length == 10 && jid_string.find("google.com", domain_begin) == domain_begin) { + else if (domain_length == 10 && jid_string.tqfind("google.com", domain_begin) == domain_begin) { domain_name = STR_GOOGLE_COM; } else { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h index 659820f5..488dc56e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/plainsaslhandler.h @@ -49,7 +49,7 @@ public: return ""; } - std::vector::const_iterator it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN"); + std::vector::const_iterator it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN"); if (it == mechanisms.end()) { return ""; } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h index a6630d90..dbd56a24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslcookiemechanism.h @@ -44,8 +44,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, mechanism_); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, mechanism_); std::string credential; credential.append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc index 092df104..4a6d7c24 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc @@ -34,12 +34,12 @@ namespace buzz { XmlElement * SaslMechanism::StartSaslAuth() { - return new XmlElement(QN_SASL_AUTH, true); + return new XmlElement(TQN_SASL_AUTH, true); } XmlElement * SaslMechanism::HandleSaslChallenge(const XmlElement * challenge) { - return new XmlElement(QN_SASL_ABORT, true); + return new XmlElement(TQN_SASL_ABORT, true); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h index 7e0b0562..2d8c1b76 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h @@ -43,8 +43,8 @@ public: virtual XmlElement * StartSaslAuth() { // send initial request - XmlElement * el = new XmlElement(QN_SASL_AUTH, true); - el->AddAttr(QN_MECHANISM, "PLAIN"); + XmlElement * el = new XmlElement(TQN_SASL_AUTH, true); + el->AddAttr(TQN_MECHANISM, "PLAIN"); FormatXmppPassword credential; credential.Append("\0", 1); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc index 959b6f88..f5b9d0b4 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(); }; -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus XmppClient::Disconnect() { if (d_->socket_.get() == NULL) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppClient::Disconnect() { return XMPP_RETURN_OK; } -XmppClient::XmppClient(Task * parent) : Task(parent), +XmppClient::XmppClient(Task * tqparent) : Task(tqparent), delivering_signal_(false) { d_.reset(new Private(this)); } @@ -263,17 +263,17 @@ XmppClient::NextId() { return d_->engine_->NextId(); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanza(const XmlElement * stanza) { return d_->engine_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppClient::SendStanzaError(const XmlElement * old_stanza, XmppStanzaError xse, const std::string & message) { return d_->engine_->SendStanzaError(old_stanza, xse, message); } -XmppReturnStatus +XmppReturntqStatus 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 f8b4798c..540d774d 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.h @@ -51,9 +51,9 @@ class CaptchaChallenge; // ///////////////////////////////////////////////////////////////////// // -// See Task first. XmppClient is a parent task for XmppTasks. +// See Task first. XmppClient is a tqparent task for XmppTasks. // -// XmppClient is a task which is designed to be the parent task for +// XmppClient is a task which is designed to be the tqparent task for // all tasks that depend on a single Xmpp connection. If you want to, // for example, listen for subscription requests forever, then your // listener should be a task that is a child of the XmppClient that owns @@ -71,17 +71,17 @@ class CaptchaChallenge; class XmppClient : public Task, public sigslot::has_slots<> { public: - XmppClient(Task * parent); + XmppClient(Task * tqparent); ~XmppClient(); - XmppReturnStatus Connect(const XmppClientSettings & settings, + XmppReturntqStatus Connect(const XmppClientSettings & settings, AsyncSocket * socket, PreXmppAuth * preauth); virtual Task * GetParent(int code); virtual int ProcessStart(); virtual int ProcessResponse(); - XmppReturnStatus Disconnect(); + XmppReturntqStatus Disconnect(); const Jid & jid(); sigslot::signal1 SignalStateChange; @@ -97,9 +97,9 @@ public: std::string GetAuthCookie(); std::string NextId(); - XmppReturnStatus SendStanza(const XmlElement *stanza); - XmppReturnStatus SendRaw(const std::string & text); - XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + XmppReturntqStatus SendStanza(const XmlElement *stanza); + XmppReturntqStatus SendRaw(const std::string & text); + XmppReturntqStatus 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 ef8f2ea8..58576328 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h @@ -30,7 +30,7 @@ // also part of the API #include "talk/xmpp/jid.h" -#include "talk/xmllite/qname.h" +#include "talk/xmllite/tqname.h" #include "talk/xmllite/xmlelement.h" @@ -53,22 +53,22 @@ enum XmppStanzaError { XSE_JID_MALFORMED, XSE_NOT_ACCEPTABLE, XSE_NOT_ALLOWED, - XSE_PAYMENT_REQUIRED, + XSE_PAYMENT_RETQUIRED, XSE_RECIPIENT_UNAVAILABLE, XSE_REDIRECT, - XSE_REGISTRATION_REQUIRED, + XSE_REGISTRATION_RETQUIRED, XSE_SERVER_NOT_FOUND, XSE_SERVER_TIMEOUT, XSE_RESOURCE_CONSTRAINT, XSE_SERVICE_UNAVAILABLE, - XSE_SUBSCRIPTION_REQUIRED, + XSE_SUBSCRIPTION_RETQUIRED, XSE_UNDEFINED_CONDITION, XSE_UNEXPECTED_REQUEST, }; -// XmppReturnStatus +// XmppReturntqStatus // This is used by API functions to synchronously return status. -enum XmppReturnStatus { +enum XmppReturntqStatus { 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 XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh) = 0; //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len) = 0; + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len) = 0; //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed() = 0; + virtual XmppReturntqStatus ConnectionClosed() = 0; // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid)= 0; + virtual XmppReturntqStatus 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 XmppReturnStatus SetSaslHandler(SaslHandler * h) = 0; + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * h) = 0; //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls) = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain) = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus SetRequestedResource(const std::string& resource) = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler) = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus Connect() = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus Disconnect() = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, HandlerLevel level = HL_PEEK) = 0; //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler) = 0; //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza) = 0; + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza) = 0; //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text) = 0; + virtual XmppReturntqStatus 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 XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus 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 XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus 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 XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus 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 173d711b..c9569524 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(); } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::ConnectionClosed() { if (state_ != STATE_CLOSED) { EnterExit ee(this); @@ -128,7 +128,7 @@ XmppEngineImpl::ConnectionClosed() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUseTls(bool useTls) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -138,7 +138,7 @@ XmppEngineImpl::SetUseTls(bool useTls) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus 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_; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetUser(const Jid & jid) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -168,7 +168,7 @@ XmppEngineImpl::GetUser() { return user_jid_; } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SetRequestedResource(const std::string & resource) { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -192,7 +192,7 @@ XmppEngineImpl::GetRequestedResource() { return requested_resource_; } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { bool found = false; @@ -227,7 +227,7 @@ XmppEngineImpl::RemoveStanzaHandler(XmppStanzaHandler * stanza_handler) { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Connect() { if (state_ != STATE_START) return XMPP_RETURN_BADSTATE; @@ -245,7 +245,7 @@ XmppEngineImpl::Connect() { return XMPP_RETURN_OK; } -XmppReturnStatus +XmppReturntqStatus 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; } -XmppReturnStatus +XmppReturntqStatus 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(); } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::Disconnect() { if (state_ != STATE_CLOSED) { @@ -317,7 +317,7 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { if (HasError() || raised_reset_) return; - if (stanza->Name() == QN_STREAM_ERROR) { + if (stanza->Name() == TQN_STREAM_ERROR) { // Explicit XMPP stream error SignalStreamError(stanza); } else if (login_task_.get()) { @@ -344,8 +344,8 @@ XmppEngineImpl::IncomingStanza(const XmlElement * stanza) { // If nobody wants to handle a stanza then send back an error. // Only do this for IQ stanzas as messages should probably just be dropped // and presence stanzas should certainly be dropped. - std::string type = stanza->Attr(QN_TYPE); - if (stanza->Name() == QN_IQ && + std::string type = stanza->Attr(TQN_TYPE); + if (stanza->Name() == TQN_IQ && !(type == "error" || type == "result")) { SendStanzaError(stanza, XSE_FEATURE_NOT_IMPLEMENTED, STR_EMPTY); } @@ -377,7 +377,7 @@ XmppEngineImpl::InternalSendStanza(const XmlElement * element) { // It should really never be necessary to set a FROM attribute on a stanza. // It is implied by the bind on the stream and if you get it wrong // (by flipping from/to on a message?) the server will close the stream. - ASSERT(!element->HasAttr(QN_FROM)); + ASSERT(!element->HasAttr(TQN_FROM)); // TODO: consider caching the XmlPrinter XmlPrinter::PrintXml(output_.get(), element, diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.h index c36f168c..6011d9e8 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 XmppReturnStatus SetOutputHandler(XmppOutputHandler *pxoh); + virtual XmppReturntqStatus SetOutputHandler(XmppOutputHandler *pxoh); //! Provides socket input to the engine - virtual XmppReturnStatus HandleInput(const char * bytes, size_t len); + virtual XmppReturntqStatus HandleInput(const char * bytes, size_t len); //! Advises the engine that the socket has closed - virtual XmppReturnStatus ConnectionClosed(); + virtual XmppReturntqStatus ConnectionClosed(); // SESSION SETUP --------------------------------------------------------- //! Indicates the (bare) JID for the user to use. - virtual XmppReturnStatus SetUser(const Jid & jid); + virtual XmppReturntqStatus SetUser(const Jid & jid); //! Get the login (bare) JID. virtual const Jid & GetUser(); //! Indicates the autentication to use. Takes ownership of the object. - virtual XmppReturnStatus SetSaslHandler(SaslHandler * sasl_handler); + virtual XmppReturntqStatus SetSaslHandler(SaslHandler * sasl_handler); //! Sets whether TLS will be used within the connection (default true). - virtual XmppReturnStatus SetUseTls(bool useTls); + virtual XmppReturntqStatus 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 XmppReturnStatus SetTlsServerDomain(const std::string & proxy_domain); + virtual XmppReturntqStatus 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 XmppReturnStatus SetRequestedResource(const std::string& resource); + virtual XmppReturntqStatus 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 XmppReturnStatus SetSessionHandler(XmppSessionHandler* handler); + virtual XmppReturntqStatus SetSessionHandler(XmppSessionHandler* handler); //! Initiates the XMPP connection. //! After supplying connection settings, call this once to initiate, //! (optionally) encrypt, authenticate, and bind the connection. - virtual XmppReturnStatus Connect(); + virtual XmppReturntqStatus 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 XmppReturnStatus Disconnect(); + virtual XmppReturntqStatus 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 XmppReturnStatus AddStanzaHandler(XmppStanzaHandler* handler, + virtual XmppReturntqStatus AddStanzaHandler(XmppStanzaHandler* handler, XmppEngine::HandlerLevel level); //! Removes a listener for session events. - virtual XmppReturnStatus RemoveStanzaHandler(XmppStanzaHandler* handler); + virtual XmppReturntqStatus RemoveStanzaHandler(XmppStanzaHandler* handler); //! Sends a stanza to the server. - virtual XmppReturnStatus SendStanza(const XmlElement * pelStanza); + virtual XmppReturntqStatus SendStanza(const XmlElement * pelStanza); //! Sends raw text to the server - virtual XmppReturnStatus SendRaw(const std::string & text); + virtual XmppReturntqStatus 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 XmppReturnStatus SendIq(const XmlElement* pelStanza, + virtual XmppReturntqStatus 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 XmppReturnStatus RemoveIqHandler(XmppIqCookie cookie, + virtual XmppReturntqStatus 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 XmppReturnStatus SendStanzaError(const XmlElement * pelOriginal, + virtual XmppReturntqStatus 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 eb623ed9..50ca23c1 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc @@ -54,26 +54,26 @@ private: }; -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, XmppIqCookie* cookie) { if (state_ == STATE_CLOSED) return XMPP_RETURN_BADSTATE; if (NULL == iq_handler) return XMPP_RETURN_BADARGUMENT; - if (!element || element->Name() != QN_IQ) + if (!element || element->Name() != TQN_IQ) return XMPP_RETURN_BADARGUMENT; - const std::string& type = element->Attr(QN_TYPE); + const std::string& type = element->Attr(TQN_TYPE); if (type != "get" && type != "set") return XMPP_RETURN_BADARGUMENT; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return XMPP_RETURN_BADARGUMENT; - const std::string& id = element->Attr(QN_ID); + const std::string& id = element->Attr(TQN_ID); XmppIqEntry * iq_entry = new XmppIqEntry(id, - element->Attr(QN_TO), + element->Attr(TQN_TO), this, iq_handler); iq_entries_->push_back(iq_entry); SendStanza(element); @@ -85,13 +85,13 @@ XmppEngineImpl::SendIq(const XmlElement * element, XmppIqHandler * iq_handler, } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::RemoveIqHandler(XmppIqCookie cookie, XmppIqHandler ** iq_handler) { std::vector >::iterator pos; - pos = std::find(iq_entries_->begin(), + pos = std::tqfind(iq_entries_->begin(), iq_entries_->end(), reinterpret_cast(cookie)); @@ -118,11 +118,11 @@ XmppEngineImpl::DeleteIqCookies() { } static void -AecImpl(XmlElement * error_element, const QName & name, +AecImpl(XmlElement * error_element, const TQName & name, const char * type, const char * code) { - error_element->AddElement(new XmlElement(QN_ERROR)); - error_element->AddAttr(QN_CODE, code, 1); - error_element->AddAttr(QN_TYPE, type, 1); + error_element->AddElement(new XmlElement(TQN_ERROR)); + error_element->AddAttr(TQN_CODE, code, 1); + error_element->AddAttr(TQN_TYPE, type, 1); error_element->AddElement(new XmlElement(name, true), 1); } @@ -131,75 +131,75 @@ static void AddErrorCode(XmlElement * error_element, XmppStanzaError code) { switch (code) { case XSE_BAD_REQUEST: - AecImpl(error_element, QN_STANZA_BAD_REQUEST, "modify", "400"); + AecImpl(error_element, TQN_STANZA_BAD_REQUEST, "modify", "400"); break; case XSE_CONFLICT: - AecImpl(error_element, QN_STANZA_CONFLICT, "cancel", "409"); + AecImpl(error_element, TQN_STANZA_CONFLICT, "cancel", "409"); break; case XSE_FEATURE_NOT_IMPLEMENTED: - AecImpl(error_element, QN_STANZA_FEATURE_NOT_IMPLEMENTED, + AecImpl(error_element, TQN_STANZA_FEATURE_NOT_IMPLEMENTED, "cancel", "501"); break; case XSE_FORBIDDEN: - AecImpl(error_element, QN_STANZA_FORBIDDEN, "auth", "403"); + AecImpl(error_element, TQN_STANZA_FORBIDDEN, "auth", "403"); break; case XSE_GONE: - AecImpl(error_element, QN_STANZA_GONE, "modify", "302"); + AecImpl(error_element, TQN_STANZA_GONE, "modify", "302"); break; case XSE_INTERNAL_SERVER_ERROR: - AecImpl(error_element, QN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); + AecImpl(error_element, TQN_STANZA_INTERNAL_SERVER_ERROR, "wait", "500"); break; case XSE_ITEM_NOT_FOUND: - AecImpl(error_element, QN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); + AecImpl(error_element, TQN_STANZA_ITEM_NOT_FOUND, "cancel", "404"); break; case XSE_JID_MALFORMED: - AecImpl(error_element, QN_STANZA_JID_MALFORMED, "modify", "400"); + AecImpl(error_element, TQN_STANZA_JID_MALFORMED, "modify", "400"); break; case XSE_NOT_ACCEPTABLE: - AecImpl(error_element, QN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); + AecImpl(error_element, TQN_STANZA_NOT_ACCEPTABLE, "cancel", "406"); break; case XSE_NOT_ALLOWED: - AecImpl(error_element, QN_STANZA_NOT_ALLOWED, "cancel", "405"); + AecImpl(error_element, TQN_STANZA_NOT_ALLOWED, "cancel", "405"); break; - case XSE_PAYMENT_REQUIRED: - AecImpl(error_element, QN_STANZA_PAYMENT_REQUIRED, "auth", "402"); + case XSE_PAYMENT_RETQUIRED: + AecImpl(error_element, TQN_STANZA_PAYMENT_RETQUIRED, "auth", "402"); break; case XSE_RECIPIENT_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); + AecImpl(error_element, TQN_STANZA_RECIPIENT_UNAVAILABLE, "wait", "404"); break; case XSE_REDIRECT: - AecImpl(error_element, QN_STANZA_REDIRECT, "modify", "302"); + AecImpl(error_element, TQN_STANZA_REDIRECT, "modify", "302"); break; - case XSE_REGISTRATION_REQUIRED: - AecImpl(error_element, QN_STANZA_REGISTRATION_REQUIRED, "auth", "407"); + case XSE_REGISTRATION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_REGISTRATION_RETQUIRED, "auth", "407"); break; case XSE_SERVER_NOT_FOUND: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_NOT_FOUND, + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_NOT_FOUND, "cancel", "404"); break; case XSE_SERVER_TIMEOUT: - AecImpl(error_element, QN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); + AecImpl(error_element, TQN_STANZA_REMOTE_SERVER_TIMEOUT, "wait", "502"); break; case XSE_RESOURCE_CONSTRAINT: - AecImpl(error_element, QN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); + AecImpl(error_element, TQN_STANZA_RESOURCE_CONSTRAINT, "wait", "500"); break; case XSE_SERVICE_UNAVAILABLE: - AecImpl(error_element, QN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); + AecImpl(error_element, TQN_STANZA_SERVICE_UNAVAILABLE, "cancel", "503"); break; - case XSE_SUBSCRIPTION_REQUIRED: - AecImpl(error_element, QN_STANZA_SUBSCRIPTION_REQUIRED, "auth", "407"); + case XSE_SUBSCRIPTION_RETQUIRED: + AecImpl(error_element, TQN_STANZA_SUBSCRIPTION_RETQUIRED, "auth", "407"); break; case XSE_UNDEFINED_CONDITION: - AecImpl(error_element, QN_STANZA_UNDEFINED_CONDITION, "wait", "500"); + AecImpl(error_element, TQN_STANZA_UNDEFINED_CONDITION, "wait", "500"); break; case XSE_UNEXPECTED_REQUEST: - AecImpl(error_element, QN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); + AecImpl(error_element, TQN_STANZA_UNEXPECTED_REQUEST, "wait", "400"); break; } } -XmppReturnStatus +XmppReturntqStatus XmppEngineImpl::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -208,22 +208,22 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, return XMPP_RETURN_BADSTATE; XmlElement error_element(element_original->Name()); - error_element.AddAttr(QN_TYPE, "error"); + error_element.AddAttr(TQN_TYPE, "error"); // copy attrs, copy 'from' to 'to' and strip 'from' for (const XmlAttr * attribute = element_original->FirstAttr(); attribute; attribute = attribute->NextAttr()) { - QName name = attribute->Name(); - if (name == QN_TO) + TQName name = attribute->Name(); + if (name == TQN_TO) continue; // no need to put a from attr. Server will stamp stanza - else if (name == QN_FROM) - name = QN_TO; - else if (name == QN_TYPE) + else if (name == TQN_FROM) + name = TQN_TO; + else if (name == TQN_TYPE) continue; error_element.AddAttr(name, attribute->Value()); } - // copy children + // copy tqchildren for (const XmlChild * child = element_original->FirstChild(); child; child = child->NextChild()) { @@ -237,7 +237,7 @@ XmppEngineImpl::SendStanzaError(const XmlElement * element_original, // add error information AddErrorCode(&error_element, code); if (text != STR_EMPTY) { - XmlElement * text_element = new XmlElement(QN_STANZA_TEXT, true); + XmlElement * text_element = new XmlElement(TQN_STANZA_TEXT, true); text_element->AddText(text); error_element.AddElement(text_element); } @@ -252,15 +252,15 @@ bool XmppEngineImpl::HandleIqResponse(const XmlElement * element) { if (iq_entries_->empty()) return false; - if (element->Name() != QN_IQ) + if (element->Name() != TQN_IQ) return false; - std::string type = element->Attr(QN_TYPE); + std::string type = element->Attr(TQN_TYPE); if (type != "result" && type != "error") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - std::string id = element->Attr(QN_ID); - std::string from = element->Attr(QN_FROM); + std::string id = element->Attr(TQN_ID); + std::string from = element->Attr(TQN_FROM); for (std::vector::iterator it = iq_entries_->begin(); it != iq_entries_->end(); it += 1) { diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc index 470c2dc2..9b3fe9bc 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc @@ -127,11 +127,11 @@ XmppLoginTask::Advance() { } case LOGINSTATE_TLS_INIT: { - const XmlElement * pelTls = GetFeature(QN_TLS_STARTTLS); + const XmlElement * pelTls = GetFeature(TQN_TLS_STARTTLS); if (!pelTls) return Failure(XmppEngine::ERROR_TLS); - XmlElement el(QN_TLS_STARTTLS, true); + XmlElement el(TQN_TLS_STARTTLS, true); pctx_->InternalSendStanza(&el); state_ = LOGINSTATE_TLS_REQUESTED; continue; @@ -140,7 +140,7 @@ XmppLoginTask::Advance() { case LOGINSTATE_TLS_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_TLS_PROCEED) + if (element->Name() != TQN_TLS_PROCEED) return Failure(XmppEngine::ERROR_TLS); // The proper domain to verify against is the real underlying @@ -155,7 +155,7 @@ XmppLoginTask::Advance() { } case LOGINSTATE_AUTH_INIT: { - const XmlElement * pelSaslAuth = GetFeature(QN_SASL_MECHANISMS); + const XmlElement * pelSaslAuth = GetFeature(TQN_SASL_MECHANISMS); if (!pelSaslAuth) { return Failure(XmppEngine::ERROR_AUTH); } @@ -163,9 +163,9 @@ XmppLoginTask::Advance() { // Collect together the SASL auth mechanisms presented by the server std::vector mechanisms; for (const XmlElement * pelMech = - pelSaslAuth->FirstNamed(QN_SASL_MECHANISM); + pelSaslAuth->FirstNamed(TQN_SASL_MECHANISM); pelMech; - pelMech = pelMech->NextNamed(QN_SASL_MECHANISM)) { + pelMech = pelMech->NextNamed(TQN_SASL_MECHANISM)) { mechanisms.push_back(pelMech->BodyText()); } @@ -199,7 +199,7 @@ XmppLoginTask::Advance() { return true; if (element->Name().Namespace() != NS_SASL) return Failure(XmppEngine::ERROR_AUTH); - if (element->Name() == QN_SASL_CHALLENGE) { + if (element->Name() == TQN_SASL_CHALLENGE) { XmlElement * response = sasl_mech_->HandleSaslChallenge(element); if (response == NULL) { return Failure(XmppEngine::ERROR_AUTH); @@ -209,7 +209,7 @@ XmppLoginTask::Advance() { state_ = LOGINSTATE_SASL_RUNNING; continue; } - if (element->Name() != QN_SASL_SUCCESS) { + if (element->Name() != TQN_SASL_SUCCESS) { return Failure(XmppEngine::ERROR_UNAUTHORIZED); } @@ -220,20 +220,20 @@ XmppLoginTask::Advance() { } case LOGINSTATE_BIND_INIT: { - const XmlElement * pelBindFeature = GetFeature(QN_BIND_BIND); - const XmlElement * pelSessionFeature = GetFeature(QN_SESSION_SESSION); + const XmlElement * pelBindFeature = GetFeature(TQN_BIND_BIND); + const XmlElement * pelSessionFeature = GetFeature(TQN_SESSION_SESSION); if (!pelBindFeature || !pelSessionFeature) return Failure(XmppEngine::ERROR_BIND); - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_BIND_BIND, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_BIND_BIND, true)); if (pctx_->requested_resource_ != STR_EMPTY) { - iq.AddElement(new XmlElement(QN_BIND_RESOURCE), 1); + iq.AddElement(new XmlElement(TQN_BIND_RESOURCE), 1); iq.AddText(pctx_->requested_resource_, 2); } pctx_->InternalSendStanza(&iq); @@ -245,15 +245,15 @@ XmppLoginTask::Advance() { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return true; - if (element->Attr(QN_TYPE) != "result" || element->FirstElement() == NULL || - element->FirstElement()->Name() != QN_BIND_BIND) + if (element->Attr(TQN_TYPE) != "result" || element->FirstElement() == NULL || + element->FirstElement()->Name() != TQN_BIND_BIND) return Failure(XmppEngine::ERROR_BIND); - fullJid_ = Jid(element->FirstElement()->TextNamed(QN_BIND_JID)); + fullJid_ = Jid(element->FirstElement()->TextNamed(TQN_BIND_JID)); if (!fullJid_.IsFull()) { return Failure(XmppEngine::ERROR_BIND); } @@ -264,12 +264,12 @@ XmppLoginTask::Advance() { } // now request session - XmlElement iq(QN_IQ); - iq.AddAttr(QN_TYPE, "set"); + XmlElement iq(TQN_IQ); + iq.AddAttr(TQN_TYPE, "set"); iqId_ = pctx_->NextId(); - iq.AddAttr(QN_ID, iqId_); - iq.AddElement(new XmlElement(QN_SESSION_SESSION, true)); + iq.AddAttr(TQN_ID, iqId_); + iq.AddElement(new XmlElement(TQN_SESSION_SESSION, true)); pctx_->InternalSendStanza(&iq); state_ = LOGINSTATE_SESSION_REQUESTED; @@ -279,11 +279,11 @@ XmppLoginTask::Advance() { case LOGINSTATE_SESSION_REQUESTED: { if (NULL == (element = NextStanza())) return true; - if (element->Name() != QN_IQ || element->Attr(QN_ID) != iqId_ || - element->Attr(QN_TYPE) == "get" || element->Attr(QN_TYPE) == "set") + if (element->Name() != TQN_IQ || element->Attr(TQN_ID) != iqId_ || + element->Attr(TQN_TYPE) == "get" || element->Attr(TQN_TYPE) == "set") return false; - if (element->Attr(QN_TYPE) != "result") + if (element->Attr(TQN_TYPE) != "result") return Failure(XmppEngine::ERROR_BIND); pctx_->SignalBound(fullJid_); @@ -301,26 +301,26 @@ XmppLoginTask::Advance() { bool XmppLoginTask::HandleStartStream(const XmlElement *element) { - if (element->Name() != QN_STREAM_STREAM) + if (element->Name() != TQN_STREAM_STREAM) return false; - if (element->Attr(QN_XMLNS) != "jabber:client") + if (element->Attr(TQN_XMLNS) != "jabber:client") return false; - if (element->Attr(QN_VERSION) != "1.0") + if (element->Attr(TQN_VERSION) != "1.0") return false; - if (!element->HasAttr(QN_ID)) + if (!element->HasAttr(TQN_ID)) return false; - streamId_ = element->Attr(QN_ID); + streamId_ = element->Attr(TQN_ID); return true; } bool XmppLoginTask::HandleFeatures(const XmlElement *element) { - if (element->Name() != QN_STREAM_FEATURES) + if (element->Name() != TQN_STREAM_FEATURES) return false; pelFeatures_.reset(new XmlElement(*element)); @@ -328,7 +328,7 @@ XmppLoginTask::HandleFeatures(const XmlElement *element) { } const XmlElement * -XmppLoginTask::GetFeature(const QName & name) { +XmppLoginTask::GetFeature(const TQName & name) { return pelFeatures_->FirstNamed(name); } diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h index 7f321a30..18c70312 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.h @@ -71,7 +71,7 @@ private: bool Advance(); bool HandleStartStream(const XmlElement * element); bool HandleFeatures(const XmlElement * element); - const XmlElement * GetFeature(const QName & name); + const XmlElement * GetFeature(const TQName & name); bool Failure(XmppEngine::Error reason); void FlushQueuedStanzas(); diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc index 82207f3b..38ed1994 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc @@ -32,9 +32,9 @@ namespace buzz { -XmppTask::XmppTask(Task * parent, XmppEngine::HandlerLevel level) - : Task(parent), client_(NULL) { - XmppClient * client = (XmppClient*)parent->GetParent(XMPP_CLIENT_TASK_CODE); +XmppTask::XmppTask(Task * tqparent, XmppEngine::HandlerLevel level) + : Task(tqparent), client_(NULL) { + XmppClient * client = (XmppClient*)tqparent->GetParent(XMPP_CLIENT_TASK_CODE); client_ = client; id_ = client->NextId(); client->AddXmppTask(this, level); @@ -55,14 +55,14 @@ XmppTask::StopImpl() { } } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanza(const XmlElement * stanza) { if (client_ == NULL) return XMPP_RETURN_BADSTATE; return client_->SendStanza(stanza); } -XmppReturnStatus +XmppReturntqStatus XmppTask::SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text) { @@ -102,37 +102,37 @@ XmppTask::NextStanza() { XmlElement * XmppTask::MakeIq(const std::string & type, const buzz::Jid & to, const std::string id) { - XmlElement * result = new XmlElement(QN_IQ); + XmlElement * result = new XmlElement(TQN_IQ); if (!type.empty()) - result->AddAttr(QN_TYPE, type); + result->AddAttr(TQN_TYPE, type); if (to != JID_EMPTY) - result->AddAttr(QN_TO, to.Str()); + result->AddAttr(TQN_TO, to.Str()); if (!id.empty()) - result->AddAttr(QN_ID, id); + result->AddAttr(TQN_ID, id); return result; } XmlElement * XmppTask::MakeIqResult(const XmlElement * query) { - XmlElement * result = new XmlElement(QN_IQ); - result->AddAttr(QN_TYPE, STR_RESULT); - if (query->HasAttr(QN_FROM)) { - result->AddAttr(QN_TO, query->Attr(QN_FROM)); + XmlElement * result = new XmlElement(TQN_IQ); + result->AddAttr(TQN_TYPE, STR_RESULT); + if (query->HasAttr(TQN_FROM)) { + result->AddAttr(TQN_TO, query->Attr(TQN_FROM)); } - result->AddAttr(QN_ID, query->Attr(QN_ID)); + result->AddAttr(TQN_ID, query->Attr(TQN_ID)); return result; } bool XmppTask::MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & id) { - if (stanza->Name() != QN_IQ) + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_ID) != id) + if (stanza->Attr(TQN_ID) != id) return false; - Jid from(stanza->Attr(QN_FROM)); + Jid from(stanza->Attr(TQN_FROM)); if (from != to) { Jid me = client_->jid(); // we address the server as "", but it is legal for the server @@ -152,11 +152,11 @@ XmppTask::MatchResponseIq(const XmlElement * stanza, bool XmppTask::MatchRequestIq(const XmlElement * stanza, - const std::string & type, const QName & qn) { - if (stanza->Name() != QN_IQ) + const std::string & type, const TQName & qn) { + if (stanza->Name() != TQN_IQ) return false; - if (stanza->Attr(QN_TYPE) != type) + if (stanza->Attr(TQN_TYPE) != type) return false; if (stanza->FirstNamed(qn) == NULL) diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h index 3b56a1c9..d84019a2 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.h @@ -45,7 +45,7 @@ namespace buzz { // See Task and XmppClient first. // // XmppTask is a task that is designed to go underneath XmppClient and be -// useful there. It has a way of finding its XmppClient parent so you +// useful there. It has a way of finding its XmppClient tqparent so you // can have it nested arbitrarily deep under an XmppClient and it can // still find the XMPP services. // @@ -69,7 +69,7 @@ class XmppTask : public sigslot::has_slots<> { public: - XmppTask(Task * parent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); + XmppTask(Task * tqparent, XmppEngine::HandlerLevel level = XmppEngine::HL_NONE); virtual ~XmppTask(); virtual XmppClient * GetClient() const { return client_; } @@ -78,9 +78,9 @@ public: protected: friend class XmppClient; - XmppReturnStatus SendStanza(const XmlElement * stanza); - XmppReturnStatus SetResult(const std::string & code); - XmppReturnStatus SendStanzaError(const XmlElement * element_original, + XmppReturntqStatus SendStanza(const XmlElement * stanza); + XmppReturntqStatus SetResult(const std::string & code); + XmppReturntqStatus SendStanzaError(const XmlElement * element_original, XmppStanzaError code, const std::string & text); @@ -93,7 +93,7 @@ protected: const XmlElement * NextStanza(); bool MatchResponseIq(const XmlElement * stanza, const Jid & to, const std::string & task_id); - bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const QName & qn); + bool MatchRequestIq(const XmlElement * stanza, const std::string & type, const TQName & qn); XmlElement *MakeIqResult(const XmlElement * query); XmlElement *MakeIq(const std::string & type, const Jid & to, const std::string task_id); diff --git a/kopete/protocols/jabber/jingle/voicecaller.h b/kopete/protocols/jabber/jingle/voicecaller.h index 0f0d18bb..6907f09d 100644 --- a/kopete/protocols/jabber/jingle/voicecaller.h +++ b/kopete/protocols/jabber/jingle/voicecaller.h @@ -14,9 +14,10 @@ using namespace XMPP; /** * \brief An abstract class for a voice call implementation. */ -class VoiceCaller : public QObject +class VoiceCaller : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/kioslave/jabberdisco.cpp index 4ceeca09..ae95eadb 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/kioslave/jabberdisco.cpp @@ -57,7 +57,7 @@ void JabberDiscoProtocol::setHost ( const TQString &host, int port, const TQStri m_host = host; m_port = !port ? 5222 : port; - m_user = TQString(user).replace ( "%", "@" ); + m_user = TQString(user).tqreplace ( "%", "@" ); m_password = pass; } @@ -340,7 +340,7 @@ void JabberDiscoProtocol::slotCSError ( int errorCode ) bool breakEventLoop = false; -class EventLoopThread : public QThread +class EventLoopThread : public TQThread { public: void run (); @@ -351,7 +351,7 @@ void EventLoopThread::run () while ( true ) { - qApp->processEvents (); + tqApp->processEvents (); msleep ( 100 ); if ( breakEventLoop ) diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h index ef6e75fa..19a12d8a 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ b/kopete/protocols/jabber/kioslave/jabberdisco.h @@ -37,6 +37,7 @@ class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase { Q_OBJECT + TQ_OBJECT public: JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); diff --git a/kopete/protocols/jabber/libiris/001_last_activity.patch b/kopete/protocols/jabber/libiris/001_last_activity.patch index 24673e80..4e91b8ef 100644 --- a/kopete/protocols/jabber/libiris/001_last_activity.patch +++ b/kopete/protocols/jabber/libiris/001_last_activity.patch @@ -51,8 +51,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + QString message; +}; + -+JT_GetLastActivity::JT_GetLastActivity(Task *parent) -+:Task(parent) ++JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) ++:Task(tqparent) +{ + d = new Private; +} @@ -110,4 +110,4 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- - JT_GetServices::JT_GetServices(Task *parent) + JT_GetServices::JT_GetServices(Task *tqparent) diff --git a/kopete/protocols/jabber/libiris/004_xhtml_im.patch b/kopete/protocols/jabber/libiris/004_xhtml_im.patch index 990ab4f7..feba04bb 100644 --- a/kopete/protocols/jabber/libiris/004_xhtml_im.patch +++ b/kopete/protocols/jabber/libiris/004_xhtml_im.patch @@ -127,17 +127,17 @@ Index: iris/xmpp-im/types.cpp } - + if ( !d->xHTMLBody.isEmpty()) { -+ QDomElement parent = s.createElement(s.xhtmlImNS(), "html"); ++ QDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); + for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { + const QString &str = it.data(); + if(!str.isEmpty()) { + QDomElement child = s.createXHTMLElement(str); + if(!it.key().isEmpty()) + child.setAttributeNS(NS_XML, "xml:lang", it.key()); -+ parent.appendChild(child); ++ tqparent.appendChild(child); + } + } -+ s.appendChild(parent); ++ s.appendChild(tqparent); + } if(d->type == "error") s.setError(d->error); 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 058825db..844d5e3f 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 groupChatSetStatus(const QString &host, const QString &room, const Status &); - void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const Status &); + void groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &); + void groupChatChangeNick(const QString &host, const QString &room, const QString &nick, const tqStatus &); 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").arg(jid.full())); ++ debug(QString("Client: Joined: [%1]\n").tqarg(jid.full())); + GroupChat i; + i.j = jid; + i.status = GroupChat::Connecting; + d->groupChatList += i; + + JT_MucPresence *j = new JT_MucPresence(rootTask()); -+ j->pres(jid, Status(), password); ++ j->pres(jid, tqStatus(), password); + j->go(true); + + return true; +} + - void Client::groupChatSetStatus(const QString &host, const QString &room, const Status &_s) + void Client::groupChatSettqStatus(const QString &host, const QString &room, const tqStatus &_s) { Jid jid(room + "@" + host); Index: iris/xmpp-im/xmpp_tasks.h @@ -63,11 +63,11 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_MucPresence(Task *parent); ++ JT_MucPresence(Task *tqparent); + ~JT_MucPresence(); + -+ void pres(const Status &); -+ void pres(const Jid &, const Status &, const QString &password); ++ void pres(const tqStatus &); ++ void pres(const Jid &, const tqStatus &, const QString &password); + + void onGo(); + @@ -92,8 +92,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +//---------------------------------------------------------------------------- +// JT_MucPresence +//---------------------------------------------------------------------------- -+JT_MucPresence::JT_MucPresence(Task *parent) -+:Task(parent) ++JT_MucPresence::JT_MucPresence(Task *tqparent) ++:Task(tqparent) +{ + type = -1; +} @@ -102,7 +102,7 @@ Index: iris/xmpp-im/xmpp_tasks.cpp +{ +} + -+void JT_MucPresence::pres(const Status &s) ++void JT_MucPresence::pres(const tqStatus &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").arg(s.priority()) ) ); ++ tag.appendChild( textTag(doc(), "priority", QString("%1").tqarg(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 Status &s, const QString &password) ++void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const QString &password) +{ + pres(s); + tag.setAttribute("to", to.full()); diff --git a/kopete/protocols/jabber/libiris/006_private_storage.patch b/kopete/protocols/jabber/libiris/006_private_storage.patch index 288d24c5..35031fec 100644 --- a/kopete/protocols/jabber/libiris/006_private_storage.patch +++ b/kopete/protocols/jabber/libiris/006_private_storage.patch @@ -11,7 +11,7 @@ Index: iris/xmpp-im/xmpp_tasks.h + { + Q_OBJECT + public: -+ JT_PrivateStorage(Task *parent); ++ JT_PrivateStorage(Task *tqparent); + ~JT_PrivateStorage(); + + void set(const QDomElement &); @@ -53,8 +53,8 @@ Index: iris/xmpp-im/xmpp_tasks.cpp + int type; +}; + -+JT_PrivateStorage::JT_PrivateStorage(Task *parent) -+ :Task(parent) ++JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) ++ :Task(tqparent) +{ + d = new Private; +} diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index a60c8040..3d54cc16 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -58,8 +58,8 @@ public: SafeDelete sd; }; -BSocket::BSocket(TQObject *parent) -:ByteStream(parent) +BSocket::BSocket(TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; #ifndef NO_NDNS @@ -88,7 +88,7 @@ void BSocket::reset(bool clear) appendRead(block); } - d->sd.deleteLater(d->qsock); + d->sd.deleteLater(TQT_TQOBJECT(d->qsock)); d->qsock = 0; } else { @@ -109,9 +109,7 @@ void BSocket::ensureSocket() { if(!d->qsock) { d->qsock = new TQSocket; -#if QT_VERSION >= 0x030200 d->qsock->setReadBufferSize(READBUFSIZE); -#endif connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound())); connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected())); connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed())); @@ -122,7 +120,7 @@ void BSocket::ensureSocket() } } -void BSocket::connectToHost(const TQString &host, Q_UINT16 port) +void BSocket::connectToHost(const TQString &host, TQ_UINT16 port) { reset(true); d->host = host; @@ -248,7 +246,7 @@ TQHostAddress BSocket::address() const return TQHostAddress(); } -Q_UINT16 BSocket::port() const +TQ_UINT16 BSocket::port() const { if(d->qsock) return d->qsock->port(); @@ -264,7 +262,7 @@ TQHostAddress BSocket::peerAddress() const return TQHostAddress(); } -Q_UINT16 BSocket::peerPort() const +TQ_UINT16 BSocket::peerPort() const { if(d->qsock) return d->qsock->port(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 7887b9c0..246f61a0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -30,13 +30,14 @@ class BSocket : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; enum State { Idle, HostLookup, Connecting, Connected, Closing }; - BSocket(TQObject *parent=0); + BSocket(TQObject *tqparent=0); ~BSocket(); - void connectToHost(const TQString &host, Q_UINT16 port); + void connectToHost(const TQString &host, TQ_UINT16 port); void connectToServer(const TQString &srv, const TQString &type); int socket() const; void setSocket(int); @@ -52,11 +53,11 @@ public: // local TQHostAddress address() const; - Q_UINT16 port() const; + TQ_UINT16 port() const; // remote TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void hostFound(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index 6abeb556..2064e4ab 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -58,13 +58,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.find(' '); + int n = line.tqfind(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.find(' ', n); + int n2 = line.tqfind(' ', n); if(n2 == -1) return false; if(code) @@ -96,8 +96,8 @@ public: bool active; }; -HttpConnect::HttpConnect(TQObject *parent) -:ByteStream(parent) +HttpConnect::HttpConnect(TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 2acef809..2f2ed13f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -28,9 +28,10 @@ class HttpConnect : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpConnect(TQObject *parent=0); + HttpConnect(TQObject *tqparent=0); ~HttpConnect(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index f20c054f..2e6d0779 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -82,8 +82,8 @@ public: int polltime; }; -HttpPoll::HttpPoll(TQObject *parent) -:ByteStream(parent) +HttpPoll::HttpPoll(TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; @@ -229,14 +229,14 @@ void HttpPoll::http_result() // get id and packet TQString id; TQString cookie = d->http.getHeader("Set-Cookie"); - int n = cookie.find("ID="); + int n = cookie.tqfind("ID="); if(n == -1) { reset(); error(ErrRead); return; } n += 3; - int n2 = cookie.find(';', n); + int n2 = cookie.tqfind(';', n); if(n2 != -1) id = cookie.mid(n, n2-n); else @@ -358,7 +358,7 @@ void HttpPoll::resetKey() fprintf(stderr, "HttpPoll: reset key!\n"); #endif TQByteArray a = randomArray(64); - TQString str = TQString::fromLatin1(a.data(), a.size()); + TQString str = TQString::tqfromLatin1(a.data(), a.size()); d->key_n = POLL_KEYS; for(int n = 0; n < POLL_KEYS; ++n) @@ -406,13 +406,13 @@ static TQString extractLine(TQByteArray *buf, bool *found) static bool extractMainHeader(const TQString &line, TQString *proto, int *code, TQString *msg) { - int n = line.find(' '); + int n = line.tqfind(' '); if(n == -1) return false; if(proto) *proto = line.mid(0, n); ++n; - int n2 = line.find(' ', n); + int n2 = line.tqfind(' ', n); if(n2 == -1) return false; if(code) @@ -438,8 +438,8 @@ public: TQString host; }; -HttpProxyPost::HttpProxyPost(TQObject *parent) -:TQObject(parent) +HttpProxyPost::HttpProxyPost(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); @@ -508,7 +508,7 @@ TQString HttpProxyPost::getHeader(const TQString &var) const { for(TQStringList::ConstIterator it = d->headerLines.begin(); it != d->headerLines.end(); ++it) { const TQString &s = *it; - int n = s.find(": "); + int n = s.tqfind(": "); if(n == -1) continue; TQString v = s.mid(0, n); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index c38b7a8a..02034fee 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -28,9 +28,10 @@ class HttpPoll : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpPoll(TQObject *parent=0); + HttpPoll(TQObject *tqparent=0); ~HttpPoll(); void setAuth(const TQString &user, const TQString &pass=""); @@ -67,12 +68,13 @@ private: const TQString & getKey(bool *); }; -class HttpProxyPost : public QObject +class HttpProxyPost : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; - HttpProxyPost(TQObject *parent=0); + HttpProxyPost(TQObject *tqparent=0); ~HttpProxyPost(); void setAuth(const TQString &user, const TQString &pass=""); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index a060b23a..39fbfdda 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -21,7 +21,7 @@ //! \class NDns ndns.h //! \brief Simple DNS resolution using native system calls //! -//! This class is to be used when Qt's TQDns is not good enough. Because QDns +//! This class is to be used when TQt's TQDns is not good enough. Because TQDns //! does not use threads, it cannot make a system call asyncronously. Thus, //! TQDns tries to imitate the behavior of each platform's native behavior, and //! generally falls short. @@ -69,7 +69,7 @@ // CS_NAMESPACE_BEGIN //! \if _hide_doc_ -class NDnsWorkerEvent : public QCustomEvent +class NDnsWorkerEvent : public TQCustomEvent { public: enum Type { WorkerEvent = TQEvent::User + 100 }; @@ -78,7 +78,7 @@ public: NDnsWorker *worker; }; -class NDnsWorker : public QThread +class NDnsWorker : public TQThread { public: NDnsWorker(TQObject *, const TQCString &); @@ -116,7 +116,7 @@ public: class NDnsManager::Private { public: - Item *find(const NDns *n) + Item *tqfind(const NDns *n) { TQPtrListIterator it(list); for(Item *i; (i = it.current()); ++it) { @@ -126,7 +126,7 @@ public: return 0; } - Item *find(const NDnsWorker *w) + Item *tqfind(const NDnsWorker *w) { TQPtrListIterator it(list); for(Item *i; (i = it.current()); ++it) { @@ -157,7 +157,7 @@ NDnsManager::NDnsManager() d = new Private; d->list.setAutoDelete(true); - connect(qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); + connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); } NDnsManager::~NDnsManager() @@ -184,7 +184,7 @@ void NDnsManager::resolve(NDns *self, const TQString &name) void NDnsManager::stop(NDns *self) { - Item *i = d->find(self); + Item *i = d->tqfind(self); if(!i) return; // disassociate @@ -200,7 +200,7 @@ void NDnsManager::stop(NDns *self) bool NDnsManager::isBusy(const NDns *self) const { - Item *i = d->find(self); + Item *i = d->tqfind(self); return (i ? true: false); } @@ -210,7 +210,7 @@ bool NDnsManager::event(TQEvent *e) NDnsWorkerEvent *we = static_cast(e); we->worker->wait(); // ensure that the thread is terminated - Item *i = d->find(we->worker); + Item *i = d->tqfind(we->worker); if(!i) { // should NOT happen return true; @@ -242,7 +242,7 @@ void NDnsManager::tryDestroy() void NDnsManager::app_aboutToQuit() { while(man) { - TQEventLoop *e = qApp->eventLoop(); + TQEventLoop *e = tqApp->eventLoop(); e->processEvents(TQEventLoop::WaitForMore); } } @@ -256,9 +256,9 @@ void NDnsManager::app_aboutToQuit() //! This signal is emitted when the DNS resolution succeeds or fails. //! -//! Constructs an NDns object with parent \a parent. -NDns::NDns(TQObject *parent) -:TQObject(parent) +//! Constructs an NDns object with tqparent \a tqparent. +NDns::NDns(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index 48243e30..b48ff75e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -32,11 +32,12 @@ class NDnsWorker; class NDnsManager; -class NDns : public QObject +class NDns : public TQObject { Q_OBJECT + TQ_OBJECT public: - NDns(TQObject *parent=0); + NDns(TQObject *tqparent=0); ~NDns(); void resolve(const TQString &); @@ -56,9 +57,10 @@ private: void finished(const TQHostAddress &); }; -class NDnsManager : public QObject +class NDnsManager : public TQObject { Q_OBJECT + TQ_OBJECT public: ~NDnsManager(); class Item; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 5b88b4e5..2968968c 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -1,5 +1,5 @@ /* - * servsock.cpp - simple wrapper to QServerSocket + * servsock.cpp - simple wrapper to TQServerSocket * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -33,8 +33,8 @@ public: ServSockSignal *serv; }; -ServSock::ServSock(TQObject *parent) -:TQObject(parent) +ServSock::ServSock(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->serv = 0; @@ -51,7 +51,7 @@ bool ServSock::isActive() const return (d->serv ? true: false); } -bool ServSock::listen(Q_UINT16 port) +bool ServSock::listen(TQ_UINT16 port) { stop(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index 4628d8ea..0fddf2e0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -1,5 +1,5 @@ /* - * servsock.h - simple wrapper to QServerSocket + * servsock.h - simple wrapper to TQServerSocket * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -25,15 +25,16 @@ // CS_NAMESPACE_BEGIN -class ServSock : public QObject +class ServSock : public TQObject { Q_OBJECT + TQ_OBJECT public: - ServSock(TQObject *parent=0); + ServSock(TQObject *tqparent=0); ~ServSock(); bool isActive() const; - bool listen(Q_UINT16 port); + bool listen(TQ_UINT16 port); void stop(); int port() const; TQHostAddress address() const; @@ -49,9 +50,10 @@ private: Private *d; }; -class ServSockSignal : public QServerSocket +class ServSockSignal : public TQServerSocket { Q_OBJECT + TQ_OBJECT public: ServSockSignal(int port); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index 59504170..7948dcd7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -49,7 +49,7 @@ //---------------------------------------------------------------------------- // SocksUDP //---------------------------------------------------------------------------- -static TQByteArray sp_create_udp(const TQString &host, Q_UINT16 port, const TQByteArray &buf) +static TQByteArray sp_create_udp(const TQString &host, TQ_UINT16 port, const TQByteArray &buf) { // detect for IP addresses //TQHostAddress addr; @@ -89,7 +89,7 @@ static TQByteArray sp_create_udp(const TQString &host, Q_UINT16 port, const TQBy struct SPS_UDP { TQString host; - Q_UINT16 port; + TQ_UINT16 port; TQByteArray data; }; @@ -107,7 +107,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) full_len += 4; if((int)from->size() < full_len) return 0; - Q_UINT32 ip4; + TQ_UINT32 ip4; memcpy(&ip4, from->data() + 4, 4); addr.setAddress(ntohl(ip4)); host = addr.toString(); @@ -122,13 +122,13 @@ 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::fromLatin1(cs); + host = TQString::tqfromLatin1(cs); } else if(atype == 0x04) { full_len += 16; if((int)from->size() < full_len) return 0; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; memcpy(a6, from->data() + 4, 16); addr.setAddress(a6); host = addr.toString(); @@ -138,7 +138,7 @@ static int sp_read_udp(TQByteArray *from, SPS_UDP *s) if((int)from->size() < full_len) return 0; - Q_UINT16 p; + TQ_UINT16 p; memcpy(&p, from->data() + full_len - 2, 2); s->host = host; @@ -208,9 +208,9 @@ void SocksUDP::sn_activated(int) //---------------------------------------------------------------------------- // SocksClient //---------------------------------------------------------------------------- -#define REQ_CONNECT 0x01 -#define REQ_BIND 0x02 -#define REQ_UDPASSOCIATE 0x03 +#define RETQ_CONNECT 0x01 +#define RETQ_BIND 0x02 +#define RETQ_UDPASSOCIATE 0x03 #define RET_SUCCESS 0x00 #define RET_UNREACHABLE 0x04 @@ -366,17 +366,17 @@ static TQByteArray sp_set_request(const TQHostAddress &addr, unsigned short port a[at++] = 0x00; // reserved if(addr.isIp4Addr()) { a[at++] = 0x01; // address type = ipv4 - Q_UINT32 ip4 = htonl(addr.ip4Addr()); + TQ_UINT32 ip4 = htonl(addr.ip4Addr()); a.resize(at+4); memcpy(a.data() + at, &ip4, 4); at += 4; } else { a[at++] = 0x04; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; TQStringList s6 = TQStringList::split(':', addr.toString(), true); int at = 0; - Q_UINT16 c; + TQ_UINT16 c; bool ok; for(TQStringList::ConstIterator it = s6.begin(); it != s6.end(); ++it) { c = (*it).toInt(&ok, 16); @@ -396,7 +396,7 @@ static TQByteArray sp_set_request(const TQHostAddress &addr, unsigned short port return a; } -static TQByteArray sp_set_request(const TQString &host, Q_UINT16 port, unsigned char cmd1) +static TQByteArray sp_set_request(const TQString &host, TQ_UINT16 port, unsigned char cmd1) { // detect for IP addresses TQHostAddress addr; @@ -436,7 +436,7 @@ struct SPS_CONNREQ int address_type; TQString host; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) @@ -453,7 +453,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) full_len += 4; if((int)from->size() < full_len) return 0; - Q_UINT32 ip4; + TQ_UINT32 ip4; memcpy(&ip4, from->data() + 4, 4); addr.setAddress(ntohl(ip4)); } @@ -467,13 +467,13 @@ 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::fromLatin1(cs); + host = TQString::tqfromLatin1(cs); } else if(atype == 0x04) { full_len += 16; if((int)from->size() < full_len) return 0; - Q_UINT8 a6[16]; + TQ_UINT8 a6[16]; memcpy(a6, from->data() + 4, 16); addr.setAddress(a6); } @@ -484,7 +484,7 @@ static int sp_get_request(TQByteArray *from, SPS_CONNREQ *s) TQByteArray a = ByteStream::takeArray(from, full_len); - Q_UINT16 p; + TQ_UINT16 p; memcpy(&p, a.data() + full_len - 2, 2); s->version = a[0]; @@ -527,16 +527,16 @@ public: int udpPort; }; -SocksClient::SocksClient(TQObject *parent) -:ByteStream(parent) +SocksClient::SocksClient(TQObject *tqparent) +:ByteStream(tqparent) { init(); d->incoming = false; } -SocksClient::SocksClient(int s, TQObject *parent) -:ByteStream(parent) +SocksClient::SocksClient(int s, TQObject *tqparent) +:ByteStream(tqparent) { init(); @@ -838,7 +838,7 @@ void SocksClient::do_request() fprintf(stderr, "SocksClient: Requesting ...\n"); #endif d->step = StepRequest; - int cmd = d->udp ? REQ_UDPASSOCIATE : REQ_CONNECT; + int cmd = d->udp ? RETQ_UDPASSOCIATE : RETQ_CONNECT; TQByteArray buf; if(!d->real_host.isEmpty()) buf = sp_set_request(d->real_host, d->real_port, cmd); @@ -956,7 +956,7 @@ void SocksClient::continueIncoming() } else if(r == 1) { d->waiting = true; - if(s.cmd == REQ_CONNECT) { + if(s.cmd == RETQ_CONNECT) { if(!s.host.isEmpty()) d->rhost = s.host; else @@ -964,7 +964,7 @@ void SocksClient::continueIncoming() d->rport = s.port; incomingConnectRequest(d->rhost, d->rport); } - else if(s.cmd == REQ_UDPASSOCIATE) { + else if(s.cmd == RETQ_UDPASSOCIATE) { incomingUDPAssociateRequest(); } else { @@ -1068,7 +1068,7 @@ TQHostAddress SocksClient::peerAddress() const return d->sock.peerAddress(); } -Q_UINT16 SocksClient::peerPort() const +TQ_UINT16 SocksClient::peerPort() const { return d->sock.peerPort(); } @@ -1078,7 +1078,7 @@ TQString SocksClient::udpAddress() const return d->udpAddr; } -Q_UINT16 SocksClient::udpPort() const +TQ_UINT16 SocksClient::udpPort() const { return d->udpPort; } @@ -1102,8 +1102,8 @@ public: TQSocketNotifier *sn; }; -SocksServer::SocksServer(TQObject *parent) -:TQObject(parent) +SocksServer::SocksServer(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->sd = 0; @@ -1124,7 +1124,7 @@ bool SocksServer::isActive() const return d->serv.isActive(); } -bool SocksServer::listen(Q_UINT16 port, bool udp) +bool SocksServer::listen(TQ_UINT16 port, bool udp) { stop(); if(!d->serv.listen(port)) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index 00ed09b4..d61fef1a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -29,9 +29,10 @@ class TQHostAddress; class SocksClient; class SocksServer; -class SocksUDP : public QObject +class SocksUDP : public TQObject { Q_OBJECT + TQ_OBJECT public: ~SocksUDP(); @@ -55,12 +56,13 @@ private: class SocksClient : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; enum Method { AuthNone=0x0001, AuthUsername=0x0002 }; enum Request { ReqConnect, ReqUDPAssociate }; - SocksClient(TQObject *parent=0); - SocksClient(int, TQObject *parent=0); + SocksClient(TQObject *tqparent=0); + SocksClient(int, TQObject *tqparent=0); ~SocksClient(); bool isIncoming() const; @@ -86,11 +88,11 @@ public: // remote address TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; // udp TQString udpAddress() const; - Q_UINT16 udpPort() const; + TQ_UINT16 udpPort() const; SocksUDP *createUDP(const TQString &host, int port, const TQHostAddress &routeAddr, int routePort); signals: @@ -125,15 +127,16 @@ private: void writeData(const TQByteArray &a); }; -class SocksServer : public QObject +class SocksServer : public TQObject { Q_OBJECT + TQ_OBJECT public: - SocksServer(TQObject *parent=0); + SocksServer(TQObject *tqparent=0); ~SocksServer(); bool isActive() const; - bool listen(Q_UINT16 port, bool udp=false); + bool listen(TQ_UINT16 port, bool udp=false); void stop(); int port() const; TQHostAddress address() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index fd1c4992..0bd0ca45 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -67,7 +67,7 @@ public: bool failed; TQHostAddress resultAddress; - Q_UINT16 resultPort; + TQ_UINT16 resultPort; bool srvonly; TQString srv; @@ -78,8 +78,8 @@ public: SafeDelete sd; }; -SrvResolver::SrvResolver(TQObject *parent) -:TQObject(parent) +SrvResolver::SrvResolver(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->qdns = 0; @@ -180,7 +180,7 @@ TQHostAddress SrvResolver::resultAddress() const return d->resultAddress; } -Q_UINT16 SrvResolver::resultPort() const +TQ_UINT16 SrvResolver::resultPort() const { return d->resultPort; } @@ -205,7 +205,7 @@ void SrvResolver::qdns_done() if(!d->qdns) return; - // apparently we sometimes get this signal even though the results aren't ready + // aptqparently we sometimes get this signal even though the results aren't ready if(d->qdns->isWorking()) return; d->t.stop(); @@ -266,7 +266,7 @@ void SrvResolver::ndns_done() if(!d->qdns) return; - // apparently we sometimes get this signal even though the results aren't ready + // aptqparently we sometimes get this signal even though the results aren't ready if(d->qdns->isWorking()) return; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 400639c1..5533790e 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -26,11 +26,12 @@ // CS_NAMESPACE_BEGIN -class SrvResolver : public QObject +class SrvResolver : public TQObject { Q_OBJECT + TQ_OBJECT public: - SrvResolver(TQObject *parent=0); + SrvResolver(TQObject *tqparent=0); ~SrvResolver(); void resolve(const TQString &server, const TQString &type, const TQString &proto); @@ -43,7 +44,7 @@ public: bool failed() const; TQHostAddress resultAddress() const; - Q_UINT16 resultPort() const; + TQ_UINT16 resultPort() const; signals: void resultsReady(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp index 06df3f73..c9726d75 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp @@ -44,7 +44,7 @@ TQByteArray Base64::encode(const TQByteArray &s) { int i; int len = s.size(); - char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + char tbl[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; int a, b, c; TQByteArray p((len+2)/3*4); @@ -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::fromLatin1(c); + return TQString::tqfromLatin1(c); } //! diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp index e78c2f9a..76d4a799 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index f10b46a1..5706fff6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp index 8f918dde..814b6e9d 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp @@ -23,7 +23,7 @@ #include #include #include"bytestream.h" -#include"qrandom.h" +#include"tqrandom.h" static bool lib_encryptArray(const EVP_CIPHER *type, const TQByteArray &buf, const TQByteArray &key, const TQByteArray &iv, bool pad, TQByteArray *out) { @@ -130,7 +130,7 @@ Cipher::Key Cipher::generateKey(Type t) if(!type) return k; TQByteArray out; - if(!lib_generateKeyIV(type, QRandom::randomArray(128), QRandom::randomArray(2), &out, 0)) + if(!lib_generateKeyIV(type, TQRandom::randomArray(128), TQRandom::randomArray(2), &out, 0)) return k; k.setType(t); k.setData(out); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h index f04c7e0f..b877c1f2 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h @@ -1,5 +1,5 @@ -#ifndef CS_QRANDOM_H -#define CS_QRANDOM_H +#ifndef CS_TQRANDOM_H +#define CS_TQRANDOM_H #include diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 12ed189b..8ba6272d 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -43,13 +43,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h index add5af6b..01c47a32 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h @@ -38,9 +38,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp index a3195d89..f7b3c3a9 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp @@ -44,7 +44,7 @@ SHA1::SHA1() qSysInfo(&wordSize, &bigEndian); } -unsigned long SHA1::blk0(Q_UINT32 i) +unsigned long SHA1::blk0(TQ_UINT32 i) { if(bigEndian) return block->l[i]; @@ -53,9 +53,9 @@ unsigned long SHA1::blk0(Q_UINT32 i) } // Hash a single 512-bit block. This is the core of the algorithm. -void SHA1::transform(Q_UINT32 state[5], unsigned char buffer[64]) +void SHA1::transform(TQ_UINT32 state[5], unsigned char buffer[64]) { - Q_UINT32 a, b, c, d, e; + TQ_UINT32 a, b, c, d, e; block = (CHAR64LONG16*)buffer; @@ -112,9 +112,9 @@ void SHA1::init(SHA1_CONTEXT* context) } // Run your data through this -void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) +void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len) { - Q_UINT32 i, j; + TQ_UINT32 i, j; j = (context->count[0] >> 3) & 63; if((context->count[0] += len << 3) < (len << 3)) @@ -137,7 +137,7 @@ void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) // Add padding and return the message digest void SHA1::final(unsigned char digest[20], SHA1_CONTEXT* context) { - Q_UINT32 i, j; + TQ_UINT32 i, j; unsigned char finalcount[8]; for (i = 0; i < 8; i++) { diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h index 7f1a3f9e..093037d3 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h @@ -37,22 +37,22 @@ private: struct SHA1_CONTEXT { - Q_UINT32 state[5]; - Q_UINT32 count[2]; + TQ_UINT32 state[5]; + TQ_UINT32 count[2]; unsigned char buffer[64]; }; typedef union { unsigned char c[64]; - Q_UINT32 l[16]; + TQ_UINT32 l[16]; } CHAR64LONG16; - void transform(Q_UINT32 state[5], unsigned char buffer[64]); + void transform(TQ_UINT32 state[5], unsigned char buffer[64]); void init(SHA1_CONTEXT* context); - void update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len); + void update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len); void final(unsigned char digest[20], SHA1_CONTEXT* context); - unsigned long blk0(Q_UINT32 i); + unsigned long blk0(TQ_UINT32 i); bool bigEndian; CHAR64LONG16* block; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 0c8b46df..2b9407ce 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -27,8 +27,8 @@ #include -ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name) -:TQDialog(parent, name, FALSE, WDestructiveClose) +ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *tqparent, const char *name) +:TQDialog(tqparent, name, FALSE, WDestructiveClose) { TQString text; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index 3d92dd74..408699f7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -23,11 +23,12 @@ #include -class ShowTextDlg : public QDialog +class ShowTextDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0); + ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *tqparent=0, const char *name=0); }; #endif diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index f4905057..12b9ad55 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 Status + class tqStatus { public: - Status(const TQString &show="", const TQString &status="", int priority=0, bool available=true); - ~Status(); + tqStatus(const TQString &show="", const TQString &status="", int priority=0, bool available=true); + ~tqStatus(); int priority() const; const TQString & show() const; @@ -162,7 +162,7 @@ namespace XMPP void setPriority(int); void setShow(const TQString &); - void setStatus(const TQString &); + void settqStatus(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 Status &s=Status()); + Resource(const TQString &name="", const tqStatus &s=tqStatus()); ~Resource(); const TQString & name() const; int priority() const; - const Status & status() const; + const tqStatus & status() const; void setName(const TQString &); - void setStatus(const Status &); + void settqStatus(const tqStatus &); private: TQString v_name; - Status v_status; + tqStatus v_status; class ResourcePrivate *d; }; @@ -220,10 +220,10 @@ namespace XMPP ResourceList(); ~ResourceList(); - ResourceList::Iterator find(const TQString &); + ResourceList::Iterator tqfind(const TQString &); ResourceList::Iterator priority(); - ResourceList::ConstIterator find(const TQString &) const; + ResourceList::ConstIterator tqfind(const TQString &) const; ResourceList::ConstIterator priority() const; private: @@ -273,8 +273,8 @@ namespace XMPP Roster(); ~Roster(); - Roster::Iterator find(const Jid &); - Roster::ConstIterator find(const Jid &) const; + Roster::Iterator tqfind(const Jid &); + Roster::ConstIterator tqfind(const Jid &) const; private: class RosterPrivate *d; @@ -492,16 +492,17 @@ namespace XMPP class JidLinkManager; class FileTransferManager; - class Task : public QObject + class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task(Client *, bool isRoot); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Client *client() const; TQDomDocument *doc() const; TQString id() const; @@ -539,12 +540,13 @@ namespace XMPP TaskPrivate *d; }; - class Client : public QObject + class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); bool isActive() const; @@ -568,7 +570,7 @@ namespace XMPP void rosterRequest(); void sendMessage(const Message &); void sendSubscription(const Jid &, const TQString &); - void setPresence(const Status &); + void setPresence(const tqStatus &); void debug(const TQString &); TQString genUniqueId(); @@ -608,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 groupChatSetStatus(const TQString &host, const TQString &room, const Status &); - void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &); + void groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &); + void groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &); void groupChatLeave(const TQString &host, const TQString &room); signals: @@ -630,7 +632,7 @@ namespace XMPP void xmlOutgoing(const TQString &); void groupChatJoined(const Jid &); void groupChatLeft(const Jid &); - void groupChatPresence(const Jid &, const Status &); + void groupChatPresence(const Jid &, const tqStatus &); void groupChatError(const Jid &, int, const TQString &); void incomingJidLink(); @@ -639,7 +641,7 @@ namespace XMPP //void streamConnected(); //void streamHandshaken(); //void streamError(const StreamError &); - //void streamSSLCertificateReady(const QSSLCert &); + //void streamSSLCertificateReady(const TQSSLCert &); //void streamCloseFinished(); void streamError(int); void streamReadyRead(); @@ -650,7 +652,7 @@ namespace XMPP // basic daemons void ppSubscription(const Jid &, const TQString &); - void ppPresence(const Jid &, const Status &); + void ppPresence(const Jid &, const tqStatus &); void pmMessage(const Message &); void prRoster(const Roster &); @@ -664,8 +666,8 @@ namespace XMPP void distribute(const TQDomElement &); void importRoster(const Roster &); void importRosterItem(const RosterItem &); - void updateSelfPresence(const Jid &, const Status &); - void updatePresence(LiveRosterItem *, const Jid &, const Status &); + void updateSelfPresence(const Jid &, const tqStatus &); + void updatePresence(LiveRosterItem *, const Jid &, const tqStatus &); class ClientPrivate; ClientPrivate *d; @@ -687,15 +689,15 @@ namespace XMPP ResourceList::ConstIterator priority() const; bool isAvailable() const; - const Status & lastUnavailableStatus() const; + const tqStatus & lastUnavailabletqStatus() const; bool flagForDelete() const; - void setLastUnavailableStatus(const Status &); + void setLastUnavailabletqStatus(const tqStatus &); void setFlagForDelete(bool); private: ResourceList v_resourceList; - Status v_lastUnavailableStatus; + tqStatus v_lastUnavailabletqStatus; bool v_flagForDelete; class LiveRosterItemPrivate; @@ -709,8 +711,8 @@ namespace XMPP ~LiveRoster(); void flagAllForDelete(); - LiveRoster::Iterator find(const Jid &, bool compareRes=true); - LiveRoster::ConstIterator find(const Jid &, bool compareRes=true) const; + LiveRoster::Iterator tqfind(const Jid &, bool compareRes=true); + LiveRoster::ConstIterator tqfind(const Jid &, bool compareRes=true) const; private: class LiveRosterPrivate; diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h index 12d87d18..a59a4827 100644 --- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h +++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h @@ -60,11 +60,12 @@ namespace XMPP void setDebug(Debug *); - class Connector : public QObject + class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -74,7 +75,7 @@ namespace XMPP bool useSSL() const; bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -83,21 +84,22 @@ namespace XMPP protected: void setUseSSL(bool b); void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool ssl; bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; class AdvancedConnector : public Connector { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream }; - AdvancedConnector(TQObject *parent=0); + AdvancedConnector(TQObject *tqparent=0); virtual ~AdvancedConnector(); class Proxy @@ -109,28 +111,28 @@ namespace XMPP int type() const; TQString host() const; - Q_UINT16 port() const; + TQ_UINT16 port() const; TQString url() const; TQString user() const; TQString pass() const; int pollInterval() const; - void setHttpConnect(const TQString &host, Q_UINT16 port); - void setHttpPoll(const TQString &host, Q_UINT16 port, const TQString &url); - void setSocks(const TQString &host, Q_UINT16 port); + void setHttpConnect(const TQString &host, TQ_UINT16 port); + void setHttpPoll(const TQString &host, TQ_UINT16 port, const TQString &url); + void setSocks(const TQString &host, TQ_UINT16 port); void setUserPass(const TQString &user, const TQString &pass); void setPollInterval(int secs); private: int t; TQString v_host, v_url; - Q_UINT16 v_port; + TQ_UINT16 v_port; TQString v_user, v_pass; int v_poll; }; void setProxy(const Proxy &proxy); - void setOptHostPort(const TQString &host, Q_UINT16 port); + void setOptHostPort(const TQString &host, TQ_UINT16 port); void setOptProbe(bool); void setOptSSL(bool); @@ -166,11 +168,12 @@ namespace XMPP void tryNextSrv(); }; - class TLSHandler : public QObject + class TLSHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - TLSHandler(TQObject *parent=0); + TLSHandler(TQObject *tqparent=0); virtual ~TLSHandler(); virtual void reset()=0; @@ -189,8 +192,9 @@ namespace XMPP class QCATLSHandler : public TLSHandler { Q_OBJECT + TQ_OBJECT public: - QCATLSHandler(QCA::TLS *parent); + QCATLSHandler(QCA::TLS *tqparent); ~QCATLSHandler(); QCA::TLS *tls() const; @@ -353,9 +357,10 @@ namespace XMPP Private *d; }; - class Stream : public QObject + class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond { @@ -370,7 +375,7 @@ namespace XMPP SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual TQDomDocument & doc() const=0; @@ -404,6 +409,7 @@ namespace XMPP class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -450,8 +456,8 @@ namespace XMPP BindConflict // resource in-use }; - ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *parent=0); - ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *parent=0); // server + ClientStream(Connector *conn, TLSHandler *tlsHandler=0, TQObject *tqparent=0); + ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls=0, TQObject *tqparent=0); // server ~ClientStream(); Jid jid() const; @@ -479,7 +485,7 @@ namespace XMPP void setSSFRange(int low, int high); void setOldOnly(bool); void setSASLMechanism(const TQString &s); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); // reimplemented TQDomDocument & doc() const; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp index b76a2837..8532fd4a 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/all_mocs.cpp @@ -1,5 +1,5 @@ /* - * all_mocs.cpp - #include all .moc files in this directory + * all_tqmocs.cpp - #include all .tqmoc files in this directory * Copyright (C) 2004 Richard Smith * * This library is free software; you can redistribute it and/or diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 87743e7f..2a9553a2 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -53,11 +53,11 @@ public: JT_FT *ft; Jid peer; TQString fname; - Q_LLONG size; - Q_LLONG sent; + TQ_LLONG size; + TQ_LLONG sent; TQString desc; bool rangeSupported; - Q_LLONG rangeOffset, rangeLength, length; + TQ_LLONG rangeOffset, rangeLength, length; TQString streamType; bool needStream; TQString id, iq_id; @@ -67,8 +67,8 @@ public: bool sender; }; -FileTransfer::FileTransfer(FileTransferManager *m, TQObject *parent) -:TQObject(parent) +FileTransfer::FileTransfer(FileTransferManager *m, TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->m = m; @@ -104,7 +104,7 @@ void FileTransfer::setProxy(const Jid &proxy) d->proxy = proxy; } -void FileTransfer::sendFile(const Jid &to, const TQString &fname, Q_LLONG size, const TQString &desc) +void FileTransfer::sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, const TQString &desc) { d->state = Requesting; d->peer = to; @@ -127,9 +127,9 @@ int FileTransfer::dataSizeNeeded() const int pending = d->c->bytesToWrite(); if(pending >= SENDBUFSIZE) return 0; - Q_LLONG left = d->length - (d->sent + pending); + TQ_LLONG left = d->length - (d->sent + pending); int size = SENDBUFSIZE - pending; - if((Q_LLONG)size > left) + if((TQ_LLONG)size > left) size = (int)left; return size; } @@ -137,12 +137,12 @@ int FileTransfer::dataSizeNeeded() const void FileTransfer::writeFileData(const TQByteArray &a) { int pending = d->c->bytesToWrite(); - Q_LLONG left = d->length - (d->sent + pending); + TQ_LLONG left = d->length - (d->sent + pending); if(left == 0) return; TQByteArray block; - if((Q_LLONG)a.size() > left) { + if((TQ_LLONG)a.size() > left) { block = a.copy(); block.resize((uint)left); } @@ -161,7 +161,7 @@ TQString FileTransfer::fileName() const return d->fname; } -Q_LLONG FileTransfer::fileSize() const +TQ_LLONG FileTransfer::fileSize() const { return d->size; } @@ -176,17 +176,17 @@ bool FileTransfer::rangeSupported() const return d->rangeSupported; } -Q_LLONG FileTransfer::offset() const +TQ_LLONG FileTransfer::offset() const { return d->rangeOffset; } -Q_LLONG FileTransfer::length() const +TQ_LLONG FileTransfer::length() const { return d->length; } -void FileTransfer::accept(Q_LLONG offset, Q_LLONG length) +void FileTransfer::accept(TQ_LLONG offset, TQ_LLONG length) { d->state = Connecting; d->rangeOffset = offset; @@ -275,8 +275,8 @@ void FileTransfer::s5b_connectionClosed() void FileTransfer::s5b_readyRead() { TQByteArray a = d->c->read(); - Q_LLONG need = d->length - d->sent; - if((Q_LLONG)a.size() > need) + TQ_LLONG need = d->length - d->sent; + if((TQ_LLONG)a.size() > need) a.resize((uint)need); d->sent += a.size(); if(d->sent == d->length) @@ -445,13 +445,13 @@ class JT_FT::Private public: TQDomElement iq; Jid to; - Q_LLONG size, rangeOffset, rangeLength; + TQ_LLONG size, rangeOffset, rangeLength; TQString streamType; TQStringList streamTypes; }; -JT_FT::JT_FT(Task *parent) -:Task(parent) +JT_FT::JT_FT(Task *tqparent) +:Task(tqparent) { d = new Private; } @@ -461,7 +461,7 @@ JT_FT::~JT_FT() delete d; } -void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, Q_LLONG size, const TQString &desc, const TQStringList &streamTypes) +void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes) { TQDomElement iq; d->to = to; @@ -512,12 +512,12 @@ void JT_FT::request(const Jid &to, const TQString &_id, const TQString &fname, Q d->iq = iq; } -Q_LLONG JT_FT::rangeOffset() const +TQ_LLONG JT_FT::rangeOffset() const { return d->rangeOffset; } -Q_LLONG JT_FT::rangeLength() const +TQ_LLONG JT_FT::rangeLength() const { return d->rangeLength; } @@ -546,8 +546,8 @@ bool JT_FT::take(const TQDomElement &x) TQString id = si.attribute("id"); - Q_LLONG range_offset = 0; - Q_LLONG range_length = 0; + TQ_LLONG range_offset = 0; + TQ_LLONG range_length = 0; TQDomElement file = si.elementsByTagName("file").item(0).toElement(); if(!file.isNull()) { @@ -556,11 +556,7 @@ bool JT_FT::take(const TQDomElement &x) int x; bool ok; if(range.hasAttribute("offset")) { -#if QT_VERSION >= 0x030200 x = range.attribute("offset").toLongLong(&ok); -#else - x = range.attribute("offset").toLong(&ok); -#endif if(!ok || x < 0) { setError(900, ""); return true; @@ -568,11 +564,7 @@ bool JT_FT::take(const TQDomElement &x) range_offset = x; } if(range.hasAttribute("length")) { -#if QT_VERSION >= 0x030200 x = range.attribute("length").toLongLong(&ok); -#else - x = range.attribute("length").toLong(&ok); -#endif if(!ok || x < 0) { setError(900, ""); return true; @@ -627,8 +619,8 @@ bool JT_FT::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushFT //---------------------------------------------------------------------------- -JT_PushFT::JT_PushFT(Task *parent) -:Task(parent) +JT_PushFT::JT_PushFT(Task *tqparent) +:Task(tqparent) { } @@ -636,7 +628,7 @@ JT_PushFT::~JT_PushFT() { } -void JT_PushFT::respondSuccess(const Jid &to, const TQString &id, Q_LLONG rangeOffset, Q_LLONG rangeLength, const TQString &streamType) +void JT_PushFT::respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType) { TQDomElement iq = createIQ(doc(), "result", to.full(), id); TQDomElement si = doc()->createElement("si"); @@ -717,11 +709,7 @@ bool JT_PushFT::take(const TQDomElement &e) } bool ok; -#if QT_VERSION >= 0x030200 - Q_LLONG size = file.attribute("size").toLongLong(&ok); -#else - Q_LLONG size = file.attribute("size").toLong(&ok); -#endif + TQ_LLONG size = file.attribute("size").toLongLong(&ok); if(!ok || size < 0) { respondError(from, id, 400, "Bad file size"); return true; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h index 9026b478..6ad8f7ff 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h @@ -21,20 +21,17 @@ #ifndef XMPP_FILETRANSFER_H #define XMPP_FILETRANSFER_H -#include"im.h" - -#if QT_VERSION < 0x030200 -typedef long int Q_LLONG; -#endif +#include "im.h" namespace XMPP { class S5BConnection; struct FTRequest; - class FileTransfer : public QObject + class FileTransfer : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream }; enum { Idle, Requesting, Connecting, WaitingForAccept, Active }; @@ -43,19 +40,19 @@ namespace XMPP void setProxy(const Jid &proxy); // send - void sendFile(const Jid &to, const TQString &fname, Q_LLONG size, const TQString &desc); - Q_LLONG offset() const; - Q_LLONG length() const; + void sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, const TQString &desc); + TQ_LLONG offset() const; + TQ_LLONG length() const; int dataSizeNeeded() const; void writeFileData(const TQByteArray &a); // receive Jid peer() const; TQString fileName() const; - Q_LLONG fileSize() const; + TQ_LLONG fileSize() const; TQString description() const; bool rangeSupported() const; - void accept(Q_LLONG offset=0, Q_LLONG length=0); + void accept(TQ_LLONG offset=0, TQ_LLONG length=0); // both void close(); // reject, or stop sending/receiving @@ -84,14 +81,15 @@ namespace XMPP void reset(); friend class FileTransferManager; - FileTransfer(FileTransferManager *, TQObject *parent=0); + FileTransfer(FileTransferManager *, TQObject *tqparent=0); void man_waitForAccept(const FTRequest &req); void takeConnection(S5BConnection *c); }; - class FileTransferManager : public QObject + class FileTransferManager : public TQObject { Q_OBJECT + TQ_OBJECT public: FileTransferManager(Client *); ~FileTransferManager(); @@ -123,13 +121,14 @@ namespace XMPP class JT_FT : public Task { Q_OBJECT + TQ_OBJECT public: - JT_FT(Task *parent); + JT_FT(Task *tqparent); ~JT_FT(); - void request(const Jid &to, const TQString &id, const TQString &fname, Q_LLONG size, const TQString &desc, const TQStringList &streamTypes); - Q_LLONG rangeOffset() const; - Q_LLONG rangeLength() const; + void request(const Jid &to, const TQString &id, const TQString &fname, TQ_LLONG size, const TQString &desc, const TQStringList &streamTypes); + TQ_LLONG rangeOffset() const; + TQ_LLONG rangeLength() const; TQString streamType() const; void onGo(); @@ -145,7 +144,7 @@ namespace XMPP Jid from; TQString iq_id, id; TQString fname; - Q_LLONG size; + TQ_LLONG size; TQString desc; bool rangeSupported; TQStringList streamTypes; @@ -153,11 +152,12 @@ namespace XMPP class JT_PushFT : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushFT(Task *parent); + JT_PushFT(Task *tqparent); ~JT_PushFT(); - void respondSuccess(const Jid &to, const TQString &id, Q_LLONG rangeOffset, Q_LLONG rangeLength, const TQString &streamType); + void respondSuccess(const Jid &to, const TQString &id, TQ_LLONG rangeOffset, TQ_LLONG rangeLength, const TQString &streamType); void respondError(const Jid &to, const TQString &id, int code, const TQString &str); bool take(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index df753925..1914ad26 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -61,9 +61,10 @@ static bool haveHost(const StreamHostList &list, const Jid &j) return false; } -class S5BManager::Item : public QObject +class S5BManager::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { Idle, Initiator, Target, Active }; enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy }; @@ -184,8 +185,8 @@ public: static int id_conn = 0; static int num_conn = 0; -S5BConnection::S5BConnection(S5BManager *m, TQObject *parent) -:ByteStream(parent) +S5BConnection::S5BConnection(S5BManager *m, TQObject *tqparent) +:ByteStream(tqparent) { d = new Private; d->m = m; @@ -574,15 +575,15 @@ public: JT_PushS5B *ps; }; -S5BManager::S5BManager(Client *parent) -:TQObject(parent) +S5BManager::S5BManager(Client *tqparent) +:TQObject(tqparent) { // S5B needs SHA1 if(!QCA::isSupported(QCA::CAP_SHA1)) QCA::insertProvider(createProviderHash()); d = new Private; - d->client = parent; + d->client = tqparent; d->serv = 0; d->activeList.setAutoDelete(true); @@ -1745,9 +1746,10 @@ void S5BManager::Item::finished() //---------------------------------------------------------------------------- // S5BConnector //---------------------------------------------------------------------------- -class S5BConnector::Item : public QObject +class S5BConnector::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: SocksClient *client; SocksUDP *client_udp; @@ -1863,8 +1865,8 @@ public: TQTimer t; }; -S5BConnector::S5BConnector(TQObject *parent) -:TQObject(parent) +S5BConnector::S5BConnector(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->active = 0; @@ -1976,9 +1978,10 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost) //---------------------------------------------------------------------------- // S5BServer //---------------------------------------------------------------------------- -class S5BServer::Item : public QObject +class S5BServer::Item : public TQObject { Q_OBJECT + TQ_OBJECT public: SocksClient *client; TQString host; @@ -2051,8 +2054,8 @@ public: TQPtrList itemList; }; -S5BServer::S5BServer(TQObject *parent) -:TQObject(parent) +S5BServer::S5BServer(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; d->itemList.setAutoDelete(true); @@ -2192,8 +2195,8 @@ public: TQTimer t; }; -JT_S5B::JT_S5B(Task *parent) -:Task(parent) +JT_S5B::JT_S5B(Task *tqparent) +:Task(tqparent) { d = new Private; d->mode = -1; @@ -2353,8 +2356,8 @@ StreamHost JT_S5B::proxyInfo() const //---------------------------------------------------------------------------- // JT_PushS5B //---------------------------------------------------------------------------- -JT_PushS5B::JT_PushS5B(Task *parent) -:Task(parent) +JT_PushS5B::JT_PushS5B(Task *tqparent) +:Task(tqparent) { } diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h index d8c301c1..d9818503 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h @@ -60,6 +60,7 @@ namespace XMPP class S5BConnection : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Mode { Stream, Datagram }; enum Error { ErrRefused, ErrConnect, ErrProxy, ErrSocket }; @@ -124,12 +125,13 @@ namespace XMPP void man_clientReady(SocksClient *, SocksUDP *); void man_udpReady(const TQByteArray &buf); void man_failed(int); - S5BConnection(S5BManager *, TQObject *parent=0); + S5BConnection(S5BManager *, TQObject *tqparent=0); }; - class S5BManager : public QObject + class S5BManager : public TQObject { Q_OBJECT + TQ_OBJECT public: S5BManager(Client *); ~S5BManager(); @@ -196,11 +198,12 @@ namespace XMPP void doActivate(const Jid &peer, const TQString &sid, const Jid &streamHost); }; - class S5BConnector : public QObject + class S5BConnector : public TQObject { Q_OBJECT + TQ_OBJECT public: - S5BConnector(TQObject *parent=0); + S5BConnector(TQObject *tqparent=0); ~S5BConnector(); void reset(); @@ -227,9 +230,10 @@ namespace XMPP }; // listens on a port for serving - class S5BServer : public QObject + class S5BServer : public TQObject { Q_OBJECT + TQ_OBJECT public: S5BServer(TQObject *par=0); ~S5BServer(); @@ -263,6 +267,7 @@ namespace XMPP class JT_S5B : public Task { Q_OBJECT + TQ_OBJECT public: JT_S5B(Task *); ~JT_S5B(); @@ -297,6 +302,7 @@ namespace XMPP class JT_PushS5B : public Task { Q_OBJECT + TQ_OBJECT public: JT_PushS5B(Task *); ~JT_PushS5B(); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index 2ca012c1..6bf15aa2 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp @@ -346,11 +346,11 @@ public: JT_IBB *ibb; }; -IBBManager::IBBManager(Client *parent) -:TQObject(parent) +IBBManager::IBBManager(Client *tqparent) +:TQObject(tqparent) { d = new Private; - d->client = parent; + d->client = tqparent; d->ibb = new JT_IBB(d->client->rootTask(), true); connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); @@ -479,8 +479,8 @@ public: TQString streamid; }; -JT_IBB::JT_IBB(Task *parent, bool serve) -:Task(parent) +JT_IBB::JT_IBB(Task *tqparent, bool serve) +:Task(tqparent) { d = new Private; d->serve = serve; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h index e5a0ed93..27df2465 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h @@ -37,6 +37,7 @@ namespace XMPP class IBBConnection : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum { ErrRequest, ErrData }; enum { Idle, Requesting, WaitingForAccept, Active }; @@ -78,9 +79,10 @@ namespace XMPP typedef TQPtrList IBBConnectionList; typedef TQPtrListIterator IBBConnectionListIt; - class IBBManager : public QObject + class IBBManager : public TQObject { Q_OBJECT + TQ_OBJECT public: IBBManager(Client *); ~IBBManager(); @@ -114,6 +116,7 @@ namespace XMPP class JT_IBB : public Task { Q_OBJECT + TQ_OBJECT public: enum { ModeRequest, ModeSendData }; JT_IBB(Task *, bool serve=false); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h index 40d3d4eb..a10547ff 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h @@ -35,9 +35,10 @@ namespace XMPP { class Client; - class JidLink : public QObject + class JidLink : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { None, DTCP, IBB }; enum { Idle, Connecting, WaitingForAccept, Active }; @@ -94,9 +95,10 @@ namespace XMPP }; // the job of JidLinkManager is to keep track of streams and properly shut them down - class JidLinkManager : public QObject + class JidLinkManager : public TQObject { Q_OBJECT + TQ_OBJECT public: JidLinkManager(Client *); ~JidLinkManager(); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index 3c8e5435..a8ad7bd9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -55,8 +55,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // Connector //---------------------------------------------------------------------------- -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setUseSSL(false); setPeerAddressNone(); @@ -81,7 +81,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -98,7 +98,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; @@ -129,7 +129,7 @@ TQString AdvancedConnector::Proxy::host() const return v_host; } -Q_UINT16 AdvancedConnector::Proxy::port() const +TQ_UINT16 AdvancedConnector::Proxy::port() const { return v_port; } @@ -154,14 +154,14 @@ int AdvancedConnector::Proxy::pollInterval() const return v_poll; } -void AdvancedConnector::Proxy::setHttpConnect(const TQString &host, Q_UINT16 port) +void AdvancedConnector::Proxy::setHttpConnect(const TQString &host, TQ_UINT16 port) { t = HttpConnect; v_host = host; v_port = port; } -void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, Q_UINT16 port, const TQString &url) +void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, TQ_UINT16 port, const TQString &url) { t = HttpPoll; v_host = host; @@ -169,7 +169,7 @@ void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, Q_UINT16 port, v_url = url; } -void AdvancedConnector::Proxy::setSocks(const TQString &host, Q_UINT16 port) +void AdvancedConnector::Proxy::setSocks(const TQString &host, TQ_UINT16 port) { t = Socks; v_host = host; @@ -223,8 +223,8 @@ public: SafeDelete sd; }; -AdvancedConnector::AdvancedConnector(TQObject *parent) -:Connector(parent) +AdvancedConnector::AdvancedConnector(TQObject *tqparent) +:Connector(tqparent) { d = new Private; d->bs = 0; @@ -285,7 +285,7 @@ void AdvancedConnector::setProxy(const Proxy &proxy) d->proxy = proxy; } -void AdvancedConnector::setOptHostPort(const TQString &host, Q_UINT16 _port) +void AdvancedConnector::setOptHostPort(const TQString &host, TQ_UINT16 _port) { if(d->mode != Idle) return; @@ -409,7 +409,7 @@ void AdvancedConnector::dns_done() //if(!d->qdns) // return; - // apparently we sometimes get this signal even though the results aren' t ready + // aptqparently we sometimes get this signal even though the results aren' t ready //if(d->qdns->isWorking()) // return; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp index 4c8307cb..1b1dc1c7 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp @@ -104,8 +104,8 @@ static void ensureEndian() * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined. */ -typedef Q_UINT8 md5_byte_t; /* 8-bit byte */ -typedef Q_UINT32 md5_word_t; /* 32-bit word */ +typedef TQ_UINT8 md5_byte_t; /* 8-bit byte */ +typedef TQ_UINT32 md5_word_t; /* 32-bit word */ /* Define the state of the MD5 Algorithm. */ typedef struct md5_state_s { @@ -437,14 +437,14 @@ md5_finish(md5_state_t *pms, md5_byte_t digest[16]) struct SHA1_CONTEXT { - Q_UINT32 state[5]; - Q_UINT32 count[2]; + TQ_UINT32 state[5]; + TQ_UINT32 count[2]; unsigned char buffer[64]; }; typedef union { unsigned char c[64]; - Q_UINT32 l[16]; + TQ_UINT32 l[16]; } CHAR64LONG16; class SHA1Context : public QCA_HashContext @@ -480,7 +480,7 @@ public: *out = b; } - unsigned long blk0(Q_UINT32 i) + unsigned long blk0(TQ_UINT32 i) { if(bigEndian) return block->l[i]; @@ -489,9 +489,9 @@ public: } // Hash a single 512-bit block. This is the core of the algorithm. - void transform(Q_UINT32 state[5], unsigned char buffer[64]) + void transform(TQ_UINT32 state[5], unsigned char buffer[64]) { - Q_UINT32 a, b, c, d, e; + TQ_UINT32 a, b, c, d, e; block = (CHAR64LONG16*)buffer; @@ -548,9 +548,9 @@ public: } // Run your data through this - void sha1_update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) + void sha1_update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len) { - Q_UINT32 i, j; + TQ_UINT32 i, j; j = (context->count[0] >> 3) & 63; if((context->count[0] += len << 3) < (len << 3)) @@ -573,7 +573,7 @@ public: // Add padding and return the message digest void sha1_final(unsigned char digest[20], SHA1_CONTEXT* context) { - Q_UINT32 i, j; + TQ_UINT32 i, j; unsigned char finalcount[8]; for (i = 0; i < 8; i++) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp index 090cc9df..90cf1364 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp @@ -42,7 +42,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nameprep_table.find(in); + Result *r = that->nameprep_table.tqfind(in); if(r) { if(!r->norm) @@ -78,7 +78,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->nodeprep_table.find(in); + Result *r = that->nodeprep_table.tqfind(in); if(r) { if(!r->norm) @@ -114,7 +114,7 @@ public: StringPrepCache *that = get_instance(); - Result *r = that->resourceprep_table.find(in); + Result *r = that->resourceprep_table.tqfind(in); if(r) { if(!r->norm) @@ -248,7 +248,7 @@ void Jid::set(const TQString &s) { TQString rest, domain, node, resource; TQString norm_domain, norm_node, norm_resource; - int x = s.find('/'); + int x = s.tqfind('/'); if(x != -1) { rest = s.mid(0, x); resource = s.mid(x+1); @@ -262,7 +262,7 @@ void Jid::set(const TQString &s) return; } - x = rest.find('@'); + x = rest.tqfind('@'); if(x != -1) { node = rest.mid(0, x); domain = rest.mid(x+1); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index 4c10bd53..ba14f404 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -22,7 +22,7 @@ TODO: For XMPP::Parser to be "perfect", some things must be solved/changed in the - Qt library: + TQt library: - Fix weird TQDomElement::haveAttributeNS() bug (patch submitted to Trolltech on Aug 31st, 2003). @@ -31,7 +31,7 @@ the final '>' is reached. - Fix incremental parsing bugs in TQXmlSimpleReader. At the moment, the only bug I've found is related to attribute parsing, but there might - be more (search for '###' in $QTDIR/src/xml/qxml.cpp). + be more (search for '###' in $TQTDIR/src/xml/qxml.cpp). We have workarounds for all of the above problems in the code below. @@ -44,7 +44,7 @@ - Make TQXmlInputSource capable of accepting data incrementally, to ensure proper text encoding detection and processing over a network. This is technically not a bug, as we have our own subclass below to do it, but - it would be nice if Qt had this already. + it would be nice if TQt had this already. */ #include"parser.h" @@ -61,7 +61,7 @@ static bool qt_bug_have; //---------------------------------------------------------------------------- // StreamInput //---------------------------------------------------------------------------- -class StreamInput : public QXmlInputSource +class StreamInput : public TQXmlInputSource { public: StreamInput() @@ -232,10 +232,10 @@ private: if(mightChangeEncoding) { while(1) { - int n = out.find('<'); + int n = out.tqfind('<'); if(n != -1) { // we need a closing bracket - int n2 = out.find('>', n); + int n2 = out.tqfind('>', n); if(n2 != -1) { ++n2; TQString h = out.mid(n, n2-n); @@ -278,8 +278,8 @@ private: if(h.left(5) != ""); - int startPos = h.find("encoding"); + int endPos = h.tqfind(">"); + int startPos = h.tqfind("encoding"); if(startPos < endPos && startPos != -1) { TQString encoding; do { @@ -335,7 +335,7 @@ private: bool checkForBadChars(const TQString &s) { - int len = s.find('<'); + int len = s.tqfind('<'); if(len == -1) len = s.length(); else @@ -354,7 +354,7 @@ private: //---------------------------------------------------------------------------- namespace XMPP { - class ParserHandler : public QXmlDefaultHandler + class ParserHandler : public TQXmlDefaultHandler { public: ParserHandler(StreamInput *_in, TQDomDocument *_doc) @@ -465,7 +465,7 @@ namespace XMPP current = TQDomElement(); } else - current = current.parentNode().toElement(); + current = current.tqparentNode().toElement(); } if(in->lastRead() == '/') @@ -610,7 +610,7 @@ TQString Parser::Event::nsprefix(const TQString &s) const return (*it2); ++it2; } - return TQString::null; + return TQString(); } TQString Parser::Event::namespaceURI() const @@ -737,7 +737,7 @@ Parser::Parser() { d = new Private; - // check for evil bug in Qt <= 3.2.1 + // check for evil bug in TQt <= 3.2.1 if(!qt_bug_check) { qt_bug_check = true; TQDomElement e = d->doc->createElementNS("someuri", "somename"); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h index b702ad55..55dcdde9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h @@ -45,7 +45,7 @@ namespace XMPP int type() const; // for document open - TQString nsprefix(const TQString &s=TQString::null) const; + TQString nsprefix(const TQString &s=TQString()) const; // for document open / close TQString namespaceURI() const; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp index 76d3c781..5a6bc64f 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp @@ -39,7 +39,7 @@ using namespace XMPP; // // This function prints out an array of bytes as latin characters, converting // non-printable bytes into hex values as necessary. Useful for displaying -// QByteArrays for debugging purposes. +// TQByteArrays for debugging purposes. static TQString printArray(const TQByteArray &a) { TQString s; @@ -440,7 +440,7 @@ void BasicProtocol::handleDocOpen(const Parser::Event &pe) int minor = 0; TQString verstr = atts.value("version"); if(!verstr.isEmpty()) { - int n = verstr.find('.'); + int n = verstr.tqfind('.'); if(n != -1) { major = verstr.mid(0, n).toInt(); minor = verstr.mid(n+1).toInt(); @@ -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]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(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]").arg(printArray(sasl_step))); + TD::msg(TQString("SASL OUT: [%1]").tqarg(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]").arg((*it)); + s += TQString(" [%1]").tqarg((*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]").arg(printArray(a))); + TD::msg(TQString("SASL IN: [%1]").tqarg(printArray(a))); #endif sasl_step = a; need = NSASLNext; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/qcaprovider.h @@ -141,7 +141,7 @@ public: struct QCA_SASLHostPort { TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; struct QCA_SASLNeedParams diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp index f7d44db4..40872ce0 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp @@ -109,9 +109,10 @@ int LayerTracker::finished(int encoded) //---------------------------------------------------------------------------- // SecureStream //---------------------------------------------------------------------------- -class SecureLayer : public QObject +class SecureLayer : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { TLS, SASL, TLSH }; int type; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h index 844fd3d1..f76bd617 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h @@ -36,6 +36,7 @@ namespace XMPP class SecureStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrTLS = ErrCustom, ErrSASL }; SecureStream(ByteStream *s); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp index c825a2ca..da78fef1 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp @@ -78,7 +78,7 @@ public: PropList list; int at = 0; while(1) { - int n = str.find('=', at); + int n = str.tqfind('=', at); if(n == -1) break; TQCString var, val; @@ -86,14 +86,14 @@ public: at = n + 1; if(str[at] == '\"') { ++at; - n = str.find('\"', at); + n = str.tqfind('\"', at); if(n == -1) break; val = str.mid(at, n-at); at = n + 1; } else { - n = str.find(',', at); + n = str.tqfind(',', at); if(n != -1) { val = str.mid(at, n-at); at = n; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index d3182ffe..fe7275ad 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -488,8 +488,8 @@ void Stanza::clearError() // Stream //---------------------------------------------------------------------------- static XmlProtocol *foo = 0; -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } @@ -574,7 +574,7 @@ public: bool allowPlain, mutualAuth; bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; int minimumSSF, maximumSSF; TQString sasl_mech; bool doBinding; @@ -612,8 +612,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *tqparent) +:Stream(tqparent) { d = new Private; d->mode = Client; @@ -627,8 +627,8 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d->tlsHandler = tlsHandler; } -ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *tqparent) +:Stream(tqparent) { d = new Private; d->mode = Server; @@ -832,7 +832,7 @@ void ClientStream::setSASLMechanism(const TQString &s) d->sasl_mech = s; } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -1115,7 +1115,7 @@ void ClientStream::sasl_authCheck(const TQString &user, const TQString &) // printf("authcheck: [%s], [%s]\n", user.latin1(), authzid.latin1()); //#endif TQString u = user; - int n = u.find('@'); + int n = u.tqfind('@'); if(n != -1) u.truncate(n); d->srv.user = u; @@ -1241,7 +1241,7 @@ void ClientStream::srvProcessNext() printf("Break (RecvOpen)\n"); // calculate key - TQCString str = QCA::SHA1::hashToString("secret").utf8(); + TQCString str = QCA::SHA1::hashToString(TQCString("secret")).utf8(); str = QCA::SHA1::hashToString(str + "im.pyxa.org").utf8(); str = QCA::SHA1::hashToString(str + d->srv.id.utf8()).utf8(); d->srv.setDialbackKey(str); @@ -1358,9 +1358,9 @@ void ClientStream::processNext() #endif #ifdef XMPP_TEST - TQString s = TQString("handshake success (lang=[%1]").arg(d->client.lang); + TQString s = TQString("handshake success (lang=[%1]").tqarg(d->client.lang); if(!d->client.from.isEmpty()) - s += TQString(", from=[%1]").arg(d->client.from); + s += TQString(", from=[%1]").tqarg(d->client.from); s += ')'; TD::msg(s); #endif diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 313c6b6a..996727ea 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp @@ -28,8 +28,8 @@ using namespace XMPP; //---------------------------------------------------------------------------- // TLSHandler //---------------------------------------------------------------------------- -TLSHandler::TLSHandler(TQObject *parent) -:TQObject(parent) +TLSHandler::TLSHandler(TQObject *tqparent) +:TQObject(tqparent) { } @@ -48,11 +48,11 @@ public: int state, err; }; -QCATLSHandler::QCATLSHandler(QCA::TLS *parent) -:TLSHandler(parent) +QCATLSHandler::QCATLSHandler(QCA::TLS *tqparent) +:TLSHandler(tqparent) { d = new Private; - d->tls = parent; + d->tls = tqparent; connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index de321e7c..0f8b17a7 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -28,14 +28,14 @@ using namespace XMPP; // // This function removes namespace information from various nodes for // display purposes only (the element is pretty much useless for processing -// after this). We do this because QXml is a bit overzealous about outputting +// after this). We do this because TQXml is a bit overzealous about outputting // redundant namespaces. static TQDomElement stripExtraNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -66,7 +66,7 @@ static TQDomElement stripExtraNS(const TQDomElement &e) i.setAttributeNodeNS(a); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -82,13 +82,13 @@ static TQDomElement stripExtraNS(const TQDomElement &e) // // This function converts a TQDomElement into a TQString, using stripExtraNS // to make it pretty. -static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const TQString &fakeQName, bool clip) +static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const TQString &fakeTQName, bool clip) { TQDomElement i = e.cloneNode().toElement(); - // It seems QDom can only have one namespace attribute at a time (see docElement 'HACK'). + // It seems TQDom can only have one namespace attribute at a time (see docElement 'HACK'). // Fortunately we only need one kind depending on the input, so it is specified here. - TQDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeQName); + TQDomElement fake = e.ownerDocument().createElementNS(fakeNS, fakeTQName); fake.appendChild(i); fake = stripExtraNS(fake); TQString out; @@ -98,7 +98,7 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const } // 'clip' means to remove any unwanted (and unneeded) characters, such as a trailing newline if(clip) { - int n = out.findRev('>'); + int n = out.tqfindRev('>'); out.truncate(n+1); } return out; @@ -106,11 +106,11 @@ static TQString xmlToString(const TQDomElement &e, const TQString &fakeNS, const // createRootXmlTags // -// This function creates three QStrings, one being an processing +// This function creates three TQStrings, one being an processing // instruction, and the others being the opening and closing tags of an // element, and . This basically allows us to get the raw XML // text needed to open/close an XML stream, without resorting to generating -// the XML ourselves. This function uses QDom to do the generation, which +// the XML ourselves. This function uses TQDom to do the generation, which // ensures proper encoding and entity output. static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQString *tagOpen, TQString *tagClose) { @@ -128,12 +128,12 @@ static void createRootXmlTags(const TQDomElement &root, TQString *xmlHeader, TQS } // parse the tags out - int n = str.find('<'); - int n2 = str.find('>', n); + int n = str.tqfind('<'); + int n2 = str.tqfind('>', n); ++n2; *tagOpen = str.mid(n, n2-n); - n2 = str.findRev('>'); - n = str.findRev('<'); + n2 = str.tqfindRev('>'); + n = str.tqfindRev('<'); ++n2; *tagClose = str.mid(n, n2-n); @@ -329,7 +329,7 @@ TQString XmlProtocol::elementToString(const TQDomElement &e, bool clip) for(n = 0; n < al.count(); ++n) { TQDomAttr a = al.item(n).toAttr(); TQString s = a.name(); - int x = s.find(':'); + int x = s.tqfind(':'); if(x != -1) s = s.mid(x+1); else diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index c78875bc..9d56467c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -34,8 +34,8 @@ //! Client, you will need to manually invoke Tasks. Fortunately, the //! process is very simple. //! -//! The entire Task system is heavily founded on Qt. All Tasks have a parent, -//! except for the root Task, and are considered QObjects. By using Qt's RTTI +//! The entire Task system is heavily founded on TQt. All Tasks have a tqparent, +//! except for the root Task, and are considered TQObjects. By using TQt's RTTI //! facilities (TQObject::sender(), TQObject::isA(), etc), you can use a //! "fire and forget" approach with Tasks. //! @@ -96,7 +96,7 @@ using namespace Jabber;*/ -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #define vsnprintf _vsnprintf #endif @@ -191,7 +191,7 @@ void Client::connectToServer(ClientStream *s, const Jid &j, bool auth) //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &))); + //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &))); @@ -208,13 +208,13 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->pass = pass; d->resource = _resource; - Status stat; + tqStatus 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 Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); + connect(pp, TQT_SIGNAL(presence(const Jid &, const tqStatus &)), TQT_SLOT(ppPresence(const Jid &, const tqStatus &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); @@ -266,7 +266,7 @@ bool Client::isActive() const return d->active; } -void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const Status &_s) +void Client::groupChatChangeNick(const TQString &host, const TQString &room, const TQString &nick, const tqStatus &_s) { Jid jid(room + "@" + host + "/" + nick); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -274,7 +274,7 @@ void Client::groupChatChangeNick(const TQString &host, const TQString &room, con if(i.j.compare(jid, false)) { i.j = jid; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -302,14 +302,14 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_Presence *j = new JT_Presence(rootTask()); - j->pres(jid, Status()); + j->pres(jid, tqStatus()); j->go(true); return true; @@ -331,20 +331,20 @@ bool Client::groupChatJoin(const TQString &host, const TQString &room, const TQS ++it; } - debug(TQString("Client: Joined: [%1]\n").arg(jid.full())); + debug(TQString("Client: Joined: [%1]\n").tqarg(jid.full())); GroupChat i; i.j = jid; i.status = GroupChat::Connecting; d->groupChatList += i; JT_MucPresence *j = new JT_MucPresence(rootTask()); - j->pres(jid, Status(), password); + j->pres(jid, tqStatus(), password); j->go(true); return true; } -void Client::groupChatSetStatus(const TQString &host, const TQString &room, const Status &_s) +void Client::groupChatSettqStatus(const TQString &host, const TQString &room, const tqStatus &_s) { Jid jid(room + "@" + host); bool found = false; @@ -359,7 +359,7 @@ void Client::groupChatSetStatus(const TQString &host, const TQString &room, cons if(!found) return; - Status s = _s; + tqStatus s = _s; s.setIsAvailable(true); JT_Presence *j = new JT_Presence(rootTask()); @@ -377,10 +377,10 @@ void Client::groupChatLeave(const TQString &host, const TQString &room) continue; i.status = GroupChat::Closing; - debug(TQString("Client: Leaving: [%1]\n").arg(i.j.full())); + debug(TQString("Client: Leaving: [%1]\n").tqarg(i.j.full())); JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -409,7 +409,7 @@ void Client::close(bool) i.status = GroupChat::Closing; JT_Presence *j = new JT_Presence(rootTask()); - Status s; + tqStatus s; s.setIsAvailable(false); j->pres(i.j, s); j->go(true); @@ -457,7 +457,7 @@ void Client::streamError(int) //} } -/*void Client::streamSSLCertificateReady(const QSSLCert &cert) +/*void Client::streamSSLCertificateReady(const TQSSLCert &cert) { sslCertReady(cert); } @@ -469,10 +469,10 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -492,7 +492,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -513,7 +513,7 @@ void Client::streamReadyRead() Stanza s = d->stream->read(); TQString out = s.toString(); - debug(TQString("Client: incoming: [\n%1]\n").arg(out)); + debug(TQString("Client: incoming: [\n%1]\n").tqarg(out)); xmlIncoming(out); TQDomElement x = oldStyleNS(s.element()); @@ -588,7 +588,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) // find closest xmlns TQDomNode n = e; while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) - n = n.parentNode(); + n = n.tqparentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; @@ -606,7 +606,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(a.cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -630,7 +630,7 @@ void Client::send(const TQDomElement &x) //x.save(ts, 0); //TQString out = Stream::xmlToString(x); - //debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + //debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); //xmlOutgoing(out); TQDomElement e = addCorrectNS(x); @@ -641,7 +641,7 @@ void Client::send(const TQDomElement &x) } TQString out = s.toString(); - debug(TQString("Client: outgoing: [\n%1]\n").arg(out)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out)); xmlOutgoing(out); //printf("x[%s] x2[%s] s[%s]\n", Stream::xmlToString(x).latin1(), Stream::xmlToString(e).latin1(), s.toString().latin1()); @@ -653,7 +653,7 @@ void Client::send(const TQString &str) if(!d->stream) return; - debug(TQString("Client: outgoing: [\n%1]\n").arg(str)); + debug(TQString("Client: outgoing: [\n%1]\n").tqarg(str)); xmlOutgoing(str); static_cast(d->stream)->writeDirect(str); } @@ -712,12 +712,12 @@ void Client::ppSubscription(const Jid &j, const TQString &s) subscription(j, s); } -void Client::ppPresence(const Jid &j, const Status &s) +void Client::ppPresence(const Jid &j, const tqStatus &s) { if(s.isAvailable()) - debug(TQString("Client: %1 is available.\n").arg(j.full())); + debug(TQString("Client: %1 is available.\n").tqarg(j.full())); else - debug(TQString("Client: %1 is unavailable.\n").arg(j.full())); + debug(TQString("Client: %1 is unavailable.\n").tqarg(j.full())); for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { GroupChat &i = *it; @@ -725,7 +725,7 @@ void Client::ppPresence(const Jid &j, const Status &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").arg(i.j.full()).arg(j.full()).arg(us)); + debug(TQString("for groupchat i=[%1] pres=[%2], [us=%3].\n").tqarg(i.j.full()).tqarg(j.full()).tqarg(us)); switch(i.status) { case GroupChat::Connecting: if(us && s.hasError()) { @@ -788,16 +788,16 @@ void Client::ppPresence(const Jid &j, const Status &s) } } -void Client::updateSelfPresence(const Jid &j, const Status &s) +void Client::updateSelfPresence(const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = d->resourceList.find(j.resource()); + ResourceList::Iterator rit = d->resourceList.tqfind(j.resource()); bool found = (rit == d->resourceList.end()) ? false: true; // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - debug(TQString("Client: Removing self resource: name=[%1]\n").arg(j.resource())); - (*rit).setStatus(s); + debug(TQString("Client: Removing self resource: name=[%1]\n").tqarg(j.resource())); + (*rit).settqStatus(s); resourceUnavailable(j, *rit); d->resourceList.remove(rit); } @@ -808,31 +808,31 @@ void Client::updateSelfPresence(const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); d->resourceList += r; - debug(TQString("Client: Adding self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Adding self resource: name=[%1]\n").tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("Client: Updating self resource: name=[%1]\n").arg(j.resource())); + debug(TQString("Client: Updating self resource: name=[%1]\n").tqarg(j.resource())); } resourceAvailable(j, r); } } -void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) +void Client::updatePresence(LiveRosterItem *i, const Jid &j, const tqStatus &s) { - ResourceList::Iterator rit = i->resourceList().find(j.resource()); + ResourceList::Iterator rit = i->resourceList().tqfind(j.resource()); bool found = (rit == i->resourceList().end()) ? false: true; // unavailable? remove the resource if(!s.isAvailable()) { if(found) { - (*rit).setStatus(s); - debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + (*rit).settqStatus(s); + debug(TQString("Client: Removing resource from [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); resourceUnavailable(j, *rit); i->resourceList().remove(rit); - i->setLastUnavailableStatus(s); + i->setLastUnavailabletqStatus(s); } } // available? add/update the resource @@ -841,12 +841,12 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) if(!found) { r = Resource(j.resource(), s); i->resourceList() += r; - debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Adding resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } else { - (*rit).setStatus(s); + (*rit).settqStatus(s); r = *rit; - debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").arg(i->jid().full()).arg(j.resource())); + debug(TQString("Client: Updating resource to [%1]: name=[%2]\n").tqarg(i->jid().full()).tqarg(j.resource())); } resourceAvailable(j, r); @@ -855,7 +855,7 @@ void Client::updatePresence(LiveRosterItem *i, const Jid &j, const Status &s) void Client::pmMessage(const Message &m) { - debug(TQString("Client: Message from %1\n").arg(m.from().full())); + debug(TQString("Client: Message from %1\n").tqarg(m.from().full())); if(m.type() == "groupchat") { for(TQValueList::Iterator it = d->groupChatList.begin(); it != d->groupChatList.end(); it++) { @@ -950,7 +950,7 @@ void Client::importRosterItem(const RosterItem &item) // Remove if(item.subscription().type() == Subscription::Remove) { - LiveRoster::Iterator it = d->roster.find(item.jid()); + LiveRoster::Iterator it = d->roster.tqfind(item.jid()); if(it != d->roster.end()) { rosterItemRemoved(*it); d->roster.remove(it); @@ -959,7 +959,7 @@ void Client::importRosterItem(const RosterItem &item) } // Add/Update else { - LiveRoster::Iterator it = d->roster.find(item.jid()); + LiveRoster::Iterator it = d->roster.tqfind(item.jid()); if(it != d->roster.end()) { LiveRosterItem &i = *it; i.setFlagForDelete(false); @@ -993,7 +993,7 @@ void Client::sendSubscription(const Jid &jid, const TQString &type) j->go(true); } -void Client::setPresence(const Status &s) +void Client::setPresence(const tqStatus &s) { JT_Presence *j = new JT_Presence(rootTask()); j->pres(s); @@ -1001,9 +1001,9 @@ void Client::setPresence(const Status &s) // update our resourceList ppPresence(jid(), s); - //ResourceList::Iterator rit = d->resourceList.find(resource()); + //ResourceList::Iterator rit = d->resourceList.tqfind(resource()); //Resource &r = *rit; - //r.setStatus(s); + //r.settqStatus(s); } TQString Client::OSName() const @@ -1097,7 +1097,7 @@ void Client::addExtension(const TQString& ext, const Features& features) void Client::removeExtension(const TQString& ext) { - if (d->extension_features.contains(ext)) { + if (d->extension_features.tqcontains(ext)) { d->extension_features.remove(ext); d->capsExt = extensions().join(" "); } @@ -1155,22 +1155,22 @@ public: bool done; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); - d->client = parent->client(); + d->client = tqparent->client(); d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *parent, bool) +Task::Task(Client *tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -1189,9 +1189,9 @@ void Task::init() d->done = false; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -1233,12 +1233,12 @@ void Task::go(bool autoDelete) bool Task::take(const TQDomElement &x) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; // pass along the xml - TQObjectListIt it(*p); + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { TQObject *obj = it.current(); @@ -1362,7 +1362,7 @@ void Task::debug(const char *fmt, ...) void Task::debug(const TQString &str) { - client()->debug(TQString("%1: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::iqVerify(const TQDomElement &x, const Jid &to, const TQString &id, const TQString &xmlns) @@ -1461,9 +1461,9 @@ bool LiveRosterItem::isAvailable() const return false; } -const Status & LiveRosterItem::lastUnavailableStatus() const +const tqStatus & LiveRosterItem::lastUnavailabletqStatus() const { - return v_lastUnavailableStatus; + return v_lastUnavailabletqStatus; } bool LiveRosterItem::flagForDelete() const @@ -1471,9 +1471,9 @@ bool LiveRosterItem::flagForDelete() const return v_flagForDelete; } -void LiveRosterItem::setLastUnavailableStatus(const Status &s) +void LiveRosterItem::setLastUnavailabletqStatus(const tqStatus &s) { - v_lastUnavailableStatus = s; + v_lastUnavailabletqStatus = s; } void LiveRosterItem::setFlagForDelete(bool b) @@ -1499,7 +1499,7 @@ void LiveRoster::flagAllForDelete() (*it).setFlagForDelete(true); } -LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) +LiveRoster::Iterator LiveRoster::tqfind(const Jid &j, bool compareRes) { Iterator it; for(it = begin(); it != end(); ++it) { @@ -1509,7 +1509,7 @@ LiveRoster::Iterator LiveRoster::find(const Jid &j, bool compareRes) return it; } -LiveRoster::ConstIterator LiveRoster::find(const Jid &j, bool compareRes) const +LiveRoster::ConstIterator LiveRoster::tqfind(const Jid &j, bool compareRes) const { ConstIterator it; for(it = begin(); it != end(); ++it) { diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index f2fcf7c9..fb9de2e8 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -274,7 +274,7 @@ TQString Message::subject(const TQString &lang) const //! This function will return a plain text or the Richtext version if it //! it exists. //! \param rich - Returns richtext if true and plain text if false. (default: false) -//! \note Richtext is in Qt's richtext format and not in xhtml. +//! \note Richtext is in TQt's richtext format and not in xhtml. TQString Message::body(const TQString &lang) const { return d->body[lang]; @@ -295,7 +295,7 @@ Stanza::Error Message::error() const return d->error; } -//! \brief Set receivers information +//! \brief Set tqreceivers information //! //! \param to - Receivers Jabber id void Message::setTo(const Jid &j) @@ -421,12 +421,12 @@ bool Message::containsEvents() const bool Message::containsEvent(MsgEvent e) const { - return d->eventList.contains(e); + return d->eventList.tqcontains(e); } void Message::addEvent(MsgEvent e) { - if (!d->eventList.contains(e)) { + if (!d->eventList.tqcontains(e)) { if (e == CancelEvent || containsEvent(CancelEvent)) d->eventList.clear(); // Reset list d->eventList += e; @@ -503,17 +503,17 @@ Stanza Message::toStanza(Stream *stream) const } } if ( !d->xHTMLBody.isEmpty()) { - TQDomElement parent = s.createElement(s.xhtmlImNS(), "html"); + TQDomElement tqparent = s.createElement(s.xhtmlImNS(), "html"); for(it = d->xHTMLBody.begin(); it != d->xHTMLBody.end(); ++it) { const TQString &str = it.data(); if(!str.isEmpty()) { TQDomElement child = s.createXHTMLElement(str); if(!it.key().isEmpty()) child.setAttributeNS(NS_XML, "xml:lang", it.key()); - parent.appendChild(child); + tqparent.appendChild(child); } } - s.appendChild(parent); + s.appendChild(tqparent); } if(d->type == "error") s.setError(d->error); @@ -658,7 +658,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) if(e.tagName() == "active") { //like in JEP-0022 we let the client know that we can receive ComposingEvent - // (we can do that according to §4.6 of the JEP-0085) + // (we can do that according to �4.6 of the JEP-0085) d->eventList += ComposingEvent; d->eventList += InactiveEvent; d->eventList += GoneEvent; @@ -697,7 +697,7 @@ bool Message::fromStanza(const Stanza &s, int timeZoneOffset) d->spooled = true; } else { - d->timeStamp = TQDateTime::currentDateTime(); + d->timeStamp = TQDateTime::tqcurrentDateTime(); d->spooled = false; } @@ -801,100 +801,100 @@ bool Subscription::fromString(const TQString &s) //--------------------------------------------------------------------------- -// Status +// tqStatus //--------------------------------------------------------------------------- -Status::Status(const TQString &show, const TQString &status, int priority, bool available) +tqStatus::tqStatus(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::currentDateTime(); + v_timeStamp = TQDateTime::tqcurrentDateTime(); v_isInvisible = false; ecode = -1; } -Status::~Status() +tqStatus::~tqStatus() { } -bool Status::hasError() const +bool tqStatus::hasError() const { return (ecode != -1); } -void Status::setError(int code, const TQString &str) +void tqStatus::setError(int code, const TQString &str) { ecode = code; estr = str; } -void Status::setIsAvailable(bool available) +void tqStatus::setIsAvailable(bool available) { v_isAvailable = available; } -void Status::setIsInvisible(bool invisible) +void tqStatus::setIsInvisible(bool invisible) { v_isInvisible = invisible; } -void Status::setPriority(int x) +void tqStatus::setPriority(int x) { v_priority = x; } -void Status::setShow(const TQString & _show) +void tqStatus::setShow(const TQString & _show) { v_show = _show; } -void Status::setStatus(const TQString & _status) +void tqStatus::settqStatus(const TQString & _status) { v_status = _status; } -void Status::setTimeStamp(const TQDateTime & _timestamp) +void tqStatus::setTimeStamp(const TQDateTime & _timestamp) { v_timeStamp = _timestamp; } -void Status::setKeyID(const TQString &key) +void tqStatus::setKeyID(const TQString &key) { v_key = key; } -void Status::setXSigned(const TQString &s) +void tqStatus::setXSigned(const TQString &s) { v_xsigned = s; } -void Status::setSongTitle(const TQString & _songtitle) +void tqStatus::setSongTitle(const TQString & _songtitle) { v_songTitle = _songtitle; } -void Status::setCapsNode(const TQString & _capsNode) +void tqStatus::setCapsNode(const TQString & _capsNode) { v_capsNode = _capsNode; } -void Status::setCapsVersion(const TQString & _capsVersion) +void tqStatus::setCapsVersion(const TQString & _capsVersion) { v_capsVersion = _capsVersion; } -void Status::setCapsExt(const TQString & _capsExt) +void tqStatus::setCapsExt(const TQString & _capsExt) { v_capsExt = _capsExt; } -bool Status::isAvailable() const +bool tqStatus::isAvailable() const { return v_isAvailable; } -bool Status::isAway() const +bool tqStatus::isAway() const { if(v_show == "away" || v_show == "xa" || v_show == "dnd") return true; @@ -902,66 +902,66 @@ bool Status::isAway() const return false; } -bool Status::isInvisible() const +bool tqStatus::isInvisible() const { return v_isInvisible; } -int Status::priority() const +int tqStatus::priority() const { return v_priority; } -const TQString & Status::show() const +const TQString & tqStatus::show() const { return v_show; } -const TQString & Status::status() const +const TQString & tqStatus::status() const { return v_status; } -TQDateTime Status::timeStamp() const +TQDateTime tqStatus::timeStamp() const { return v_timeStamp; } -const TQString & Status::keyID() const +const TQString & tqStatus::keyID() const { return v_key; } -const TQString & Status::xsigned() const +const TQString & tqStatus::xsigned() const { return v_xsigned; } -const TQString & Status::songTitle() const +const TQString & tqStatus::songTitle() const { return v_songTitle; } -const TQString & Status::capsNode() const +const TQString & tqStatus::capsNode() const { return v_capsNode; } -const TQString & Status::capsVersion() const +const TQString & tqStatus::capsVersion() const { return v_capsVersion; } -const TQString & Status::capsExt() const +const TQString & tqStatus::capsExt() const { return v_capsExt; } -int Status::errorCode() const +int tqStatus::errorCode() const { return ecode; } -const TQString & Status::errorString() const +const TQString & tqStatus::errorString() const { return estr; } @@ -970,7 +970,7 @@ const TQString & Status::errorString() const //--------------------------------------------------------------------------- // Resource //--------------------------------------------------------------------------- -Resource::Resource(const TQString &name, const Status &stat) +Resource::Resource(const TQString &name, const tqStatus &stat) { v_name = name; v_status = stat; @@ -990,7 +990,7 @@ int Resource::priority() const return v_status.priority(); } -const Status & Resource::status() const +const tqStatus & Resource::status() const { return v_status; } @@ -1000,7 +1000,7 @@ void Resource::setName(const TQString & _name) v_name = _name; } -void Resource::setStatus(const Status & _status) +void Resource::settqStatus(const tqStatus & _status) { v_status = _status; } @@ -1018,10 +1018,10 @@ ResourceList::~ResourceList() { } -ResourceList::Iterator ResourceList::find(const TQString & _find) +ResourceList::Iterator ResourceList::tqfind(const TQString & _tqfind) { for(ResourceList::Iterator it = begin(); it != end(); ++it) { - if((*it).name() == _find) + if((*it).name() == _tqfind) return it; } @@ -1040,10 +1040,10 @@ ResourceList::Iterator ResourceList::priority() return highest; } -ResourceList::ConstIterator ResourceList::find(const TQString & _find) const +ResourceList::ConstIterator ResourceList::tqfind(const TQString & _tqfind) const { for(ResourceList::ConstIterator it = begin(); it != end(); ++it) { - if((*it).name() == _find) + if((*it).name() == _tqfind) return it; } @@ -1222,7 +1222,7 @@ Roster::~Roster() { } -Roster::Iterator Roster::find(const Jid &j) +Roster::Iterator Roster::tqfind(const Jid &j) { for(Roster::Iterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1232,7 +1232,7 @@ Roster::Iterator Roster::find(const Jid &j) return end(); } -Roster::ConstIterator Roster::find(const Jid &j) const +Roster::ConstIterator Roster::tqfind(const Jid &j) const { for(Roster::ConstIterator it = begin(); it != end(); ++it) { if((*it).jid().compare(j)) @@ -1512,7 +1512,7 @@ bool Features::test(const TQStringList &ns) const { TQStringList::ConstIterator it = ns.begin(); for ( ; it != ns.end(); ++it) - if ( _list.find( *it ) != _list.end() ) + if ( _list.tqfind( *it ) != _list.end() ) return true; return false; @@ -1597,12 +1597,13 @@ bool Features::haveVCard() const // custom Psi acitons #define FID_ADD "psi:add" -class Features::FeatureName : public QObject +class Features::FeatureName : public TQObject { Q_OBJECT + TQ_OBJECT public: FeatureName() - : TQObject(qApp) + : TQObject(tqApp) { id2s[FID_Invalid] = tr("ERROR: Incorrect usage of Features class"); id2s[FID_None] = tr("None"); @@ -1866,7 +1867,7 @@ TQString DiscoItem::action2string(Action a) else if ( a == Remove ) s = "remove"; else - s = TQString::null; + s = TQString(); return s; } 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 9e2fc061..2d13db79 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -35,9 +35,9 @@ using namespace XMPP; static TQString lineEncode(TQString str) { - str.replace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash - str.replace(TQRegExp("\\|"), "\\p"); // pipe to \p - str.replace(TQRegExp("\n"), "\\n"); // newline to \n + str.tqreplace(TQRegExp("\\\\"), "\\\\"); // backslash to double-backslash + str.tqreplace(TQRegExp("\\|"), "\\p"); // pipe to \p + str.tqreplace(TQRegExp("\n"), "\\n"); // newline to \n return str; } @@ -103,8 +103,8 @@ public: int type; }; -JT_Register::JT_Register(Task *parent) -:Task(parent) +JT_Register::JT_Register(Task *tqparent) +:Task(tqparent) { d = new Private; d->type = -1; @@ -246,8 +246,8 @@ public: JT_Register *jt_reg; }; -JT_UnRegister::JT_UnRegister(Task *parent) -: Task(parent) +JT_UnRegister::JT_UnRegister(Task *tqparent) +: Task(tqparent) { d = new Private; d->jt_reg = 0; @@ -306,8 +306,8 @@ public: TQValueList itemList; }; -JT_Roster::JT_Roster(Task *parent) -:Task(parent) +JT_Roster::JT_Roster(Task *tqparent) +:Task(tqparent) { type = -1; d = new Private; @@ -448,8 +448,8 @@ bool JT_Roster::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_PushRoster //---------------------------------------------------------------------------- -JT_PushRoster::JT_PushRoster(Task *parent) -:Task(parent) +JT_PushRoster::JT_PushRoster(Task *tqparent) +:Task(tqparent) { } @@ -475,8 +475,8 @@ bool JT_PushRoster::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Presence //---------------------------------------------------------------------------- -JT_Presence::JT_Presence(Task *parent) -:Task(parent) +JT_Presence::JT_Presence(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -485,7 +485,7 @@ JT_Presence::~JT_Presence() { } -void JT_Presence::pres(const Status &s) +void JT_Presence::pres(const tqStatus &s) { type = 0; @@ -504,7 +504,7 @@ void JT_Presence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -529,7 +529,7 @@ void JT_Presence::pres(const Status &s) } } -void JT_Presence::pres(const Jid &to, const Status &s) +void JT_Presence::pres(const Jid &to, const tqStatus &s) { pres(s); tag.setAttribute("to", to.full()); @@ -554,8 +554,8 @@ void JT_Presence::onGo() //---------------------------------------------------------------------------- // JT_PushPresence //---------------------------------------------------------------------------- -JT_PushPresence::JT_PushPresence(Task *parent) -:Task(parent) +JT_PushPresence::JT_PushPresence(Task *tqparent) +:Task(tqparent) { } @@ -569,7 +569,7 @@ bool JT_PushPresence::take(const TQDomElement &e) return false; Jid j(e.attribute("from")); - Status p; + tqStatus 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.setStatus(tagContent(tag)); + p.settqStatus(tagContent(tag)); tag = findSubTag(e, "show", &found); if(found) p.setShow(tagContent(tag)); @@ -653,10 +653,10 @@ bool JT_PushPresence::take(const TQDomElement &e) //---------------------------------------------------------------------------- static TQDomElement oldStyleNS(const TQDomElement &e) { - // find closest parent with a namespace - TQDomNode par = e.parentNode(); + // find closest tqparent with a namespace + TQDomNode par = e.tqparentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.parentNode(); + par = par.tqparentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -676,7 +676,7 @@ static TQDomElement oldStyleNS(const TQDomElement &e) if(!noShowNS) i.setAttribute("xmlns", e.namespaceURI()); - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -688,8 +688,8 @@ static TQDomElement oldStyleNS(const TQDomElement &e) return i; } -JT_Message::JT_Message(Task *parent, const Message &msg) -:Task(parent) +JT_Message::JT_Message(Task *tqparent, const Message &msg) +:Task(tqparent) { m = msg; m.setId(id()); @@ -724,7 +724,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) // find closest xmlns TQDomNode n = e; while(!n.isNull() && !n.toElement().hasAttribute("xmlns")) - n = n.parentNode(); + n = n.tqparentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; @@ -742,7 +742,7 @@ static TQDomElement addCorrectNS(const TQDomElement &e) i.setAttributeNodeNS(al.item(x).cloneNode().toAttr()); } - // copy children + // copy tqchildren TQDomNodeList nl = e.childNodes(); for(x = 0; x < nl.count(); ++x) { TQDomNode n = nl.item(x); @@ -756,8 +756,8 @@ static TQDomElement addCorrectNS(const TQDomElement &e) return i; } -JT_PushMessage::JT_PushMessage(Task *parent) -:Task(parent) +JT_PushMessage::JT_PushMessage(Task *tqparent) +:Task(tqparent) { } @@ -799,8 +799,8 @@ public: TQString message; }; -JT_GetLastActivity::JT_GetLastActivity(Task *parent) -:Task(parent) +JT_GetLastActivity::JT_GetLastActivity(Task *tqparent) +:Task(tqparent) { d = new Private; } @@ -858,8 +858,8 @@ bool JT_GetLastActivity::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_GetServices //---------------------------------------------------------------------------- -JT_GetServices::JT_GetServices(Task *parent) -:Task(parent) +JT_GetServices::JT_GetServices(Task *tqparent) +:Task(tqparent) { } @@ -955,8 +955,8 @@ public: VCard vcard; }; -JT_VCard::JT_VCard(Task *parent) -:Task(parent) +JT_VCard::JT_VCard(Task *tqparent) +:Task(tqparent) { type = -1; d = new Private; @@ -1055,8 +1055,8 @@ public: TQValueList resultList; }; -JT_Search::JT_Search(Task *parent) -:Task(parent) +JT_Search::JT_Search(Task *tqparent) +:Task(tqparent) { d = new Private; type = -1; @@ -1187,8 +1187,8 @@ bool JT_Search::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ClientVersion //---------------------------------------------------------------------------- -JT_ClientVersion::JT_ClientVersion(Task *parent) -:Task(parent) +JT_ClientVersion::JT_ClientVersion(Task *tqparent) +:Task(tqparent) { } @@ -1258,8 +1258,8 @@ const TQString & JT_ClientVersion::os() const //---------------------------------------------------------------------------- // JT_ClientTime //---------------------------------------------------------------------------- -/*JT_ClientTime::JT_ClientTime(Task *parent, const Jid &_j) -:Task(parent) +/*JT_ClientTime::JT_ClientTime(Task *tqparent, const Jid &_j) +:Task(tqparent) { j = _j; iq = createIQ("get", j.full(), id()); @@ -1307,8 +1307,8 @@ bool JT_ClientTime::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_ServInfo //---------------------------------------------------------------------------- -JT_ServInfo::JT_ServInfo(Task *parent) -:Task(parent) +JT_ServInfo::JT_ServInfo(Task *tqparent) +:Task(tqparent) { } @@ -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::currentDateTime(); + // TQDateTime local = TQDateTime::tqcurrentDateTime(); // 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").arg(local.toString()).arg(str))); + // query.appendChild(textTag("display", TQString("%1 %2").tqarg(local.toString()).tqarg(str))); // send(iq); // return TRUE; //} @@ -1417,7 +1417,7 @@ bool JT_ServInfo::take(const TQDomElement &e) } else if (node.startsWith(client()->capsNode() + "#")) { TQString ext = node.right(node.length()-client()->capsNode().length()-1); - if (client()->extensions().contains(ext)) { + if (client()->extensions().tqcontains(ext)) { const TQStringList& l = client()->extension(ext).list(); for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { feature = doc()->createElement("feature"); @@ -1444,8 +1444,8 @@ bool JT_ServInfo::take(const TQDomElement &e) //---------------------------------------------------------------------------- // JT_Gateway //---------------------------------------------------------------------------- -JT_Gateway::JT_Gateway(Task *parent) -:Task(parent) +JT_Gateway::JT_Gateway(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -1539,8 +1539,8 @@ public: AgentItem root; }; -JT_Browse::JT_Browse (Task *parent) -:Task (parent) +JT_Browse::JT_Browse (Task *tqparent) +:Task (tqparent) { d = new Private; } @@ -1664,8 +1664,8 @@ public: DiscoList items; }; -JT_DiscoItems::JT_DiscoItems(Task *parent) -: Task(parent) +JT_DiscoItems::JT_DiscoItems(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1753,8 +1753,8 @@ public: DiscoItem item; }; -JT_DiscoInfo::JT_DiscoInfo(Task *parent) -: Task(parent) +JT_DiscoInfo::JT_DiscoInfo(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1895,8 +1895,8 @@ public: DiscoList list; }; -JT_DiscoPublish::JT_DiscoPublish(Task *parent) -: Task(parent) +JT_DiscoPublish::JT_DiscoPublish(Task *tqparent) +: Task(tqparent) { d = new Private; } @@ -1959,8 +1959,8 @@ bool JT_DiscoPublish::take(const TQDomElement &x) //---------------------------------------------------------------------------- // JT_MucPresence //---------------------------------------------------------------------------- -JT_MucPresence::JT_MucPresence(Task *parent) -:Task(parent) +JT_MucPresence::JT_MucPresence(Task *tqparent) +:Task(tqparent) { type = -1; } @@ -1969,7 +1969,7 @@ JT_MucPresence::~JT_MucPresence() { } -void JT_MucPresence::pres(const Status &s) +void JT_MucPresence::pres(const tqStatus &s) { type = 0; @@ -1988,7 +1988,7 @@ void JT_MucPresence::pres(const Status &s) if(!s.status().isEmpty()) tag.appendChild(textTag(doc(), "status", s.status())); - tag.appendChild( textTag(doc(), "priority", TQString("%1").arg(s.priority()) ) ); + tag.appendChild( textTag(doc(), "priority", TQString("%1").tqarg(s.priority()) ) ); if(!s.keyID().isEmpty()) { TQDomElement x = textTag(doc(), "x", s.keyID()); @@ -2013,7 +2013,7 @@ void JT_MucPresence::pres(const Status &s) } } -void JT_MucPresence::pres(const Jid &to, const Status &s, const TQString &password) +void JT_MucPresence::pres(const Jid &to, const tqStatus &s, const TQString &password) { pres(s); tag.setAttribute("to", to.full()); @@ -2043,8 +2043,8 @@ class JT_PrivateStorage::Private int type; }; -JT_PrivateStorage::JT_PrivateStorage(Task *parent) - :Task(parent) +JT_PrivateStorage::JT_PrivateStorage(Task *tqparent) + :Task(tqparent) { d = new Private; } 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 c8085013..9d5125d9 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -30,13 +30,14 @@ namespace XMPP { class Roster; - class Status; + class tqStatus; class JT_Register : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Register(Task *parent); + JT_Register(Task *tqparent); ~JT_Register(); void reg(const TQString &user, const TQString &pass); @@ -61,8 +62,9 @@ namespace XMPP class JT_UnRegister : public Task { Q_OBJECT + TQ_OBJECT public: - JT_UnRegister(Task *parent); + JT_UnRegister(Task *tqparent); ~JT_UnRegister(); void unreg(const Jid &); @@ -81,8 +83,9 @@ namespace XMPP class JT_Roster : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Roster(Task *parent); + JT_Roster(Task *tqparent); ~JT_Roster(); void get(); @@ -109,8 +112,9 @@ namespace XMPP class JT_PushRoster : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushRoster(Task *parent); + JT_PushRoster(Task *tqparent); ~JT_PushRoster(); bool take(const TQDomElement &); @@ -126,12 +130,13 @@ namespace XMPP class JT_Presence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Presence(Task *parent); + JT_Presence(Task *tqparent); ~JT_Presence(); - void pres(const Status &); - void pres(const Jid &, const Status &); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &); void sub(const Jid &, const TQString &subType); void onGo(); @@ -147,14 +152,15 @@ namespace XMPP class JT_PushPresence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushPresence(Task *parent); + JT_PushPresence(Task *tqparent); ~JT_PushPresence(); bool take(const TQDomElement &); signals: - void presence(const Jid &, const Status &); + void presence(const Jid &, const tqStatus &); void subscription(const Jid &, const TQString &); private: @@ -165,8 +171,9 @@ namespace XMPP class JT_Message : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Message(Task *parent, const Message &); + JT_Message(Task *tqparent, const Message &); ~JT_Message(); void onGo(); @@ -181,8 +188,9 @@ namespace XMPP class JT_PushMessage : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PushMessage(Task *parent); + JT_PushMessage(Task *tqparent); ~JT_PushMessage(); bool take(const TQDomElement &); @@ -198,6 +206,7 @@ namespace XMPP class JT_GetLastActivity : public Task { Q_OBJECT + TQ_OBJECT public: JT_GetLastActivity(Task *); ~JT_GetLastActivity(); @@ -221,6 +230,7 @@ namespace XMPP class JT_GetServices : public Task { Q_OBJECT + TQ_OBJECT public: JT_GetServices(Task *); @@ -243,8 +253,9 @@ namespace XMPP class JT_VCard : public Task { Q_OBJECT + TQ_OBJECT public: - JT_VCard(Task *parent); + JT_VCard(Task *tqparent); ~JT_VCard(); void get(const Jid &); @@ -266,8 +277,9 @@ namespace XMPP class JT_Search : public Task { Q_OBJECT + TQ_OBJECT public: - JT_Search(Task *parent); + JT_Search(Task *tqparent); ~JT_Search(); const Form & form() const; @@ -290,6 +302,7 @@ namespace XMPP class JT_ClientVersion : public Task { Q_OBJECT + TQ_OBJECT public: JT_ClientVersion(Task *); @@ -312,6 +325,7 @@ namespace XMPP class JT_ClientTime : public Task { Q_OBJECT + TQ_OBJECT public: JT_ClientTime(Task *, const Jid &); @@ -329,6 +343,7 @@ namespace XMPP class JT_ServInfo : public Task { Q_OBJECT + TQ_OBJECT public: JT_ServInfo(Task *); ~JT_ServInfo(); @@ -339,6 +354,7 @@ namespace XMPP class JT_Gateway : public Task { Q_OBJECT + TQ_OBJECT public: JT_Gateway(Task *); @@ -362,6 +378,7 @@ namespace XMPP class JT_Browse : public Task { Q_OBJECT + TQ_OBJECT public: JT_Browse(Task *); ~JT_Browse(); @@ -384,11 +401,12 @@ namespace XMPP class JT_DiscoItems : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoItems(Task *); ~JT_DiscoItems(); - void get(const Jid &, const TQString &node = TQString::null); + void get(const Jid &, const TQString &node = TQString()); void get(const DiscoItem &); const DiscoList &items() const; @@ -404,11 +422,12 @@ namespace XMPP class JT_DiscoInfo : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoInfo(Task *); ~JT_DiscoInfo(); - void get(const Jid &, const TQString &node = TQString::null, const DiscoItem::Identity = DiscoItem::Identity()); + void get(const Jid &, const TQString &node = TQString(), const DiscoItem::Identity = DiscoItem::Identity()); void get(const DiscoItem &); const DiscoItem &item() const; @@ -426,6 +445,7 @@ namespace XMPP class JT_DiscoPublish : public Task { Q_OBJECT + TQ_OBJECT public: JT_DiscoPublish(Task *); ~JT_DiscoPublish(); @@ -443,12 +463,13 @@ namespace XMPP class JT_MucPresence : public Task { Q_OBJECT + TQ_OBJECT public: - JT_MucPresence(Task *parent); + JT_MucPresence(Task *tqparent); ~JT_MucPresence(); - void pres(const Status &); - void pres(const Jid &, const Status &, const TQString &password); + void pres(const tqStatus &); + void pres(const Jid &, const tqStatus &, const TQString &password); void onGo(); @@ -463,8 +484,9 @@ namespace XMPP class JT_PrivateStorage : public Task { Q_OBJECT + TQ_OBJECT public: - JT_PrivateStorage(Task *parent); + JT_PrivateStorage(Task *tqparent); ~JT_PrivateStorage(); void set(const TQDomElement &); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp index 5f5214fd..009f0136 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp @@ -81,7 +81,7 @@ static TQString subTagText(const TQDomElement &e, const TQString &name) TQDomElement i = findSubTag(e, name, &found); if ( found ) return i.text().stripWhiteSpace(); - return TQString::null; + return TQString(); } using namespace XMPP; @@ -93,7 +93,7 @@ static TQString image2type(const TQByteArray &ba) { TQBuffer buf(ba); buf.open(IO_ReadOnly); - TQString format = TQImageIO::imageFormat( &buf ); + TQString format = TQImageIO::imageFormat( TQT_TQIODEVICE(&buf) ); // TODO: add more formats if ( format == "PNG" || format == "PsiPNG" ) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp index d7b5c82d..65c3b8b3 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp @@ -185,7 +185,7 @@ TQString subTagText(const TQDomElement &e, const TQString &name) TQDomElement i = findSubTag(e, name, &found); if ( found ) return i.text(); - return TQString::null; + return TQString(); } TQDomElement textTag(TQDomDocument &doc, const TQString &name, const TQString &content) diff --git a/kopete/protocols/jabber/libiris/jingle_iris.patch b/kopete/protocols/jabber/libiris/jingle_iris.patch index 41acad0e..2fcf782b 100644 --- a/kopete/protocols/jabber/libiris/jingle_iris.patch +++ b/kopete/protocols/jabber/libiris/jingle_iris.patch @@ -159,7 +159,7 @@ diff -ur psi/iris/xmpp-im/client.cpp psi-jingle/iris/xmpp-im/client.cpp + +void Client::removeExtension(const QString& ext) +{ -+ if (d->extension_features.contains(ext)) { ++ if (d->extension_features.tqcontains(ext)) { + d->extension_features.remove(ext); + d->capsExt = extensions().join(" "); + } @@ -185,44 +185,44 @@ diff -ur psi/iris/xmpp-im/types.cpp psi-jingle/iris/xmpp-im/types.cpp v_songTitle = _songtitle; } -+void Status::setCapsNode(const QString & _capsNode) ++void tqStatus::setCapsNode(const QString & _capsNode) +{ + v_capsNode = _capsNode; +} + -+void Status::setCapsVersion(const QString & _capsVersion) ++void tqStatus::setCapsVersion(const QString & _capsVersion) +{ + v_capsVersion = _capsVersion; +} + -+void Status::setCapsExt(const QString & _capsExt) ++void tqStatus::setCapsExt(const QString & _capsExt) +{ + v_capsExt = _capsExt; +} + - bool Status::isAvailable() const + bool tqStatus::isAvailable() const { return v_isAvailable; @@ -836,6 +851,21 @@ return v_songTitle; } -+const QString & Status::capsNode() const ++const QString & tqStatus::capsNode() const +{ + return v_capsNode; +} + -+const QString & Status::capsVersion() const ++const QString & tqStatus::capsVersion() const +{ + return v_capsVersion; +} + -+const QString & Status::capsExt() const ++const QString & tqStatus::capsExt() const +{ + return v_capsExt; +} + - int Status::errorCode() const + int tqStatus::errorCode() const { return ecode; @@ -1427,6 +1457,15 @@ @@ -354,7 +354,7 @@ diff -ur psi/iris/xmpp-im/xmpp_tasks.cpp psi-jingle/iris/xmpp-im/xmpp_tasks.cpp + } + else if (node.startsWith(client()->capsNode() + "#")) { + QString ext = node.right(node.length()-client()->capsNode().length()-1); -+ if (client()->extensions().contains(ext)) { ++ if (client()->extensions().tqcontains(ext)) { + const QStringList& l = client()->extension(ext).list(); + for ( QStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { + feature = doc()->createElement("feature"); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp index 4a197527..ee51335f 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp +++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp @@ -1,5 +1,5 @@ /* - * qca.cpp - Qt Cryptographic Architecture + * qca.cpp - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -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::fromLatin1(cs); + return TQString::tqfromLatin1(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::fromLatin1(cs); + return TQString::tqfromLatin1(cs); } bool Cert::fromPEM(const TQString &str) @@ -859,8 +859,8 @@ public: TQPtrList store; }; -TLS::TLS(TQObject *parent) -:TQObject(parent) +TLS::TLS(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } @@ -1127,8 +1127,8 @@ public: TQByteArray inbuf, outbuf; }; -SASL::SASL(TQObject *parent) -:TQObject(parent) +SASL::SASL(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; reset(); @@ -1227,13 +1227,13 @@ void SASL::setExternalSSF(int x) d->ext_ssf = x; } -void SASL::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->localAddr = addr; d->localPort = port; } -void SASL::setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port) +void SASL::setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->remoteAddr = addr; d->remotePort = port; diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h index 9df6f7cd..dab99d5a 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.h +++ b/kopete/protocols/jabber/libiris/qca/src/qca.h @@ -1,5 +1,5 @@ /* - * qca.h - Qt Cryptographic Architecture + * qca.h - TQt Cryptographic Architecture * Copyright (C) 2003 Justin Karneges * * This library is free software; you can redistribute it and/or @@ -311,9 +311,10 @@ namespace QCA void fromContext(QCA_CertContext *); }; - class QCA_EXPORT TLS : public QObject + class QCA_EXPORT TLS : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Validity { NoCert, @@ -332,7 +333,7 @@ namespace QCA }; enum Error { ErrHandshake, ErrCrypt }; - TLS(TQObject *parent=0); + TLS(TQObject *tqparent=0); ~TLS(); void setCertificate(const Cert &cert, const RSAKey &key); @@ -372,9 +373,10 @@ namespace QCA Private *d; }; - class QCA_EXPORT SASL : public QObject + class QCA_EXPORT SASL : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrAuth, ErrCrypt }; enum ErrorCond { @@ -390,7 +392,7 @@ namespace QCA NoUser, RemoteUnavail }; - SASL(TQObject *parent=0); + SASL(TQObject *tqparent=0); ~SASL(); static void setAppName(const TQString &name); @@ -412,8 +414,8 @@ namespace QCA void setExternalAuthID(const TQString &authid); void setExternalSSF(int); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); - void setRemoteAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); + void setRemoteAddr(const TQHostAddress &addr, TQ_UINT16 port); // initialize bool startClient(const TQString &service, const TQString &host, const TQStringList &mechlist, bool allowClientSendFirst=true); diff --git a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h index 6eda17f9..9f4fa1fb 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h +++ b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h @@ -141,7 +141,7 @@ public: struct QCA_SASLHostPort { TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; struct QCA_SASLNeedParams diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index 20a4ab98..f39e81ef 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -1,6 +1,6 @@ dlgAddContact - + dlgAddContact @@ -25,22 +25,22 @@ 6 - + - layout24 + tqlayout24 unnamed - + lblID &Jabber ID: - + AlignTop @@ -66,14 +66,14 @@ - + textLabel1 <i>(for example: joe@jabber.org)</i> - + WordBreak|AlignVCenter|AlignRight @@ -87,7 +87,7 @@ Expanding - + 20 190 @@ -98,7 +98,7 @@ - + klineedit.h diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index f45f224a..1b73dd95 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -1,6 +1,6 @@ dlgBrowse - + dlgBrowse @@ -19,14 +19,14 @@ unnamed - + splitter1 Horizontal - + dynamicForm @@ -37,7 +37,7 @@ unnamed - + lblWait @@ -47,13 +47,13 @@ Please wait while retrieving search form... - + WordBreak|AlignVCenter - + JID @@ -110,7 +110,7 @@ - + buttonsLayout @@ -128,7 +128,7 @@ Expanding - + 51 21 @@ -193,7 +193,7 @@ close() - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/jabber/ui/dlgchangepassword.ui b/kopete/protocols/jabber/ui/dlgchangepassword.ui index c3e34de6..18c0b439 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -1,6 +1,6 @@ DlgChangePassword - + DlgChangePassword @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -24,7 +24,7 @@ Current password: - + textLabel2 @@ -32,7 +32,7 @@ New password: - + textLabel3 @@ -55,9 +55,9 @@ peNewPassword2 - + - lblStatus + lbltqStatus @@ -71,7 +71,7 @@ Please enter your current password first and then your new password twice. - + AlignCenter @@ -79,7 +79,7 @@ and then your new password twice. - + kpassdlg.h kpassdlg.h diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui index 699f9ef4..db1bbfcb 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -16,7 +16,7 @@ unnamed - + lblNick @@ -24,22 +24,22 @@ Nick: - + leServer - + leNick - + leRoom - + lblRoom @@ -47,7 +47,7 @@ Room: - + lblServer @@ -55,9 +55,9 @@ Server: - + - layout3 + tqlayout3 @@ -73,14 +73,14 @@ Expanding - + 41 20 - + pbJoin @@ -91,7 +91,7 @@ true - + pbBrowse @@ -122,9 +122,9 @@ leServer leNick - + slotBowse() slotJoin() - - + + diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index f4624de3..0c5e07be 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -19,15 +19,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + lblServer @@ -35,12 +35,12 @@ Server - + leServer - + pbQuery @@ -50,7 +50,7 @@ - + Chatroom Name @@ -95,9 +95,9 @@ FollowStyle - + - layout5 + tqlayout5 @@ -113,14 +113,14 @@ Expanding - + 121 21 - + pbJoin @@ -128,7 +128,7 @@ &Join - + pbClose @@ -172,13 +172,13 @@ slotDoubleClick(int,int,int,const QPoint&) - + slotQuery() slotJoin() slotClick(int row, int col, int button, const QPoint& mousePos) slotDoubleClick(int row, int col, int button, const QPoint& mousePos) - - + + kdialog.h diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index be558388..22c228c7 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -30,7 +30,7 @@ #include "jabberformtranslator.h" #include "dlgjabberbrowse.h" -dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgBrowse (parent, name) +dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgBrowse (tqparent, name) { m_account = account; @@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm () // translate the form and create it inside the display widget translator = new JabberFormTranslator (task->form (), dynamicForm); - dynamicForm->layout()->add( translator ); + dynamicForm->tqlayout()->add( translator ); translator->show(); // enable the send button diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 20886005..85b67fb9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -35,9 +35,10 @@ class dlgJabberBrowse:public dlgBrowse { Q_OBJECT + TQ_OBJECT public: - dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberBrowse (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index 948a594e..ec7d1d10 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -30,8 +30,8 @@ #include "jabberaccount.h" #include "dlgchangepassword.h" -DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Change Jabber Password"), +DlgJabberChangePassword::DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Change Jabber Password"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ) { @@ -116,7 +116,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () if ( task->success () ) { - KMessageBox::queuedMessageBox ( dynamic_cast(parent()), KMessageBox::Information, + KMessageBox::queuedMessageBox ( dynamic_cast(tqparent()), KMessageBox::Information, i18n ( "Your password has been changed successfully. Please note that the change may not be instantaneous. If you have problems logging in with your new password, please contact the administrator." ), i18n ( "Jabber Password Change" ) ); @@ -124,7 +124,7 @@ void DlgJabberChangePassword::slotChangePasswordDone () } else { - KMessageBox::queuedMessageBox ( dynamic_cast(parent()), KMessageBox::Sorry, + KMessageBox::queuedMessageBox ( dynamic_cast(tqparent()), KMessageBox::Sorry, i18n ( "Your password could not be changed. Either your server does not support this feature or the administrator does not allow you to change your password." ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index 023485ec..2dd8d8dd 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -32,9 +32,10 @@ class DlgJabberChangePassword : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + DlgJabberChangePassword ( JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); ~DlgJabberChangePassword(); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index 9d69beae..e24815d5 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -27,8 +27,8 @@ #include "dlgjabberchatjoin.h" -dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* parent, const char* name) : -dlgChatJoin(parent, name), +dlgJabberChatJoin::dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent, const char* name) : +dlgChatJoin(tqparent, name), m_account(account) { setCaption(i18n("Join Jabber Groupchat")); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index d68ae78e..6263fd32 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -25,9 +25,10 @@ class dlgJabberChatJoin : public dlgChatJoin { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatJoin(JabberAccount *account, TQWidget* tqparent = 0, const char* name = 0); ~dlgJabberChatJoin(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 1803a013..838eb84f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -21,8 +21,8 @@ #include "dlgjabberchatroomslist.h" #include "jabberprotocol.h" -dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *parent, const char *name) : -dlgChatRoomsList(parent, name), +dlgJabberChatRoomsList::dlgJabberChatRoomsList(JabberAccount* account, const TQString& server, const TQString &nick, TQWidget *tqparent, const char *name) : +dlgChatRoomsList(tqparent, name), m_account(account) , m_selectedRow(-1) , m_nick(nick) { if (!server.isNull()) diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index 6b1dce7b..5bb8b4a9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -21,9 +21,10 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList { Q_OBJECT + TQ_OBJECT public: - dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString::null, const TQString& nick = TQString::null, TQWidget* parent = 0, const char* name = 0); + dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* tqparent = 0, const char* name = 0); ~dlgJabberChatRoomsList(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index 0a04b388..51943ee4 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -1,6 +1,6 @@ DlgJabberChooseServer - + DlgJabberChooseServer @@ -12,7 +12,7 @@ 343 - + 300 300 @@ -25,7 +25,7 @@ unnamed - + Server @@ -85,9 +85,9 @@ <a href="http://www.jabber.org/network/">Details about free public Jabber servers</a> - + - lblStatus + lbltqStatus @@ -100,7 +100,7 @@ 789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa - + kactivelabel.h diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 099e84a6..085f0b91 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -1,7 +1,7 @@ DlgJabberEditAccountWidget Daniel Stone - + DlgJabberEditAccountWidget @@ -26,14 +26,14 @@ unnamed - + tabWidget10 0 - + tab @@ -44,7 +44,7 @@ unnamed - + groupBox65 @@ -55,15 +55,15 @@ unnamed - + - layout61 + tqlayout61 unnamed - + TextLabel1_3 @@ -80,7 +80,7 @@ The Jabber ID for the account you would like to use. Note that this must include the username and the domain (like an E-mail address), as there are many Jabber servers. - + mID @@ -101,7 +101,7 @@ mPass - + cbAutoConnect @@ -112,7 +112,7 @@ Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window - + cbGlobalIdentity @@ -122,7 +122,7 @@ - + groupBox5 @@ -141,7 +141,7 @@ unnamed - + lblRegistration @@ -153,7 +153,7 @@ 0 - + 0 0 @@ -162,11 +162,11 @@ 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. - + WordBreak|AlignVCenter - + btnRegister @@ -182,7 +182,7 @@ - + groupBox8_2 @@ -201,7 +201,7 @@ unnamed - + btnChangePassword @@ -209,7 +209,7 @@ Change &Your Password - + tlChangePwSuccess @@ -227,7 +227,7 @@ If you have an existing Jabber account and would like to change its password, you can use this button to enter a new password. - + WordBreak|AlignVCenter @@ -243,7 +243,7 @@ Maximum - + 20 16 @@ -252,7 +252,7 @@ - + TabPage @@ -263,7 +263,7 @@ unnamed - + groupBox66 @@ -274,7 +274,7 @@ unnamed - + cbUseSSL @@ -288,7 +288,7 @@ Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server. - + cbAllowPlainTextPassword @@ -299,7 +299,7 @@ true - + cbCustomServer @@ -310,15 +310,15 @@ false - + - layout66 + tqlayout66 unnamed - + labelServer @@ -346,7 +346,7 @@ The IP address or hostname of the server you would like to connect to (for example jabber.org). - + mServer @@ -363,7 +363,7 @@ The IP address or hostname of the server you would like to connect to (for example jabber.org). - + labelPort @@ -391,7 +391,7 @@ The port on the server that you would like to connect to (default is 5222). - + mPort @@ -429,7 +429,7 @@ - + groupBox8 @@ -440,7 +440,7 @@ unnamed - + TextLabel3_3 @@ -457,7 +457,7 @@ The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example. - + mResource @@ -469,7 +469,7 @@ 0 - + 100 32767 @@ -495,14 +495,14 @@ Expanding - + 31 20 - + TextLabel3_3_2 @@ -517,7 +517,7 @@ P&riority: - + AlignVCenter @@ -530,7 +530,7 @@ The resource name you would like to use on the Jabber network. Jabber allows you to sign on with the same account from multiple locations with different resource names, so you may wish to enter 'Home' or 'Work' here, for example. - + mPriority @@ -542,13 +542,13 @@ 0 - + 100 0 - + 100 32767 @@ -575,7 +575,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 20 200 @@ -584,7 +584,7 @@ If two resources have the same priority, the messages will be sent to the one co - + TabPage @@ -595,7 +595,7 @@ If two resources have the same priority, the messages will be sent to the one co unnamed - + groupBox4 @@ -606,20 +606,20 @@ If two resources have the same priority, the messages will be sent to the one co unnamed - + - layout70 + tqlayout70 unnamed - + leProxyJID - + textLabel5 @@ -630,20 +630,20 @@ If two resources have the same priority, the messages will be sent to the one co leProxyJID - + - layout68 + tqlayout68 unnamed - + leLocalIP - + textLabel4 @@ -654,7 +654,7 @@ If two resources have the same priority, the messages will be sent to the one co sbLocalPort - + sbLocalPort @@ -667,7 +667,7 @@ If two resources have the same priority, the messages will be sent to the one co - + textLabel2 @@ -680,7 +680,7 @@ If two resources have the same priority, the messages will be sent to the one co - + textLabel3 @@ -691,7 +691,7 @@ If two resources have the same priority, the messages will be sent to the one co <li>Changes to these fields will only take effect the next time you start Kopete.</li> <li>The "Proxy JID" can be configured per account.</li></ul></i> - + WordBreak|AlignVCenter @@ -707,7 +707,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 20 241 @@ -716,7 +716,7 @@ If two resources have the same priority, the messages will be sent to the one co - + TabPage @@ -727,7 +727,7 @@ If two resources have the same priority, the messages will be sent to the one co unnamed - + groupBox7 @@ -748,14 +748,14 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 40 20 - + cbHideSystemInfo @@ -768,7 +768,7 @@ If two resources have the same priority, the messages will be sent to the one co - + groupBox6 @@ -779,7 +779,7 @@ If two resources have the same priority, the messages will be sent to the one co unnamed - + cbSendEvents @@ -796,9 +796,9 @@ If two resources have the same priority, the messages will be sent to the one co Check this box if you want to always send notifications to your contacts. - + - layout10 + tqlayout10 @@ -814,22 +814,22 @@ If two resources have the same priority, the messages will be sent to the one co Fixed - + 30 20 - + - layout9 + tqlayout9 unnamed - + cbSendDeliveredEvent @@ -846,7 +846,7 @@ If two resources have the same priority, the messages will be sent to the one co <qt>Check this box to send the <b>Delivered notification</b> to your contacts : when a message is delivered to Kopete, Kopete can notify your contact that it has received the message.</qt> - + cbSendDisplayedEvent @@ -863,7 +863,7 @@ If two resources have the same priority, the messages will be sent to the one co <qt>Check this box to send the <b>Displayed notification</b> to your contacts : when a message is displayed in Kopete, Kopete can notify your contact that it has displayed the message.</qt> - + cbSendComposingEvent @@ -880,7 +880,7 @@ If two resources have the same priority, the messages will be sent to the one co <qt>Check this box to send the <b>Typing notification</b> to your contacts : when you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt> - + cbSendGoneEvent @@ -907,7 +907,7 @@ If two resources have the same priority, the messages will be sent to the one co Expanding - + 21 110 @@ -986,7 +986,7 @@ If two resources have the same priority, the messages will be sent to the one co cbSendDisplayedEvent cbSendComposingEvent - + kopetepasswordwidget.h diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index ff324085..5f6b05a2 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -26,7 +26,7 @@ #include "jabberclient.h" #include "dlgjabberregister.h" -dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent, const char *name):dlgRegister (parent, name) +dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent, const char *name):dlgRegister (tqparent, name) { m_account = account; @@ -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(grpForm->layout())->insertWidget(1, translator); + static_cast(grpForm->tqlayout())->insertWidget(1, translator); translator->show(); - resize(sizeHint()); + resize(tqsizeHint()); // enable the send button btnRegister->setEnabled (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index 5cb0af67..86100852 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -39,9 +39,10 @@ class dlgJabberRegister:public dlgRegister { Q_OBJECT + TQ_OBJECT public: - dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); + dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberRegister (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index c411bb96..96c91ec1 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -1,6 +1,6 @@ DlgJabberRegisterAccount - + DlgJabberRegisterAccount @@ -12,7 +12,7 @@ 376 - + 300 350 @@ -25,7 +25,7 @@ unnamed - + lblJID @@ -36,32 +36,32 @@ leJID - + pixPasswordVerify - + 16 16 - + 32767 32767 - + - layoutServerEntry + tqlayoutServerEntry unnamed - + leServer @@ -79,7 +79,7 @@ - + lblPassword @@ -106,7 +106,7 @@ 65535 - + cbUseSSL @@ -131,24 +131,24 @@ Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server. - + pixJID - + 16 16 - + 32767 32767 - + lblPort @@ -159,7 +159,7 @@ sbPort - + lblPasswordVerify @@ -181,24 +181,24 @@ Password - + pixServer - + 16 16 - + 32767 32767 - + lblServer @@ -209,17 +209,17 @@ leServer - + pixPassword - + 16 16 - + 32767 32767 @@ -237,7 +237,7 @@ Password - + leJID @@ -245,19 +245,19 @@ - + - layout3 + tqlayout3 unnamed - + lblJIDInformation - + 0 100 @@ -266,7 +266,7 @@ - + WordBreak|AlignVCenter @@ -280,21 +280,21 @@ Expanding - + 20 16 - + lblStatusMessage - + AlignCenter @@ -309,7 +309,7 @@ lePassword lePasswordVerify - + kpushbutton.h knuminput.h diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 4b9192dc..f16d927a 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -24,8 +24,8 @@ #include #include "jabberclient.h" -dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, const char *name ) - : DlgSendRaw (parent, name) +dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *tqparent, const char *name ) + : DlgSendRaw (tqparent, name) { // Connect the GUI elements to things that do stuff connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 44e1a9ad..8a16f3e7 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -28,7 +28,7 @@ class JabberClient; * A dialog to send raw strings to the jabber server. * * It comes with a TQComboBox to choose some "template" strings - * like "Availability Status", "Subscription",... + * like "Availability tqStatus", "Subscription",... * * @author Till Gerken * @author Chris TenHarmsel @@ -36,9 +36,10 @@ class JabberClient; class dlgJabberSendRaw:public DlgSendRaw { Q_OBJECT + TQ_OBJECT public: - dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); + dlgJabberSendRaw ( JabberClient *client, TQWidget * tqparent = 0, const char *name = 0); virtual ~ dlgJabberSendRaw (); public slots: @@ -54,7 +55,7 @@ public slots: void slotClear (); /** - * Sets a xml message in tePacket(QTextWidget) + * Sets a xml message in tePacket(TQTextWidget) * according to the state of inputWidget. */ void slotCreateMessage (int); diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 1bd1310c..e0e1a315 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -32,7 +32,7 @@ #include "dlgjabberservices.moc" -dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, const char *name):dlgServices (parent, name) +dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *tqparent, const char *name):dlgServices (tqparent, name) { m_account = account; @@ -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").arg(error), i18n ("Jabber Error")); + KMessageBox::queuedMessageBox (this, KMessageBox::Error, i18n ("Unable to retrieve the list of services.\nReason: %1").tqarg(error), i18n ("Jabber Error")); return; } diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index c64fb045..9672cc55 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -34,9 +34,10 @@ class dlgJabberServices:public dlgServices { Q_OBJECT + TQ_OBJECT public: - dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); + dlgJabberServices (JabberAccount *account, TQWidget *tqparent = 0, const char *name = 0); ~dlgJabberServices (); private slots: @@ -59,9 +60,10 @@ private: class dlgJabberServies_item : protected TQObject, public TQListViewItem { Q_OBJECT + TQ_OBJECT public: - dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) - : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} + dlgJabberServies_item( TQListView *tqparent , const TQString &s1 , const TQString &s2 ) + : TQListViewItem(tqparent,s1,s2), can_browse(false) , can_register(false) {} bool can_browse, can_register; XMPP::Jid jid; diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 19070798..44278511 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -22,7 +22,7 @@ #include "dlgjabbervcard.h" -// Qt includes +// TQt includes #include #include #include @@ -56,12 +56,12 @@ #include "dlgvcard.h" /* - * Constructs a dlgJabberVCard which is a child of 'parent', with the + * Constructs a dlgJabberVCard which is a child of 'tqparent', with the * name 'name' * */ -dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent, const char *name) - : KDialogBase (parent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) +dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent, const char *name) + : KDialogBase (tqparent, name, false, i18n("Jabber vCard"), Close | User1 | User2, Close, false, i18n("&Save User Info"), i18n("&Fetch vCard") ) { m_account = account; @@ -92,7 +92,7 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta */ dlgJabberVCard::~dlgJabberVCard () { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -296,7 +296,7 @@ void dlgJabberVCard::setEnabled(bool state) void dlgJabberVCard::slotSaveVCard() { setEnabled(false); - m_mainWidget->lblStatus->setText( i18n("Saving vCard to server...") ); + m_mainWidget->lbltqStatus->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->lblStatus->setText( i18n("vCard save sucessful.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard save sucessful.") ); m_contact->setPropertiesFromVCard( vCard->vcard() ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: Unable to save vCard.") ); + m_mainWidget->lbltqStatus->setText( i18n("Error: Unable to save vCard.") ); } setEnabled(true); @@ -431,7 +431,7 @@ void dlgJabberVCard::slotVCardSaved() void dlgJabberVCard::slotGetVCard() { - m_mainWidget->lblStatus->setText( i18n("Fetching contact vCard...") ); + m_mainWidget->lbltqStatus->setText( i18n("Fetching contact vCard...") ); setReadOnly(true); setEnabled(false); @@ -454,11 +454,11 @@ void dlgJabberVCard::slotGotVCard() assignContactProperties(); - m_mainWidget->lblStatus->setText( i18n("vCard fetching Done.") ); + m_mainWidget->lbltqStatus->setText( i18n("vCard fetching Done.") ); } else { - m_mainWidget->lblStatus->setText( i18n("Error: vCard could not be fetched correctly. Check connectivity with the Jabber server.") ); + m_mainWidget->lbltqStatus->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 ); @@ -469,7 +469,7 @@ void dlgJabberVCard::slotSelectPhoto() { TQString path; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Jabber Photo" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "Jabber Photo" ) ); if( filePath.isEmpty() ) return; @@ -493,7 +493,7 @@ void dlgJabberVCard::slotSelectPhoto() if(img.width() > 96 || img.height() > 96) { // Scale and crop the picture. - img = img.smoothScale( 96, 96, TQImage::ScaleMin ); + img = img.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 96, 96); @@ -504,7 +504,7 @@ void dlgJabberVCard::slotSelectPhoto() else if (img.width() < 32 || img.height() < 32) { // Scale and crop the picture. - img = img.smoothScale( 32, 32, TQImage::ScaleMin ); + img = img.smoothScale( 32, 32, TQ_ScaleMin ); // crop image if not square if(img.width() < img.height()) img = img.copy((img.width()-img.height())/2, 0, 32, 32); @@ -520,14 +520,14 @@ void dlgJabberVCard::slotSelectPhoto() img = img.copy(0, (img.height()-img.width())/2, img.height(), img.height()); } - m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().replace(TQRegExp("[./~]"),"-") +".png"); + m_photoPath = locateLocal("appdata", "jabberphotos/" + m_contact->rosterItem().jid().full().lower().tqreplace(TQRegExp("[./~]"),"-") +".png"); if( img.save(m_photoPath, "PNG") ) { m_mainWidget->lblPhoto->setPixmap( TQPixmap(img) ); } else { - m_photoPath = TQString::null; + m_photoPath = TQString(); } } else @@ -542,12 +542,12 @@ void dlgJabberVCard::slotSelectPhoto() void dlgJabberVCard::slotClearPhoto() { m_mainWidget->lblPhoto->setPixmap( TQPixmap() ); - m_photoPath = TQString::null; + m_photoPath = TQString(); } void dlgJabberVCard::slotOpenURL(const TQString &url) { - if ( !url.isEmpty () || (url == TQString::fromLatin1("mailto:") ) ) + if ( !url.isEmpty () || (url == TQString::tqfromLatin1("mailto:") ) ) new KRun(KURL( url ) ); } diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index a3794ee4..0ab95193 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -45,6 +45,7 @@ class dlgVCard; class dlgJabberVCard : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -55,7 +56,7 @@ public: * @param widget Parent widget. * @param name widget name. */ - dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * parent = 0, const char *name = 0); + dlgJabberVCard (JabberAccount *account, JabberBaseContact *contact, TQWidget * tqparent = 0, const char *name = 0); ~dlgJabberVCard (); private slots: diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index a3930c2e..76c8cc84 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -1,6 +1,6 @@ dlgRegister - + dlgRegister @@ -30,7 +30,7 @@ unnamed - + grpForm @@ -52,7 +52,7 @@ unnamed - + lblWait @@ -78,7 +78,7 @@ Expanding - + 20 0 @@ -87,7 +87,7 @@ - + Layout1 @@ -111,14 +111,14 @@ Expanding - + 20 20 - + btnRegister @@ -135,7 +135,7 @@ true - + btnCancel @@ -158,5 +158,5 @@ reject() - + diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 08e31f66..20c01e7c 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -1,6 +1,6 @@ DlgSendRaw - + DlgSendRaw @@ -19,15 +19,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + lblInfo @@ -42,15 +42,15 @@ Type in the packet that should be sent to the server: - lblRealStatus + lblRealtqStatus - + tePacket - + User Defined @@ -63,7 +63,7 @@ - Availability Status + Availability tqStatus @@ -100,15 +100,15 @@ inputWidget - + - layout3 + tqlayout3 unnamed - + btnClear @@ -116,7 +116,7 @@ Clea&r - + btnSend @@ -134,14 +134,14 @@ Expanding - + 16 25 - + btnClose @@ -155,5 +155,5 @@ - + diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index 7679309d..03022c61 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -1,6 +1,6 @@ dlgServices - + dlgServices @@ -22,15 +22,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + lblServer @@ -46,7 +46,7 @@ Server: - + leServer @@ -59,7 +59,7 @@ - + btnQuery @@ -83,7 +83,7 @@ - + Jid @@ -110,9 +110,9 @@ lvServices - + - layout1 + tqlayout1 @@ -128,14 +128,14 @@ Expanding - + 111 21 - + btnRegister @@ -151,7 +151,7 @@ &Register - + btnBrowse @@ -167,7 +167,7 @@ &Browse - + btnClose @@ -195,5 +195,5 @@ close() - + diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index efaf5519..857a2890 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -1,6 +1,6 @@ dlgVCard - + dlgVCard @@ -16,11 +16,11 @@ unnamed - + tabWidget3 - + tab @@ -31,15 +31,15 @@ unnamed - + - layout13 + tqlayout13 unnamed - + lblBirthday @@ -47,7 +47,7 @@ Birthday: - + leBirthday @@ -62,15 +62,15 @@ - + - layout12 + tqlayout12 unnamed - + lblHomepage @@ -78,7 +78,7 @@ Homepage: - + wsHomepage @@ -90,13 +90,13 @@ 0 - + 0 0 - + page @@ -125,14 +125,14 @@ - + page 1 - + leHomepage @@ -157,15 +157,15 @@ - + - layout14 + tqlayout14 unnamed - + lblTimezone @@ -173,7 +173,7 @@ Timezone: - + leTimezone @@ -188,15 +188,15 @@ - + - layout11 + tqlayout11 unnamed - + lblJID @@ -204,7 +204,7 @@ Jabber ID: - + leJID @@ -219,15 +219,15 @@ - + - layout10 + tqlayout10 unnamed - + lblName @@ -235,7 +235,7 @@ Full name: - + leName @@ -253,15 +253,15 @@ - + - layout9 + tqlayout9 unnamed - + lblNick @@ -269,7 +269,7 @@ Nickname: - + leNick @@ -294,7 +294,7 @@ Expanding - + 20 20 @@ -311,14 +311,14 @@ Expanding - + 20 20 - + groupBox1 @@ -329,7 +329,7 @@ unnamed - + btnSelectPhoto @@ -337,7 +337,7 @@ &Select Photo... - + btnClearPhoto @@ -345,7 +345,7 @@ Clear Pho&to - + lblPhoto @@ -357,13 +357,13 @@ 0 - + 96 96 - + 96 96 @@ -386,7 +386,7 @@ Expanding - + 40 20 @@ -403,7 +403,7 @@ Expanding - + 40 20 @@ -414,7 +414,7 @@ - + tab @@ -425,15 +425,15 @@ unnamed - + - layout36 + tqlayout36 unnamed - + lblState @@ -441,7 +441,7 @@ Postal code: - + lblPOBox @@ -449,12 +449,12 @@ PO box: - + leHomeExtAddr - + lblCity @@ -472,14 +472,14 @@ Expanding - + 20 16 - + wsHomeEmail @@ -491,7 +491,7 @@ 0 - + page @@ -512,14 +512,14 @@ - + page 1 - + leHomeEmail @@ -534,7 +534,7 @@ - + lblCountry @@ -542,7 +542,7 @@ Country: - + lblStreet @@ -550,7 +550,7 @@ Street: - + lblEmail @@ -566,12 +566,12 @@ Email: - + leHomePOBox - + leHomePostalCode @@ -586,24 +586,24 @@ Expanding - + 20 50 - + leHomeCountry - + leHomeCity - + leHomeStreet @@ -612,7 +612,7 @@ - + tab @@ -623,9 +623,9 @@ unnamed - + - layout37 + tqlayout37 @@ -641,24 +641,24 @@ Expanding - + 20 16 - + leWorkPOBox - + leWorkCountry - + lblCity_2 @@ -666,12 +666,12 @@ City: - + leWorkExtAddr - + lblPOBox_2 @@ -679,17 +679,17 @@ PO box: - + leWorkCity - + leWorkStreet - + lblEmail_2 @@ -697,7 +697,7 @@ Email: - + lblCountry_2 @@ -705,7 +705,7 @@ Country: - + leWorkPostalCode @@ -720,14 +720,14 @@ Expanding - + 20 30 - + lblState_2 @@ -735,7 +735,7 @@ Postal code: - + lblStreet_2 @@ -743,7 +743,7 @@ Street: - + wsWorkEmail @@ -755,7 +755,7 @@ 0 - + page @@ -776,14 +776,14 @@ - + page 1 - + leWorkEmail @@ -810,7 +810,7 @@ - + tab @@ -821,20 +821,20 @@ unnamed - + - layout57 + tqlayout57 unnamed - + leDepartment - + leCompany @@ -849,14 +849,14 @@ Expanding - + 20 20 - + lblPosition @@ -864,17 +864,17 @@ Position: - + lePosition - + leRole - + lblRole @@ -882,7 +882,7 @@ Role: - + lblDepartment @@ -890,7 +890,7 @@ Department: - + lblCompany @@ -902,7 +902,7 @@ - + tab @@ -913,9 +913,9 @@ unnamed - + - layout59 + tqlayout59 @@ -931,24 +931,24 @@ Expanding - + 20 20 - + lePhoneFax - + lePhoneCell - + lblPhoneFax @@ -956,12 +956,12 @@ Fax: - + lePhoneHome - + lblPhoneCell @@ -969,12 +969,12 @@ Cell: - + lePhoneWork - + lblPhoneWork @@ -982,7 +982,7 @@ Work: - + lblPhoneHome @@ -994,7 +994,7 @@ - + tab @@ -1005,7 +1005,7 @@ unnamed - + teAbout @@ -1013,9 +1013,9 @@ - + - lblStatus + lbltqStatus @@ -1055,7 +1055,7 @@ lePhoneCell teAbout - + kurllabel.h kurllabel.h diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 076b92b8..90f4f1e0 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -35,7 +35,7 @@ #include "jabberclient.h" #include "xmpp_tasks.h" -JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * parent, const char *name):AddContactPage (parent, name) +JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent, const char *name):AddContactPage (tqparent, name) { (new TQVBoxLayout (this))->setAutoAdd (true); @@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData () } -bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact ) +bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) { if( canadd && validateData () ) @@ -90,25 +90,25 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact { XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = - new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); + new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , tqparentContact , gatewayTask ); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); @@ -167,25 +167,25 @@ void JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND::slot TQString contactId=task->prompt(); - Kopete::MetaContact* parentContact=metacontact; + Kopete::MetaContact* tqparentContact=metacontact; JabberAccount *jaccount=transport->account();; /*\ * this is a copy of the end of JabberAddContactPage::apply \*/ - TQString displayName = parentContact->displayName (); + TQString displayName = tqparentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = parentContact->groups(); + Kopete::GroupList groupList = tqparentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index 09cdaae1..bb4e0271 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -32,9 +32,10 @@ class TQLabel; class JabberAddContactPage:public AddContactPage { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); + JabberAddContactPage (Kopete::Account * owner, TQWidget * tqparent = 0, const char *name = 0); ~JabberAddContactPage (); virtual bool validateData (); virtual bool apply (Kopete::Account *, Kopete::MetaContact *); @@ -52,10 +53,11 @@ class JabberTransport; * @author Olivier Goffart * this class is just there to workaround the fact that it's not possible to add contact assync with Kopete::AddContactPage::apply */ -class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public QObject +class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public TQObject { Q_OBJECT + TQ_OBJECT public: - JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); + JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *tqparent); Kopete::MetaContact *metacontact; JabberTransport *transport; public slots: diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 63339158..b5fef8f3 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -30,18 +30,18 @@ #include "dlgjabberchooseserver.h" #include "jabberregisteraccount.h" -JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Choose Jabber Server"), +JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Choose Jabber Server"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; mSelectedRow = -1; mMainWidget = new DlgJabberChooseServer ( this ); setMainWidget ( mMainWidget ); - mMainWidget->lblStatus->setText ( i18n ( "Retrieving server list...") ); + mMainWidget->lbltqStatus->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->lblStatus->setText ( i18n ( "Could not retrieve server list." ) ); + mMainWidget->lbltqStatus->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->lblStatus->setText ( "" ); + mMainWidget->lbltqStatus->setText ( "" ); // parse XML list TQDomDocument doc; if ( !doc.setContent ( xmlServerList ) ) { - mMainWidget->lblStatus->setText ( i18n ( "Could not parse the server list.") ); + mMainWidget->lbltqStatus->setText ( i18n ( "Could not parse the server list.") ); return; } diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index cc64040b..bd74575d 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -39,9 +39,10 @@ class JabberChooseServer : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); + JabberChooseServer ( JabberRegisterAccount *tqparent = 0, const char *name = 0); ~JabberChooseServer(); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 6c928ad6..9a769122 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -40,8 +40,8 @@ #include "jabberregisteraccount.h" #include "dlgjabberchangepassword.h" -JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * parent, const char *name) - : DlgJabberEditAccountWidget (parent, name), KopeteEditAccountWidget (ident) +JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, JabberAccount * ident, TQWidget * tqparent, const char *name) + : DlgJabberEditAccountWidget (tqparent, name), KopeteEditAccountWidget (ident) { m_protocol = proto; @@ -88,15 +88,15 @@ void JabberEditAccountWidget::reopen () mPass->load (&account()->password ()); cbAutoConnect->setChecked (account()->excludeConnect()); - mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::fromLatin1("Kopete"))); + mResource->setText (account()->configGroup()->readEntry ("Resource", TQString::tqfromLatin1("Kopete"))); mPriority->setValue (account()->configGroup()->readNumEntry ("Priority", 5)); - mServer->setText (account()->configGroup()->readEntry ("Server", TQString::null)); + mServer->setText (account()->configGroup()->readEntry ("Server", TQString())); cbUseSSL->setChecked (account()->configGroup()->readBoolEntry( "UseSSL", false)); mPort->setValue (account()->configGroup()->readNumEntry("Port", 5222)); - TQString auth = account()->configGroup()->readEntry("AuthType", TQString::null); + TQString auth = account()->configGroup()->readEntry("AuthType", TQString()); cbCustomServer->setChecked (account()->configGroup()->readBoolEntry("CustomServer",false)); @@ -119,7 +119,7 @@ void JabberEditAccountWidget::reopen () leLocalIP->setText (KGlobal::config()->readEntry("LocalIP", "")); sbLocalPort->setValue (KGlobal::config()->readNumEntry("LocalPort", 8010)); - leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString::null)); + leProxyJID->setText (account()->configGroup()->readEntry("ProxyJID", TQString())); // Privacy cbSendEvents->setChecked( account()->configGroup()->readBoolEntry("SendEvents", true) ); @@ -200,7 +200,7 @@ void JabberEditAccountWidget::writeConfig () bool JabberEditAccountWidget::validateData () { - if(!mID->text().contains('@')) + if(!mID->text().tqcontains('@')) { KMessageBox::sorry(this, i18n("The Jabber ID you have chosen is invalid. " "Please make sure it is in the form user@server.com, like an email address."), diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index e56dcbd2..e1ce2d30 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -35,9 +35,10 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd { Q_OBJECT + TQ_OBJECT public: - JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); + JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * tqparent = 0, const char *name = 0); ~JabberEditAccountWidget (); virtual bool validateData (); virtual Kopete::Account *apply (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index bb20611b..dee7534a 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -47,18 +47,18 @@ #include "jabberchooseserver.h" #include "dlgjabberregisteraccount.h" -JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, const char *name ) - : KDialogBase ( parent, name, true, i18n("Register New Jabber Account"), +JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *tqparent, const char *name ) + : KDialogBase ( tqparent, name, true, i18n("Register New Jabber Account"), KDialogBase::Ok | KDialogBase::Cancel ) { - mParentWidget = parent; + mParentWidget = tqparent; // setup main dialog mMainWidget = new DlgJabberRegisterAccount ( this ); setMainWidget ( mMainWidget ); - // replace "Ok" button with a "Register" button + // tqreplace "Ok" button with a "Register" button KGuiItem registerButton = KStdGuiItem::ok(); registerButton.setText ( i18n ( "Register" ) ); setButtonOK ( registerButton ); @@ -78,12 +78,12 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mSuccess = false; // get all settings from the main dialog - mMainWidget->leServer->setText ( parent->mServer->text () ); - mMainWidget->leJID->setText ( parent->mID->text () ); - mMainWidget->lePassword->setText ( parent->mPass->password () ); - // mMainWidget->lePasswordVerify->setText ( parent->mPass->password () ); //BUG 114631 - mMainWidget->sbPort->setValue ( parent->mPort->value () ); - mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); + mMainWidget->leServer->setText ( tqparent->mServer->text () ); + mMainWidget->leJID->setText ( tqparent->mID->text () ); + mMainWidget->lePassword->setText ( tqparent->mPass->password () ); + // mMainWidget->lePasswordVerify->setText ( tqparent->mPass->password () ); //BUG 114631 + mMainWidget->sbPort->setValue ( tqparent->mPort->value () ); + mMainWidget->cbUseSSL->setChecked ( tqparent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); @@ -146,8 +146,8 @@ void JabberRegisterAccount::validateData () } if ( valid && - ( TQString::fromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ).isEmpty () ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ).isEmpty () || + TQString::tqfromLatin1 ( 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::fromLatin1 ( mMainWidget->lePassword->password () ) != - TQString::fromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) + ( TQString::tqfromLatin1 ( mMainWidget->lePassword->password () ) != + TQString::tqfromLatin1 ( mMainWidget->lePasswordVerify->password () ) ) ) { mMainWidget->lblStatusMessage->setText ( i18n ( "Password entries do not match." ) ); valid = false; @@ -259,7 +259,7 @@ void JabberRegisterAccount::slotOk () jabberClient->setOverrideHost ( true, mMainWidget->leServer->text (), mMainWidget->sbPort->value () ); // start connection, no authentication - switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString::null, false ) ) + switch ( jabberClient->connect ( XMPP::Jid ( mMainWidget->leJID->text () ), TQString(), false ) ) { case JabberClient::NoTLS: // no SSL support, at the connecting stage this means the problem is client-side @@ -341,7 +341,7 @@ void JabberRegisterAccount::slotRegisterUserDone () { mMainWidget->lblStatusMessage->setText ( i18n ( "Registration successful." ) ); - // save settings to parent + // save settings to tqparent mParentWidget->mServer->setText ( mMainWidget->leServer->text () ); mParentWidget->mID->setText ( mMainWidget->leJID->text () ); mParentWidget->mPass->setPassword ( mMainWidget->lePassword->password () ); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 727d61fb..5d8b9b5f 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -36,9 +36,10 @@ class JabberRegisterAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); + JabberRegisterAccount ( JabberEditAccountWidget *tqparent = 0, const char *name = 0 ); ~JabberRegisterAccount (); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 9dba56f2..91ad1a0f 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -35,17 +35,17 @@ #include MeanwhileAccount::MeanwhileAccount( - MeanwhileProtocol *parent, + MeanwhileProtocol *tqparent, const TQString &accountID, const char *name) - : Kopete::PasswordedAccount(parent, accountID, 0, name) + : Kopete::PasswordedAccount(tqparent, accountID, 0, name) { HERE; m_meanwhileId = accountID; m_session = 0L; setMyself(new MeanwhileContact(m_meanwhileId, m_meanwhileId, this, Kopete::ContactList::self()->myself())); - setOnlineStatus(parent->statusOffline); + setOnlineStatus(tqparent->statusOffline); infoPlugin = new MeanwhilePlugin(); } @@ -63,15 +63,15 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin) bool MeanwhileAccount::createContact( const TQString & contactId , - Kopete::MetaContact * parentContact) + Kopete::MetaContact * tqparentContact) { MeanwhileContact* newContact = new MeanwhileContact(contactId, - parentContact->displayName(), this, parentContact); + tqparentContact->displayName(), this, tqparentContact); MeanwhileProtocol *p = static_cast(protocol()); if ((newContact != 0L) && (m_session != 0L) - && (myself()->onlineStatus() != + && (myself()->onlinetqStatus() != 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(initialStatus()); + m_session->setStatus(initialtqStatus()); } void MeanwhileAccount::disconnect() @@ -123,7 +123,7 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason) return; MeanwhileProtocol *p = static_cast(protocol()); - setAllContactsStatus(p->statusOffline); + setAllContactstqStatus(p->statusOffline); disconnected(reason); emit isConnectedChanged(); @@ -138,9 +138,9 @@ KActionMenu * MeanwhileAccount::actionMenu() menu->popupMenu()->insertSeparator(); #if 0 - menu->insert(new KAction(i18n("&Change Status Message"), TQString::null, 0, - this, TQT_SLOT(meanwhileChangeStatus()), this, - "meanwhileChangeStatus")); + menu->insert(new KAction(i18n("&Change tqStatus Message"), TQString(), 0, + this, TQT_SLOT(meanwhileChangetqStatus()), this, + "meanwhileChangetqStatus")); //infoPlugin->addCustomMenus(theMenu); #endif return menu; @@ -219,7 +219,7 @@ void MeanwhileAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason) { HERE; - Kopete::OnlineStatus oldstatus = myself()->onlineStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); 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()->onlineStatus(); + Kopete::OnlineStatus oldstatus = myself()->onlinetqStatus(); myself()->setOnlineStatus(status); if (status.isDefinitelyOnline() != oldstatus.isDefinitelyOnline()) { diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h index ba747212..daa5ca0c 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.h +++ b/kopete/protocols/meanwhile/meanwhileaccount.h @@ -30,6 +30,7 @@ class MeanwhileSession; class MeanwhileAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: /** * Create a new Meanwhile account @@ -43,7 +44,7 @@ public: ~MeanwhileAccount(); virtual bool createContact(const TQString &contactId, - Kopete::MetaContact *parentContact); + Kopete::MetaContact *tqparentContact); virtual void connectWithPassword(const TQString &password); @@ -104,8 +105,8 @@ public slots: /** Reimplemented from Kopete::Account */ void setOnlineStatus(const Kopete::OnlineStatus& status, - const TQString &reason = TQString::null); - void setAway(bool away, const TQString&reason = TQString::null); + const TQString &reason = TQString()); + void setAway(bool away, const TQString&reason = TQString()); private: /** Current online status */ diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 44b10bbc..7eb44fd2 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -26,10 +26,10 @@ #include "meanwhileplugin.h" MeanwhileAddContactPage::MeanwhileAddContactPage( - TQWidget* parent, + TQWidget* tqparent, Kopete::Account *_account) - : AddContactPage(parent, 0L), theAccount(_account), - theParent(parent) + : AddContactPage(tqparent, 0L), theAccount(_account), + theParent(tqparent) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); theDialog = new MeanwhileAddContactBase(this); @@ -37,7 +37,7 @@ MeanwhileAddContactPage::MeanwhileAddContactPage( static_cast(_account); if (account->infoPlugin->canProvideMeanwhileId()) { - TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), + TQT_BASE_OBJECT_NAME::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), TQT_SLOT(slotFindUser())); } else diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h index fdf6445c..4807b3e0 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.h +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.h @@ -26,8 +26,9 @@ namespace Kopete { class MetaContact; } class MeanwhileAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - MeanwhileAddContactPage( TQWidget* parent = 0, + MeanwhileAddContactPage( TQWidget* tqparent = 0, Kopete::Account *account=0); ~MeanwhileAddContactPage(); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index e77d470a..450bc8e4 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -30,8 +30,8 @@ #include "meanwhileplugin.h" MeanwhileContact::MeanwhileContact(TQString userId, TQString nickname, - MeanwhileAccount *account, Kopete::MetaContact *parent) - : Kopete::Contact(account, userId, parent) + MeanwhileAccount *account, Kopete::MetaContact *tqparent) + : Kopete::Contact(account, userId, tqparent) { setNickName(nickname); m_msgManager = 0L; diff --git a/kopete/protocols/meanwhile/meanwhilecontact.h b/kopete/protocols/meanwhile/meanwhilecontact.h index 048a4b0f..28f49c2a 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.h +++ b/kopete/protocols/meanwhile/meanwhilecontact.h @@ -31,10 +31,11 @@ namespace Kopete { class MetaContact; } class MeanwhileContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: MeanwhileContact(TQString userId, TQString nickname, - MeanwhileAccount *account, Kopete::MetaContact *parent); + MeanwhileAccount *account, Kopete::MetaContact *tqparent); ~MeanwhileContact(); virtual bool isReachable(); diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index edaa66f6..e1ef6100 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -40,8 +40,8 @@ void MeanwhileEditAccountWidget::setupClientList() for (id = MeanwhileSession::getClientIDs(); id->name; id++, i++) { TQString name = TQString("%1 (0x%2)") - .arg(TQString(id->name)) - .arg(id->id, 0, 16); + .tqarg(TQString(id->name)) + .tqarg(id->id, 0, 16); mClientID->insertItem(name, i); @@ -64,10 +64,10 @@ void MeanwhileEditAccountWidget::selectClientListItem(int selectedID) } MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( - TQWidget* parent, + TQWidget* tqparent, Kopete::Account* theAccount, MeanwhileProtocol *theProtocol) - : MeanwhileEditAccountBase(parent), + : MeanwhileEditAccountBase(tqparent), KopeteEditAccountWidget( theAccount ) { protocol = theProtocol; @@ -106,7 +106,7 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( slotSetServer2Default(); } - TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()), + TQT_BASE_OBJECT_NAME::connect(btnServerDefaults, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetServer2Default())); show(); diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h index effb51be..a208b5f2 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.h @@ -29,8 +29,9 @@ class MeanwhileEditAccountWidget : public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - MeanwhileEditAccountWidget( TQWidget* parent, + MeanwhileEditAccountWidget( TQWidget* tqparent, Kopete::Account* account, MeanwhileProtocol *protocol); diff --git a/kopete/protocols/meanwhile/meanwhileplugin.cpp b/kopete/protocols/meanwhile/meanwhileplugin.cpp index 4ee995dd..13a06b11 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.cpp +++ b/kopete/protocols/meanwhile/meanwhileplugin.cpp @@ -18,7 +18,7 @@ #include #include "meanwhileplugin.h" -void MeanwhilePlugin::getMeanwhileId(TQWidget * /*parent*/, +void MeanwhilePlugin::getMeanwhileId(TQWidget * /*tqparent*/, TQLineEdit * /*fillThis*/) { } diff --git a/kopete/protocols/meanwhile/meanwhileplugin.h b/kopete/protocols/meanwhile/meanwhileplugin.h index 072ffc08..3c5c2768 100644 --- a/kopete/protocols/meanwhile/meanwhileplugin.h +++ b/kopete/protocols/meanwhile/meanwhileplugin.h @@ -29,7 +29,7 @@ public: * - like do lookups in company databases * when done fill 'fillThis' with the id of the contact */ - virtual void getMeanwhileId(TQWidget *parent,TQLineEdit *fillThis); + virtual void getMeanwhileId(TQWidget *tqparent,TQLineEdit *fillThis); /* can this plugin provide the above functionality */ virtual bool canProvideMeanwhileId(); diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.cpp b/kopete/protocols/meanwhile/meanwhileprotocol.cpp index b9915e94..b20eb48a 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.cpp +++ b/kopete/protocols/meanwhile/meanwhileprotocol.cpp @@ -29,17 +29,17 @@ typedef KGenericFactory MeanwhileProtocolFactory; K_EXPORT_COMPONENT_FACTORY(kopete_meanwhile, MeanwhileProtocolFactory("kopete_meanwhile")) -MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name, +MeanwhileProtocol::MeanwhileProtocol(TQObject* tqparent, const char *name, const TQStringList &/*args*/) -: Kopete::Protocol(MeanwhileProtocolFactory::instance(), parent, name), +: Kopete::Protocol(MeanwhileProtocolFactory::instance(), tqparent, name), - statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString::null, + statusOffline(Kopete::OnlineStatus::Offline, 25, this, 0, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::DisabledIfOffline), statusOnline(Kopete::OnlineStatus::Online, 25, this, mwStatus_ACTIVE, - TQString::null, i18n("Online"), i18n("Online"), + TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online, 0), statusAway(Kopete::OnlineStatus::Away, 20, this, mwStatus_AWAY, @@ -57,10 +57,10 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name, Kopete::OnlineStatusManager::Idle, 0), statusAccountOffline(Kopete::OnlineStatus::Offline, 0, this, 0, - TQString::null, i18n("Account Offline")), + TQString(), i18n("Account Offline")), - statusMessage(TQString::fromLatin1("statusMessage"), - i18n("Status Message"), TQString::null, false, true), + statusMessage(TQString::tqfromLatin1("statusMessage"), + i18n("tqStatus Message"), TQString(), false, true), awayMessage(Kopete::Global::Properties::self()->awayMessage()) { @@ -73,16 +73,16 @@ MeanwhileProtocol::~MeanwhileProtocol() { } -AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *parent, +AddContactPage * MeanwhileProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account ) { - return new MeanwhileAddContactPage(parent, account); + return new MeanwhileAddContactPage(tqparent, account); } KopeteEditAccountWidget * MeanwhileProtocol::createEditAccountWidget( - Kopete::Account *account, TQWidget *parent ) + Kopete::Account *account, TQWidget *tqparent ) { - return new MeanwhileEditAccountWidget(parent, account, this); + return new MeanwhileEditAccountWidget(tqparent, account, this); } Kopete::Account *MeanwhileProtocol::createNewAccount(const TQString &accountId) @@ -113,14 +113,14 @@ Kopete::Contact *MeanwhileProtocol::deserializeContact( return theAccount->contacts()[contactId]; } -const Kopete::OnlineStatus MeanwhileProtocol::accountOfflineStatus() +const Kopete::OnlineStatus MeanwhileProtocol::accountOfflinetqStatus() { return statusAccountOffline; } -const Kopete::OnlineStatus MeanwhileProtocol::lookupStatus( +const Kopete::OnlineStatus MeanwhileProtocol::lookuptqStatus( enum Kopete::OnlineStatusManager::Categories cats) { - return Kopete::OnlineStatusManager::self()->onlineStatus(this, cats); + return Kopete::OnlineStatusManager::self()->onlinetqStatus(this, cats); } #include "meanwhileprotocol.moc" diff --git a/kopete/protocols/meanwhile/meanwhileprotocol.h b/kopete/protocols/meanwhile/meanwhileprotocol.h index 343d443f..98c8804a 100644 --- a/kopete/protocols/meanwhile/meanwhileprotocol.h +++ b/kopete/protocols/meanwhile/meanwhileprotocol.h @@ -38,17 +38,18 @@ class MeanwhileAddContactPage; class MeanwhileProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - MeanwhileProtocol(TQObject *parent, const char *name, + MeanwhileProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~MeanwhileProtocol(); - virtual AddContactPage *createAddContactWidget(TQWidget *parent, + virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account); virtual KopeteEditAccountWidget *createEditAccountWidget( - Kopete::Account *account, TQWidget *parent); + Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); @@ -57,9 +58,9 @@ public: const TQMap &serializedData, const TQMap &addressBookData); - const Kopete::OnlineStatus accountOfflineStatus(); + const Kopete::OnlineStatus accountOfflinetqStatus(); - const Kopete::OnlineStatus lookupStatus( + const Kopete::OnlineStatus lookuptqStatus( enum Kopete::OnlineStatusManager::Categories cats); const Kopete::OnlineStatus statusOffline; diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index c7121875..5f367540 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -426,7 +426,7 @@ void MeanwhileSession::syncContactsToServer() if (contactgroup->type() == Kopete::Group::TopLevel) { stgroup = topstgroup; } else { - /* find (or create) a matching sametime list group */ + /* tqfind (or create) a matching sametime list group */ stgroup = mwSametimeList_findGroup(list, contactgroup->displayName().ascii()); if (stgroup == 0L) { @@ -473,7 +473,7 @@ void MeanwhileSession::slotSocketDataAvailable() { HERE; guchar *buf; - Q_LONG bytesRead; + TQ_LONG bytesRead; if (socket == 0L) return; @@ -548,17 +548,17 @@ void MeanwhileSession::resolveContactNickname(MeanwhileContact *contact) TQString MeanwhileSession::getNickName(struct mwLoginInfo *logininfo) { if (logininfo == 0L || logininfo->user_name == 0L) - return TQString::null; + return TQString(); return getNickName(logininfo->user_name); } TQString MeanwhileSession::getNickName(TQString name) { - int index = name.find(" - "); + int index = name.tqfind(" - "); if (index != -1) name = name.remove(0, index + 3); - index = name.find('/'); + index = name.tqfind('/'); if (index != -1) name = name.left(index); diff --git a/kopete/protocols/meanwhile/meanwhilesession.h b/kopete/protocols/meanwhile/meanwhilesession.h index b7d7f8c7..9d583a8b 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.h +++ b/kopete/protocols/meanwhile/meanwhilesession.h @@ -33,9 +33,10 @@ struct MeanwhileClientID { /** * A class to handle libmeanwhile session management. */ -class MeanwhileSession : public QObject +class MeanwhileSession : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -70,7 +71,7 @@ public: * @param msg a custom message to use, if required */ void setStatus(Kopete::OnlineStatus status, - const TQString msg = TQString::null); + const TQString msg = TQString()); /** * Add a single contact to be registered for status updates @@ -228,7 +229,7 @@ private: TQString getNickName(struct mwLoginInfo *logininfo); /** - * Resolve a contact to find (and set) the display name. This requires the + * Resolve a contact to tqfind (and set) the display name. This requires the * session to be connected to use the meanwhile resolve service. * @param contact The contact to resolve */ diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index d146a8ed..d323bbe9 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -1,6 +1,6 @@ MeanwhileAddContactBase - + Form1 @@ -25,15 +25,15 @@ 6 - + - layout53 + tqlayout53 unnamed - + textLabel1 @@ -50,7 +50,7 @@ The user id of the contact you would like to add. - + contactID @@ -61,7 +61,7 @@ The user id of the contact you would like to add. - + btnFindUser @@ -77,14 +77,14 @@ - + textLabel3_2 <i>(for example: johndoe)</i> - + AlignVCenter|AlignRight @@ -98,7 +98,7 @@ Expanding - + 20 80 @@ -107,5 +107,5 @@ - + diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 2f160039..39bde950 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -1,6 +1,6 @@ MeanwhileEditAccountBase - + MeanwhileEditAccountBase @@ -19,11 +19,11 @@ unnamed - + tabWidget11 - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox53 @@ -45,15 +45,15 @@ unnamed - + - layout81 + tqlayout81 unnamed - + label1 @@ -70,7 +70,7 @@ Your Sametime userid - + mScreenName @@ -88,7 +88,7 @@ mPasswordWidget - + mAutoConnect @@ -103,7 +103,7 @@ - + tab @@ -114,7 +114,7 @@ unnamed - + groupBox54 @@ -125,23 +125,23 @@ unnamed - + - layout21 + tqlayout21 unnamed - + - layout56 + tqlayout56 unnamed - + lblServer @@ -158,7 +158,7 @@ The IP address or hostname of the Sametime server you wish to connect to. - + mServerName @@ -171,15 +171,15 @@ - + - layout57 + tqlayout57 unnamed - + lblPort @@ -196,7 +196,7 @@ The port on the Sametime server that you would like to connect to. Usually this is 1533. - + mServerPort @@ -220,7 +220,7 @@ - + groupBox5 @@ -231,7 +231,7 @@ unnamed - + chkCustomClientID @@ -239,15 +239,15 @@ Use custom client identifier - + - layout17 + tqlayout17 unnamed - + mClientID @@ -255,7 +255,7 @@ false - + lblClientIdentifier @@ -269,15 +269,15 @@ mClientID - + - layout13 + tqlayout13 unnamed - + mClientVersionMajor @@ -288,7 +288,7 @@ 65535 - + lblVersionSeparator @@ -298,11 +298,11 @@ . - + AlignCenter - + mClientVersionMinor @@ -315,7 +315,7 @@ - + lblClientVersion @@ -333,7 +333,7 @@ - + btnServerDefaults @@ -357,7 +357,7 @@ Expanding - + 20 31 @@ -430,7 +430,7 @@ mScreenName - + kopetepasswordwidget.h diff --git a/kopete/protocols/msn/config/msnpreferences.cpp b/kopete/protocols/msn/config/msnpreferences.cpp index a6f5371f..6366e849 100644 --- a/kopete/protocols/msn/config/msnpreferences.cpp +++ b/kopete/protocols/msn/config/msnpreferences.cpp @@ -26,7 +26,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_msn, MSNProtocolConfigFactory( "kcm_kopet class MSNPreferences : public KCAutoConfigModule { public: - MSNPreferences( TQWidget *parent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), parent, args ) + MSNPreferences( TQWidget *tqparent = 0, const char * = 0, const TQStringList &args = TQStringList() ) : KCAutoConfigModule( MSNProtocolConfigFactory::instance(), tqparent, args ) { setMainWidget( new msnPrefsUI( this ) , "MSN"); } diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index c9321a60..e6d95217 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -1,7 +1,7 @@ msnPrefsUI Duncan Mac-Vicar P. - + msnPrefsUI @@ -17,7 +17,7 @@ unnamed - + TextLabel3_2_2_2_3 @@ -30,7 +30,7 @@ General - + Frame3_3_3_2_3 @@ -49,7 +49,7 @@ Sunken - + NotifyNewChat @@ -57,7 +57,7 @@ &Automatically open a chat window when someone starts a conversation - + AutoDownloadPicture @@ -68,7 +68,7 @@ true - + useCustomEmoticons @@ -76,7 +76,7 @@ Download and show custom emoticons (experimental) - + TextLabel1_3_3_3 @@ -84,7 +84,7 @@ - + TextLabel3_2_2_2_2 @@ -97,7 +97,7 @@ Away Messages - + Frame3_3_3_2_2 @@ -116,7 +116,7 @@ Sunken - + SendAwayMessages @@ -135,15 +135,15 @@ true - + - layout18 + tqlayout18 unnamed - + textLabel3 @@ -162,7 +162,7 @@ 1 - + textLabel4 @@ -182,7 +182,7 @@ Expanding - + 21 70 @@ -209,7 +209,7 @@ knuminput.h - + knuminput.h knuminput.h diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index fb88e8bc..91f3361a 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -36,7 +36,7 @@ using P2P::OutgoingTransfer; #include #include -// Qt includes +// TQt includes #include #include #include @@ -50,8 +50,8 @@ using P2P::OutgoingTransfer; #include -Dispatcher::Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip) - : TQObject(parent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) +Dispatcher::Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip) + : TQObject(tqparent) , m_contact(contact) , m_callbackChannel(0l) , m_ip(ip) {} Dispatcher::~Dispatcher() @@ -78,7 +78,7 @@ TQString Dispatcher::localContact() void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObject) { - Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4; + TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4; TransferContext* current = new IncomingTransfer(from, this, sessionId); @@ -94,7 +94,7 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj TQString context = TQString::fromUtf8(KCodecs::base64Encode(msnObject.utf8())); // NOTE remove the \0 character automatically // appended to a TQCString. - context.replace("=", TQString::null); + context.tqreplace("=", TQString()); TQString content = "EUF-GUID: {A4268EEC-FEC5-49E5-95C3-F126696BDBF6}\r\n" "SessionID: " + TQString::number(sessionId) + "\r\n" @@ -105,11 +105,11 @@ void Dispatcher::requestDisplayIcon(const TQString& from, const TQString& msnObj current->sendMessage(INVITE, content); } -void Dispatcher::sendFile(const TQString& path, Q_INT64 fileSize, const TQString& to) +void Dispatcher::sendFile(const TQString& path, TQ_INT64 fileSize, const TQString& to) { // Create a new transfer context that will handle // the file transfer. - Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4; + TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4; TransferContext *current = new OutgoingTransfer(to, this, sessionId); current->m_branch = P2P::Uid::createUid(); @@ -129,26 +129,26 @@ void Dispatcher::sendFile(const TQString& path, Q_INT64 fileSize, const TQString writer.setByteOrder(TQDataStream::LittleEndian); // Write the header length to the stream. - writer << (Q_INT32)638; + writer << (TQ_INT32)638; // Write client version to the stream. - writer << (Q_INT32)3; + writer << (TQ_INT32)3; // Write the file size to the stream. writer << fileSize; // Write the file transfer flag to the stream. // TODO support file preview. For now disable file preview. - writer << (Q_INT32)1; + writer << (TQ_INT32)1; // Write the file name in utf-16 to the stream. TQTextStream ts(header, IO_WriteOnly); ts.setEncoding(TQTextStream::RawUnicode); - ts.device()->at(20); + ts.tqdevice()->tqat(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.device()->at(570); - writer << (Q_UINT32)0xFFFFFFFF; + writer.tqdevice()->tqat(570); + writer << (TQ_UINT32)0xFFFFFFFF; // Encode the file context header to base64 encoding. context = TQString::fromUtf8(KCodecs::base64Encode(header)); @@ -182,7 +182,7 @@ void Dispatcher::sendImage(const TQString& /*fileName*/, const TQString& /*to*/) #if MSN_WEBCAM void Dispatcher::startWebcam(const TQString &/*myHandle*/, const TQString &msgHandle, bool wantToReceive) { - Q_UINT32 sessionId = rand()%0xFFFFFF00 + 4; + TQ_UINT32 sessionId = rand()%0xFFFFFF00 + 4; Webcam::Who who= wantToReceive ? Webcam::wViewer : Webcam::wProducer; TransferContext* current = new Webcam(who, msgHandle, this, sessionId); @@ -200,7 +200,7 @@ void Dispatcher::startWebcam(const TQString &/*myHandle*/, const TQString &msgHa TQString content="EUF-GUID: {"+GUID+"}\r\n" "SessionID: "+ TQString::number(sessionId)+"\r\n" "AppID: 4\r\n" - "Context: ewBCADgAQgBFADcAMABEAEUALQBFADIAQwBBAC0ANAA0ADAAMAAtAEEARQAwADMALQA4ADgARgBGADgANQBCADkARgA0AEUAOAB9AA==\r\n\r\n"; + "Context: ewBCADgAQgBFADcAMABEAEUALTQBFADIAQwBBAC0ANAA0ADAAMAAtAEEARTQAwADMALQA4ADgARgBGADgANTQBCADkARgA0AEUAOAB9AA==\r\n\r\n"; // context is the base64 of the utf16 of {B8BE70DE-E2CA-4400-AE03-88FF85B9F4E8} @@ -222,7 +222,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream if((receivedMessage.header.dataSize == 0)/* && ((receivedMessage.header.flag & 0x02) == 0x02)*/) { TransferContext *current = 0l; - TQMap::Iterator it = m_sessions.begin(); + TQMap::Iterator it = m_sessions.begin(); for(; it != m_sessions.end(); it++) { if(receivedMessage.header.ackSessionIdentifier == it.data()->m_identifier){ @@ -247,10 +247,10 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream return; } - if(m_messageBuffer.contains(receivedMessage.header.identifier)) + if(m_messageBuffer.tqcontains(receivedMessage.header.identifier)) { kdDebug(14140) << k_funcinfo - << TQString("retrieving buffered messsage, %1").arg(receivedMessage.header.identifier) + << TQString("retrieving buffered messsage, %1").tqarg(receivedMessage.header.identifier) << endl; // The message was split, try to reconstruct the message @@ -260,7 +260,7 @@ void Dispatcher::slotReadMessage(const TQString &from, const TQByteArray& stream m_messageBuffer.remove(receivedMessage.header.identifier); bufferedMessage.body.resize(bufferedMessage.body.size() + receivedMessage.header.dataSize); - for(Q_UINT32 i=0; i < receivedMessage.header.dataSize; i++){ + for(TQ_UINT32 i=0; i < receivedMessage.header.dataSize; i++){ // Add the remaining message data to the buffered message. bufferedMessage.body[receivedMessage.header.dataOffset + i] = receivedMessage.body[i]; } @@ -282,7 +282,7 @@ void Dispatcher::dispatch(const P2P::Message& message) if(message.header.sessionId > 0) { - if(m_sessions.contains(message.header.sessionId)){ + if(m_sessions.tqcontains(message.header.sessionId)){ messageHandler = m_sessions[message.header.sessionId]; } } @@ -293,8 +293,8 @@ void Dispatcher::dispatch(const P2P::Message& message) TQRegExp regex("SessionID: ([0-9]*)\r\n"); if(regex.search(body) > 0) { - Q_UINT32 sessionId = regex.cap(1).toUInt(); - if(m_sessions.contains(sessionId)){ + TQ_UINT32 sessionId = regex.cap(1).toUInt(); + if(m_sessions.tqcontains(sessionId)){ // Retrieve the message handler associated with the specified session Id. messageHandler = m_sessions[sessionId]; } @@ -303,7 +303,7 @@ void Dispatcher::dispatch(const P2P::Message& message) { // Otherwise, try to retrieve the message handler // based on the acknowlegded unique identifier. - if(m_sessions.contains(message.header.ackUniqueIdentifier)){ + if(m_sessions.tqcontains(message.header.ackUniqueIdentifier)){ messageHandler = m_sessions[message.header.ackUniqueIdentifier]; } @@ -317,7 +317,7 @@ void Dispatcher::dispatch(const P2P::Message& message) TQString callId = regex.cap(1); TransferContext *current = 0l; - TQMap::Iterator it = m_sessions.begin(); + TQMap::Iterator it = m_sessions.begin(); for(; it != m_sessions.end(); it++) { current = it.data(); @@ -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").arg(message.header.identifier) + << TQString("Buffering messsage, %1").tqarg(message.header.identifier) << endl; m_messageBuffer.insert(message.header.identifier, message); return; @@ -380,7 +380,7 @@ void Dispatcher::dispatch(const P2P::Message& message) // is being requested. regex = TQRegExp("AppID: ([0-9]*)\r\n"); regex.search(body); - Q_UINT32 applicationId = regex.cap(1).toUInt(); + TQ_UINT32 applicationId = regex.cap(1).toUInt(); if(applicationId == 1 || applicationId == 11 || applicationId == 12 ) { //the AppID is 12 since Messenger 7.5 @@ -407,7 +407,7 @@ void Dispatcher::dispatch(const P2P::Message& message) m_sessions.insert(sessionId.toUInt(), current); // Determine the display icon being requested. - TQString fileName = objectList.contains(msnobj) + TQString fileName = objectList.tqcontains(msnobj) ? objectList[msnobj] : m_pictureUrl; TQFile *source = new TQFile(fileName); @@ -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").arg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); current->sendMessage(OK, content); } else if(applicationId == 2) @@ -457,14 +457,14 @@ 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.device()->at(8); - Q_INT64 fileSize; + reader.tqdevice()->tqat(8); + TQ_INT64 fileSize; reader >> fileSize; // Flag [15..18] Int32 // 0x00 File transfer with preview data. // 0x01 File transfer without preview data. // 0x02 Background sharing. - Q_INT32 flag; + TQ_INT32 flag; reader >> flag; kdDebug(14140) << flag << endl; // FileName UTF16 (Unicode) [19..539] @@ -478,7 +478,7 @@ void Dispatcher::dispatch(const P2P::Message& message) emit incomingTransfer(from, fileName, fileSize); kdDebug(14140) << - TQString("%1, %2 bytes.").arg(fileName, TQString::number(fileSize)) + TQString("%1, %2 bytes.").tqarg(fileName, TQString::number(fileSize)) << endl << endl; @@ -497,7 +497,7 @@ void Dispatcher::dispatch(const P2P::Message& message) TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQT_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&))); // Show the file transfer accept/decline dialog. - Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString::null, sessionId); + Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString(), sessionId); } else { @@ -551,7 +551,7 @@ void Dispatcher::dispatch(const P2P::Message& message) // A contact has sent an inkformat (handwriting) gif. // NOTE The entire message body is UTF16 encoded. TQString body = ""; - for (Q_UINT32 i=0; i < message.header.totalDataSize; i++){ + for (TQ_UINT32 i=0; i < message.header.totalDataSize; i++){ if (message.body[i] != TQChar('\0')){ body += TQChar(message.body[i]); } @@ -590,7 +590,7 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv if(fullReceive) { TransferContext *current = 0l; - TQMap::Iterator it = m_sessions.begin(); + TQMap::Iterator it = m_sessions.begin(); for(; it != m_sessions.end(); it++) { current = it.data(); @@ -607,10 +607,10 @@ void Dispatcher::messageAcknowledged(unsigned int correlationId, bool fullReceiv Kopete::Contact* Dispatcher::getContactByAccountId(const TQString& accountId) { Kopete::Contact *contact = 0l; - if(parent()) + if(tqparent()) { // Retrieve the contact from the current chat session context. - Kopete::ChatSession *session = dynamic_cast(parent()->parent()); + Kopete::ChatSession *session = dynamic_cast(tqparent()->tqparent()); if(session) { contact = session->account()->contacts()[accountId]; @@ -628,7 +628,7 @@ Dispatcher::CallbackChannel::CallbackChannel(MSNSwitchBoardSocket *switchboard) Dispatcher::CallbackChannel::~CallbackChannel() {} -Q_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream) +TQ_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream) { return m_switchboard->sendCommand("MSG", "D", true, stream, true); } @@ -636,7 +636,7 @@ Q_UINT32 Dispatcher::CallbackChannel::send(const TQByteArray& stream) Dispatcher::CallbackChannel* Dispatcher::callbackChannel() { if(m_callbackChannel == 0l){ - MSNSwitchBoardSocket *callback = dynamic_cast(parent()); + MSNSwitchBoardSocket *callback = dynamic_cast(tqparent()); if(callback == 0l) return 0l; m_callbackChannel = new Dispatcher::CallbackChannel(callback); } diff --git a/kopete/protocols/msn/dispatcher.h b/kopete/protocols/msn/dispatcher.h index 72a9cc12..690a7992 100644 --- a/kopete/protocols/msn/dispatcher.h +++ b/kopete/protocols/msn/dispatcher.h @@ -38,16 +38,17 @@ namespace P2P{ class IncomingTransfer; class OutgoingTransfer; - class KOPETE_EXPORT Dispatcher : public QObject + class KOPETE_EXPORT Dispatcher : public TQObject { Q_OBJECT + TQ_OBJECT public: - Dispatcher(TQObject *parent, const TQString& contact, const TQStringList &ip); + Dispatcher(TQObject *tqparent, const TQString& contact, const TQStringList &ip); ~Dispatcher(); void detach(TransferContext* transfer); TQString localContact(); void requestDisplayIcon(const TQString& from, const TQString& msnObject); - void sendFile(const TQString& path, Q_INT64 fileSize, const TQString& to); + void sendFile(const TQString& path, TQ_INT64 fileSize, const TQString& to); void sendImage(const TQString& fileName, const TQString& to); TQString m_pictureUrl; TQMap objectList; @@ -62,9 +63,9 @@ namespace P2P{ void messageAcknowledged(unsigned int correlationId, bool fullReceive); signals: - void sendCommand(const TQString &cmd, const TQString &args = TQString::null, bool addId = true, const TQByteArray &body = TQByteArray(), bool binary=false); + void sendCommand(const TQString &cmd, const TQString &args = TQString(), bool addId = true, const TQByteArray &body = TQByteArray(), bool binary=false); void displayIconReceived(KTempFile* file, const TQString& msnObject); - void incomingTransfer(const TQString& from, const TQString& fileName, Q_INT64 fileSize); + void incomingTransfer(const TQString& from, const TQString& fileName, TQ_INT64 fileSize); private: class CallbackChannel @@ -73,7 +74,7 @@ namespace P2P{ CallbackChannel(MSNSwitchBoardSocket *switchboard); ~CallbackChannel(); - Q_UINT32 send(const TQByteArray& stream); + TQ_UINT32 send(const TQByteArray& stream); private: MSNSwitchBoardSocket *m_switchboard; @@ -92,8 +93,8 @@ namespace P2P{ Kopete::Contact* getContactByAccountId(const TQString& accountId); P2P::MessageFormatter m_messageFormatter; - TQMap m_sessions; - TQMap m_messageBuffer; + TQMap m_sessions; + TQMap m_messageBuffer; TQString m_contact; CallbackChannel *m_callbackChannel; TQStringList m_ip; diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index c7757219..b7b90296 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -28,14 +28,14 @@ using P2P::Message; #include using namespace KNetwork; -// Qt includes +// TQt includes #include #include // Kopete includes #include -IncomingTransfer::IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId) +IncomingTransfer::IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId) : TransferContext(from,dispatcher,sessionId) { m_direction = P2P::Incoming; @@ -61,14 +61,14 @@ IncomingTransfer::~IncomingTransfer() void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQString& /*fileName*/) { - Q_UINT32 sessionId = transfer->info().internalId().toUInt(); + TQ_UINT32 sessionId = transfer->info().internalId().toUInt(); if(sessionId!=m_sessionId) return; TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); m_transfer = transfer; - TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(sessionId); sendMessage(OK, content); TQObject::disconnect(Kopete::TransferManager::transferManager(), 0l, this, 0l); @@ -76,11 +76,11 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ void IncomingTransfer::slotTransferRefused(const Kopete::FileTransferInfo& info) { - Q_UINT32 sessionId = info.internalId().toUInt(); + TQ_UINT32 sessionId = info.internalId().toUInt(); if(sessionId!=m_sessionId) return; - TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(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").arg(message.header.dataSize) << endl; + kdDebug(14140) << k_funcinfo << TQString("Received, %1 bytes").tqarg(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").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()) + + 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()) + "\r\n"; } else diff --git a/kopete/protocols/msn/incomingtransfer.h b/kopete/protocols/msn/incomingtransfer.h index ca879deb..aeac991e 100644 --- a/kopete/protocols/msn/incomingtransfer.h +++ b/kopete/protocols/msn/incomingtransfer.h @@ -30,8 +30,9 @@ namespace KNetwork{ namespace P2P{ class IncomingTransfer : public P2P::TransferContext { Q_OBJECT + TQ_OBJECT public: - IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId); + IncomingTransfer(const TQString& from, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId); virtual ~IncomingTransfer(); private slots: diff --git a/kopete/protocols/msn/messageformatter.cpp b/kopete/protocols/msn/messageformatter.cpp index 7d830ea6..f869d87e 100644 --- a/kopete/protocols/msn/messageformatter.cpp +++ b/kopete/protocols/msn/messageformatter.cpp @@ -16,7 +16,7 @@ #include "messageformatter.h" #include "p2p.h" -// Qt includes +// TQt includes #include #include @@ -26,7 +26,7 @@ using P2P::MessageFormatter; using P2P::Message; -MessageFormatter::MessageFormatter(TQObject *parent, const char *name) : TQObject(parent, name) +MessageFormatter::MessageFormatter(TQObject *tqparent, const char *name) : TQObject(tqparent, name) {} MessageFormatter::~MessageFormatter() @@ -36,7 +36,7 @@ Message MessageFormatter::readMessage(const TQByteArray& stream, bool compact) { Message inbound; - Q_UINT32 index = 0; + TQ_UINT32 index = 0; if(compact == false) { // Determine the end position of the message header. @@ -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.device()->at(index); + reader.tqdevice()->tqat(index); // Read the message transport headers from the stream. reader >> inbound.header.sessionId; @@ -143,7 +143,7 @@ void MessageFormatter::writeMessage(const Message& message, TQByteArray& stream, // Set the capacity of the message buffer. stream.resize(4 + 48 + message.body.size()); // Write the message size to the stream. - writer << (Q_INT32)(48+message.body.size()); + writer << (TQ_INT32)(48+message.body.size()); } diff --git a/kopete/protocols/msn/messageformatter.h b/kopete/protocols/msn/messageformatter.h index f86d679d..c5e7e77a 100644 --- a/kopete/protocols/msn/messageformatter.h +++ b/kopete/protocols/msn/messageformatter.h @@ -26,10 +26,11 @@ namespace P2P{ @author Kopete Developers */ namespace P2P{ - class MessageFormatter : public QObject + class MessageFormatter : public TQObject { Q_OBJECT + TQ_OBJECT public: - MessageFormatter(TQObject *parent = 0, const char *name = 0); + MessageFormatter(TQObject *tqparent = 0, const char *name = 0); ~MessageFormatter(); Message readMessage(const TQByteArray& stream, bool compact=false); diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 267cd0d7..567ff91e 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -61,8 +61,8 @@ #include "avdevice/videodevicepool.h" #endif -MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const char *name ) - : Kopete::PasswordedAccount ( parent, AccountID.lower(), 0, name ) +MSNAccount::MSNAccount( MSNProtocol *tqparent, const TQString& AccountID, const char *name ) + : Kopete::PasswordedAccount ( tqparent, AccountID.lower(), 0, name ) { m_notifySocket = 0L; m_connectstatus = MSNProtocol::protocol()->NLN; @@ -81,7 +81,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString::null, 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); + m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); @@ -92,7 +92,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch m_reverseList = config->readListEntry( "reverseList" ) ; // Load the avatar - m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().replace(TQRegExp("[./~]"),"-") +".png" ); + m_pictureFilename = locateLocal( "appdata", "msnpicture-"+ accountId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ); resetPictureObject(true); static_cast( myself() )->setInfo( "PHH", config->readEntry("PHH") ); @@ -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->setStatus( m_connectstatus ); + m_notifySocket->settqStatus( m_connectstatus ); m_notifySocket->connect(host, port); } @@ -288,7 +288,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS kdDebug( 14140 ) << k_funcinfo << status.description() << endl; // HACK: When changing song, do don't anything while connected - if( reason.contains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) + if( reason.tqcontains("[Music]") && ( status == MSNProtocol::protocol()->UNK || status == MSNProtocol::protocol()->CNT ) ) return; // Only send personal message when logged. @@ -296,7 +296,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS { // Only update the personal/status message, don't change the online status // since it's the same. - if( reason.contains("[Music]") ) + if( reason.tqcontains("[Music]") ) { TQString personalMessage = reason.section("[Music]", 1); setPersonalMessage( MSNProtocol::PersonalMessageMusic, personalMessage ); @@ -314,7 +314,7 @@ void MSNAccount::setOnlineStatus( const Kopete::OnlineStatus &status , const TQS disconnect(); else if ( m_notifySocket ) { - m_notifySocket->setStatus( status ); + m_notifySocket->settqStatus( status ); } else { @@ -330,7 +330,7 @@ void MSNAccount::slotStartChat() bool ok; TQString handle = KInputDialog::getText( i18n( "Start Chat - MSN Plugin" ), - i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString::null, &ok ).lower(); + i18n( "Please enter the email address of the person with whom you want to chat:" ), TQString(), &ok ).lower(); if ( ok ) { if ( MSNProtocol::validContactId( handle ) ) @@ -359,7 +359,7 @@ void MSNAccount::slotDebugRawCommand() if ( result == TQDialog::Accepted && m_notifySocket ) { m_notifySocket->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().replace( "\n", "\r\n" ).utf8() ); + dlg->addId(), dlg->msg().tqreplace( "\n", "\r\n" ).utf8() ); } delete dlg; #endif @@ -409,7 +409,7 @@ void MSNAccount::slotNotifySocketClosed() m_notifySocket->deleteLater(); m_notifySocket = 0l; myself()->setOnlineStatus( MSNProtocol::protocol()->FLN ); - setAllContactsStatus( MSNProtocol::protocol()->FLN ); + setAllContactstqStatus( MSNProtocol::protocol()->FLN ); disconnected(reason); @@ -484,7 +484,7 @@ void MSNAccount::setPublicName( const TQString &publicName ) { if ( m_notifySocket ) { - m_notifySocket->changePublicName( publicName, TQString::null ); + m_notifySocket->changePublicName( publicName, TQString() ); } } @@ -503,7 +503,7 @@ void MSNAccount::setPersonalMessage( MSNProtocol::PersonalMessageType type, cons void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &groupGuid ) { - if ( m_groupList.contains( groupGuid ) ) + if ( m_groupList.tqcontains( groupGuid ) ) { // Group can already be in the list since the idle timer does a 'List Groups' // command. Simply return, don't issue a warning. @@ -587,7 +587,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou m_groupList.insert( groupGuid, fallBack ); // We have pending groups that we need add a contact to - if ( tmp_addToNewGroup.contains(groupName) ) + if ( tmp_addToNewGroup.tqcontains(groupName) ) { TQStringList list=tmp_addToNewGroup[groupName]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -596,12 +596,12 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou kdDebug( 14140 ) << k_funcinfo << "Adding to new group: " << contactId << endl; MSNContact *c = static_cast(contacts()[contactId]); if(c && c->hasProperty(MSNProtocol::protocol()->propGuid.key()) ) - notifySocket()->addContact( contactId, MSNProtocol::FL, TQString::null, c->guid(), groupGuid ); + notifySocket()->addContact( contactId, MSNProtocol::FL, TQString(), c->guid(), groupGuid ); else { // If we get to here, we're currently adding a new contact, add the groupGUID to the groupList // to add when contact will be added to contactlist. - if( tmp_addNewContactToGroup.contains( contactId ) ) + if( tmp_addNewContactToGroup.tqcontains( contactId ) ) tmp_addNewContactToGroup[contactId].append(groupGuid); else tmp_addNewContactToGroup.insert(contactId, TQStringList(groupGuid) ); @@ -613,7 +613,7 @@ void MSNAccount::slotGroupAdded( const TQString& groupName, const TQString &grou void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& groupName ) { - if ( m_groupList.contains( groupGuid ) ) + if ( m_groupList.tqcontains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " id", groupGuid ); m_groupList[ groupGuid ]->setPluginData( protocol(), accountId() + " displayName", groupName ); @@ -627,7 +627,7 @@ void MSNAccount::slotGroupRenamed( const TQString &groupGuid, const TQString& gr void MSNAccount::slotGroupRemoved( const TQString& groupGuid ) { - if ( m_groupList.contains( groupGuid ) ) + if ( m_groupList.tqcontains( groupGuid ) ) { m_groupList[ groupGuid ]->setPluginData( protocol(), TQMap() ); m_groupList.remove( groupGuid ); @@ -638,7 +638,7 @@ void MSNAccount::addGroup( const TQString &groupName, const TQString& contactToA { if ( !contactToAdd.isNull() ) { - if( tmp_addToNewGroup.contains(groupName) ) + if( tmp_addToNewGroup.tqcontains(groupName) ) { tmp_addToNewGroup[groupName].append(contactToAdd); //A group with the same name is about to be added, @@ -664,7 +664,7 @@ void MSNAccount::slotKopeteGroupRenamed( Kopete::Group *g ) { if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() && g->displayName() != g->pluginData( protocol(), accountId() + " displayName" ) && - m_groupList.contains( g->pluginData( protocol(), accountId() + " id" ) ) ) + m_groupList.tqcontains( g->pluginData( protocol(), accountId() + " id" ) ) ) { notifySocket()->renameGroup( g->displayName(), g->pluginData( protocol(), accountId() + " id" ) ); } @@ -683,7 +683,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) if ( !g->pluginData( protocol(), accountId() + " id" ).isEmpty() ) { TQString groupGuid = g->pluginData( protocol(), accountId() + " id" ); - if ( !m_groupList.contains( groupGuid ) ) + if ( !m_groupList.tqcontains( groupGuid ) ) { // the group is maybe already removed in the server slotGroupRemoved( groupGuid ); @@ -703,7 +703,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " id", "" ); Kopete::Group::topLevel()->setPluginData( protocol(), accountId() + " displayName", g->pluginData( protocol(), accountId() + " displayName" ) ); - g->setPluginData( protocol(), accountId() + " id", TQString::null ); // the group should be soon deleted, but make sure + g->setPluginData( protocol(), accountId() + " id", TQString() ); // the group should be soon deleted, but make sure return; } @@ -716,7 +716,7 @@ void MSNAccount::slotKopeteGroupRemoved( Kopete::Group *g ) for ( ; it.current(); ++it ) { MSNContact *c = static_cast( it.current() ); - if ( c && c->serverGroups().contains( groupGuid ) ) + if ( c && c->serverGroups().tqcontains( groupGuid ) ) { /** don't do that becasue theses may already have been sent m_notifySocket->removeContact( c->contactId(), groupNumber, MSNProtocol::FL ); @@ -737,7 +737,7 @@ void MSNAccount::slotNewContactList() for(TQMap::Iterator it=m_oldGroupList.begin() ; it != m_oldGroupList.end() ; ++it ) { //they are about to be changed if(it.data()) - it.data()->setPluginData( protocol(), accountId() + " id", TQString::null ); + it.data()->setPluginData( protocol(), accountId() + " id", TQString() ); } m_allowList.clear(); @@ -745,9 +745,9 @@ void MSNAccount::slotNewContactList() m_reverseList.clear(); m_groupList.clear(); KConfigGroup *config=configGroup(); - config->writeEntry( "blockList" , TQString::null ) ; - config->writeEntry( "allowList" , TQString::null ); - config->writeEntry( "reverseList" , TQString::null ); + config->writeEntry( "blockList" , TQString() ) ; + config->writeEntry( "allowList" , TQString() ); + config->writeEntry( "reverseList" , TQString() ); // clear all date information which will be received. // if the information is not anymore on the server, it will not be received @@ -759,9 +759,9 @@ void MSNAccount::slotNewContactList() c->setAllowed( false ); c->setReversed( false ); c->setDeleted( true ); - c->setInfo( "PHH", TQString::null ); - c->setInfo( "PHW", TQString::null ); - c->setInfo( "PHM", TQString::null ); + c->setInfo( "PHH", TQString() ); + c->setInfo( "PHW", TQString() ); + c->setInfo( "PHM", TQString() ); c->removeProperty( MSNProtocol::protocol()->propGuid ); } m_newContactList=true; @@ -804,11 +804,11 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ for ( TQStringList::ConstIterator it = contactGroups.begin(); it != contactGroups.end(); ++it ) { TQString newServerGroupID = *it; - if(m_groupList.contains(newServerGroupID)) + if(m_groupList.tqcontains(newServerGroupID)) { Kopete::Group *newServerGroup=m_groupList[ newServerGroupID ] ; c->contactAddedToGroup( newServerGroupID, newServerGroup ); - if( !c->metaContact()->groups().contains(newServerGroup) ) + if( !c->metaContact()->groups().tqcontains(newServerGroup) ) { // The contact has been added in a group by another client c->metaContact()->addToGroup( newServerGroup ); @@ -822,7 +822,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ if(old_group) { TQString oldnewID=old_group->pluginData(protocol() , accountId() +" id"); - if ( !oldnewID.isEmpty() && contactGroups.contains( oldnewID ) ) + if ( !oldnewID.isEmpty() && contactGroups.tqcontains( oldnewID ) ) continue; //ok, it's correctn no need to do anything. c->metaContact()->removeFromGroup( old_group ); @@ -851,7 +851,7 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ it != contactGroups.end(); ++it ) { TQString groupGuid = *it; - if(m_groupList.contains(groupGuid)) + if(m_groupList.tqcontains(groupGuid)) { c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); metaContact->addToGroup( m_groupList[ groupGuid ] ); @@ -874,21 +874,21 @@ void MSNAccount::slotContactListed( const TQString& handle, const TQString& publ } } if ( lists & 2 ) - slotContactAdded( handle, "AL", publicName, TQString::null, TQString::null ); + slotContactAdded( handle, "AL", publicName, TQString(), TQString() ); else if(c) c->setAllowed(false); if ( lists & 4 ) - slotContactAdded( handle, "BL", publicName, TQString::null, TQString::null ); + slotContactAdded( handle, "BL", publicName, TQString(), TQString() ); else if(c) c->setBlocked(false); if ( lists & 8 ) - slotContactAdded( handle, "RL", publicName, TQString::null, TQString::null ); + slotContactAdded( handle, "RL", publicName, TQString(), TQString() ); else if(c) c->setReversed(false); if ( lists & 16 ) // This contact is on the pending list. Add to the reverse list and delete from the pending list { - notifySocket()->addContact( handle, MSNProtocol::RL, TQString::null, TQString::null, TQString::null ); - notifySocket()->removeContact( handle, MSNProtocol::PL, TQString::null, TQString::null ); + notifySocket()->addContact( handle, MSNProtocol::RL, TQString(), TQString(), TQString() ); + notifySocket()->removeContact( handle, MSNProtocol::PL, TQString(), TQString() ); } } @@ -910,7 +910,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, c->removeProperty( Kopete::Global::Properties::self()->nickName() ); c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); // Add the new contact to the group he belongs. - if ( tmp_addNewContactToGroup.contains(handle) ) + if ( tmp_addNewContactToGroup.tqcontains(handle) ) { TQStringList list = tmp_addNewContactToGroup[handle]; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -919,10 +919,10 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // If the group didn't exist yet (yay for async operations), don't add the contact to the group // Let slotGroupAdded do it. - if( m_groupList.contains(groupGuid) ) + if( m_groupList.tqcontains(groupGuid) ) { kdDebug( 14140 ) << k_funcinfo << "Adding " << handle << " to group: " << groupGuid << endl; - notifySocket()->addContact( handle, MSNProtocol::FL, TQString::null, contactGuid, groupGuid ); + notifySocket()->addContact( handle, MSNProtocol::FL, TQString(), contactGuid, groupGuid ); c->contactAddedToGroup( groupGuid, m_groupList[ groupGuid ] ); @@ -951,14 +951,14 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, if( !c->hasProperty(MSNProtocol::protocol()->propGuid.key()) ) c->setProperty( MSNProtocol::protocol()->propGuid, contactGuid ); - if ( c->onlineStatus() == MSNProtocol::protocol()->UNK ) + if ( c->onlinetqStatus() == MSNProtocol::protocol()->UNK ) c->setOnlineStatus( MSNProtocol::protocol()->FLN ); if ( c->metaContact() && c->metaContact()->isTemporary() ) - c->metaContact()->setTemporary( false, m_groupList.contains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); + c->metaContact()->setTemporary( false, m_groupList.tqcontains( groupGuid ) ? m_groupList[ groupGuid ] : 0L ); else { - if(m_groupList.contains(groupGuid)) + if(m_groupList.tqcontains(groupGuid)) { if( c->metaContact() ) c->metaContact()->addToGroup( m_groupList[groupGuid] ); @@ -968,17 +968,17 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, } } - if ( !handle.isEmpty() && !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) + if ( !handle.isEmpty() && !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) { kdDebug(14140) << k_funcinfo << "Trying to add contact to AL. " << endl; - notifySocket()->addContact(handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); + notifySocket()->addContact(handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); } } else if ( list == "BL" ) { if ( contacts()[ handle ] ) static_cast( contacts()[ handle ] )->setBlocked( true ); - if ( !m_blockList.contains( handle ) ) + if ( !m_blockList.tqcontains( handle ) ) { m_blockList.append( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; @@ -988,7 +988,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, { if ( contacts()[ handle ] ) static_cast( contacts()[ handle ] )->setAllowed( true ); - if ( !m_allowList.contains( handle ) ) + if ( !m_allowList.tqcontains( handle ) ) { m_allowList.append( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; @@ -1004,7 +1004,7 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, // 'new user' dialog, which makes it impossible to add those here. // Not necessarily bad, but the usability effects need more thought // before I declare it good :- ) - if ( !m_allowList.contains( handle ) && !m_blockList.contains( handle ) ) + if ( !m_allowList.tqcontains( handle ) && !m_blockList.tqcontains( handle ) ) { TQString nick; //in most case, the public name is not know if(publicName!=handle) // so we don't whos it if it is not know @@ -1034,8 +1034,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_blockList.remove( handle ); configGroup()->writeEntry( "blockList" , m_blockList ) ; - if ( !m_allowList.contains( handle ) ) - notifySocket()->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); + if ( !m_allowList.tqcontains( handle ) ) + notifySocket()->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); if(c) c->setBlocked( false ); @@ -1044,8 +1044,8 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis { m_allowList.remove( handle ); configGroup()->writeEntry( "allowList" , m_allowList ) ; - if ( !m_blockList.contains( handle ) ) - notifySocket()->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null ); + if ( !m_blockList.tqcontains( handle ) ) + notifySocket()->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); if(c) c->setAllowed( false ); @@ -1118,7 +1118,7 @@ void MSNAccount::slotContactRemoved( const TQString& handle, const TQString& lis for ( ; it.current(); ++it ) { MSNContact *c2 = static_cast( it.current() ); - if ( c2->serverGroups().contains( *stringIt ) ) + if ( c2->serverGroups().tqcontains( *stringIt ) ) { still_have_contact=true; break; @@ -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" ).arg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).tqarg( c->metaContact()->displayName() ); Kopete::Message tmpMsg = Kopete::Message( c, manager->members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); manager->appendMessage( tmpMsg ); } @@ -1241,17 +1241,17 @@ void MSNAccount::slotContactAddedNotifyDialogClosed(const TQString& handle) if ( !dialog->authorized() ) { - if ( m_allowList.contains( handle ) ) - m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null ); - else if ( !m_blockList.contains( handle ) ) - m_notifySocket->addContact( handle, MSNProtocol::BL, TQString::null, TQString::null, TQString::null ); + if ( m_allowList.tqcontains( handle ) ) + m_notifySocket->removeContact( handle, MSNProtocol::AL, TQString(), TQString() ); + else if ( !m_blockList.tqcontains( handle ) ) + m_notifySocket->addContact( handle, MSNProtocol::BL, TQString(), TQString(), TQString() ); } else { - if ( m_blockList.contains( handle ) ) - m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null ); - else if ( !m_allowList.contains( handle ) ) - m_notifySocket->addContact( handle, MSNProtocol::AL, TQString::null, TQString::null, TQString::null ); + if ( m_blockList.tqcontains( handle ) ) + m_notifySocket->removeContact( handle, MSNProtocol::BL, TQString(), TQString() ); + else if ( !m_allowList.tqcontains( handle ) ) + m_notifySocket->addContact( handle, MSNProtocol::AL, TQString(), TQString(), TQString() ); } @@ -1351,11 +1351,11 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrListsetPluginData( protocol() , accountId() + " id" , TQString::null); - group->setPluginData( protocol() , accountId() + " displayName" , TQString::null); + group->setPluginData( protocol() , accountId() + " id" , TQString()); + group->setPluginData( protocol() , accountId() + " displayName" , TQString()); kdDebug( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" << groupId << " does not seems to be anymore on the server" << endl; // Add the group on MSN server, will fix the corruption. @@ -1365,7 +1365,7 @@ void MSNAccount::addContactServerside(const TQString &contactId, TQPtrListaddContact( contactId, MSNProtocol::FL, contactId, TQString::null, TQString::null ); + m_notifySocket->addContact( contactId, MSNProtocol::FL, contactId, TQString(), TQString() ); } MSNContact *MSNAccount::findContactByGuid(const TQString &contactGuid) @@ -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->setStatus( myself()->onlineStatus() ); + m_notifySocket->settqStatus( myself()->onlinetqStatus() ); } } diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h index 5f7352e3..d62998cf 100644 --- a/kopete/protocols/msn/msnaccount.h +++ b/kopete/protocols/msn/msnaccount.h @@ -40,9 +40,10 @@ class MSNContact; class MSNAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: - MSNAccount( MSNProtocol *parent, const TQString &accountID, const char *name = 0L ); + MSNAccount( MSNProtocol *tqparent, const TQString &accountID, const char *name = 0L ); /* * return the menu for this account @@ -112,7 +113,7 @@ public: public slots: virtual void connectWithPassword( const TQString &password ) ; virtual void disconnect() ; - virtual void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString::null); + virtual void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString()); /** * Ask to the account to create a new chat session @@ -125,7 +126,7 @@ public slots: void slotErrorMessageReceived( int type, const TQString &msg ); protected: - virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ); + virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ); private slots: @@ -134,7 +135,7 @@ private slots: void slotOpenInbox(); void slotChangePublicName(); -//#if !defined NDEBUG //(Stupid moc which don't see when he don't need to slot this slot) +//#if !defined NDEBUG //(Stupid tqmoc which don't see when he don't need to slot this slot) /** * Show simple debugging aid */ @@ -227,7 +228,7 @@ private: public: //FIXME: should be private TQMap m_groupList; - void addGroup( const TQString &groupName, const TQString &contactToAdd = TQString::null ); + void addGroup( const TQString &groupName, const TQString &contactToAdd = TQString() ); /** * Find and retrive a MSNContact by its contactGuid. (Helper function) diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp index 8bdf77a1..2442d627 100644 --- a/kopete/protocols/msn/msnaddcontactpage.cpp +++ b/kopete/protocols/msn/msnaddcontactpage.cpp @@ -25,8 +25,8 @@ #include "kopeteaccount.h" #include "kopeteuiglobal.h" -MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *parent, const char *name ) - : AddContactPage(parent,name) +MSNAddContactPage::MSNAddContactPage(bool connected, TQWidget *tqparent, const char *name ) + : AddContactPage(tqparent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); /* if ( connected ) diff --git a/kopete/protocols/msn/msnaddcontactpage.h b/kopete/protocols/msn/msnaddcontactpage.h index 4b51a15e..5d1fa2f0 100644 --- a/kopete/protocols/msn/msnaddcontactpage.h +++ b/kopete/protocols/msn/msnaddcontactpage.h @@ -15,8 +15,9 @@ class MSNProtocol; class MSNAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - MSNAddContactPage(bool connected, TQWidget *parent=0, const char *name=0); + MSNAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0); ~MSNAddContactPage(); msnAddUI *msndata; TQLabel *noaddMsg1; diff --git a/kopete/protocols/msn/msnchallengehandler.cpp b/kopete/protocols/msn/msnchallengehandler.cpp index 46d4b8a0..5492b9e7 100644 --- a/kopete/protocols/msn/msnchallengehandler.cpp +++ b/kopete/protocols/msn/msnchallengehandler.cpp @@ -46,8 +46,8 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString) kdDebug(14140) << k_funcinfo << "md5: " << digest << endl; - TQValueVector md5Integers(4); - for(Q_UINT32 i=0; i < md5Integers.count(); i++) + TQValueVector md5Integers(4); + for(TQ_UINT32 i=0; i < md5Integers.count(); i++) { md5Integers[i] = hexSwap(digest.mid(i*8, 8)).toUInt(0, 16) & 0x7FFFFFFF; kdDebug(14140) << k_funcinfo << ("0x" + hexSwap(digest.mid(i*8, 8))) << " " << md5Integers[i] << endl; @@ -61,8 +61,8 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString) kdDebug(14140) << k_funcinfo << "challenge key: " << challengeKey << endl; - TQValueVector challengeIntegers(challengeKey.length() / 4); - for(Q_UINT32 i=0; i < challengeIntegers.count(); i++) + TQValueVector challengeIntegers(challengeKey.length() / 4); + for(TQ_UINT32 i=0; i < challengeIntegers.count(); i++) { TQString sNum = challengeKey.mid(i*4, 4), sNumHex; @@ -82,7 +82,7 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString) // Step Three: Create the 64-bit hash key. // Get the hash key using the specified arrays. - Q_INT64 key = createHashKey(md5Integers, challengeIntegers); + TQ_INT64 key = createHashKey(md5Integers, challengeIntegers); kdDebug(14140) << k_funcinfo << "key: " << key << endl; // Step Four: Create the final hash key. @@ -98,16 +98,16 @@ TQString MSNChallengeHandler::computeHash(const TQString& challengeString) return (upper + lower); } -Q_INT64 MSNChallengeHandler::createHashKey(const TQValueVector& md5Integers, - const TQValueVector& challengeIntegers) +TQ_INT64 MSNChallengeHandler::createHashKey(const TQValueVector& md5Integers, + const TQValueVector& challengeIntegers) { kdDebug(14140) << k_funcinfo << "Creating 64-bit key." << endl; - Q_INT64 magicNumber = 0x0E79A9C1L, high = 0L, low = 0L; + TQ_INT64 magicNumber = 0x0E79A9C1L, high = 0L, low = 0L; for(uint i=0; i < challengeIntegers.count(); i += 2) { - Q_INT64 temp = ((challengeIntegers[i] * magicNumber) % 0x7FFFFFFF) + high; + TQ_INT64 temp = ((challengeIntegers[i] * magicNumber) % 0x7FFFFFFF) + high; temp = ((temp * md5Integers[0]) + md5Integers[1]) % 0x7FFFFFFF; high = (challengeIntegers[i + 1] + temp) % 0x7FFFFFFF; @@ -121,12 +121,12 @@ Q_INT64 MSNChallengeHandler::createHashKey(const TQValueVector& md5Inte TQDataStream buffer(TQByteArray(8), IO_ReadWrite); buffer.setByteOrder(TQDataStream::LittleEndian); - buffer << (Q_INT32)high; - buffer << (Q_INT32)low; + buffer << (TQ_INT32)high; + buffer << (TQ_INT32)low; buffer.device()->reset(); buffer.setByteOrder(TQDataStream::BigEndian); - Q_INT64 key; + TQ_INT64 key; buffer >> key; return key; diff --git a/kopete/protocols/msn/msnchallengehandler.h b/kopete/protocols/msn/msnchallengehandler.h index 8ae8c3aa..e2413fb5 100644 --- a/kopete/protocols/msn/msnchallengehandler.h +++ b/kopete/protocols/msn/msnchallengehandler.h @@ -28,9 +28,10 @@ * * @author Gregg Edghill */ -class MSNChallengeHandler : public QObject +class MSNChallengeHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: MSNChallengeHandler(const TQString& productKey, const TQString& productId); ~MSNChallengeHandler(); @@ -50,7 +51,7 @@ private: /** * Creates a 64-bit hash key. */ - Q_INT64 createHashKey(const TQValueVector& md5Integers, const TQValueVector& challengeIntegers); + TQ_INT64 createHashKey(const TQValueVector& md5Integers, const TQValueVector& challengeIntegers); /** * Swaps the bytes in a hex string. diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index f799edc1..6e0bc03e 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -128,7 +128,7 @@ MSNChatSession::~MSNChatSession() { delete m_image; //force to disconnect the switchboard - //not needed since the m_chatService has us as parent + //not needed since the m_chatService has us as tqparent // if(m_chatService) // delete m_chatService; @@ -202,7 +202,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub m_timeoutTimer=0L; if( !account()->contacts()[ handle ] ) - account()->addContact( handle, TQString::null, 0L, Kopete::Account::Temporary); + account()->addContact( handle, TQString(), 0L, Kopete::Account::Temporary); MSNContact *c = static_cast( account()->contacts()[ handle ] ); @@ -316,7 +316,7 @@ void MSNChatSession::slotActionInviteAboutToShow() TQDictIterator it( account()->contacts() ); for( ; it.current(); ++it ) { - if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) + if( !members().tqcontains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { KAction *a=new KopeteContactAction( it.current(), this, TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); @@ -355,11 +355,11 @@ void MSNChatSession::slotInviteOtherContact() bool ok; TQString handle = KInputDialog::getText(i18n( "MSN Plugin" ), i18n( "Please enter the email address of the person you want to invite:" ), - TQString::null, &ok ); + TQString(), &ok ); if( !ok ) return; - if( handle.contains('@') != 1 || handle.contains('.') <1) + if( handle.tqcontains('@') != 1 || handle.tqcontains('.') <1) { KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("You must enter a valid email address."), i18n("MSN Plugin")); @@ -399,7 +399,7 @@ void MSNChatSession::sendMessageQueue() void MSNChatSession::slotAcknowledgement(unsigned int id, bool ack) { - if ( !m_messagesSent.contains( id ) ) + if ( !m_messagesSent.tqcontains( id ) ) { // This is maybe a ACK/NAK for a non-messaging message return; @@ -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" ).arg( m.plainBody() ); + TQString body = i18n( "The following message has not been sent correctly:\n%1" ).tqarg( m.plainBody() ); Kopete::Message msg = Kopete::Message( m.to().first(), members(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); appendMessage( msg ); //stop the stupid animation @@ -433,14 +433,14 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) rx.search(msg); long unsigned int cookie=rx.cap(1).toUInt(); - if(m_invitations.contains(cookie)) + if(m_invitations.tqcontains(cookie)) { MSNInvitation *msnI=m_invitations[cookie]; msnI->parseInvitation(msg); } - else if( msg.contains("Invitation-Command: INVITE") ) + else if( msg.tqcontains("Invitation-Command: INVITE") ) { - if( msg.contains(MSNFileTransferSocket::applicationID()) ) + if( msg.tqcontains(MSNFileTransferSocket::applicationID()) ) { MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this); connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); @@ -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" ) - .arg( c->property( Kopete::Global::Properties::self()->nickName()).value().toString(), inviteName ); + .tqarg( 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); @@ -493,7 +493,7 @@ void MSNChatSession::sendFile(const TQString &fileLocation, const TQString &/*fi // TODO create a switchboard to send the file is one is not available. if(m_chatService && members().getFirst()) { - m_chatService->PeerDispatcher()->sendFile(fileLocation, (Q_INT64)fileSize, members().getFirst()->contactId()); + m_chatService->PeerDispatcher()->sendFile(fileLocation, (TQ_INT64)fileSize, members().getFirst()->contactId()); } } @@ -527,7 +527,7 @@ void MSNChatSession::slotRequestPicture() if( !c->object().isEmpty() ) m_chatService->requestDisplayPicture(); } - else if(myself()->onlineStatus().isDefinitelyOnline() && myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) + else if(myself()->onlinetqStatus().isDefinitelyOnline() && myself()->onlinetqStatus().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( view(false)->mainWidget()->topLevelWidget() ) : 0L; + KMainWindow *w= view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. @@ -603,7 +603,7 @@ void MSNChatSession::slotDebugRawCommand() if( result == TQDialog::Accepted && m_chatService ) { m_chatService->sendCommand( dlg->command(), dlg->params(), - dlg->addId(), dlg->msg().replace("\n","\r\n").utf8() ); + dlg->addId(), dlg->msg().tqreplace("\n","\r\n").utf8() ); } delete dlg; #endif @@ -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" ).arg( c->metaContact()->displayName() ); + TQString body = i18n( "%1 has started a chat with you" ).tqarg( 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").arg(reason, m.plainBody()); + TQString body=i18n("The following message has not been sent correctly (%1): \n%2").tqarg(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):
    ").arg(reason); + TQString body=i18n("These messages have not been sent correctly (%1):
      ").tqarg(reason); for ( TQMap::iterator it = m_messagesSent.begin(); it!=m_messagesSent.end(); it = m_messagesSent.begin() ) { m=it.data(); diff --git a/kopete/protocols/msn/msnchatsession.h b/kopete/protocols/msn/msnchatsession.h index df63f337..dde77246 100644 --- a/kopete/protocols/msn/msnchatsession.h +++ b/kopete/protocols/msn/msnchatsession.h @@ -34,12 +34,13 @@ class TQLabel; class KOPETE_EXPORT MSNChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 ); ~MSNChatSession(); - void createChat( const TQString &handle, const TQString &address, const TQString &auth, const TQString &ID = TQString::null ); + void createChat( const TQString &handle, const TQString &address, const TQString &auth, const TQString &ID = TQString() ); MSNSwitchBoardSocket *service() { return m_chatService; }; diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index c6ef14f8..8e7742f0 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -50,8 +50,8 @@ #include "msnnotifysocket.h" #include "msnaccount.h" -MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ) -: Kopete::Contact( account, id, parent ) +MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ) +: Kopete::Contact( account, id, tqparent ) { m_deleted = false; m_allowed = false; @@ -75,7 +75,7 @@ MSNContact::MSNContact( Kopete::Account *account, const TQString &id, Kopete::Me // wizard, and it can be because we are creating a temporary contact. // if it's added by the wizard, the status will be set immediately after. // if it's a temporary contact, better to set the unknown status. - setOnlineStatus( ( parent && parent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); + setOnlineStatus( ( tqparent && tqparent->isTemporary() ) ? MSNProtocol::protocol()->UNK : MSNProtocol::protocol()->FLN ); actionBlock = 0L; @@ -89,7 +89,7 @@ MSNContact::~MSNContact() bool MSNContact::isReachable() { - if ( account()->isConnected() && isOnline() && account()->myself()->onlineStatus() != MSNProtocol::protocol()->HDN ) + if ( account()->isConnected() && isOnline() && account()->myself()->onlinetqStatus() != MSNProtocol::protocol()->HDN ) return true; MSNChatSession *kmm=dynamic_cast(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()->onlineStatus() == MSNProtocol::protocol()->HDN ) + if ( !account()->isConnected() || account()->myself()->onlinetqStatus() == 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( onlineStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() ) + if( onlinetqStatus() == MSNProtocol::protocol()->FLN && ( isAllowed() || isBlocked() ) && !serverGroups().isEmpty() ) return false; return true; @@ -178,20 +178,20 @@ void MSNContact::slotBlockUser() if( m_blocked ) { - notify->removeContact( contactId(), MSNProtocol::BL, TQString::null, TQString::null ); + notify->removeContact( contactId(), MSNProtocol::BL, TQString(), TQString() ); } else { if(m_allowed) - notify->removeContact( contactId(), MSNProtocol::AL, TQString::null, TQString::null ); + notify->removeContact( contactId(), MSNProtocol::AL, TQString(), TQString() ); else - notify->addContact( contactId(), MSNProtocol::BL, TQString::null, TQString::null, TQString::null ); + notify->addContact( contactId(), MSNProtocol::BL, TQString(), TQString(), TQString() ); } } void MSNContact::slotUserInfo() { - KDialogBase *infoDialog=new KDialogBase( 0l, "infoDialog", /*modal = */false, TQString::null, KDialogBase::Close , KDialogBase::Close, false ); + KDialogBase *infoDialog=new KDialogBase( 0l, "infoDialog", /*modal = */false, TQString(), KDialogBase::Close , KDialogBase::Close, false ); TQString nick=property( Kopete::Global::Properties::self()->nickName()).value().toString(); TQString personalMessage=property( MSNProtocol::protocol()->propPersonalMessage).value().toString(); MSNInfo *info=new MSNInfo ( infoDialog,"info"); @@ -237,7 +237,7 @@ void MSNContact::deleteContact() // Then trully remove it from server contact list, // because only removing the contact from his groups isn't sufficent from MSNP11. kdDebug( 14140 ) << k_funcinfo << "Removing contact from top-level." << endl; - notify->removeContact( contactId(), MSNProtocol::FL, guid(), TQString::null); + notify->removeContact( contactId(), MSNProtocol::FL, guid(), TQString()); } else { @@ -264,8 +264,8 @@ void MSNContact::setBlocked( bool blocked ) { m_blocked = blocked; //update the status - setOnlineStatus(m_currentStatus); - //m_currentStatus is used here. previously it was onlineStatus() but this may cause problem when + setOnlineStatus(m_currenttqStatus); + //m_currenttqStatus is used here. previously it was onlinetqStatus() but this may cause problem when // the account is offline because of the Kopete::Contact::OnlineStatus() account offline hack. } } @@ -317,7 +317,7 @@ void MSNContact::setClientFlags( uint flags ) setProperty( MSNProtocol::protocol()->propClient , i18n("Windows Mobile") ); else if( flags & MSNProtocol::MSNMobileDevice) setProperty( MSNProtocol::protocol()->propClient , i18n("MSN Mobile") ); - else if( m_obj.contains("kopete") ) + else if( m_obj.tqcontains("kopete") ) setProperty( MSNProtocol::protocol()->propClient , i18n("Kopete") ); } @@ -427,7 +427,7 @@ void MSNContact::sync( unsigned int changed ) // and then, the same command can be sent twice. // FIXME: if this method is called a seconds times, that mean change can be // done in the contactlist. we should found a way to recall this - // method later. (a QTimer?) + // method later. (a TQTimer?) kdDebug( 14140 ) << k_funcinfo << " This contact is already moving. Abort sync id: " << contactId() << endl; return; } @@ -458,14 +458,14 @@ void MSNContact::sync( unsigned int changed ) if( !group->pluginData( protocol() , account()->accountId() + " id" ).isEmpty() ) { TQString Gid=group->pluginData( protocol(), account()->accountId() + " id" ); - if( !static_cast( account() )->m_groupList.contains(Gid) ) + if( !static_cast( account() )->m_groupList.tqcontains(Gid) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. // This shouln't be possible anymore 2004-06-10 -Olivier //repair the problem - group->setPluginData( protocol() , account()->accountId() + " id" , TQString::null); - group->setPluginData( protocol() , account()->accountId() + " displayName" , TQString::null); + group->setPluginData( protocol() , account()->accountId() + " id" , TQString()); + group->setPluginData( protocol() , account()->accountId() + " displayName" , TQString()); kdWarning( 14140 ) << k_funcinfo << " Group " << group->displayName() << " marked with id #" <displayName().isEmpty() && group->type() == Kopete::Group::Normal) //not the top-level @@ -476,10 +476,10 @@ void MSNContact::sync( unsigned int changed ) m_moving=true; } } - else if( !m_serverGroups.contains(Gid) ) + else if( !m_serverGroups.tqcontains(Gid) ) { //Add the contact to the group on the server - notify->addContact( contactId(), MSNProtocol::FL, TQString::null, guid(), Gid ); + notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), Gid ); count++; m_moving=true; } @@ -506,7 +506,7 @@ void MSNContact::sync( unsigned int changed ) for( TQMap::Iterator it = m_serverGroups.begin();(count > 1 && it != m_serverGroups.end()); ++it ) { - if( !static_cast( account() )->m_groupList.contains(it.key()) ) + if( !static_cast( account() )->m_groupList.tqcontains(it.key()) ) { // ohoh! something is corrupted on the contactlist.xml // anyway, we never should add a contact to an unexisting group on the server. @@ -523,7 +523,7 @@ void MSNContact::sync( unsigned int changed ) Kopete::Group *group=it.data(); if(!group) //we can't trust the data of it() see in MSNProtocol::deserializeContact why group=static_cast( account() )->m_groupList[it.key()]; - if( !metaContact()->groups().contains(group) ) + if( !metaContact()->groups().tqcontains(group) ) { m_moving=true; notify->removeContact( contactId(), MSNProtocol::FL, guid(), it.key() ); @@ -539,7 +539,7 @@ void MSNContact::sync( unsigned int changed ) // we add the contact to the group #0 (the default one) /*if(count==0) { -// notify->addContact( contactId(), MSNProtocol::FL, TQString::null, guid(), "0"); +// notify->addContact( contactId(), MSNProtocol::FL, TQString(), guid(), "0"); }*/ } @@ -577,7 +577,7 @@ void MSNContact::rename( const TQString &newName ) void MSNContact::slotShowProfile() { - KRun::runURL( KURL( TQString::fromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" ); + KRun::runURL( KURL( TQString::tqfromLatin1("http://members.msn.com/?pgmarket=it-it&mem=") + contactId()) , "text/html" ); } @@ -590,7 +590,7 @@ void MSNContact::sendFile( const KURL &sourceURL, const TQString &altFileName, u //If the file location is null, then get it from a file open dialog if( !sourceURL.isValid() ) - filePath = KFileDialog::getOpenFileName( TQString::null ,"*", 0l , i18n( "Kopete File Transfer" )); + filePath = KFileDialog::getOpenFileName( TQString() ,"*", 0l , i18n( "Kopete File Transfer" )); else filePath = sourceURL.path(-1); @@ -598,7 +598,7 @@ void MSNContact::sendFile( const KURL &sourceURL, const TQString &altFileName, u if ( !filePath.isEmpty() ) { - Q_UINT32 fileSize = TQFileInfo(filePath).size(); + TQ_UINT32 fileSize = TQFileInfo(filePath).size(); //Send the file static_cast( manager(Kopete::Contact::CanCreate) )->sendFile( filePath, altFileName, fileSize ); @@ -615,7 +615,7 @@ void MSNContact::setOnlineStatus(const Kopete::OnlineStatus& status) protocol() , status.internalStatus()+15 , status.overlayIcons() + TQStringList("msn_blocked") , - i18n("%1|Blocked").arg( status.description() ) ) ); + i18n("%1|Blocked").tqarg( 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_currentStatus=status; + m_currenttqStatus=status; } void MSNContact::slotSendMail() @@ -672,7 +672,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) //copy the temp file somewere else. // in a better world, the file could be dirrectly wrote at the correct location. // but the custom emoticon code is to deeply merged in the display picture code while it could be separated. - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ ); @@ -685,7 +685,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) void MSNContact::slotEmitDisplayPictureChanged() { - TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); } @@ -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()->onlineStatus().status() != Kopete::OnlineStatus::Invisible ) + && account()->myself()->onlinetqStatus().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 8326b499..7ab36fc0 100644 --- a/kopete/protocols/msn/msncontact.h +++ b/kopete/protocols/msn/msncontact.h @@ -44,9 +44,10 @@ namespace Kopete { class OnlineStatus; } class MSNContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: - MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent ); + MSNContact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent ); ~MSNContact(); /** @@ -134,7 +135,7 @@ public slots: virtual void slotUserInfo(); virtual void deleteContact(); virtual void sendFile( const KURL &sourceURL = KURL(), - const TQString &fileName = TQString::null, uint fileSize = 0L ); + const TQString &fileName = TQString(), uint fileSize = 0L ); /** * Every time the kopete's contactlist is modified, we sync the serverlist with it @@ -184,10 +185,10 @@ private: TQString m_obj; //the MSNObject /** - * keep the current status here. (it's normally already in Kopete::Contact::d->onlineStatus) + * keep the current status here. (it's normally already in Kopete::Contact::d->onlinetqStatus) * This is a workaround to prevent problems with the account offline status. */ - Kopete::OnlineStatus m_currentStatus; + Kopete::OnlineStatus m_currenttqStatus; //MSNProtocol::deserializeContact need to acess some contact insternals friend class MSNProtocol; diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp index 48c4050e..a6790062 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.cpp +++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp @@ -27,8 +27,8 @@ #include -MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent ) -: KDialogBase( parent, 0L, true, +MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *tqparent ) +: KDialogBase( tqparent, 0L, true, i18n( "DEBUG: Send Raw Command - MSN Plugin" ), Ok | Cancel, Ok, true ) { diff --git a/kopete/protocols/msn/msndebugrawcmddlg.h b/kopete/protocols/msn/msndebugrawcmddlg.h index 7f9741e8..ee69f6c6 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.h +++ b/kopete/protocols/msn/msndebugrawcmddlg.h @@ -32,9 +32,10 @@ class MSNDebugRawCommand_base; class MSNDebugRawCmdDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MSNDebugRawCmdDlg( TQWidget *parent ); + MSNDebugRawCmdDlg( TQWidget *tqparent ); ~MSNDebugRawCmdDlg(); TQString command(); diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index c07fad06..c08bd3eb 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -40,8 +40,8 @@ using namespace KNetwork; -MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* parent) - : MSNSocket(parent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) +MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Contact *c,bool incoming, TQObject* tqparent) + : MSNSocket(tqparent) , MSNInvitation(incoming, MSNFileTransferSocket::applicationID() , i18n("File Transfer - MSN Plugin")) { m_handle=handle; m_kopeteTransfer=0l; @@ -217,7 +217,7 @@ void MSNFileTransferSocket::slotAcceptConnection() void MSNFileTransferSocket::slotTimer() { - if(onlineStatus() != Disconnected) + if(onlinetqStatus() != Disconnected) return; kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl; if( m_kopeteTransfer) @@ -331,7 +331,7 @@ TQString MSNFileTransferSocket::invitationHead() TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer return TQString( MSNInvitation::invitationHead()+ - "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n" + "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.tqfindRev( '/' ) - 1 ) +"\r\n" "Application-FileSize: "+ TQString::number(size()) +"\r\n\r\n").utf8(); } @@ -340,7 +340,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) TQRegExp rx("Invitation-Command: ([A-Z]*)"); rx.search(msg); TQString command=rx.cap(1); - if( msg.contains("Invitation-Command: INVITE") ) + if( msg.tqcontains("Invitation-Command: INVITE") ) { rx=TQRegExp("Application-File: ([^\\r\\n]*)"); rx.search(msg); @@ -351,13 +351,13 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) MSNInvitation::parseInvitation(msg); //for the cookie - Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString::null, TQString::number( cookie() ) ); + Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString(), TQString::number( cookie() ) ); TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQT_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) ); TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); } - else if( msg.contains("Invitation-Command: ACCEPT") ) + else if( msg.tqcontains("Invitation-Command: ACCEPT") ) { if(incoming()) { diff --git a/kopete/protocols/msn/msnfiletransfersocket.h b/kopete/protocols/msn/msnfiletransfersocket.h index 2d9a6c57..a5a21f49 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.h +++ b/kopete/protocols/msn/msnfiletransfersocket.h @@ -40,9 +40,10 @@ namespace Kopete { class Contact; } class MSNFileTransferSocket : public MSNSocket , public MSNInvitation { Q_OBJECT + TQ_OBJECT public: - MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* parent = 0L ); + MSNFileTransferSocket(const TQString &myID,Kopete::Contact* c, bool incoming, TQObject* tqparent = 0L ); ~MSNFileTransferSocket(); static TQString applicationID() { return "5D3E02AB-6190-11d3-BBBB-00C04F795683"; } diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 3b3fc531..7db79dd1 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( onlineStatus() == Connected ) - sendCommand( "OUT", TQString::null, false ); + if( onlinetqStatus() == Connected ) + sendCommand( "OUT", TQString(), false ); if( m_keepaliveTimer ) m_keepaliveTimer->stop(); // the socket is not connected yet, so I should force the signals - if ( onlineStatus() == Disconnected || onlineStatus() == Connecting ) + if ( onlinetqStatus() == Disconnected || onlinetqStatus() == Connecting ) emit socketClosed(); else MSNSocket::disconnect(); @@ -108,7 +108,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) kdDebug(14140) << k_funcinfo << endl; TQString handle; - if(m_tmpHandles.contains(id)) + if(m_tmpHandles.tqcontains(id)) handle=m_tmpHandles[id]; TQString msg; @@ -122,7 +122,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) case 205: case 208: { - msg = i18n( "The MSN user '%1' does not exist.
      Please check the MSN ID.      " ).arg( handle ); + msg = i18n( "The MSN user '%1' does not exist.
      Please check the MSN ID.      " ).tqarg( handle ); type = MSNSocket::ErrorServerError; break; } @@ -134,7 +134,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) "MSN Error: %1
      " "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.)" ).arg(code); + "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(code); type = MSNSocket::ErrorServerError; break; } @@ -166,7 +166,7 @@ void MSNNotifySocket::handleError( uint code, uint id ) msg = i18n( "The user '%1' already exists in this group on the MSN server;
      " "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.)      " ).arg(handle); + "console (in gzipped format, as it is probably a lot of output.)" ).tqarg(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." ).arg(handle); + msg = i18n( "The user '%1' seems to already be blocked or allowed on the server." ).tqarg(handle); type = MSNSocket::ErrorServerError; break; } @@ -465,12 +465,12 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString if( list == "FL" ) { // Removing a contact - if( data.contains( ' ' ) < 2 ) + if( data.tqcontains( ' ' ) < 2 ) { contactGuid = data.section( ' ', 1, 1 ); } // Removing a contact from a group - else if( data.contains( ' ' ) < 3 ) + else if( data.tqcontains( ' ' ) < 3 ) { contactGuid = data.section( ' ', 1, 1 ); groupGuid = data.section( ' ', 2, 2 ); @@ -541,7 +541,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString m_challengeHandler = new MSNChallengeHandler("CFHUR$52U_{VIX5T", "PROD0101{0RM?UBW"); // Compute the challenge response hash, and send the response. TQString chlResponse = m_challengeHandler->computeHash(data.section(' ', 0, 0)); - sendCommand("QRY", m_challengeHandler->productId(), true, chlResponse.utf8()); + sendCommand("TQRY", m_challengeHandler->productId(), true, chlResponse.utf8()); // Dispose of the challenge handler. m_challengeHandler->deleteLater(); m_challengeHandler = 0L; @@ -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 - setStatus( m_newstatus ); + settqStatus( m_newstatus ); } else if( cmd == "BPR" ) { @@ -592,11 +592,11 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString else //FROM SYN m_account->configGroup()->writeEntry( "BLP" , data.section( ' ', 0, 0 ) ); } - else if( cmd == "QRY" ) + else if( cmd == "TQRY" ) { // Do nothing } - else if( cmd == "QNG" ) + else if( cmd == "TQNG" ) { //this is a reply from a ping m_ping=false; @@ -633,7 +633,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString "\n" "
      \n" "\n" - "\n" + "\n" "\n" "\n" "\n" @@ -641,7 +641,7 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString "\n" "\n" "\n" - "\n" + "\n" "\n" "\n" "\n\n"; @@ -735,9 +735,9 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) { TQString msg = TQString::fromUtf8(bytes, bytes.size()); - if(msg.contains("text/x-msmsgsinitialmdatanotification")) + if(msg.tqcontains("text/x-msmsgsinitialmdatanotification")) { - //Mail-Data: 301142409600204800 + //Mail-Data: 301142409600204800 // MD - Mail Data // E - email // I - initial mail @@ -758,14 +758,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } } - else if(msg.contains("text/x-msmsgsactivemailnotification")) + else if(msg.tqcontains("text/x-msmsgsactivemailnotification")) { //this sends the server if mails are deleted - TQString m = msg.right(msg.length() - msg.find("Message-Delta:") ); - m = m.left(msg.find("\r\n")); - mailCount = mailCount - m.right(m.length() -m.find(" ")-1).toUInt(); + TQString m = msg.right(msg.length() - msg.tqfind("Message-Delta:") ); + m = m.left(msg.tqfind("\r\n")); + mailCount = mailCount - m.right(m.length() -m.tqfind(" ")-1).toUInt(); } - else if(msg.contains("text/x-msmsgsemailnotification")) + else if(msg.tqcontains("text/x-msmsgsemailnotification")) { //this sends the server if a new mail has arrived TQRegExp rx("From-Addr: ([A-Za-z0-9@._\\-]*)"); @@ -775,32 +775,32 @@ 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." ).arg(m), + TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).tqarg(m), 0 , 0 , i18n( "Open Inbox..." ) ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); } - else if(msg.contains("text/x-msmsgsprofile")) + else if(msg.tqcontains("text/x-msmsgsprofile")) { //Hotmail profile - if(msg.contains("MSPAuth:")) + if(msg.tqcontains("MSPAuth:")) { TQRegExp rx("MSPAuth: ([A-Za-z0-9$!*]*)"); rx.search(msg); m_MSPAuth=rx.cap(1); } - if(msg.contains("sid:")) + if(msg.tqcontains("sid:")) { TQRegExp rx("sid: ([0-9]*)"); rx.search(msg); m_sid=rx.cap(1); } - if(msg.contains("kv:")) + if(msg.tqcontains("kv:")) { TQRegExp rx("kv: ([0-9]*)"); rx.search(msg); m_kv=rx.cap(1); } - if(msg.contains("LoginTime:")) + if(msg.tqcontains("LoginTime:")) { TQRegExp rx("LoginTime: ([0-9]*)"); rx.search(msg); @@ -812,14 +812,14 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) time(&actualTime); m_loginTime=TQString::number((unsigned long)actualTime); } - if(msg.contains("EmailEnabled:")) + if(msg.tqcontains("EmailEnabled:")) { TQRegExp rx("EmailEnabled: ([0-9]*)"); rx.search(msg); m_isHotmailAccount = (rx.cap(1).toUInt() == 1); emit hotmailSeted(m_isHotmailAccount); } - if(msg.contains("ClientIP:")) + if(msg.tqcontains("ClientIP:")) { TQRegExp rx("ClientIP: ([0-9.]*)"); rx.search(msg); @@ -829,7 +829,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) // We are logged when we receive the initial profile from Hotmail. m_isLogged = true; } - else if (msg.contains("NOTIFICATION")) + else if (msg.tqcontains("NOTIFICATION")) { // MSN alert (i.e. NOTIFICATION) [for docs see http://www.hypothetic.org/docs/msn/client/notification.php] // format of msg is as follows: @@ -849,7 +849,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) TQString notificationDOMAsString(msg); TQRegExp rx( "&(?!amp;)" ); // match ampersands but not & - notificationDOMAsString.replace(rx, "&"); + notificationDOMAsString.tqreplace(rx, "&"); TQDomDocument alertDOM; alertDOM.setContent(notificationDOMAsString); @@ -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::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") ) + if( subscString != TQString::tqfromLatin1("s.htm") && actionString != TQString::tqfromLatin1("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))); @@ -956,7 +956,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) contact->setProperty(MSNProtocol::protocol()->propPersonalMessage, currentMedia.isEmpty() ? personalMessage : currentMedia); } } - m_tmpLastHandle = TQString::null; + m_tmpLastHandle = TQString(); } } @@ -1008,13 +1008,13 @@ TQString MSNNotifySocket::processCurrentMedia( const TQString &mediaXmlElement ) currentMedia = format; for(uint i=0; imyselfClientId() + " " + 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").arg(mediaList[0]); + formatterArguments += TQString("%1\\0").tqarg(mediaList[0]); } if( !mediaList[1].isEmpty() ) // Current Artist { xmlCurrentMedia += " - {1}"; - formatterArguments += TQString("%1\\0").arg(mediaList[1]); + formatterArguments += TQString("%1\\0").tqarg(mediaList[1]); } if( !mediaList[2].isEmpty() ) // Current Album { xmlCurrentMedia += " ({2})"; - formatterArguments += TQString("%1\\0").arg(mediaList[2]); + formatterArguments += TQString("%1\\0").tqarg(mediaList[2]); } xmlCurrentMedia += "\\0" + formatterArguments + "\\0"; break; @@ -1256,7 +1256,7 @@ TQString MSNNotifySocket::statusToString( const Kopete::OnlineStatus &status ) c void MSNNotifySocket::slotSendKeepAlive() { - //we did not received the previous QNG + //we did not received the previous TQNG if(m_ping) { m_disconnectReason=Kopete::Account::ConnectionReset; @@ -1269,7 +1269,7 @@ void MSNNotifySocket::slotSendKeepAlive() { // Send a dummy command to fake activity. This makes sure MSN doesn't // disconnect you when the notify socket is idle. - sendCommand( "PNG" , TQString::null , false ); + sendCommand( "PNG" , TQString() , false ); m_ping=true; } diff --git a/kopete/protocols/msn/msnnotifysocket.h b/kopete/protocols/msn/msnnotifysocket.h index e8c22158..805e427c 100644 --- a/kopete/protocols/msn/msnnotifysocket.h +++ b/kopete/protocols/msn/msnnotifysocket.h @@ -42,6 +42,7 @@ class MSNChallengeHandler; class MSNNotifySocket : public MSNSocket { Q_OBJECT + TQ_OBJECT public: MSNNotifySocket( MSNAccount* account, const TQString &msnId, const TQString &password ); @@ -49,7 +50,7 @@ public: virtual void disconnect(); - void setStatus( const Kopete::OnlineStatus &status ); + void settqStatus( 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 ); @@ -57,7 +58,7 @@ public: void removeGroup( const TQString& group ); void renameGroup( const TQString& groupName, const TQString& groupGuid ); - void changePublicName( const TQString& publicName , const TQString &handle=TQString::null ); + void changePublicName( const TQString& publicName , const TQString &handle=TQString() ); void changePersonalMessage( MSNProtocol::PersonalMessageType type , const TQString& personalMessage ); void changePhoneNumber( const TQString &key, const TQString &data ); @@ -85,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 contactStatus(const TQString&, const TQString&, const TQString& ); + void contacttqStatus(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); @@ -98,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 &newStatus ); + void statusChanged( const Kopete::OnlineStatus &newtqStatus ); void hotmailSeted(bool) ; @@ -164,7 +165,7 @@ private: Kopete::OnlineStatus m_newstatus; /** - * Convert an entry of the Status enum back to a string + * Convert an entry of the tqStatus 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 9c0007fc..587826ad 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -47,18 +47,18 @@ K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_ms MSNProtocol *MSNProtocol::s_protocol = 0L; -MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ), - NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString::null, i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ), +MSNProtocol::MSNProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( MSNProtocolFactory::instance(), tqparent, name ), + NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString(), i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ), BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", i18n( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", i18n( "Be Right Back" ), i18n( "Be &Right Back" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), AWY( Kopete::OnlineStatus::Away, 18, this, 4, "contact_away_overlay", i18n( "Away From Computer" ),i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ), PHN( Kopete::OnlineStatus::Away, 12, this, 5, "contact_phone_overlay", i18n( "On the Phone" ) , i18n( "On The &Phone" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), LUN( Kopete::OnlineStatus::Away, 15, this, 6, "contact_food_overlay", i18n( "Out to Lunch" ) , i18n( "Out To &Lunch" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), - FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString::null, i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ), + FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString(), i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ), HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ), IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ), - UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "Status not available" ) ), + UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "tqStatus not available" ) ), CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ), propEmail(Kopete::Global::Properties::self()->emailAddress()), propPhoneHome(Kopete::Global::Properties::self()->privatePhone()), @@ -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_unknownStatus = UNK; + // m_status = m_unknowntqStatus = UNK; } Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaContact, const TQMap &serializedData, @@ -104,21 +104,21 @@ Kopete::Contact *MSNProtocol::deserializeContact( Kopete::MetaContact *metaConta c->setInfo( "PHM" , serializedData[ "PHM" ] ); c->setProperty( propGuid, contactGuid ); - c->setBlocked( (bool)(lists.contains('B')) ); - c->setAllowed( (bool)(lists.contains('A')) ); - c->setReversed( (bool)(lists.contains('R')) ); + c->setBlocked( (bool)(lists.tqcontains('B')) ); + c->setAllowed( (bool)(lists.tqcontains('A')) ); + c->setReversed( (bool)(lists.tqcontains('R')) ); return c; } -AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *parent , Kopete::Account *i) +AddContactPage *MSNProtocol::createAddContactWidget(TQWidget *tqparent , Kopete::Account *i) { - return (new MSNAddContactPage(i->isConnected(),parent)); + return (new MSNAddContactPage(i->isConnected(),tqparent)); } -KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *MSNProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new MSNEditAccountWidget(this,account,parent); + return new MSNEditAccountWidget(this,account,tqparent); } Kopete::Account *MSNProtocol::createNewAccount(const TQString &accountId) @@ -154,13 +154,13 @@ MSNProtocol* MSNProtocol::protocol() bool MSNProtocol::validContactId(const TQString& userid) { - return ( userid.contains('@') ==1 && userid.contains('.') >=1 && userid.contains(' ') == 0); + return ( userid.tqcontains('@') ==1 && userid.tqcontains('.') >=1 && userid.tqcontains(' ') == 0); } TQImage MSNProtocol::scalePicture(const TQImage &picture) { TQImage img(picture); - img = img.smoothScale( 96, 96, TQImage::ScaleMin ); + img = img.smoothScale( 96, 96, TQ_ScaleMin ); // crop image if not square if(img.width() < img.height()) { diff --git a/kopete/protocols/msn/msnprotocol.h b/kopete/protocols/msn/msnprotocol.h index 45a5c46d..405baa95 100644 --- a/kopete/protocols/msn/msnprotocol.h +++ b/kopete/protocols/msn/msnprotocol.h @@ -56,9 +56,10 @@ namespace Kopete { class Group; } class KOPETE_EXPORT MSNProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - MSNProtocol( TQObject *parent, const char *name, const TQStringList &args ); + MSNProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); /** * SyncMode indicates whether settings differing between client and @@ -152,8 +153,8 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - virtual AddContactPage *createAddContactWidget( TQWidget *parent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget( TQWidget *tqparent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); static MSNProtocol* protocol(); diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index a795b43a..681ce8d4 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -16,7 +16,7 @@ */ #include "msnsecureloginhandler.h" -// Qt includes +// TQt includes #include // KDE includes @@ -55,7 +55,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob) // Retrive the HTTP header TQString httpHeaders = loginJob->queryMetaData("HTTP-Headers"); - // Get the login URL using QRegExp + // Get the login URL using TQRegExp TQRegExp rx("PassportURLs: DARealm=(.*),DALogin=(.*),DAReg="); rx.search(httpHeaders); @@ -74,7 +74,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob) "OrgVerb=GET," "OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom," "sign-in=" + KURL::encode_string(m_accountId) + - ",pwd=" + KURL::encode_string( m_password ).replace(',',"%2C") + + ",pwd=" + KURL::encode_string( m_password ).tqreplace(',',"%2C") + "," + m_authentification + "\r\n"; // warning, this debug contains the password @@ -105,7 +105,7 @@ void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob) // kdDebug(14140) << k_funcinfo << "HTTP headers: " << httpHeaders << endl; // Check if we get "401 Unauthorized", thats means it's a bad password. - if(httpHeaders.contains(TQString::fromUtf8("401 Unauthorized"))) + if(httpHeaders.tqcontains(TQString::fromUtf8("401 Unauthorized"))) { // kdDebug(14140) << k_funcinfo << "MSN Login Bad password." << endl; emit loginBadPassword(); diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h index 8f913fc7..c25daf0d 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.h +++ b/kopete/protocols/msn/msnsecureloginhandler.h @@ -31,9 +31,10 @@ namespace KIO * * @author Michaël Larouche */ -class MSNSecureLoginHandler : public QObject +class MSNSecureLoginHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: MSNSecureLoginHandler(const TQString &accountId, const TQString &password, const TQString &authParameters); diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 0aaad25c..3e5d84fd 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -54,9 +54,9 @@ class MimeMessage TQString message; }; -MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) +MSNSocket::MSNSocket(TQObject* tqparent) : TQObject (tqparent) { - m_onlineStatus = Disconnected; + m_onlinetqStatus = Disconnected; m_socket = 0L; m_useHttp = false; m_timer = 0L; @@ -64,7 +64,7 @@ MSNSocket::MSNSocket(TQObject* parent) : TQObject (parent) MSNSocket::~MSNSocket() { - //if ( m_onlineStatus != Disconnected ) + //if ( m_onlinetqStatus != Disconnected ) // disconnect(); delete m_timer; m_timer = 0L; @@ -75,13 +75,13 @@ MSNSocket::~MSNSocket() void MSNSocket::connect( const TQString &server, uint port ) { - if ( m_onlineStatus == Connected || m_onlineStatus == Connecting ) + if ( m_onlinetqStatus == Connected || m_onlinetqStatus == Connecting ) { kdWarning( 14140 ) << k_funcinfo << "Already connected or connecting! Not connecting again." << endl; return; } - if( m_onlineStatus == Disconnecting ) + if( m_onlinetqStatus == Disconnecting ) { // Cleanup first. // FIXME: More generic!!! @@ -166,16 +166,16 @@ void MSNSocket::doneDisconnect() void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status ) { - if ( m_onlineStatus == status ) + if ( m_onlinetqStatus == status ) return; - m_onlineStatus = status; + m_onlinetqStatus = status; emit onlineStatusChanged( status ); } void MSNSocket::slotSocketError( int error ) { - kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->errorString() << ")" << endl; + kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->KSocketBase::errorString() << ")" << endl; if(!KSocketBase::isFatalError(error)) return; @@ -183,9 +183,9 @@ 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" ).arg( m_socket->peerResolver().nodeName() ); + errormsg += i18n( "Unable to lookup %1" ).tqarg( m_socket->peerResolver().nodeName() ); else - errormsg += m_socket->errorString() ; + errormsg += m_socket->KSocketBase::errorString() ; //delete m_socket; m_socket->deleteLater(); @@ -249,12 +249,12 @@ void MSNSocket::slotDataReceived() // Check if all data has arrived. rawData = TQString(TQCString(buffer, avail + 1)); - bool headers = (rawData.find(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); + bool headers = (rawData.tqfind(TQRegExp("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)")) != -1); if(headers) { // The http header packet arrived. - int endOfHeaders = rawData.find("\r\n\r\n"); + int endOfHeaders = rawData.tqfind("\r\n\r\n"); if((endOfHeaders + 4) == avail) { // Only the response headers data is included. @@ -314,17 +314,17 @@ void MSNSocket::slotDataReceived() // Retrieve the X-MSN-Messenger header. TQString header = response.getHeaders()->getValue("X-MSN-Messenger"); - TQStringList parts = TQStringList::split(";", header.replace(" ", "")); + TQStringList parts = TQStringList::split(";", header.tqreplace(" ", "")); if(!header.isNull() && (parts.count() >= 2)) { - if(parts[0].find("SessionID", 0) != -1) + if(parts[0].tqfind("SessionID", 0) != -1) { // Assign the session id. m_sessionId = parts[0].section("=", 1, 1); }else error = true; - if(parts[1].find("GW-IP", 0) != -1) + if(parts[1].tqfind("GW-IP", 0) != -1) { // Assign the gateway IP address. m_gwip = parts[1].section("=", 1, 1); @@ -333,7 +333,7 @@ void MSNSocket::slotDataReceived() if(parts.count() > 2) - if((parts[2].find("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) + if((parts[2].tqfind("Session", 0) != -1) && (parts[2].section("=", 1, 1) == "close")) { // The http session has been closed by the server, disconnect. kdDebug(14140) << k_funcinfo << "Session closed." << endl; @@ -390,7 +390,7 @@ void MSNSocket::slotDataReceived() // all MSN commands start with one or more uppercase characters. // For now just check the first three chars, let's see how accurate it is. // Additionally, if we receive an MSN-P2P packet, strip off anything after the P2P header. - rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().replace( + rawData = TQString( TQCString( buffer, ((!m_useHttp)? avail : ret) + 1 ) ).stripWhiteSpace().tqreplace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); bool isBinary = false; @@ -446,7 +446,7 @@ void MSNSocket::slotReadLine() if ( index != -1 ) { TQString command = TQString::fromUtf8( m_buffer.take( index + 2 ), index ); - command.replace( "\r\n", "" ); + command.tqreplace( "\r\n", "" ); //kdDebug( 14141 ) << k_funcinfo << command << endl; // Don't block the GUI while parsing data, only do a single line! @@ -502,7 +502,7 @@ bool MSNSocket::pollReadBlock() void MSNSocket::parseLine( const TQString &str ) { TQString cmd = str.section( ' ', 0, 0 ); - TQString data = str.section( ' ', 2 ).replace( "\r\n" , "" ); + TQString data = str.section( ' ', 2 ).tqreplace( "\r\n" , "" ); bool isNum; uint id = str.section( ' ', 1, 1 ).toUInt( &isNum ); @@ -517,7 +517,7 @@ void MSNSocket::parseLine( const TQString &str ) //kdDebug( 14140 ) << k_funcinfo << "Parsing command " << cmd << " (ID " << id << "): '" << data << "'" << endl; - data.replace( "\r\n", "" ); + data.tqreplace( "\r\n", "" ); bool isError; uint errorCode = cmd.toUInt( &isError ); if ( isError ) @@ -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." ).arg( code ); + "Please fill a bug report with a detailed description and if possible the last console debug output." ).tqarg( code ); // "See http://www.hypothetic.org/docs/msn/basics.php for a description of all error codes." break; } @@ -725,7 +725,7 @@ void MSNSocket::slotReadyWrite() // Simple check to avoid dumping the binary data from the icons and emoticons to kdDebug: // When sending an MSN-P2P packet, strip off anything after the P2P header. - TQString debugData = TQString( *it ).stripWhiteSpace().replace( + TQString debugData = TQString( *it ).stripWhiteSpace().tqreplace( TQRegExp( "(P2P-Dest:.[a-zA-Z@.]*).*" ), "\\1\n\n(Stripped binary data)" ); kdDebug( 14141 ) << k_funcinfo << "Sending command: " << debugData << endl; @@ -757,12 +757,12 @@ TQString MSNSocket::escape( const TQString &str ) //If we encode more, the size can be longer than excepted. int old_length= str.length(); - TQChar *new_segment = new QChar[ old_length * 3 + 1 ]; + TQChar *new_segment = new TQChar[ old_length * 3 + 1 ]; int new_length = 0; for ( int i = 0; i < old_length; i++ ) { - unsigned short character = str[i].unicode(); + unsigned short character = str[i].tqunicode(); if( character <= 32 || character == '%' ) { @@ -790,10 +790,10 @@ TQString MSNSocket::unescape( const TQString &str ) { TQString str2 = KURL::decode_string( str, 106 ); //remove msn+ colors code - str2 = str2.replace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors + str2 = str2.tqreplace( TQRegExp("[\\x1-\\x8]"), "" ); // old msn+ colors // added by kaoul - str2 = str2.replace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... - str2 = str2.replace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 + str2 = str2.tqreplace( TQRegExp("\\xB7[&@\'#0]"),""); // dot ... + str2 = str2.tqreplace( TQRegExp("\\xB7\\$,?\\d{1,2}"),""); // dot dollar (comma)? 0-99 return str2; } @@ -823,7 +823,7 @@ void MSNSocket::slotSocketClosed() { kdDebug( 14140 ) << k_funcinfo << "Socket closed. " << endl; - if ( !m_socket || m_onlineStatus == Disconnected ) + if ( !m_socket || m_onlinetqStatus == Disconnected ) { kdDebug( 14140 ) << k_funcinfo << "Socket already deleted or already disconnected" << endl; return; @@ -885,7 +885,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp ) else if( s == "msnswitchboardsocket" ) m_type = "SB"; else - m_type = TQString::null; + m_type = TQString(); if( m_type.isNull() ) return false; @@ -897,7 +897,7 @@ bool MSNSocket::setUseHttpMethod( bool useHttp ) m_gateway = "gateway.messenger.hotmail.com"; } - if ( m_onlineStatus != Disconnected ) + if ( m_onlinetqStatus != Disconnected ) disconnect(); m_useHttp = useHttp; @@ -950,7 +950,7 @@ bool MSNSocket::accept( KServerSocket *server ) TQString MSNSocket::getLocalIP() { if ( !m_socket ) - return TQString::null; + return TQString(); const KSocketAddress address = m_socket->localAddress(); @@ -1031,7 +1031,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) // Parse the HTTP status header TQRegExp re("HTTP/\\d\\.\\d (\\d+) ([^\r\n]+)"); - headerEnd = data.find("\r\n"); + headerEnd = data.tqfind("\r\n"); header = data.left( (headerEnd == -1) ? 20 : headerEnd ); re.search(header); @@ -1039,7 +1039,7 @@ MSNSocket::WebResponse::WebResponse(const TQByteArray& bytes) m_statusDescription = re.cap(2); // Remove the web response status header. - data = data.mid(headerEnd + 2, (data.find("\r\n\r\n") + 2) - (headerEnd + 2)); + data = data.mid(headerEnd + 2, (data.tqfind("\r\n\r\n") + 2) - (headerEnd + 2)); // Create a MimeMessage, removing the HTTP status header m_headers = new MimeMessage(data); diff --git a/kopete/protocols/msn/msnsocket.h b/kopete/protocols/msn/msnsocket.h index 96bfd0cb..c6dff087 100644 --- a/kopete/protocols/msn/msnsocket.h +++ b/kopete/protocols/msn/msnsocket.h @@ -44,12 +44,13 @@ class MimeMessage; * Server, the Notification Server and the Switchboard Server. It is * inherited by the various specialized classes. */ -class KOPETE_EXPORT MSNSocket : public QObject +class KOPETE_EXPORT MSNSocket : public TQObject { Q_OBJECT + TQ_OBJECT public: - MSNSocket(TQObject* parent=0l); + MSNSocket(TQObject* tqparent=0l); ~MSNSocket(); /** @@ -75,11 +76,11 @@ public: * handshake likely has to follow first. */ enum OnlineStatus { Connecting, Connected, Disconnecting, Disconnected }; - enum LookupStatus { Processing, Success, Failed }; + enum LookuptqStatus { Processing, Success, Failed }; enum Transport { TcpTransport, HttpTransport }; enum ErrorType { ErrorConnectionLost, ErrorConnectionError, ErrorCannotConnect, ErrorServerError, ErrorInformation}; - OnlineStatus onlineStatus() { return m_onlineStatus; } + OnlineStatus onlinetqStatus() { return m_onlinetqStatus; } /* * return the local ip. @@ -113,7 +114,7 @@ public slots: * * return the id */ - int sendCommand( const TQString &cmd, const TQString &args = TQString::null, + int sendCommand( const TQString &cmd, const TQString &args = TQString(), bool addId = true, const TQByteArray &body = TQByteArray() , bool binary=false ); signals: @@ -278,7 +279,7 @@ private: void parseLine( const TQString &str ); KNetwork::KBufferedSocket *m_socket; - OnlineStatus m_onlineStatus; + OnlineStatus m_onlinetqStatus; TQString m_server; uint m_port; @@ -288,7 +289,7 @@ private: */ uint m_waitBlockSize; - class Buffer : public QByteArray + class Buffer : public TQByteArray { public: Buffer( unsigned size = 0 ); diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 7754c448..896de926 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -63,8 +63,8 @@ #include "dispatcher.h" using P2P::Dispatcher; -MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *parent ) -: MSNSocket( parent ) +MSNSwitchBoardSocket::MSNSwitchBoardSocket( MSNAccount *account , TQObject *tqparent ) +: MSNSocket( tqparent ) { m_account = account; m_recvIcons=0; @@ -80,7 +80,7 @@ MSNSwitchBoardSocket::~MSNSwitchBoardSocket() { kdDebug(14140) << k_funcinfo << endl; - TQMap >::Iterator it; + TQMap >::Iterator it; for ( it = m_emoticons.begin(); it != m_emoticons.end(); ++it ) { delete it.data().second; @@ -93,8 +93,8 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T m_ID = ID; m_auth = auth; - TQString server = address.left( address.find( ":" ) ); - uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt(); + TQString server = address.left( address.tqfind( ":" ) ); + uint port = address.right( address.length() - address.tqfindRev( ":" ) - 1 ).toUInt(); TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) ); @@ -128,7 +128,7 @@ void MSNSwitchBoardSocket::handleError( uint code, uint id ) } case 215: { - msg = i18n( "The user %1 is already in this chat." ).arg( m_msgHandle ); + msg = i18n( "The user %1 is already in this chat." ).tqarg( 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." ).arg( m_msgHandle ); + msg = i18n( "The user %1 is online but has blocked you:\nyou can not talk to this user." ).tqarg( 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." ).arg( m_msgHandle ); + msg = i18n( "The user %1 is currently not signed in.\n" "Messages will not be delivered." ).tqarg( 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" ).arg( m_msgHandle ); + TQString msg = i18n( "You are trying to invite too many contacts to this chat at the same time" ).tqarg( m_msgHandle ); type = MSNSocket::ErrorInformation; userLeftChat(m_msgHandle, i18n("user blocked you")); @@ -191,7 +191,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // new user joins the chat, update user in chat list TQString handle = data.section( ' ', 0, 0 ); TQString screenname = unescape(data.section( ' ', 1, 1 )); - if( !m_chatMembers.contains( handle ) ) + if( !m_chatMembers.tqcontains( handle ) ) m_chatMembers.append( handle ); emit userJoined( handle, screenname, false ); } @@ -199,7 +199,7 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , { // we have joined a multi chat session- this are the users in this chat TQString handle = data.section( ' ', 2, 2 ); - if( !m_chatMembers.contains( handle ) ) + if( !m_chatMembers.tqcontains( handle ) ) m_chatMembers.append( handle ); TQString screenname = unescape(data.section( ' ', 3, 3)); @@ -214,8 +214,8 @@ void MSNSwitchBoardSocket::parseCommand( const TQString &cmd, uint id , // some has disconnect from chat, update user in chat list cleanQueue(); //in case some message are waiting their emoticons, never mind, send them - TQString handle = data.section( ' ', 0, 0 ).replace( "\r\n" , "" ); - userLeftChat( handle, (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString::null ); + TQString handle = data.section( ' ', 0, 0 ).tqreplace( "\r\n" , "" ); + userLeftChat( handle, (data.section( ' ', 1, 1 ) == "1" ) ? i18n("timeout") : TQString() ); } else if( cmd == "MSG" ) { @@ -265,13 +265,13 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) else if( type== "text/x-msmsgscontrol" ) { TQString message; - message = msg.right( msg.length() - msg.findRev( " " ) - 1 ); - message = message.replace( "\r\n" ,"" ); + message = msg.right( msg.length() - msg.tqfindRev( " " ) - 1 ); + message = message.tqreplace( "\r\n" ,"" ); emit receivedTypingMsg( message.lower(), true ); } else if(type == "text/x-msnmsgr-datacast") { - if(msg.contains("ID:")) + if(msg.tqcontains("ID:")) { TQRegExp rx("ID: ([0-9]*)"); rx.search(msg); @@ -293,7 +293,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) TQColor fontColor; TQFont font; - if ( msg.contains( "X-MMS-IM-Format" ) ) + if ( msg.tqcontains( "X-MMS-IM-Format" ) ) { TQString fontName; TQString fontInfo; @@ -329,7 +329,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } } - fontName = parseFontAttr(fontInfo, "FN").replace( "%20" , " " ); + fontName = parseFontAttr(fontInfo, "FN").tqreplace( "%20" , " " ); // Some clients like Trillian and Kopete itself send a font // name of 'MS Serif' since MS changed the server to @@ -343,10 +343,10 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) font = TQFont( fontName, parseFontAttr( fontInfo, "PF" ).toInt(), // font size - ef.contains( 'B' ) ? TQFont::Bold : TQFont::Normal, - ef.contains( 'I' ) ); - font.setUnderline(ef.contains( 'U' )); - font.setStrikeOut(ef.contains( 'S' )); + ef.tqcontains( 'B' ) ? TQFont::Bold : TQFont::Normal, + ef.tqcontains( 'I' ) ); + font.setUnderline(ef.tqcontains( 'U' )); + font.setStrikeOut(ef.tqcontains( 'S' )); } } @@ -359,17 +359,17 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) others.append( m_account->contacts()[ *it2 ] ); } - TQString message=msg.right( msg.length() - msg.find("\r\n\r\n") - 4 ); + TQString message=msg.right( msg.length() - msg.tqfind("\r\n\r\n") - 4 ); //Stupid MSN PLUS colors code. message with incorrect charactere are not showed correctly in the chatwindow. //TODO: parse theses one to show the color too in Kopete - message.replace("\3","").replace("\4","").replace("\2","").replace("\5","").replace("\6","").replace("\7",""); + message.tqreplace("\3","").tqreplace("\4","").tqreplace("\2","").tqreplace("\5","").tqreplace("\6","").tqreplace("\7",""); if(!m_account->contacts()[m_msgHandle]) { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" <(m_account->contacts()[m_msgHandle]); if(!c) return; @@ -493,7 +493,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) } - else if(type == "image/gif" || msg.contains("Message-ID:")) + else if(type == "image/gif" || msg.tqcontains("Message-ID:")) { // Incoming inkformatgif. TQRegExp regex("Message-ID: \\{([0-9A-F\\-]*)\\}"); @@ -510,7 +510,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) { bool valid = true; // Retrieve the nmber of data chunks. - Q_UINT32 numberOfChunks = chunks.toUInt(&valid); + TQ_UINT32 numberOfChunks = chunks.toUInt(&valid); if(valid && (numberOfChunks > 1)) { regex = TQRegExp("base64:([0-9a-zA-Z+/=]+)"); @@ -536,7 +536,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!messageId.isNull()) { - if(m_inkMessageBuffer.contains(messageId)) + if(m_inkMessageBuffer.tqcontains(messageId)) { if(chunks.isNull()) { @@ -577,7 +577,7 @@ void MSNSwitchBoardSocket::sendTypingMsg( bool isTyping ) if( !isTyping ) return; - if ( onlineStatus() != Connected || m_chatMembers.empty()) + if ( onlinetqStatus() != Connected || m_chatMembers.empty()) { //we are not yet in a chat. //if we send that command now, we may get disconnected. @@ -653,14 +653,14 @@ int MSNSwitchBoardSocket::sendCustomEmoticon(const TQString &name, const TQStrin // this sends a short message to the server int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { - if ( onlineStatus() != Connected || m_chatMembers.empty()) + if ( onlinetqStatus() != Connected || m_chatMembers.empty()) { // m_messagesQueue.append(msg); return -1; } #if 0 //this is to test webcam - if(msg.plainBody().contains("/webcam")) + if(msg.plainBody().tqcontains("/webcam")) { PeerDispatcher()->startWebcam( m_myHandle , m_msgHandle); return -3; @@ -678,7 +678,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { for ( TQStringList::const_iterator itr2 = itr.data().constBegin(); itr2 != itr.data().constEnd(); ++itr2 ) { - if ( msg.plainBody().contains( *itr2 ) ) + if ( msg.plainBody().tqcontains( *itr2 ) ) sendCustomEmoticon( *itr2, itr.key() ); } } @@ -748,7 +748,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) head += "; RL=1"; head += "\r\n"; - TQString message= msg.plainBody().replace( "\n" , "\r\n" ); + TQString message= msg.plainBody().tqreplace( "\n" , "\r\n" ); //-- Check if the message isn't too big, TODO: do that at the libkopete level. int len_H=head.utf8().length(); // != head.length() because i need the size in butes and @@ -767,8 +767,8 @@ 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.").arg(nb) , + if(KMessageBox::warningContinueCancel(0L /* FIXME: we should try to find a tqparent somewere*/ , + i18n("The message you are trying to send is too long; it will be split into %1 messages.").tqarg(nb) , i18n("Message too big - MSN Plugin" ), KStdGuiItem::cont() , "SendLongMessages" ) == KMessageBox::Continue ) { @@ -850,7 +850,7 @@ void MSNSwitchBoardSocket::slotSocketClosed( ) void MSNSwitchBoardSocket::slotCloseSession() { - sendCommand( "OUT", TQString::null, false ); + sendCommand( "OUT", TQString(), false ); disconnect(); } @@ -888,7 +888,7 @@ void MSNSwitchBoardSocket::userLeftChat(const TQString& handle , const TQString { emit userLeft( handle, reason ); - if( m_chatMembers.contains( handle ) ) + if( m_chatMembers.tqcontains( handle ) ) m_chatMembers.remove( handle ); if(m_chatMembers.isEmpty()) @@ -907,7 +907,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin { kdDebug(14141) << k_funcinfo << msnObj << endl; - if(m_emoticons.contains(msnObj)) + if(m_emoticons.tqcontains(msnObj)) { //it's an emoticon m_emoticons[msnObj].second=file; @@ -920,7 +920,7 @@ void MSNSwitchBoardSocket::slotEmoticonReceived( KTempFile *file, const TQStrin } else if(msnObj == "inkformatgif") { - TQString msg=i18n("\"Typewrited" ).arg( file->name() ); + TQString msg=i18n("\"Typewrited" ).tqarg( file->name() ); kdDebug(14140) << k_funcinfo << file->name() < others; others.append( m_account->myself() ); @@ -976,7 +976,7 @@ void MSNSwitchBoardSocket::slotIncomingFileTransfer(const TQString& from, const { //this may happens if the contact has been deleted. kdDebug(14140) << k_funcinfo <<"WARNING: contact is null, adding it" < >::Iterator it; + TQMap >::Iterator it; for ( it = m_emoticons.begin(); it != m_emoticons.end(); ++it ) { TQString es=TQStyleSheet::escape(it.data().first); KTempFile *f=it.data().second; - if(message.contains(es) && f) + if(message.tqcontains(es) && f) { TQString imgPath = f->name(); TQImage iconImage(imgPath); @@ -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::fromLatin1( "(^|[\\W\\s]|%1)(%2)(?!\\w)" ).arg(em).arg(em)), - TQString::fromLatin1("\\1<]*>)").arg(TQRegExp::escape(es))), - TQString::fromLatin1("<]*>)").tqarg(TQRegExp::escape(es))), + TQString::tqfromLatin1("\"")" ) ); + TQString::tqfromLatin1("\" src=\"") + imgPath + + TQString::tqfromLatin1("\" title=\"") + es + + TQString::tqfromLatin1("\" alt=\"") + es + + TQString::tqfromLatin1( "\"/>" ) ); kmsg.setBody(message, Kopete::Message::RichText); } } @@ -1060,12 +1060,12 @@ TQString MSNSwitchBoardSocket::parseFontAttr(TQString str, TQString attr) TQString tmp; int pos1=0, pos2=0; - pos1 = str.find(attr + "="); + pos1 = str.tqfind(attr + "="); if (pos1 == -1) return ""; - pos2 = str.find(";", pos1+3); + pos2 = str.tqfind(";", pos1+3); if (pos2 == -1) tmp = str.mid(pos1+3, str.length() - pos1 - 3); @@ -1092,7 +1092,7 @@ Dispatcher* MSNSwitchBoardSocket::PeerDispatcher() // TQObject::connect(this, TQT_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQT_SLOT(slotReadMessage(const TQByteArray&))); // TQObject::connect(m_dispatcher, TQT_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQT_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool))); - TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, Q_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, Q_INT64))); + TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64))); TQObject::connect(m_dispatcher, TQT_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQT_SLOT(slotEmoticonReceived( KTempFile *, const TQString&))); TQObject::connect(this, TQT_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQT_SLOT(messageAcknowledged(unsigned int, bool))); m_dispatcher->m_pictureUrl = m_account->pictureUrl(); @@ -1104,7 +1104,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( ) { /* This is a workaround against the bug 113425 - The problem: the P2P::Webcam class is parent of us, and when we get deleted, it get deleted. + The problem: the P2P::Webcam class is tqparent of us, and when we get deleted, it get deleted. the correct solution would be to change that. The second problem: after one minute of inactivity, the official client close the chat socket. the workaround: we simulate the activity by sending small packet each 50 seconds @@ -1112,7 +1112,7 @@ void MSNSwitchBoardSocket::slotKeepAliveTimer( ) the bad side effect: some switchboard connection may be maintained for really long time! */ - if ( onlineStatus() != Connected || m_chatMembers.empty()) + if ( onlinetqStatus() != 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/msnswitchboardsocket.h b/kopete/protocols/msn/msnswitchboardsocket.h index 178143e4..df76eab0 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.h +++ b/kopete/protocols/msn/msnswitchboardsocket.h @@ -43,12 +43,13 @@ namespace P2P { class Dispatcher; } class KOPETE_EXPORT MSNSwitchBoardSocket : public MSNSocket { Q_OBJECT + TQ_OBJECT public: /** * Contructor: id is the KopeteMessageMangager's id */ - MSNSwitchBoardSocket( MSNAccount * account , TQObject *parent); + MSNSwitchBoardSocket( MSNAccount * account , TQObject *tqparent); ~MSNSwitchBoardSocket(); private: @@ -69,13 +70,13 @@ private: //used for emoticons TQValueList m_msgQueue; unsigned m_recvIcons; - TQMap > m_emoticons; + TQMap > m_emoticons; Kopete::Message &parseCustomEmoticons(Kopete::Message &msg); TQTimer *m_emoticonTimer; TQPtrList m_typewrited; struct InkMessage{ - Q_UINT32 chunks; + TQ_UINT32 chunks; TQString data; }; TQMap m_inkMessageBuffer; @@ -141,7 +142,7 @@ private slots: void slotSocketClosed( ); void slotReadMessage( const TQByteArray &bytes ); void slotEmoticonReceived( KTempFile *, const TQString& ); - void slotIncomingFileTransfer(const TQString& from, const TQString& fileName, Q_INT64 fileSize); + void slotIncomingFileTransfer(const TQString& from, const TQString& fileName, TQ_INT64 fileSize); void cleanQueue(); /** workaround Bug 113425 . see comment inside the function **/ diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index f6b71c12..39d3c5d0 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -25,7 +25,7 @@ #include using namespace KNetwork; -// Qt includes +// TQt includes #include #include #include @@ -39,7 +39,7 @@ using P2P::Dispatcher; using P2P::OutgoingTransfer; using P2P::Message; -OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId) +OutgoingTransfer::OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId) : TransferContext(to,dispatcher,sessionId) { m_direction = Outgoing; @@ -83,7 +83,7 @@ void OutgoingTransfer::sendImage(const TQByteArray& image) void OutgoingTransfer::slotSendData() { - Q_INT32 bytesRead = 0; + TQ_INT32 bytesRead = 0; TQByteArray buffer(1202); if(!m_file) return; @@ -101,7 +101,7 @@ void OutgoingTransfer::slotSendData() buffer.resize(bytesRead); } - kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").arg(bytesRead) << endl; + kdDebug(14140) << k_funcinfo << TQString("Sending, %1 bytes").tqarg(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").arg("-123657987") + - TQString("Conn-Type: %1\r\n").arg("Restrict-NAT") + + TQString("NetID: %1\r\n").tqarg("-123657987") + + TQString("Conn-Type: %1\r\n").tqarg("Restrict-NAT") + "UPnPNat: false\r\n" "ICF: false\r\n" + - TQString("Hashed-Nonce: {%1}\r\n").arg(P2P::Uid::createUid()) + + TQString("Hashed-Nonce: {%1}\r\n").tqarg(P2P::Uid::createUid()) + "\r\n"; sendMessage(INVITE, content); } @@ -357,7 +357,7 @@ void OutgoingTransfer::slotConnected() { kdDebug(14140) << k_funcinfo << endl; // Check if connection is ok. - Q_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4); + TQ_UINT32 bytesWritten = m_socket->writeBlock(TQCString("foo").data(), 4); if(bytesWritten != 4) { // Not all data was written, close the socket. @@ -381,10 +381,10 @@ void OutgoingTransfer::slotConnected() handshake.header.ackSessionIdentifier = nonce.mid(0, 8).toUInt(0, 16); handshake.header.ackUniqueIdentifier = nonce.mid(8, 4).toUInt(0, 16) | (nonce.mid(12, 4).toUInt(0, 16) << 16); - const Q_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16); - const Q_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16); + const TQ_UINT32 lo = nonce.mid(16, 8).toUInt(0, 16); + const TQ_UINT32 hi = nonce.mid(24, 8).toUInt(0, 16); handshake.header.ackDataSize = - ((Q_INT64)htonl(lo)) | (((Q_INT64)htonl(hi)) << 32); + ((TQ_INT64)htonl(lo)) | (((TQ_INT64)htonl(hi)) << 32); TQByteArray stream; // Write the message to the memory stream. @@ -395,13 +395,13 @@ void OutgoingTransfer::slotConnected() void OutgoingTransfer::slotRead() { - Q_INT32 bytesAvailable = m_socket->bytesAvailable(); + TQ_INT32 bytesAvailable = m_socket->bytesAvailable(); kdDebug(14140) << k_funcinfo << bytesAvailable << ", bytes available." << endl; } void OutgoingTransfer::slotSocketError(int) { - kdDebug(14140) << k_funcinfo << m_socket->errorString() << endl; + kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl; // If an error has occurred, try to connect // to another available peer endpoint. // If there are no more available endpoints, diff --git a/kopete/protocols/msn/outgoingtransfer.h b/kopete/protocols/msn/outgoingtransfer.h index ee55593f..90542151 100644 --- a/kopete/protocols/msn/outgoingtransfer.h +++ b/kopete/protocols/msn/outgoingtransfer.h @@ -27,8 +27,9 @@ namespace P2P{ class OutgoingTransfer : public TransferContext { Q_OBJECT + TQ_OBJECT public: - OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId); + OutgoingTransfer(const TQString& to, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId); virtual ~OutgoingTransfer(); void sendImage(const TQByteArray& image); diff --git a/kopete/protocols/msn/p2p.cpp b/kopete/protocols/msn/p2p.cpp index 1aa3ddae..7de59a20 100644 --- a/kopete/protocols/msn/p2p.cpp +++ b/kopete/protocols/msn/p2p.cpp @@ -26,7 +26,7 @@ using P2P::TransferType; // Kde includes #include #include -// Qt includes +// TQt includes #include // Kopete includes @@ -44,7 +44,7 @@ TQString P2P::Uid::createUid() + TQString::number((unsigned long int)rand()%0xAAFF+0x1111, 16)).upper(); } -TransferContext::TransferContext(const TQString &contact, P2P::Dispatcher *dispatcher, Q_UINT32 sessionId) +TransferContext::TransferContext(const TQString &contact, P2P::Dispatcher *dispatcher, TQ_UINT32 sessionId) : TQObject(dispatcher) , m_sessionId(sessionId) , m_identifier(0) , @@ -206,7 +206,7 @@ void TransferContext::sendDataPreparation() m_dispatcher->callbackChannel()->send(stream); } -void TransferContext::sendMessage(MessageType type, const TQString& content, Q_INT32 flag, Q_INT32 appId) +void TransferContext::sendMessage(MessageType type, const TQString& content, TQ_INT32 flag, TQ_INT32 appId) { Message outbound; if(appId != 0){ @@ -318,8 +318,8 @@ void TransferContext::sendMessage(MessageType type, const TQString& content, Q_I void TransferContext::sendMessage(Message& outbound, const TQByteArray& body) { - Q_INT64 offset = 0L, bytesLeft = outbound.header.totalDataSize; - Q_INT16 chunkLength = 1202; + TQ_INT64 offset = 0L, bytesLeft = outbound.header.totalDataSize; + TQ_INT16 chunkLength = 1202; // Split the outbound message if necessary. while(bytesLeft > 0L) diff --git a/kopete/protocols/msn/p2p.h b/kopete/protocols/msn/p2p.h index e3bdd6ff..363fb3ff 100644 --- a/kopete/protocols/msn/p2p.h +++ b/kopete/protocols/msn/p2p.h @@ -17,7 +17,7 @@ #ifndef P2P_H #define P2P_H -// Qt includes +// TQt includes #include #include "messageformatter.h" @@ -64,15 +64,15 @@ namespace P2P{ struct TransportHeader { - Q_UINT32 sessionId; - Q_UINT32 identifier; - Q_INT64 dataOffset; - Q_INT64 totalDataSize; - Q_UINT32 dataSize; - Q_UINT32 flag; - Q_UINT32 ackSessionIdentifier; - Q_UINT32 ackUniqueIdentifier; - Q_INT64 ackDataSize; + TQ_UINT32 sessionId; + TQ_UINT32 identifier; + TQ_INT64 dataOffset; + TQ_INT64 totalDataSize; + TQ_UINT32 dataSize; + TQ_UINT32 flag; + TQ_UINT32 ackSessionIdentifier; + TQ_UINT32 ackUniqueIdentifier; + TQ_INT64 ackDataSize; }; struct Message @@ -84,7 +84,7 @@ namespace P2P{ TQString source; TransportHeader header; TQByteArray body; - Q_INT32 applicationIdentifier; + TQ_INT32 applicationIdentifier; bool attachApplicationIdentifier; }; @@ -93,8 +93,9 @@ namespace P2P{ public: static TQString createUid(); }; - class KOPETE_EXPORT TransferContext : public QObject + class KOPETE_EXPORT TransferContext : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~TransferContext(); @@ -103,16 +104,16 @@ namespace P2P{ void error(); virtual void processMessage(const P2P::Message& message) = 0; void sendDataPreparation(); - void sendMessage(MessageType type, const TQString& content=TQString::null, Q_INT32 flag=0, Q_INT32 appId=0); + void sendMessage(MessageType type, const TQString& content=TQString(), TQ_INT32 flag=0, TQ_INT32 appId=0); void setType(TransferType type); public: - Q_UINT32 m_sessionId; - Q_UINT32 m_identifier; + TQ_UINT32 m_sessionId; + TQ_UINT32 m_identifier; TQFile *m_file; - Q_UINT32 m_transactionId; - Q_UINT32 m_ackSessionIdentifier; - Q_UINT32 m_ackUniqueIdentifier; + TQ_UINT32 m_transactionId; + TQ_UINT32 m_ackSessionIdentifier; + TQ_UINT32 m_ackUniqueIdentifier; Kopete::Transfer *m_transfer; TQString m_branch; TQString m_callId; @@ -124,17 +125,17 @@ namespace P2P{ void readyWrite(); protected: - TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,Q_UINT32 sessionId); + TransferContext(const TQString& contact, P2P::Dispatcher *dispatcher,TQ_UINT32 sessionId); void sendData(const TQByteArray& bytes); void sendMessage(P2P::Message& outbound, const TQByteArray& body); virtual void readyToSend(); - Q_UINT32 m_baseIdentifier; + TQ_UINT32 m_baseIdentifier; TransferDirection m_direction; P2P::Dispatcher *m_dispatcher; bool m_isComplete; - Q_INT64 m_offset; - Q_INT64 m_totalDataSize; + TQ_INT64 m_offset; + TQ_INT64 m_totalDataSize; P2P::MessageFormatter m_messageFormatter; TQString m_recipient; TQString m_sender; diff --git a/kopete/protocols/msn/sha1.cpp b/kopete/protocols/msn/sha1.cpp index 0774cede..d7c6549b 100644 --- a/kopete/protocols/msn/sha1.cpp +++ b/kopete/protocols/msn/sha1.cpp @@ -42,7 +42,7 @@ SHA1::SHA1() qSysInfo(&wordSize, &bigEndian); } -unsigned long SHA1::blk0(Q_UINT32 i) +unsigned long SHA1::blk0(TQ_UINT32 i) { if(bigEndian) return block->l[i]; @@ -51,9 +51,9 @@ unsigned long SHA1::blk0(Q_UINT32 i) } // Hash a single 512-bit block. This is the core of the algorithm. -void SHA1::transform(Q_UINT32 state[5], unsigned char buffer[64]) +void SHA1::transform(TQ_UINT32 state[5], unsigned char buffer[64]) { - Q_UINT32 a, b, c, d, e; + TQ_UINT32 a, b, c, d, e; block = (CHAR64LONG16*)buffer; @@ -110,9 +110,9 @@ void SHA1::init(SHA1_CONTEXT* context) } // Run your data through this -void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) +void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len) { - Q_UINT32 i, j; + TQ_UINT32 i, j; j = (context->count[0] >> 3) & 63; if((context->count[0] += len << 3) < (len << 3)) @@ -135,7 +135,7 @@ void SHA1::update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len) // Add padding and return the message digest void SHA1::final(unsigned char digest[20], SHA1_CONTEXT* context) { - Q_UINT32 i, j; + TQ_UINT32 i, j; unsigned char finalcount[8]; for (i = 0; i < 8; i++) { diff --git a/kopete/protocols/msn/sha1.h b/kopete/protocols/msn/sha1.h index 2038b9e7..eee84abc 100644 --- a/kopete/protocols/msn/sha1.h +++ b/kopete/protocols/msn/sha1.h @@ -35,22 +35,22 @@ private: struct SHA1_CONTEXT { - Q_UINT32 state[5]; - Q_UINT32 count[2]; + TQ_UINT32 state[5]; + TQ_UINT32 count[2]; unsigned char buffer[64]; }; typedef union { unsigned char c[64]; - Q_UINT32 l[16]; + TQ_UINT32 l[16]; } CHAR64LONG16; - void transform(Q_UINT32 state[5], unsigned char buffer[64]); + void transform(TQ_UINT32 state[5], unsigned char buffer[64]); void init(SHA1_CONTEXT* context); - void update(SHA1_CONTEXT* context, unsigned char* data, Q_UINT32 len); + void update(SHA1_CONTEXT* context, unsigned char* data, TQ_UINT32 len); void final(unsigned char digest[20], SHA1_CONTEXT* context); - unsigned long blk0(Q_UINT32 i); + unsigned long blk0(TQ_UINT32 i); bool bigEndian; CHAR64LONG16* block; diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 904e9411..6b913816 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -34,8 +34,8 @@ using namespace KNetwork; namespace PeerToPeer { -Transport::Transport(TQObject* parent, const char* name) - : TQObject(parent, name) +Transport::Transport(TQObject* tqparent, const char* name) + : TQObject(tqparent, name) { mFormatter = new PeerToPeer::MessageFormatter(this); } @@ -47,11 +47,11 @@ Transport::~Transport() //BEGIN Public Methods -TransportBridge* Transport::getBridge (const TQString& to, Q_UINT16 port, TransportBridgeType type, const TQString& identifier) +TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier) { TransportBridge *bridge = 0l; KInetSocketAddress address; - if (mAddresses.contains(to)) + if (mAddresses.tqcontains(to)) { address = mAddresses[to]; } @@ -103,15 +103,15 @@ void Transport::slotOnReceive(const TQString& contact, const TQByteArray& bytes) -TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) -: TQObject(parent, name) +TransportBridge::TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) +: TQObject(tqparent, name) { mAddress = to; mFormatter = formatter; } -TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) -: TQObject(parent, name) +TransportBridge::TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) +: TQObject(tqparent, name) { mSocket = socket; mAddress = mSocket->peerAddress(); @@ -166,8 +166,8 @@ void TransportBridge::slotOnSocketReceive() -TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name) -: TransportBridge(to, formatter, parent, name) +TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name) +: TransportBridge(to, formatter, tqparent, name) { mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this); mSocket->setBlocking(false); @@ -176,8 +176,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M mConnected = false; } -TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name) -: TransportBridge(socket, formatter, parent, name) +TcpTransportBridge::TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name) +: TransportBridge(socket, formatter, tqparent, name) { mConnected = (mSocket->state() == KStreamSocket::Open) ? true : false; mSocket->setBlocking(false); @@ -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").arg(errorCode).arg(mSocket->errorString())); + emit bridgeError(TQString("Bridge ERROR %1: %2").tqarg(errorCode).tqarg(mSocket->errorString())); if (mConnected){ mSocket->disconnect(); mConnected = false; @@ -245,7 +245,7 @@ void TcpTransportBridge::slotOnSocketConnect() mVerified = true; TQString foo = "foo\0"; mSocket->writeBlock(foo.ascii(), foo.length()); - foo = TQString::null; + foo = TQString(); emit bridgeConnect(); } @@ -311,7 +311,7 @@ void TcpTransportBridge::slotOnSocketConnectTimeout() -TcpTransportBridge::Buffer::Buffer(Q_UINT32 length) +TcpTransportBridge::Buffer::Buffer(TQ_UINT32 length) : TQByteArray(length) { } @@ -330,7 +330,7 @@ void TcpTransportBridge::Buffer::write(const TQByteArray& bytes) } } -TQByteArray TcpTransportBridge::Buffer::read(Q_UINT32 length) +TQByteArray TcpTransportBridge::Buffer::read(TQ_UINT32 length) { if (length >= size()) return TQByteArray(); diff --git a/kopete/protocols/msn/transport.h b/kopete/protocols/msn/transport.h index eb190325..a606714b 100644 --- a/kopete/protocols/msn/transport.h +++ b/kopete/protocols/msn/transport.h @@ -47,15 +47,16 @@ enum TransportBridgeType /** @author Gregg Edghill */ /** @brief Represents the protocol used to send and receive message between peers. */ -class Transport : public QObject +class Transport : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @brief Creates a new instance of the class Transport. */ - Transport(TQObject* parent, const char* name = 0l); + Transport(TQObject* tqparent, const char* name = 0l); ~Transport(); /** @brief Get a transport bridge with the specified address, port, type and identifier. */ - TransportBridge* getBridge(const TQString& address, Q_UINT16 port, TransportBridgeType type, const TQString& identifier); + TransportBridge* getBridge(const TQString& address, TQ_UINT16 port, TransportBridgeType type, const TQString& identifier); /** @brief Sets the default transport bridge. */ void setDefaultBridge(MSNSwitchBoardSocket* mss); @@ -77,17 +78,18 @@ private: }; /** @brief Represents the channel connecting two peers. */ -class TransportBridge : public QObject +class TransportBridge : public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~TransportBridge(); protected: /** @brief Creates a new instance of the class TransportBridge with the specified address and formatter. */ - TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); + TransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); /** @brief Creates a new instance of the class TransportBridge with the specified socket and formatter. */ - TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); + TransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); public: /** @brief Creates a connection between two peers. */ @@ -114,7 +116,7 @@ protected: KNetwork::KInetSocketAddress mAddress; bool mConnected; MessageFormatter *mFormatter; - Q_UINT32 mLength; + TQ_UINT32 mLength; KNetwork::KClientSocketBase *mSocket; bool mVerified; }; @@ -122,14 +124,15 @@ protected: class TcpTransportBridge : public TransportBridge { Q_OBJECT + TQ_OBJECT friend class Transport; public: virtual ~TcpTransportBridge(); private: - TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); - TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* parent, const char* name = 0l); + TcpTransportBridge(const KNetwork::KInetSocketAddress& to, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); + TcpTransportBridge(KNetwork::KClientSocketBase* socket, MessageFormatter* formatter, TQObject* tqparent, const char* name = 0l); protected slots: virtual void slotOnConnect(); @@ -146,19 +149,19 @@ signals: void bridgeConnectTimeout(); private: - class Buffer : public QByteArray + class Buffer : public TQByteArray { public: - Buffer(Q_UINT32 length = 0); + Buffer(TQ_UINT32 length = 0); ~Buffer(); public: void write(const TQByteArray& bytes); - TQByteArray read(Q_UINT32 length); + TQByteArray read(TQ_UINT32 length); }; Buffer mBuffer; - Q_UINT32 mLength; + TQ_UINT32 mLength; }; diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index ff99bb92..6373ccf3 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -1,6 +1,6 @@ msnAddUI - + msnAddUI @@ -22,22 +22,22 @@ 6 - + - layout21 + tqlayout21 unnamed - + TextLabel1 &MSN Passport ID: - + AlignTop @@ -50,7 +50,7 @@ The user ID of the MSN contact you would like to add. This should be in the form of a valid E-mail address. - + addID @@ -63,14 +63,14 @@ - + textLabel2 <i>(for example: joe@hotmail.com)</i> - + AlignVCenter|AlignRight @@ -84,7 +84,7 @@ Expanding - + 20 160 @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui index 3b98ce0d..27c1050f 100644 --- a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui +++ b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui @@ -1,6 +1,6 @@ MSNDebugRawCommand_base - + MSNDebugRawCommand_base @@ -22,7 +22,7 @@ 6 - + TextLabel2 @@ -33,12 +33,12 @@ m_params - + m_command - + TextLabel1 @@ -49,12 +49,12 @@ m_command - + m_params - + m_addId @@ -65,7 +65,7 @@ true - + m_addNewline @@ -84,7 +84,7 @@ PlainText - + TextLabel3 @@ -100,7 +100,7 @@ m_addId m_addNewline - + ktextedit.h diff --git a/kopete/protocols/msn/ui/msneditaccountui.ui b/kopete/protocols/msn/ui/msneditaccountui.ui index 5a3b8294..b4bfe186 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -1,7 +1,7 @@ MSNEditAccountUI Olivier Goffart - + Form1 @@ -26,14 +26,14 @@ 0 - + tabWidget3 Rounded - + tab_connection @@ -54,14 +54,14 @@ Expanding - + 20 146 - + groupBox5 @@ -80,7 +80,7 @@ unnamed - + textLabel6 @@ -92,7 +92,7 @@ 0 - + 0 0 @@ -101,11 +101,11 @@ To connect to the Microsoft network, you will need a Microsoft Passport.<br><br>If you do not currently have a Passport, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -115,7 +115,7 @@ - + m_accountInfo @@ -126,15 +126,15 @@ unnamed - + - layout14 + tqlayout14 unnamed - + TextLabel1_3 @@ -159,7 +159,7 @@ The user ID of the MSN contact you would like to use. This should be in the form of a valid E-mail address. - + m_login @@ -180,7 +180,7 @@ m_password - + m_autologin @@ -194,7 +194,7 @@ If you check this checkbox, the account will not be connected when you press the "Connect All" button, or at startup when automatic connection at startup is enabled. - + m_globalIdentity @@ -206,7 +206,7 @@ - + TabPage @@ -217,7 +217,7 @@ unnamed - + textLabel1_3 @@ -229,11 +229,11 @@ <qt><b>Note:</b> These settings are applicable to all MSN accounts - + WordBreak|AlignCenter - + global_settings_page @@ -244,7 +244,7 @@ unnamed - + NotifyNewChat @@ -263,15 +263,15 @@ This option will notify you when a contact starts typing their message, before the message is sent or finished. - + - layout13_2 + tqlayout13_2 unnamed - + textLabel1_4 @@ -285,7 +285,7 @@ <dt>Automatically</dt><dd>Always try to download the picture if the contact has one. <b>Note:</b> this will open a socket, and let the user know you are downloading their picture.</dd></dl> - + Only Manually @@ -324,7 +324,7 @@ - + useCustomEmoticons @@ -338,7 +338,7 @@ MSN Messenger allows users to download and use custom emoticons. If this option is enabled, Kopete will download these emoticons and show them. - + exportEmoticons @@ -355,7 +355,7 @@ Only works for emoticons in the PNG format. - + privacy_page @@ -366,7 +366,7 @@ Only works for emoticons in the PNG format. unnamed - + SendClientInfo @@ -389,7 +389,7 @@ Only works for emoticons in the PNG format. Third party MSN clients, such as Kopete, give users the ability to let other third party clients guess which client they are using. We recommend leaving this checkbox checked. - + SendTypingNotification @@ -406,15 +406,15 @@ Only works for emoticons in the PNG format. <qt>Check this box to send <b>Typing notifications</b> to your contacts. When you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt> - + - layout28 + tqlayout28 unnamed - + SendJabber @@ -449,7 +449,7 @@ Only works for emoticons in the PNG format. Expanding - + 61 21 @@ -468,21 +468,21 @@ Only works for emoticons in the PNG format. Minimum - + 20 21 - + textLabel1_5 There are also privacy options in the "Contacts" tab - + WordBreak|AlignCenter @@ -498,7 +498,7 @@ Only works for emoticons in the PNG format. Expanding - + 31 40 @@ -507,7 +507,7 @@ Only works for emoticons in the PNG format. - + tab_info @@ -518,7 +518,7 @@ Only works for emoticons in the PNG format. unnamed - + Layout22_2 @@ -532,7 +532,7 @@ Only works for emoticons in the PNG format. 6 - + TextLabel2_2_2 @@ -554,7 +554,7 @@ Only works for emoticons in the PNG format. The alias you would like to use on MSN. You may change this at any time you wish. - + m_displayName @@ -567,7 +567,7 @@ Only works for emoticons in the PNG format. - + m_phones @@ -578,7 +578,7 @@ Only works for emoticons in the PNG format. unnamed - + TextLabel5 @@ -589,7 +589,7 @@ Only works for emoticons in the PNG format. m_phh - + TextLabel6 @@ -600,17 +600,17 @@ Only works for emoticons in the PNG format. m_phw - + m_phw - + m_phh - + TextLabel7 @@ -621,14 +621,14 @@ Only works for emoticons in the PNG format. m_phm - + m_phm - + groupBox2 @@ -639,15 +639,15 @@ Only works for emoticons in the PNG format. unnamed - + - layout17 + tqlayout17 unnamed - + m_useDisplayPicture @@ -655,7 +655,7 @@ Only works for emoticons in the PNG format. E&xport a display picture - + textLabel1_2 @@ -673,19 +673,19 @@ Only works for emoticons in the PNG format. Please select a square image. The image will be scaled to 96x96. - + WordBreak|AlignVCenter - + - layout13 + tqlayout13 unnamed - + m_selectImage @@ -706,7 +706,7 @@ Only works for emoticons in the PNG format. Expanding - + 61 21 @@ -725,7 +725,7 @@ Only works for emoticons in the PNG format. Minimum - + 20 1 @@ -734,9 +734,9 @@ Only works for emoticons in the PNG format. - + - layout16 + tqlayout16 @@ -745,7 +745,7 @@ Only works for emoticons in the PNG format. 0 - + m_displayPicture @@ -760,13 +760,13 @@ Only works for emoticons in the PNG format. 0 - + 96 96 - + 96 96 @@ -789,7 +789,7 @@ Only works for emoticons in the PNG format. Minimum - + 20 1 @@ -810,14 +810,14 @@ Only works for emoticons in the PNG format. Expanding - + 20 21 - + m_warning_1 @@ -836,13 +836,13 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page. - + WordBreak|AlignVCenter - + tab_contacts @@ -853,7 +853,7 @@ Only works for emoticons in the PNG format. unnamed - + label_font @@ -863,15 +863,15 @@ Only works for emoticons in the PNG format. <b>Bold</b> contacts are in your contact list but you are not in their contact list. - + - layout6 + tqlayout6 unnamed - + textLabel2 @@ -882,20 +882,20 @@ Only works for emoticons in the PNG format. m_BL - + m_AL - + - layout4 + tqlayout4 unnamed - + m_blockButton @@ -903,7 +903,7 @@ Only works for emoticons in the PNG format. &> - + m_allowButton @@ -921,7 +921,7 @@ Only works for emoticons in the PNG format. Expanding - + 20 20 @@ -930,7 +930,7 @@ Only works for emoticons in the PNG format. - + textLabel1 @@ -941,16 +941,16 @@ Only works for emoticons in the PNG format. m_AL - + m_BL - + - layout58 + tqlayout58 @@ -966,14 +966,14 @@ Only works for emoticons in the PNG format. Expanding - + 41 20 - + m_blp @@ -994,7 +994,7 @@ Only works for emoticons in the PNG format. Expanding - + 41 20 @@ -1003,9 +1003,9 @@ Only works for emoticons in the PNG format. - + - layout59 + tqlayout59 @@ -1021,18 +1021,18 @@ Only works for emoticons in the PNG format. Expanding - + 81 20 - + m_RLButton - + 200 32767 @@ -1058,7 +1058,7 @@ Only works for emoticons in the PNG format. Expanding - + 111 20 @@ -1067,7 +1067,7 @@ Only works for emoticons in the PNG format. - + m_warning_2 @@ -1086,13 +1086,13 @@ Only works for emoticons in the PNG format. WARNING: You need to be connected to modify this page - + WordBreak|AlignVCenter - + TabPage @@ -1103,7 +1103,7 @@ Only works for emoticons in the PNG format. unnamed - + groupBox66 @@ -1114,7 +1114,7 @@ Only works for emoticons in the PNG format. unnamed - + optionOverrideServer @@ -1122,17 +1122,17 @@ Only works for emoticons in the PNG format. &Override default server information - + - layout20 + tqlayout20 unnamed - + - layout19 + tqlayout19 @@ -1141,7 +1141,7 @@ Only works for emoticons in the PNG format. 3 - + labelServer @@ -1155,7 +1155,7 @@ Only works for emoticons in the PNG format. m_serverName - + labelPort @@ -1171,7 +1171,7 @@ Only works for emoticons in the PNG format. - + m_serverName @@ -1196,7 +1196,7 @@ Only works for emoticons in the PNG format. Only modify these values if you want to use a special IM proxy server, like SIMP - + m_serverPort @@ -1221,7 +1221,7 @@ Only works for emoticons in the PNG format. - + optionUseHttpMethod @@ -1234,15 +1234,15 @@ This may be used to connect on a network with a restrictive firewall. Only check this option if the normal connection doesn't work. - + - layout22 + tqlayout22 unnamed - + m_useWebcamPort @@ -1253,7 +1253,7 @@ Only check this option if the normal connection doesn't work. If you are behind a firewall, you may specify a base port to use for the incoming connection, and configure your firewall to accept connections on a range of 10 ports, starting at this one. Incoming connections are used for the webcam. If you don't specify a port yourself, the operating system will choose an available port for you. It is recommended to leave the checkbox unchecked. - + m_webcamPort @@ -1287,7 +1287,7 @@ Only check this option if the normal connection doesn't work. Expanding - + 21 70 @@ -1297,14 +1297,14 @@ Only check this option if the normal connection doesn't work. - + labelStatusMessage - + AlignCenter @@ -1412,7 +1412,7 @@ Only check this option if the normal connection doesn't work. m_blp m_RLButton - + kopetepasswordwidget.h kcombobox.h diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index baa4fb60..b165c9f4 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -65,8 +65,8 @@ public: TQImage pictureData; }; -MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent, const char * /* name */ ) -: TQWidget( parent ), KopeteEditAccountWidget( account ) +MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent, const char * /* name */ ) +: TQWidget( tqparent ), KopeteEditAccountWidget( account ) { d = new MSNEditAccountWidgetPrivate; @@ -76,7 +76,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui = new MSNEditAccountUI( this ); - d->autoConfig = new KAutoConfig( d->ui ); + d->autoConfig = new KAutoConfig( TQT_TQOBJECT(d->ui) ); d->autoConfig->addWidget( d->ui->global_settings_page, "MSN" ); d->autoConfig->addWidget( d->ui->privacy_page, "MSN" ); //the JabberAccount need to be saved as text, and can't be handled by kautoconfig @@ -159,7 +159,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_blp->setChecked( config->readEntry( "BLP" ) == "BL" ); d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); d->ui->m_displayPicture->setPixmap( d->pictureUrl ); d->ui->m_useDisplayPicture->setChecked( config->readBoolEntry( "exportCustomPicture" )); @@ -227,7 +227,7 @@ Kopete::Account * MSNEditAccountWidget::apply() if( d->ui->m_useDisplayPicture->isChecked() && !d->pictureData.isNull() ) { d->pictureUrl = locateLocal( "appdata", "msnpicture-" + - account()->accountId().lower().replace( TQRegExp("[./~]" ), "-" ) + ".png" ); + account()->accountId().lower().tqreplace( TQRegExp("[./~]" ), "-" ) + ".png" ); if ( d->pictureData.save( d->pictureUrl, "PNG" ) ) { static_cast( account() )->setPictureUrl( d->pictureUrl ); @@ -291,7 +291,7 @@ void MSNEditAccountWidget::slotAllow() MSNNotifySocket *notify = static_cast( account() )->notifySocket(); if ( !notify ) return; - notify->removeContact( handle, MSNProtocol::BL, TQString::null, TQString::null ); + notify->removeContact( handle, MSNProtocol::BL, TQString(), TQString() ); d->ui->m_BL->takeItem( item ); d->ui->m_AL->insertItem( item ); @@ -310,7 +310,7 @@ void MSNEditAccountWidget::slotBlock() if ( !notify ) return; - notify->removeContact( handle, MSNProtocol::AL, TQString::null, TQString::null ); + notify->removeContact( handle, MSNProtocol::AL, TQString(), TQString() ); d->ui->m_AL->takeItem( item ); d->ui->m_BL->insertItem( item ); @@ -327,7 +327,7 @@ void MSNEditAccountWidget::slotSelectImage() { TQString path = 0; bool remoteFile = false; - KURL filePath = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "MSN Display Picture" ) ); + KURL filePath = KFileDialog::getImageOpenURL( TQString(), this, i18n( "MSN Display Picture" ) ); if( filePath.isEmpty() ) return; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.h b/kopete/protocols/msn/ui/msneditaccountwidget.h index 40900871..1d97b4f9 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.h +++ b/kopete/protocols/msn/ui/msneditaccountwidget.h @@ -35,9 +35,10 @@ class MSNEditAccountWidgetPrivate; class MSNEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *parent = 0, const char *name = 0 ); + MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0 ); ~MSNEditAccountWidget(); virtual bool validateData(); virtual Kopete::Account * apply(); diff --git a/kopete/protocols/msn/ui/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui index 17f1eecd..f983af30 100644 --- a/kopete/protocols/msn/ui/msninfo.ui +++ b/kopete/protocols/msn/ui/msninfo.ui @@ -1,6 +1,6 @@ MSNInfo - + MSNInfo @@ -16,7 +16,7 @@ unnamed - + Layout22 @@ -30,7 +30,7 @@ 6 - + TextLabel2_2 @@ -46,7 +46,7 @@ Email address: - + m_id @@ -56,7 +56,7 @@ - + Layout22_2 @@ -70,7 +70,7 @@ 6 - + TextLabel2_2_2 @@ -86,7 +86,7 @@ Display name: - + m_displayName @@ -96,15 +96,15 @@ - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -112,7 +112,7 @@ Personal message: - + m_personalMessage @@ -122,7 +122,7 @@ - + GroupBox2 @@ -133,7 +133,7 @@ unnamed - + TextLabel5 @@ -141,7 +141,7 @@ Home: - + TextLabel6 @@ -149,7 +149,7 @@ Work: - + m_phw @@ -157,7 +157,7 @@ true - + m_phh @@ -165,7 +165,7 @@ true - + TextLabel7 @@ -173,7 +173,7 @@ Mobile: - + m_phm @@ -183,7 +183,7 @@ - + m_reversed @@ -208,7 +208,7 @@ If not, the user has not added you to their list, or has removed you. Expanding - + 20 40 @@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you. - + diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 60ce0e82..2c2023c2 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -42,8 +42,8 @@ using namespace KNetwork; namespace P2P { -Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, Q_UINT32 sessionId) - : TransferContext(to,parent,sessionId) , m_who(who) , m_timerId(0) +Webcam::Webcam(Who who, const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionId) + : TransferContext(to,tqparent,sessionId) , m_who(who) , m_timerId(0) { setType(P2P::WebcamType); m_direction = Incoming; @@ -87,12 +87,12 @@ void Webcam::askIncommingInvitation() TQString message= (m_who==wProducer) ? i18n("The contact %1 wants to see your webcam, do you want them to see it?") : i18n("The contact %1 wants to show you his/her webcam, do you want to see it?") ; - int result=KMessageBox::questionYesNo( 0L , message.arg(m_recipient), + int result=KMessageBox::questionYesNo( 0L , message.tqarg(m_recipient), i18n("Webcam invitation - Kopete MSN Plugin") , i18n("Accept") , i18n("Decline")); if(!_this) return; - TQString content = TQString("SessionID: %1\r\n\r\n").arg(m_sessionId); + TQString content = TQString("SessionID: %1\r\n\r\n").tqarg(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::fromLatin1(&C,1); + echoS+=TQString::tqfromLatin1(&C,1); } f+=16; } @@ -305,31 +305,31 @@ 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").arg(rid).arg(sess); + m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid).tqarg(sess); kdDebug(14140) << k_funcinfo << "m_myAuth= " << m_myAuth << endl; TQString producerxml=xml(sess , rid); kdDebug(14140) << k_funcinfo << "producerxml= " << producerxml << endl; makeSIPMessage(producerxml); } } - else if(m_content.contains("") || m_content.contains("")) + else if(m_content.tqcontains("") || m_content.tqcontains("")) { TQRegExp rx("([0-9]*).*([0-9]*)"); rx.search(m_content); TQString rid=rx.cap(1); TQString sess=rx.cap(2); - if(m_content.contains("")) + if(m_content.tqcontains("")) { 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").arg(rid,sess); + m_peerAuth=m_myAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); kdDebug(14140) << k_funcinfo << "m_auth= " << m_myAuth << endl; } else { - m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").arg(rid,sess); + m_peerAuth=TQString("recipientid=%1&sessionid=%2\r\n\r\n").tqarg(rid,sess); makeSIPMessage("receivedViewerData", 0xec , 0xda , 0x03); } @@ -346,33 +346,33 @@ 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").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; + kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").tqarg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; rx=TQRegExp("([^<]*)"); rx.search(m_content); TQString port1=rx.cap(1); if(port1=="0") - port1=TQString::null; + port1=TQString(); rx=TQRegExp("([^<]*)"); rx.search(m_content); TQString port2=rx.cap(1); if(port2==port1 || port2=="0") - port2=TQString::null; + port2=TQString(); rx=TQRegExp("([^<]*)"); rx.search(m_content); TQString port3=rx.cap(1); if(port3==port1 || port3==port2 || port3=="0") - port3=TQString::null; + port3=TQString(); int an=0; while(true) { an++; - if(!m_content.contains( TQString("").arg(an) )) + if(!m_content.tqcontains( TQString("").tqarg(an) )) break; - rx=TQRegExp(TQString("([^<]*)").arg(an).arg(an)); + rx=TQRegExp(TQString("([^<]*)").tqarg(an).tqarg(an)); rx.search(m_content); TQString ip=rx.cap(1); if(ip.isNull()) @@ -416,28 +416,28 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "connect to " << sock << " - "<< sock->peerAddress().toString() << " ; " << sock->localAddress().toString() << endl; } } - else if(m_content.contains("receivedViewerData")) + else if(m_content.tqcontains("receivedViewerData")) { //I'm happy you received the xml i sent, really. } else error(); - m_content=TQString::null; + m_content=TQString(); } -void Webcam::makeSIPMessage(const TQString &message, Q_UINT8 XX, Q_UINT8 YY , Q_UINT8 ZZ) +void Webcam::makeSIPMessage(const TQString &message, TQ_UINT8 XX, TQ_UINT8 YY , TQ_UINT8 ZZ) { TQByteArray dataMessage; //(12+message.length()*2); TQDataStream writer(dataMessage, IO_WriteOnly); writer.setByteOrder(TQDataStream::LittleEndian); - writer << (Q_UINT8)0x80; - writer << (Q_UINT8)XX; - writer << (Q_UINT8)YY; - writer << (Q_UINT8)ZZ; - writer << (Q_UINT8)0x08; - writer << (Q_UINT8)0x00; + writer << (TQ_UINT8)0x80; + writer << (TQ_UINT8)XX; + writer << (TQ_UINT8)YY; + writer << (TQ_UINT8)ZZ; + writer << (TQ_UINT8)0x08; + writer << (TQ_UINT8)0x00; writer << message+'\0'; - //writer << (Q_UINT16)0x0000; + //writer << (TQ_UINT16)0x0000; /*TQString echoS=""; unsigned int f=0; @@ -462,7 +462,7 @@ void Webcam::makeSIPMessage(const TQString &message, Q_UINT8 XX, Q_UINT8 YY , Q_ { unsigned char X=dataMessage[q+f]; char C=((char)(( X<128 && X>31 ) ? X : '.')); - echoS+=TQString::fromLatin1(&C,1); + echoS+=TQString::tqfromLatin1(&C,1); } f+=16; } @@ -482,7 +482,7 @@ void Webcam::sendBigP2PMessage( const TQByteArray & dataMessage) { m_offset=f; TQByteArray dm2; - dm2.duplicate(dataMessage.data()+m_offset, QMIN(1200,m_totalDataSize-m_offset)); + dm2.duplicate(dataMessage.data()+m_offset, TQMIN(1200,m_totalDataSize-m_offset)); sendData( dm2 ); m_offset+=dm2.size(); } @@ -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("%2").arg(ip_number).arg(*it).arg(ip_number); + ip+=TQString("%2").tqarg(ip_number).tqarg(*it).tqarg(ip_number); ++ip_number; } @@ -749,7 +749,7 @@ void Webcam::slotSocketRead() TQByteArray buffer(24); m_webcamSocket->peekBlock(buffer.data(), buffer.size()); - Q_UINT32 paysize=(uchar)buffer[8] + ((uchar)buffer[9]<<8) + ((uchar)buffer[10]<<16) + ((uchar)buffer[11]<<24); + TQ_UINT32 paysize=(uchar)buffer[8] + ((uchar)buffer[9]<<8) + ((uchar)buffer[10]<<16) + ((uchar)buffer[11]<<24); if(available < (paysize+24)) { @@ -805,7 +805,7 @@ void Webcam::slotSocketClosed() void Webcam::slotSocketError(int errorCode) { KBufferedSocket *socket=const_cast(static_cast(sender())); - kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->errorString() << endl; + kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->KSocketBase::errorString() << endl; //sendBYEMessage(); } @@ -868,13 +868,13 @@ void Webcam::timerEvent( TQTimerEvent *e ) TQDataStream writer(header, IO_WriteOnly); writer.setByteOrder(TQDataStream::LittleEndian); - writer << (Q_UINT16)24; // header size - writer << (Q_UINT16)img.width(); - writer << (Q_UINT16)img.height(); - writer << (Q_UINT16)0x0000; //wtf .? - writer << (Q_UINT32)frame.size(); - writer << (Q_UINT8)('M') << (Q_UINT8)('L') << (Q_UINT8)('2') << (Q_UINT8)('0'); - writer << (Q_UINT32)0x00000000; //wtf .? + writer << (TQ_UINT16)24; // header size + writer << (TQ_UINT16)img.width(); + writer << (TQ_UINT16)img.height(); + writer << (TQ_UINT16)0x0000; //wtf .? + writer << (TQ_UINT32)frame.size(); + writer << (TQ_UINT8)('M') << (TQ_UINT8)('L') << (TQ_UINT8)('2') << (TQ_UINT8)('0'); + writer << (TQ_UINT32)0x00000000; //wtf .? writer << TQTime::currentTime(); //FIXME: possible midnight bug ? m_webcamSocket->writeBlock(header.data(), header.size()); diff --git a/kopete/protocols/msn/webcam.h b/kopete/protocols/msn/webcam.h index 472a0fba..59858d94 100644 --- a/kopete/protocols/msn/webcam.h +++ b/kopete/protocols/msn/webcam.h @@ -30,10 +30,11 @@ namespace P2P { class Webcam : public TransferContext { Q_OBJECT + TQ_OBJECT public: enum Who { wProducer , wViewer }; - Webcam( Who who , const TQString& to, Dispatcher *parent, Q_UINT32 sessionID); + Webcam( Who who , const TQString& to, Dispatcher *tqparent, TQ_UINT32 sessionID); ~Webcam( ); virtual void processMessage(const Message& message); @@ -44,7 +45,7 @@ class Webcam : public TransferContext void sendBYEMessage(); private: - void makeSIPMessage(const TQString &message, Q_UINT8 XX=0, Q_UINT8 YY=9 , Q_UINT8 ZZ=0); + void makeSIPMessage(const TQString &message, TQ_UINT8 XX=0, TQ_UINT8 YY=9 , TQ_UINT8 ZZ=0); void sendBigP2PMessage( const TQByteArray& dataMessage ); void closeAllOtherSockets(); TQString m_content; @@ -56,7 +57,7 @@ class Webcam : public TransferContext KNetwork::KServerSocket *m_listener; KNetwork::KBufferedSocket *m_webcamSocket; - enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; + enum WebcamtqStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ; Who m_who; @@ -67,7 +68,7 @@ class Webcam : public TransferContext MSNWebcamDialog *m_widget; TQValueList m_allSockets; - TQMap m_webcamStates; + TQMap m_webcamStates; int m_timerId; int m_timerFps; diff --git a/kopete/protocols/msn/webcam/libmimic/mimic-private.h b/kopete/protocols/msn/webcam/libmimic/mimic-private.h index adf59291..245793fb 100644 --- a/kopete/protocols/msn/webcam/libmimic/mimic-private.h +++ b/kopete/protocols/msn/webcam/libmimic/mimic-private.h @@ -21,9 +21,9 @@ #include "mimic.h" #define ENCODER_BUFFER_SIZE 16384 -#define ENCODER_QUALITY_DEFAULT 0 -#define ENCODER_QUALITY_MIN 0 -#define ENCODER_QUALITY_MAX 10000 +#define ENCODER_TQUALITY_DEFAULT 0 +#define ENCODER_TQUALITY_MIN 0 +#define ENCODER_TQUALITY_MAX 10000 struct _MimCtx { gboolean encoder_initialized; diff --git a/kopete/protocols/msn/webcam/libmimic/mimic.c b/kopete/protocols/msn/webcam/libmimic/mimic.c index 61abf9e8..2013022d 100644 --- a/kopete/protocols/msn/webcam/libmimic/mimic.c +++ b/kopete/protocols/msn/webcam/libmimic/mimic.c @@ -155,7 +155,7 @@ gboolean mimic_encoder_init(MimCtx *ctx, const MimicResEnum resolution) mimic_init(ctx, width, height); /* Set a default quality setting. */ - ctx->quality = ENCODER_QUALITY_DEFAULT; + ctx->quality = ENCODER_TQUALITY_DEFAULT; ctx->encoder_initialized = TRUE; @@ -300,8 +300,8 @@ gboolean mimic_set_property(MimCtx *ctx, const gchar *name, gpointer data) if (strcmp(name, "quality") == 0) { gint new_quality = *((gint *) data); - if (new_quality < ENCODER_QUALITY_MIN || - new_quality > ENCODER_QUALITY_MAX) + if (new_quality < ENCODER_TQUALITY_MIN || + new_quality > ENCODER_TQUALITY_MAX) { return FALSE; } diff --git a/kopete/protocols/msn/webcam/mimicwrapper.cpp b/kopete/protocols/msn/webcam/mimicwrapper.cpp index a9d3b131..75eb52cf 100644 --- a/kopete/protocols/msn/webcam/mimicwrapper.cpp +++ b/kopete/protocols/msn/webcam/mimicwrapper.cpp @@ -16,7 +16,7 @@ #include "libmimic/mimic.h" -//#include +//#include #include #include diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index b0540cbb..e07aaebc 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -27,9 +27,9 @@ -MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, const char * name ) - : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contact ), - KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ), +MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * tqparent, const char * name ) + : KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contact ), + KDialogBase::Close, KDialogBase::Close, tqparent, name, false, true /*seperator*/ ), m_imageContainer( this ) { setInitialSize( TQSize(320,290), true ); @@ -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.setAlignment( Qt::AlignCenter ); + //m_imageContainer.tqsetAlignment( 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 < //font-weight:600 -> (anything > 400 should be , 400 is not bold) @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("\\2")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); - s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
      ") ); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
      ") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -200,13 +200,13 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio } -AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name) - : OscarAccount(parent, accountID, name, false) +AIMAccount::AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) + : OscarAccount(tqparent, accountID, name, false) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; AIMMyselfContact* mc = new AIMMyselfContact( this ); setMyself( mc ); - myself()->setOnlineStatus( static_cast( parent )->statusOffline ); + myself()->setOnlineStatus( static_cast( tqparent )->statusOffline ); TQString profile = configGroup()->readEntry( "Profile", i18n( "Visit the Kopete website at http://kopete.kde.org") ); mc->setOwnProfile( profile ); @@ -235,9 +235,9 @@ AIMAccount::~AIMAccount() { } -OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) +OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) { - AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString::null, ssiItem ); + AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem ); if ( !ssiItem.alias().isEmpty() ) contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); @@ -280,7 +280,7 @@ TQString AIMAccount::sanitizedMessage( const TQString& message ) continue; if ( fontEl.hasAttribute( "back" ) ) { - kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to replace. Doing replacement" << endl; + kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Found attribute to tqreplace. Doing replacement" << endl; TQString backgroundColor = fontEl.attribute( "back" ); backgroundColor.insert( 0, "background-color: " ); backgroundColor.append( ';' ); @@ -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()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); + myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); - mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), - i18n( "%2 <%1>" ).arg( accountId(), accountNick )); + mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); @@ -322,7 +322,7 @@ KActionMenu* AIMAccount::actionMenu() mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); - KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString::null, 0, this, + KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString(), 0, this, TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); mActionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, @@ -344,16 +344,16 @@ void AIMAccount::setAway(bool away, const TQString &awayReason) // kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl; if ( away ) { - engine()->setStatus( Client::Away, awayReason ); + engine()->settqStatus( Client::Away, awayReason ); AIMMyselfContact* me = static_cast ( myself() ); me->setLastAwayMessage(awayReason); me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason ); } else { - engine()->setStatus( Client::Online ); + engine()->settqStatus( Client::Online ); AIMMyselfContact* me = static_cast ( myself() ); - me->setLastAwayMessage(TQString::null); + me->setLastAwayMessage(TQString()); me->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } } @@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile) AIMMyselfContact* aimmc = dynamic_cast( myself() ); if ( aimmc ) aimmc->setOwnProfile( profile ); - configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile ); } void AIMAccount::slotEditInfo() @@ -451,7 +451,7 @@ void AIMAccount::slotBuddyIconChanged() iconFile.open( IO_ReadOnly ); KMD5 iconHash; - iconHash.update( iconFile ); + iconHash.update( *TQT_TQIODEVICE(&iconFile) ); kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "hash is :" << iconHash.hexDigest() << endl; //find old item, create updated item @@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat() void AIMAccount::slotGoOnline() { - if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) { kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl; - engine()->setStatus( Client::Online ); + engine()->settqStatus( Client::Online ); myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } - else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) { kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl; OscarAccount::connect(); @@ -597,16 +597,16 @@ void AIMAccount::disconnected( DisconnectReason reason ) void AIMAccount::messageReceived( const Oscar::Message& message ) { kdDebug(14152) << k_funcinfo << " Got a message, calling OscarAccount::messageReceived" << endl; - // Want to call the parent to do everything else + // Want to call the tqparent to do everything else if ( message.type() != 0x0003 ) { OscarAccount::messageReceived(message); // Check to see if our status is away, and send an away message - // Might be duplicate code from the parent class to get some needed information + // Might be duplicate code from the tqparent 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()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) { TQString sender = Oscar::normalize( message.sender() ); AIMContact* aimSender = static_cast ( 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::fromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "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()->onlineStatus() == static_cast( protocol() )->statusOffline ) + else if ( myself()->onlinetqStatus() == static_cast( protocol() )->statusOffline ) { kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ; updateVersionUpdaterStamp(); @@ -895,7 +895,7 @@ void AIMAccount::setPrivacySettings( int privacy ) void AIMAccount::setPrivacyTLVs( BYTE privacy, DWORD userClasses ) { SSIManager* ssi = engine()->ssiManager(); - Oscar::SSI item = ssi->findItem( TQString::null, ROSTER_VISIBILITY ); + Oscar::SSI item = ssi->findItem( TQString(), ROSTER_VISIBILITY ); TQValueList tList; @@ -905,7 +905,7 @@ void AIMAccount::setPrivacyTLVs( BYTE privacy, DWORD userClasses ) if ( !item ) { kdDebug(OSCAR_AIM_DEBUG) << k_funcinfo << "Adding new privacy TLV item" << endl; - Oscar::SSI s( TQString::null, 0, ssi->nextContactId(), ROSTER_VISIBILITY, tList ); + Oscar::SSI s( TQString(), 0, ssi->nextContactId(), ROSTER_VISIBILITY, tList ); engine()->modifySSIItem( item, s ); } else diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index 2df309b6..35c7adb5 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -53,6 +53,7 @@ class OscarVisibilityDialog; class AIMMyselfContact : public OscarMyselfContact { Q_OBJECT + TQ_OBJECT public: AIMMyselfContact( AIMAccount *acct ); void userInfoUpdated(); @@ -62,7 +63,7 @@ public: TQString lastAwayMessage() { return m_lastAwayMessage; }; virtual Kopete::ChatSession* manager( Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate, - WORD exchange = 0, const TQString& room = TQString::null); + WORD exchange = 0, const TQString& room = TQString()); public slots: void sendMessage( Kopete::Message&, Kopete::ChatSession* session ); @@ -83,15 +84,16 @@ private: class AIMAccount : public OscarAccount { Q_OBJECT + TQ_OBJECT public: - AIMAccount(Kopete::Protocol *parent, TQString accountID, const char *name=0L); + AIMAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name=0L); virtual ~AIMAccount(); // Accessor method for the action menu virtual KActionMenu* actionMenu(); - void setAway(bool away, const TQString &awayReason = TQString::null ); + void setAway(bool away, const TQString &awayReason = TQString() ); virtual void connectWithPassword( const TQString &password ); @@ -101,7 +103,7 @@ public: public slots: /** Reimplementation from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString::null ); + void setOnlineStatus( const Kopete::OnlineStatus& status, const TQString& reason = TQString() ); void slotEditInfo(); void slotGoOnline(); @@ -131,7 +133,7 @@ protected: * Implement virtual method from OscarAccount * This allows OscarAccount to take care of adding new contacts */ - OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); + OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); TQString sanitizedMessage( const TQString& message ); diff --git a/kopete/protocols/oscar/aim/aimchatsession.h b/kopete/protocols/oscar/aim/aimchatsession.h index 9ce3ce1f..0634d02a 100644 --- a/kopete/protocols/oscar/aim/aimchatsession.h +++ b/kopete/protocols/oscar/aim/aimchatsession.h @@ -27,10 +27,11 @@ class Client; class AIMChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: AIMChatSession( const Kopete::Contact* contact, Kopete::ContactPtrList others, Kopete::Protocol* protocol, Oscar::WORD exchange = 0, - const TQString& room = TQString::null ); + const TQString& room = TQString() ); virtual ~AIMChatSession(); /** diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index b32a5305..7f14d3ba 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -43,9 +43,9 @@ #include "aimcontact.h" #include "aimaccount.h" -AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* parent, +AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete::MetaContact* tqparent, const TQString& icon, const Oscar::SSI& ssiItem ) -: OscarContact(account, name, parent, icon, ssiItem ) +: OscarContact(account, name, tqparent, icon, ssiItem ) { mProtocol=static_cast(protocol()); setOnlineStatus( mProtocol->statusOffline ); @@ -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::currentDateTime().addDays(-1); + m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); @@ -66,8 +66,8 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: this, TQT_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), this, TQT_SLOT( updateProfile( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ), - this, TQT_SLOT( gotWarning( const TQString&, Q_UINT16, Q_UINT16 ) ) ); + TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQT_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), @@ -127,16 +127,16 @@ void AIMContact::setAwayMessage(const TQString &message) kdDebug(14152) << k_funcinfo << "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; - filteredMessage.replace( - TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)")), - TQString::fromLatin1("\\1")); - filteredMessage.replace( - TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)")), - TQString::fromLatin1("\\1") ); - TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)") ); + filteredMessage.tqreplace( + TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)")), + TQString::tqfromLatin1("\\1")); + filteredMessage.tqreplace( + TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)")), + TQString::tqfromLatin1("\\1") ); + TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)") ); fontRemover.setMinimal(true); - while ( filteredMessage.find( fontRemover ) != -1 ) - filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") ); + while ( filteredMessage.tqfind( fontRemover ) != -1 ) + filteredMessage.tqreplace( fontRemover, TQString::tqfromLatin1("\\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 && - onlineStatus() == Kopete::OnlineStatus::Unknown ) + onlinetqStatus() == Kopete::OnlineStatus::Unknown ) { //make sure they're offline setOnlineStatus( static_cast( protocol() )->statusOffline ); @@ -302,7 +302,7 @@ void AIMContact::updateProfile( const TQString& contact, const TQString& profile emit updatedProfile(); } -void AIMContact::gotWarning( const TQString& contact, Q_UINT16 increase, Q_UINT16 newLevel ) +void AIMContact::gotWarning( const TQString& contact, TQ_UINT16 increase, TQ_UINT16 newLevel ) { //somebody just got bitchslapped! :O Q_UNUSED( increase ); @@ -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.)" ).arg( nick ); + " this function, it is meant for legitimate practices.)" ).tqarg( nick ); int result = KMessageBox::questionYesNoCancel( Kopete::UI::Global::mainWidget(), message, - i18n( "Warn User %1?" ).arg( nick ), + i18n( "Warn User %1?" ).tqarg( 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 alignment codes comes in the format of spans + //looks like everything except for tqalignment codes comes in the format of spans //font-style:italic -> //font-weight:600 -> (anything > 400 should be , 400 is not bold) @@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); - s.replace ( TQRegExp( TQString::fromLatin1("")), - TQString::fromLatin1("\\2")); + s.tqreplace ( TQRegExp( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::fromLatin1("")), - TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), + TQString::tqfromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); // strip left over line break - s.remove(TQRegExp(TQString::fromLatin1("]*>$"))); + s.remove(TQRegExp(TQString::tqfromLatin1("]*>$"))); - s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
      ") ); + s.tqreplace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
      ") ); // strip left over line break - s.remove( TQRegExp( TQString::fromLatin1( "
      $" ) ) ); + s.remove( TQRegExp( TQString::tqfromLatin1( "
      $" ) ) ); 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::currentDateTime() ); + int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() ); kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl; - kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl; + kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << 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::currentDateTime(); + m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime(); } else { diff --git a/kopete/protocols/oscar/aim/aimcontact.h b/kopete/protocols/oscar/aim/aimcontact.h index a246c029..37be084d 100644 --- a/kopete/protocols/oscar/aim/aimcontact.h +++ b/kopete/protocols/oscar/aim/aimcontact.h @@ -35,10 +35,11 @@ class AIMUserInfoDialog; class AIMContact : public OscarContact { Q_OBJECT + TQ_OBJECT public: AIMContact( Kopete::Account*, const TQString&, Kopete::MetaContact*, - const TQString& icon = TQString::null, const Oscar::SSI& ssiItem = Oscar::SSI() ); + const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~AIMContact(); bool isReachable(); @@ -68,7 +69,7 @@ public slots: void userOffline( const TQString& userId ); void updateAwayMessage( const TQString& userId, const TQString& message ); void updateProfile( const TQString& contact, const TQString& profile ); - void gotWarning( const TQString& contact, Q_UINT16, Q_UINT16 ); + void gotWarning( const TQString& contact, TQ_UINT16, TQ_UINT16 ); signals: void updatedProfile(); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 2ccec9b2..98a68361 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -27,8 +27,8 @@ #include "aimaccount.h" AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, - TQWidget* parent, const char* name ) - : KDialogBase( parent, name, modal, i18n( "Join AIM Chat Room" ), + TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, modal, i18n( "Join AIM Chat Room" ), Cancel | User1, User1, true, i18n( "Join" ) ) { diff --git a/kopete/protocols/oscar/aim/aimjoinchat.h b/kopete/protocols/oscar/aim/aimjoinchat.h index a6e493d4..13dab708 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.h +++ b/kopete/protocols/oscar/aim/aimjoinchat.h @@ -30,8 +30,9 @@ class AIMJoinChatBase; class AIMJoinChatUI : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* parent = 0, + AIMJoinChatUI( AIMAccount*, bool modal, TQWidget* tqparent = 0, const char* name = 0 ); ~AIMJoinChatUI(); diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 779c63c8..0808fde9 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::fromLatin1("aim")); + registerAsProtocolHandler(TQString::tqfromLatin1("aim")); } void AIMProtocolHandler::handleURL(const KURL &url) const @@ -81,54 +81,54 @@ void AIMProtocolHandler::handleURL(const KURL &url) const TQString command = url.path(); TQString realCommand, firstParam, secondParam; bool needContactAddition = false; - if ( command.find( "goim", 0, false ) != -1 ) + if ( command.tqfind( "goim", 0, false ) != -1 ) { realCommand = "goim"; kdDebug(14152) << k_funcinfo << "Handling send IM request" << endl; command.remove(0,4); - if ( command.find( "?screenname=", 0, false ) == -1 ) + if ( command.tqfind( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove( 0, 12 ); - int andSign = command.find( "&" ); + int andSign = command.tqfind( "&" ); if ( andSign > 0 ) command = command.left( andSign ); firstParam = command; - firstParam.replace( "+", " " ); + firstParam.tqreplace( "+", " " ); needContactAddition = true; } else - if ( command.find( "addbuddy", 0, false ) != -1 ) + if ( command.tqfind( "addbuddy", 0, false ) != -1 ) { realCommand = "addbuddy"; kdDebug(14152) << k_funcinfo << "Handling AIM add buddy request" << endl; command.remove( 0, 8 ); - if ( command.find( "?screenname=", 0, false ) == -1 ) + if ( command.tqfind( "?screenname=", 0, false ) == -1 ) { kdWarning(14152) << k_funcinfo << "Unhandled AIM URI:" << url.url() << endl; return; } command.remove(0, 12); - int andSign = command.find("&"); + int andSign = command.tqfind("&"); if ( andSign > 0 ) command = command.left(andSign); - command.replace("+", " "); + command.tqreplace("+", " "); firstParam = command; needContactAddition = true; } else - if ( command.find( "gochat", 0, false ) != -1 ) + if ( command.tqfind( "gochat", 0, false ) != -1 ) { realCommand = "gochat"; kdDebug(14152) << k_funcinfo << "Handling AIM chat room request" << endl; command.remove( 0, 6 ); - if ( command.find( "?RoomName=", 0, false ) == -1 ) + if ( command.tqfind( "?RoomName=", 0, false ) == -1 ) { kdWarning(14152) << "Unhandled AIM URI: " << url.url() << endl; return; @@ -136,7 +136,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); - int andSign = command.find("&"); + int andSign = command.tqfind("&"); if (andSign > 0) // strip off anything else for now { firstParam = command.left(andSign); @@ -146,7 +146,7 @@ void AIMProtocolHandler::handleURL(const KURL &url) const command.remove( 0, 10 ); //remove "&Exchange=" secondParam = command; kdDebug(14152) << k_funcinfo << firstParam << " " << secondParam << endl; - firstParam.replace("+", " "); + firstParam.tqreplace("+", " "); } Kopete::Account *account = 0; @@ -189,8 +189,8 @@ 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?").arg(command), - TQString::null, i18n("Add"), i18n("Do Not Add")) + i18n("Do you want to add '%1' to your contact list?").tqarg(command), + TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { kdDebug(14152) << k_funcinfo << "Cancelled" << endl; @@ -212,8 +212,8 @@ 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." ).arg( firstParam ).arg( aimAccount->accountId() ), - TQString::null ); + " for %2 is not connected." ).tqarg( firstParam ).tqarg( aimAccount->accountId() ), + TQString() ); } @@ -227,10 +227,10 @@ void AIMProtocolHandler::handleURL(const KURL &url) const -AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &) - : Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ), - statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), - statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), +AIMProtocol::AIMProtocol(TQObject *tqparent, const char *name, const TQStringList &) + : Kopete::Protocol( AIMProtocolFactory::instance(), tqparent, name ), + statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString(), i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), + statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ), statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", i18n("Mobile"), i18n("Mobile"), @@ -241,7 +241,7 @@ AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList awayMessage(Kopete::Global::Properties::self()->awayMessage()), clientFeatures("clientFeatures", i18n("Client Features"), 0, false), clientProfile( "clientProfile", i18n( "User Profile"), 0, false, true), - iconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString::null, true, false, true) + iconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString(), true, false, true) { if (protocolStatic_) kdDebug(14152) << k_funcinfo << "AIM plugin already initialized" << endl; @@ -283,11 +283,11 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.contains( "ssi_type" ) ) + if ( serializedData.tqcontains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; - TQString authStatus = serializedData["ssi_waitingAuth"]; - if ( authStatus == "true" ) + TQString authtqStatus = serializedData["ssi_waitingAuth"]; + if ( authtqStatus == "true" ) ssiWaitingAuth = true; ssiGid = serializedData["ssi_gid"].toUInt(); ssiBid = serializedData["ssi_bid"].toUInt(); @@ -297,18 +297,18 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList(), 0 ); item.setWaitingAuth( ssiWaitingAuth ); - AIMContact *c = new AIMContact( account, contactId, metaContact, TQString::null, item ); + AIMContact *c = new AIMContact( account, contactId, metaContact, TQString(), item ); return c; } -AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) +AddContactPage *AIMProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) { - return ( new AIMAddContactPage( account->isConnected(), parent ) ); + return ( new AIMAddContactPage( account->isConnected(), tqparent ) ); } -KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *AIMProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return ( new AIMEditAccountWidget( this, account, parent ) ); + return ( new AIMEditAccountWidget( this, account, tqparent ) ); } Kopete::Account *AIMProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/aim/aimprotocol.h b/kopete/protocols/oscar/aim/aimprotocol.h index 16c8860a..e133ed97 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.h +++ b/kopete/protocols/oscar/aim/aimprotocol.h @@ -40,9 +40,10 @@ public: class AIMProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - AIMProtocol( TQObject *parent, const char *name, const TQStringList &args ); + AIMProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); virtual ~AIMProtocol(); /** * Return the active instance of the protocol @@ -56,8 +57,8 @@ public: const TQMap &serializedData, const TQMap &addressBookData ); - AddContactPage*createAddContactWidget( TQWidget *parent, Kopete::Account *account ); - KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + AddContactPage*createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); + KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); Kopete::Account* createNewAccount( const TQString &accountId ); /** diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 927a12ec..cc016684 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -37,9 +37,9 @@ #include AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *parent, const char* name ) - : KDialogBase( parent, name, modal, i18n( "User Information on %1" ) - .arg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), + TQWidget *tqparent, const char* name ) + : KDialogBase( tqparent, name, modal, i18n( "User Information on %1" ) + .tqarg( c->property( Kopete::Global::Properties::self()->nickName() ).value().toString() ), Cancel | Ok , Ok, true ) { kdDebug(14200) << k_funcinfo << "for contact '" << c->contactId() << "'" << endl; @@ -77,7 +77,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool userInfoView=0L; mMainWidget->userInfoFrame->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); TQVBoxLayout *l = new TQVBoxLayout(mMainWidget->userInfoFrame); - userInfoEdit = new KTextEdit(TQString::null, TQString::null, + userInfoEdit = new KTextEdit(TQString(), TQString(), mMainWidget->userInfoFrame, "userInfoEdit"); userInfoEdit->setTextFormat(PlainText); @@ -85,7 +85,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool if ( aimmc ) userInfoEdit->setText( aimmc->userProfile() ); else - userInfoEdit->setText( TQString::null ); + userInfoEdit->setText( TQString() ); setButtonText(Ok, i18n("&Save Profile")); showButton(User1, false); @@ -133,7 +133,7 @@ void AIMUserInfoDialog::slotUpdateClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").arg(newNick)); + setCaption(i18n("User Information on %1").tqarg(newNick)); } } @@ -150,7 +150,7 @@ void AIMUserInfoDialog::slotSaveClicked() { //m_contact->rename(newNick); //emit updateNickname(newNick); - setCaption(i18n("User Information on %1").arg(newNick)); + setCaption(i18n("User Information on %1").tqarg(newNick)); } mAccount->setUserProfile(userInfoEdit->text()); @@ -221,4 +221,4 @@ void AIMUserInfoDialog::slotMailClicked(const TQString&, const TQString &address #include "aimuserinfo.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.h b/kopete/protocols/oscar/aim/aimuserinfo.h index 886274ac..43f27b94 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.h +++ b/kopete/protocols/oscar/aim/aimuserinfo.h @@ -30,9 +30,10 @@ class AIMAccount; class AIMUserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AIMUserInfoDialog(Kopete::Contact *c, AIMAccount *acc, bool modal, - TQWidget *parent, const char* name); + TQWidget *tqparent, const char* name); ~AIMUserInfoDialog(); private: diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp index f00741c9..7a2d1b1d 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp @@ -25,9 +25,9 @@ #include #include -AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent, +AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *tqparent, const char *name ) - : AddContactPage(parent,name) + : AddContactPage(tqparent,name) { m_gui = 0; (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h index 7f6c732d..e186ac61 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.h @@ -17,9 +17,10 @@ class MetaContact; class AIMAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - AIMAddContactPage(bool connected, TQWidget *parent=0, + AIMAddContactPage(bool connected, TQWidget *tqparent=0, const char *name=0); ~AIMAddContactPage(); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui index b3267eb0..97484a6d 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui @@ -1,6 +1,6 @@ aimAddContactUI - + aimAddContactUI @@ -19,16 +19,16 @@ 0 - + GroupBox1 Contact Information - + - + @@ -40,12 +40,12 @@ 6 - + addSN - + TextLabel1 @@ -60,5 +60,5 @@ addSN - + diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index d8a7b9f3..a1b8dbfd 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -1,6 +1,6 @@ aimEditAccountUI - + aimEditAccountUI @@ -33,22 +33,22 @@ 0 - + labelStatusMessage - + AlignCenter - + tabWidget6 - + tab @@ -59,7 +59,7 @@ unnamed - + groupBox72 @@ -70,15 +70,15 @@ unnamed - + - layout4 + tqlayout4 unnamed - + lblAccountId @@ -95,7 +95,7 @@ The screen name of your AIM account. This should be in the form of an alphanumeric string (spaces allowed, not case sensitive). - + edtAccountId @@ -113,7 +113,7 @@ mPasswordWidget - + mGlobalIdentity @@ -121,7 +121,7 @@ Exclu&de from Global Identity - + mAutoLogon @@ -134,7 +134,7 @@ - + groupBox5 @@ -153,7 +153,7 @@ unnamed - + textLabel6 @@ -165,7 +165,7 @@ 0 - + 0 0 @@ -174,11 +174,11 @@ To connect to the AOL Instant Messaging network, you will need to use a screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an AIM screen name, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -198,7 +198,7 @@ Expanding - + 20 90 @@ -207,7 +207,7 @@ - + tab @@ -218,7 +218,7 @@ unnamed - + groupBox73 @@ -229,7 +229,7 @@ unnamed - + optionOverrideServer @@ -240,15 +240,15 @@ false - + - layout58 + tqlayout58 unnamed - + lblServer @@ -262,13 +262,13 @@ edtServerAddress - The IP address or hostmask of the AIM server you wish to connect to. + The IP address or hosttqmask of the AIM server you wish to connect to. - The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). + The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). - + edtServerAddress @@ -279,13 +279,13 @@ login.oscar.aol.com - The IP address or hostmask of the AIM server you wish to connect to. + The IP address or hosttqmask of the AIM server you wish to connect to. - The IP address or hostmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). + The IP address or hosttqmask of the AIM server you wish to connect to. Normally you will want the default (login.oscar.aol.com). - + lblPort @@ -305,7 +305,7 @@ The port on the AIM server that you would like to connect to. Normally this is 5190. - + sbxServerPort @@ -342,14 +342,14 @@ Expanding - + 20 200 - + encodingCombo @@ -357,7 +357,7 @@ false - + textLabel1 @@ -373,7 +373,7 @@ - + tab @@ -384,7 +384,7 @@ unnamed - + buttonGroup1 @@ -395,7 +395,7 @@ unnamed - + rbAllowPerimtList @@ -403,7 +403,7 @@ Allow only from visible list - + rbBlockAll @@ -411,7 +411,7 @@ Block all users - + rbBlockAIM @@ -419,7 +419,7 @@ Block AIM users - + rbBlockDenyList @@ -427,7 +427,7 @@ Block only from invisible list - + rbAllowAll @@ -435,7 +435,7 @@ Allow all users - + rbAllowMyContacts @@ -455,7 +455,7 @@ Expanding - + 31 225 @@ -533,7 +533,7 @@ rbBlockAIM rbBlockDenyList - + kopetepasswordwidget.h diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 2e0100ab..85e78ace 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -20,8 +20,8 @@ #include "aimaccount.h" AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol, - Kopete::Account *account, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), KopeteEditAccountWidget( account ) + Kopete::Account *account, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), KopeteEditAccountWidget( account ) { //kdDebug(14152) << k_funcinfo << "Called." << endl; diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h index 9f180315..b3c4ad3a 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.h @@ -37,10 +37,11 @@ class aimEditAccountUI; class AIMEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: AIMEditAccountWidget(AIMProtocol *protocol, Kopete::Account *account, - TQWidget *parent=0, const char *name=0); + TQWidget *tqparent=0, const char *name=0); virtual ~AIMEditAccountWidget(); virtual bool validateData(); diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index db22a574..5743d7e7 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -1,6 +1,6 @@ AIMUserInfoWidget - + AIMUserInfoWidget @@ -12,13 +12,13 @@ 408 - + 360 400 - + @@ -27,15 +27,15 @@ 0 - + - layout9 + tqlayout9 unnamed - + lblNickName @@ -51,7 +51,7 @@ Nickname: - + txtNickName @@ -64,7 +64,7 @@ - + lblScreenName @@ -80,7 +80,7 @@ Screen name: - + txtScreenName @@ -90,15 +90,15 @@ - + - layout10 + tqlayout10 unnamed - + lblWarnLevel @@ -106,7 +106,7 @@ Warning level: - + txtWarnLevel @@ -114,7 +114,7 @@ true - + lblIdleTime @@ -122,7 +122,7 @@ Idle minutes: - + txtIdleTime @@ -132,15 +132,15 @@ - + - layout11 + tqlayout11 unnamed - + lblOnlineSince @@ -148,7 +148,7 @@ Online since: - + txtOnlineSince @@ -158,7 +158,7 @@ - + lblAwayMessage @@ -173,7 +173,7 @@ Away message: - + AlignTop @@ -193,7 +193,7 @@ AutoText - + textLabel1 @@ -201,7 +201,7 @@ Profile: - + userInfoFrame @@ -213,7 +213,7 @@ 0 - + 64 16 @@ -239,7 +239,7 @@ txtOnlineSince txtAwayMessage - + ktextbrowser.h diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui index d1d93edf..4b3b12aa 100644 --- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui +++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui @@ -1,6 +1,6 @@ AIMJoinChatBase - + AIMJoinChatBase @@ -19,7 +19,7 @@ 0 - + textLabel3 @@ -37,7 +37,7 @@ Fixed - + 20 16 @@ -54,14 +54,14 @@ Maximum - + 60 20 - + textLabel1 @@ -72,7 +72,7 @@ roomName - + textLabel2 @@ -83,7 +83,7 @@ exchange - + roomName @@ -96,7 +96,7 @@ - + exchange @@ -111,7 +111,7 @@ Expanding - + 20 16 @@ -120,5 +120,5 @@ - + diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 7e358346..e9772233 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 extendedStatus = details().extendedStatus(); - kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedStatus, 16 ) << endl; - ICQ::Presence presence = ICQ::Presence::fromOscarStatus( extendedStatus & 0xffff ); + DWORD extendedtqStatus = details().extendedtqStatus(); + kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedtqStatus is " << TQString::number( extendedtqStatus, 16 ) << endl; + ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( extendedtqStatus & 0xffff ); setOnlineStatus( presence.toOnlineStatus() ); setProperty( Kopete::Global::Properties::self()->awayMessage(), static_cast( account() )->engine()->statusMessage() ); } @@ -74,8 +74,8 @@ void ICQMyselfContact::fetchShortInfo() static_cast( account() )->engine()->requestShortInfo( contactId() ); } -ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char *name) - : OscarAccount(parent, accountID, name, true) +ICQAccount::ICQAccount(Kopete::Protocol *tqparent, TQString accountID, const char *name) + : OscarAccount(tqparent, accountID, name, true) { kdDebug(14152) << k_funcinfo << accountID << ": Called."<< endl; setMyself( new ICQMyselfContact( this ) ); @@ -83,10 +83,10 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char m_visibilityDialog = 0; - TQString nickName = configGroup()->readEntry("NickName", TQString::null); + TQString nickName = configGroup()->readEntry("NickName", TQString()); mWebAware = configGroup()->readBoolEntry( "WebAware", false ); mHideIP = configGroup()->readBoolEntry( "HideIP", true ); - mInitialStatusMessage = TQString::null; + mInitialStatusMessage = TQString(); TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), this, TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); @@ -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; - //setStatus(mStatus, TQString::null); + //settqStatus(mtqStatus, TQString()); }*/ } @@ -116,7 +116,7 @@ ICQProtocol* ICQAccount::protocol() ICQ::Presence ICQAccount::presence() { - return ICQ::Presence::fromOnlineStatus( myself()->onlineStatus() ); + return ICQ::Presence::fromOnlineStatus( myself()->onlinetqStatus() ); } @@ -150,21 +150,21 @@ void ICQAccount::connectWithPassword( const TQString &password ) kdDebug(14153) << k_funcinfo << "accountId='" << accountId() << "'" << endl; - Kopete::OnlineStatus status = initialStatus(); + Kopete::OnlineStatus status = initialtqStatus(); 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()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); + myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); if ( accountIsOffline ) { - myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() ); + myself()->setOnlineStatus( protocol()->statusManager()->connectingtqStatus() ); TQString icqNumber = accountId(); kdDebug(14153) << k_funcinfo << "Logging in as " << icqNumber << endl ; - TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) ); uint port = configGroup()->readNumEntry( "Port", 5190 ); Connection* c = setupConnection( server, port ); @@ -172,20 +172,20 @@ 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 setStatus (in setPresenceTarget) - DWORD status = pres.toOscarStatus(); + //FIXME: also needed for the other call to settqStatus (in setPresenceTarget) + DWORD status = pres.toOscartqStatus(); if ( !mHideIP ) status |= ICQ::StatusCode::SHOWIP; if ( mWebAware ) status |= ICQ::StatusCode::WEBAWARE; - engine()->setStatus( status, mInitialStatusMessage ); + engine()->settqStatus( status, mInitialStatusMessage ); updateVersionUpdaterStamp(); engine()->start( server, port, accountId(), password ); engine()->connectToServer( c, server, true /* doAuth */ ); - mInitialStatusMessage = TQString::null; + mInitialStatusMessage = TQString(); } } @@ -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.arg( oc->nickName(), contactId); + screenName = screenName.tqarg( 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()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); + myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); if ( targetIsOffline ) { @@ -346,7 +346,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString } else { - engine()->setStatus( newPres.toOscarStatus(), message ); + engine()->settqStatus( newPres.toOscartqStatus(), message ); } } @@ -375,9 +375,9 @@ void ICQAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQSt } -OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) +OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) { - ICQContact* contact = new ICQContact( this, contactId, parentContact, TQString::null, ssiItem ); + ICQContact* contact = new ICQContact( this, contactId, tqparentContact, TQString(), ssiItem ); if ( !ssiItem.alias().isEmpty() ) contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); @@ -457,7 +457,7 @@ void ICQAccount::slotBuddyIconChanged() iconFile.open( IO_ReadOnly ); KMD5 iconHash; - iconHash.update( iconFile ); + iconHash.update( *TQT_TQIODEVICE(&iconFile) ); kdDebug(14153) << k_funcinfo << "hash is :" << iconHash.hexDigest() << endl; //find old item, create updated item diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index d64fe5d7..256c54dd 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -34,6 +34,7 @@ class OscarVisibilityDialog; class ICQMyselfContact : public OscarMyselfContact { Q_OBJECT + TQ_OBJECT public: ICQMyselfContact( ICQAccount *acct ); void userInfoUpdated(); @@ -47,9 +48,10 @@ public slots: class ICQAccount : public OscarAccount { Q_OBJECT + TQ_OBJECT public: - ICQAccount( Kopete::Protocol *parent, TQString accountID, const char *name = 0L ); + ICQAccount( Kopete::Protocol *tqparent, TQString accountID, const char *name = 0L ); virtual ~ICQAccount(); ICQProtocol *protocol(); @@ -67,7 +69,7 @@ public: void setUserProfile( const TQString &profile ); protected: - virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); + virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); virtual TQString sanitizedMessage( const TQString& message ); @@ -79,10 +81,10 @@ private: ICQ::Presence presence(); void setInvisible( ICQ::Presence::Visibility ); - void setPresenceType( ICQ::Presence::Type, const TQString &awayMessage = TQString::null ); - void setPresenceTarget( const ICQ::Presence &presence, const TQString &message = TQString::null ); + void setPresenceType( ICQ::Presence::Type, const TQString &awayMessage = TQString() ); + void setPresenceTarget( const ICQ::Presence &presence, const TQString &message = TQString() ); - //const unsigned long fullStatus( const unsigned long plainStatus ); + //const unsigned long fulltqStatus( const unsigned long plaintqStatus ); private slots: void slotToggleInvisible(); diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 90204bdf..9b13ab64 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -51,9 +51,9 @@ #include "oscarencodingselectiondialog.h" #include "ssimanager.h" -ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent, +ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent, const TQString& icon, const Oscar::SSI& ssiItem ) -: OscarContact( account, name, parent, icon, ssiItem ) +: OscarContact( account, name, tqparent, icon, ssiItem ) { mProtocol = static_cast(protocol()); m_infoWidget = 0L; @@ -103,7 +103,7 @@ void ICQContact::updateSSIItem() setOnlineStatus( mProtocol->statusManager()->waitingForAuth() ); if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false && - onlineStatus() == Kopete::OnlineStatus::Unknown ) + onlinetqStatus() == 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; - // invalidate old away message if user was offline + // tqinvalidate old away message if user was offline if ( !isOnline() ) removeProperty( mProtocol->awayMessage ); - kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedStatus() << endl; - ICQ::Presence presence = ICQ::Presence::fromOscarStatus( details.extendedStatus() & 0xffff ); + kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedtqStatus is " << details.extendedtqStatus() << endl; + ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 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()->onlineStatus() ).visibility() == ICQ::Presence::Visible ) + if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlinetqStatus() ).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" ) - .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .arg( reason ); + .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .tqarg( 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" ) - .arg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) - .arg( reason ); + .tqarg( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ) + .tqarg( reason ); } KNotifyClient::event( Kopete::UI::Global::sysTrayWId(), "icq_authorization", message ); } @@ -483,7 +483,7 @@ void ICQContact::haveIcon( const TQString& user, TQByteArray icon ) iconFile.writeBlock( icon ); iconFile.close(); - setProperty( Kopete::Global::Properties::self()->photo(), TQString::null ); + setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo(), iconLocation ); m_buddyIconDirty = false; } @@ -503,14 +503,14 @@ bool ICQContact::cachedBuddyIcon( TQByteArray hash ) return false; KMD5 buddyIconHash; - buddyIconHash.update( iconFile ); + buddyIconHash.update( *TQT_TQIODEVICE(&iconFile) ); iconFile.close(); if ( memcmp( buddyIconHash.rawDigest(), hash.data(), 16 ) == 0 ) { kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "Updating icon for " << contactId() << " from local cache" << endl; - setProperty( Kopete::Global::Properties::self()->photo(), TQString::null ); + setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo(), iconLocation ); m_buddyIconDirty = false; return true; @@ -539,7 +539,7 @@ void ICQContact::slotContactChanged(const UserInfo &u) if (!mInfo.clientVersion.isEmpty()) { capList << i18n("Translators: client-name client-version", - "%1 %2").arg(mInfo.clientName, mInfo.clientVersion); + "%1 %2").tqarg(mInfo.clientName, mInfo.clientVersion); } else { @@ -561,27 +561,27 @@ void ICQContact::slotContactChanged(const UserInfo &u) else removeProperty(mProtocol->clientFeatures); - unsigned int newStatus = 0; + unsigned int newtqStatus = 0; mInvisible = (mInfo.icqextstatus & ICQ_STATUS_IS_INVIS); if (mInfo.icqextstatus & ICQ_STATUS_IS_FFC) - newStatus = OSCAR_FFC; + newtqStatus = OSCAR_FFC; else if (mInfo.icqextstatus & ICQ_STATUS_IS_DND) - newStatus = OSCAR_DND; + newtqStatus = OSCAR_DND; else if (mInfo.icqextstatus & ICQ_STATUS_IS_OCC) - newStatus = OSCAR_OCC; + newtqStatus = OSCAR_OCC; else if (mInfo.icqextstatus & ICQ_STATUS_IS_NA) - newStatus = OSCAR_NA; + newtqStatus = OSCAR_NA; else if (mInfo.icqextstatus & ICQ_STATUS_IS_AWAY) - newStatus = OSCAR_AWAY; + newtqStatus = OSCAR_AWAY; else - newStatus = OSCAR_ONLINE; + newtqStatus = OSCAR_ONLINE; if (this != account()->myself()) { - if(newStatus != onlineStatus().internalStatus()) + if(newtqStatus != onlinetqStatus().internalStatus()) { - if(newStatus != OSCAR_ONLINE) // if user changed to some state other than online + if(newtqStatus != 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) } } - setStatus(newStatus); + settqStatus(newtqStatus); } void ICQContact::slotOffgoingBuddy(TQString sender) @@ -655,7 +655,7 @@ TQPtrList *ICQContact::customContextMenuActions() /* TQString awTxt; TQString awIcn; - unsigned int status = onlineStatus().internalStatus(); + unsigned int status = onlinetqStatus().internalStatus(); if (status >= 15) status -= 15; // get rid of invis addon switch(status) @@ -936,4 +936,4 @@ void ICQContact::slotVisibleTo() } #endif #include "icqcontact.moc" -//kate: indent-mode csands; tab-width 4; replace-tabs off; space-indent off; +//kate: indent-mode csands; tab-width 4; tqreplace-tabs off; space-indent off; diff --git a/kopete/protocols/oscar/icq/icqcontact.h b/kopete/protocols/oscar/icq/icqcontact.h index 8e3301cf..6184bf9b 100644 --- a/kopete/protocols/oscar/icq/icqcontact.h +++ b/kopete/protocols/oscar/icq/icqcontact.h @@ -47,12 +47,13 @@ class ICQInterestInfoWidget; class ICQContact : public OscarContact { Q_OBJECT + TQ_OBJECT public: /** Normal ICQ constructor */ - ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *parent, - const TQString& icon = TQString::null, const Oscar::SSI& ssiItem = Oscar::SSI() ); + ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaContact *tqparent, + const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~ICQContact(); /** @@ -152,4 +153,4 @@ private slots: }; #endif -//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp index 393f04c9..520153a6 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 &forStatus( unsigned long status ); + static const PresenceTypeData &fortqStatus( 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::forStatus( unsigned long status ) +const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status ) { const PresenceTypeData *array = all(); for ( uint n = 0; n < Presence::TypeCount; ++n ) @@ -132,8 +132,8 @@ public: , waitingForAuth( Kopete::OnlineStatus::Unknown, 1, ICQProtocol::protocol(), Presence::Offline, "button_cancel", i18n("Waiting for Authorization") ) , invisible( Kopete::OnlineStatus::Invisible, 2, ICQProtocol::protocol(), - Presence::Offline, TQString::null, TQString::null, - TQString::null, Kopete::OnlineStatusManager::Invisible, + Presence::Offline, TQString(), TQString(), + TQString(), Kopete::OnlineStatusManager::Invisible, Kopete::OnlineStatusManager::HideFromMenu ) { @@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen return d->invisibleStatusList[ presence.type() ]; } -Kopete::OnlineStatus OnlineStatusManager::connectingStatus() +Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus() { return d->connecting; } -Kopete::OnlineStatus OnlineStatusManager::unknownStatus() +Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus() { return d->unknown; } @@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const } -unsigned long Presence::toOscarStatus() const +unsigned long Presence::toOscartqStatus() const { - unsigned long basicStatus = basicOscarStatus(); + unsigned long basictqStatus = basicOscartqStatus(); if ( _visibility == Invisible ) - basicStatus |= StatusCode::INVISIBLE; - return basicStatus; + basictqStatus |= StatusCode::INVISIBLE; + return basictqStatus; } -Presence Presence::fromOscarStatus( unsigned long code ) +Presence Presence::fromOscartqStatus( unsigned long code ) { - Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE ); + Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE ); bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE; return Presence( type, invisible ? Invisible : Visible ); } -unsigned long Presence::basicOscarStatus() const +unsigned long Presence::basicOscartqStatus() const { const PresenceTypeData &data = PresenceTypeData::forType( _type ); return data.setFlag; } -Presence::Type Presence::typeFromOscarStatus( unsigned long status ) +Presence::Type Presence::typeFromOscartqStatus( unsigned long status ) { - const PresenceTypeData &data = PresenceTypeData::forStatus( status ); + const PresenceTypeData &data = PresenceTypeData::fortqStatus( status ); return data.type; } diff --git a/kopete/protocols/oscar/icq/icqpresence.h b/kopete/protocols/oscar/icq/icqpresence.h index d7ef9ed2..360cadeb 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 connectingStatus(); - Kopete::OnlineStatus unknownStatus(); + Kopete::OnlineStatus connectingtqStatus(); + Kopete::OnlineStatus unknowntqStatus(); 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 Status. + * Get the status code to pass to liboscar to set us to this tqStatus. * @note This is not the opposite of fromOnlineStatus(). The set and get codes don't match. */ - unsigned long toOscarStatus() const; + unsigned long toOscartqStatus() 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 fromOscarStatus( unsigned long code ); + static Presence fromOscartqStatus( 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 basicOscarStatus() const; - static Type typeFromOscarStatus( unsigned long status ); + unsigned long basicOscartqStatus() const; + static Type typeFromOscartqStatus( 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 79fd2848..e7a5dc6c 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_icq, ICQProtocolFactory( "kopete_icq" ) ) ICQProtocolHandler::ICQProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsMimeHandler(TQString::fromLatin1("application/x-icq")); + registerAsMimeHandler(TQString::tqfromLatin1("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'").arg(uin) : - i18n("'%1' (%2)").arg(nick, uin); + i18n("'%1'").tqarg(uin) : + i18n("'%1' (%2)").tqarg(nick, uin); if (KMessageBox::questionYesNo(Kopete::UI::Global::mainWidget(), - i18n("Do you want to add %1 to your contact list?").arg(nickuin), TQString::null, i18n("Add"), i18n("Do Not Add")) + i18n("Do you want to add %1 to your contact list?").tqarg(nickuin), TQString(), i18n("Add"), i18n("Do Not Add")) != KMessageBox::Yes) { kdDebug(14153) << k_funcinfo << "Cancelled" << endl; @@ -173,16 +173,16 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c ICQProtocol* ICQProtocol::protocolStatic_ = 0L; -ICQProtocol::ICQProtocol(TQObject *parent, const char *name, const TQStringList&) -: Kopete::Protocol( ICQProtocolFactory::instance(), parent, name ), +ICQProtocol::ICQProtocol(TQObject *tqparent, const char *name, const TQStringList&) +: Kopete::Protocol( ICQProtocolFactory::instance(), tqparent, name ), firstName(Kopete::Global::Properties::self()->firstName()), lastName(Kopete::Global::Properties::self()->lastName()), awayMessage(Kopete::Global::Properties::self()->awayMessage()), emailAddress(Kopete::Global::Properties::self()->emailAddress()), ipAddress("ipAddress", i18n("IP Address") ), clientFeatures("clientFeatures", i18n("Client Features"), 0, false), - buddyIconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString::null, true, false, true), - contactEncoding( "contactEncoding", i18n( "Contact Encoding" ), TQString::null, true, false, true ) + buddyIconHash("iconHash", i18n("Buddy Icon MD5 Hash"), TQString(), true, false, true), + contactEncoding( "contactEncoding", i18n( "Contact Encoding" ), TQString(), true, false, true ) { if (protocolStatic_) @@ -219,7 +219,7 @@ void ICQProtocol::initGenders() void ICQProtocol::initCountries() { mCountries.insert(0, ""); // unspecified - KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete")); + KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("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::fromLatin1("kopete")); + KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete")); mLanguages.insert(0 , ""); mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/); @@ -673,7 +673,7 @@ void ICQProtocol::setComboFromTable(TQComboBox *box, const TQMap { // kdDebug(14153) << k_funcinfo << "Called." << endl; TQMap::ConstIterator it; - it = map.find(value); + it = map.tqfind(value); if (!(*it)) return; @@ -770,37 +770,37 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta uint ssiGid = 0, ssiBid = 0, ssiType = 0xFFFF; TQString ssiName; bool ssiWaitingAuth = false; - if ( serializedData.contains( "ssi_name" ) ) + if ( serializedData.tqcontains( "ssi_name" ) ) ssiName = serializedData["ssi_name"]; - if ( serializedData.contains( "ssi_waitingAuth" ) ) + if ( serializedData.tqcontains( "ssi_waitingAuth" ) ) { - TQString authStatus = serializedData["ssi_waitingAuth"]; - if ( authStatus == "true" ) + TQString authtqStatus = serializedData["ssi_waitingAuth"]; + if ( authtqStatus == "true" ) ssiWaitingAuth = true; } - if ( serializedData.contains( "ssi_gid" ) ) + if ( serializedData.tqcontains( "ssi_gid" ) ) ssiGid = serializedData["ssi_gid"].toUInt(); - if ( serializedData.contains( "ssi_bid" ) ) + if ( serializedData.tqcontains( "ssi_bid" ) ) ssiBid = serializedData["ssi_bid"].toUInt(); - if ( serializedData.contains( "ssi_type" ) ) + if ( serializedData.tqcontains( "ssi_type" ) ) ssiType = serializedData["ssi_type"].toUInt(); Oscar::SSI item( ssiName, ssiGid, ssiBid, ssiType, TQValueList(), 0 ); item.setWaitingAuth( ssiWaitingAuth ); - ICQContact *c = new ICQContact( account, contactId, metaContact, TQString::null, item ); + ICQContact *c = new ICQContact( account, contactId, metaContact, TQString(), item ); return c; } -AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *account) +AddContactPage *ICQProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *account) { - return new ICQAddContactPage( static_cast( account ), parent); + return new ICQAddContactPage( static_cast( account ), tqparent); } -KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *ICQProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new ICQEditAccountWidget(this, account, parent); + return new ICQEditAccountWidget(this, account, tqparent); } Kopete::Account *ICQProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/oscar/icq/icqprotocol.h b/kopete/protocols/oscar/icq/icqprotocol.h index a64813eb..b614dd32 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.h +++ b/kopete/protocols/oscar/icq/icqprotocol.h @@ -38,9 +38,10 @@ public: class ICQProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - ICQProtocol(TQObject *parent, const char *name, const TQStringList &args); + ICQProtocol(TQObject *tqparent, const char *name, const TQStringList &args); virtual ~ICQProtocol(); /** @@ -53,8 +54,8 @@ public: virtual Kopete::Contact *deserializeContact( Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *account); - KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *account); + KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); Kopete::Account *createNewAccount(const TQString &accountId); ICQ::OnlineStatusManager *statusManager(); diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 28b86d33..7856df8a 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -29,15 +29,15 @@ #include -ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) - : KDialogBase(parent, name, false, TQString::null, Close | User1, +ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *tqparent, const char* name) + : KDialogBase(tqparent, name, false, TQString(), Close | User1, Close, false, i18n("&Fetch Again")) { assert(c); mAccount = static_cast(c->account()); mContact = c; - setCaption(i18n("'%2' Message for %1").arg(c->displayName()).arg(c->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlinetqStatus().description())); TQVBox *mMainWidget = makeVBoxMainWidget(); @@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage() mAccount->engine()->requestAwayMessage(mContact); - setCaption(i18n("Fetching '%2' Message for %1...").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); + setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description())); } // END slotFetchAwayMessage() void ICQReadAway::slotAwayMessageChanged() { - setCaption(i18n("'%2' Message for %1").arg(mContact->displayName()).arg(mContact->onlineStatus().description())); + setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description())); awayMessageBrowser->setText(mContact->awayMessage()); awayMessageBrowser->setDisabled(false); diff --git a/kopete/protocols/oscar/icq/icqreadaway.h b/kopete/protocols/oscar/icq/icqreadaway.h index 695a0eed..d489a202 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.h +++ b/kopete/protocols/oscar/icq/icqreadaway.h @@ -28,9 +28,10 @@ class TQVBox; class ICQReadAway : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQReadAway(ICQContact *, TQWidget *parent = 0, const char* name = "ICQReadAway"); + ICQReadAway(ICQContact *, TQWidget *tqparent = 0, const char* name = "ICQReadAway"); private slots: void slotFetchAwayMessage(); diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index ef793fbb..c42adfe2 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -1,6 +1,6 @@ icqAddUI - + icqAddUI @@ -22,15 +22,15 @@ 6 - + - layout3 + tqlayout3 unnamed - + textLabel1 @@ -38,22 +38,22 @@ UIN #: - + uinEdit - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -71,7 +71,7 @@ Expanding - + 47 26 @@ -101,7 +101,7 @@ Expanding - + 20 20 @@ -115,7 +115,7 @@ 89504e470d0a1a0a0000000d49484452000000100000001008060000001ff3ff61000002a749444154388d7d91cd4b945114c69f73ef3b33ea7ca838a6a32681501194d2975050b4c82f92dc042e5a550b5bf60744bb16b58a8268218144d026da64da228a0a2b52d1c8c8c48f2c54669c19df79df793fefbd2d662469860e1cb870cef3e339cf2500989b5b88e56cb78b0857f2b6d3e67b0e0b0503baf4e57bdbb21eb8b6fadedf7fda4599a2e999f9bdb66b5fb75db79b3164b8c6b3504af8426852885adff3272dc31cb14c313e38d827fe0568593d77225811b8d8d810475555a89e88e0791e0c330f2515cc7c9e6ccb822f8d6f00964a009e6b5f8ed554211a0d235c5501ce1874c30411414a89582cdc0625c3e964e64c3900b35de768301000e70c1ae7608c81738e80a6a1b2b202b16814cd4d8946ced550b90c98e33a158c113ccf47ceccc3cc5b080534282591d94c637d6d1d5bd92c2ccb3af2f0d1e8bd92135cd7370184018088c0350ec639a291086291083ccf432e6740d3822c994cc54a1c5886f5d1755d48a920a584520a4a291000251508844c3a83baf82e1051e90996e5dc5959fe0d21fd4270424208015184e9ba8e0f139350d050460fd6de7ec80e5786313b3307c33021a484effb104222994c61ecc52b380ec1cbfcc281fcd33dd3379af7ec04d0f497c5ae8977afc77b7acf6262620a7a2e0d2505a0181a1a1388d735209f5a41647504bb833fdcad8de4e896c9864edd5edb00006d9bd49468c4c0406f318b420b2121a440eaf324226d3588b79c0f6a536303d6fc2a9e5d4d5c1bb8bfb6cc769829f7cd2010aaf77741f7dbb095d1517bb81b0dadf57dd1907bf3f1a5448b5656b52d2ea6c62b6bf076ad09355f17cc939d84face736185d10bd9d9541dfbbb5c1010018c1158f14d44205600ad878ebdf9f47cfceec6a6e5b0d6e39a1139d8a5b1e2707878e47f660a15aaddfcb9a4df4a3f79d921abf7f52cda1d737f0030624881b39160420000000049454e44ae426082 - + kpushbutton.h diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 3461ed8f..6280644b 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -39,8 +39,8 @@ #include "icqsearchdialog.h" -ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *parent, const char *name) - : AddContactPage(parent,name) +ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent, const char *name) + : AddContactPage(tqparent,name) { kdDebug(14153) << k_funcinfo << "called" << endl; mAccount = owner; @@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e) AddContactPage::showEvent(e); } -bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact ) +bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact ) { kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl; TQString contactId = addUI->uinEdit->text(); kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl; - return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC ); + return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC ); } @@ -87,7 +87,7 @@ bool ICQAddContactPage::validateData() return false; } - Q_ULONG uin = addUI->uinEdit->text().toULong(); + TQ_ULONG uin = addUI->uinEdit->text().toULong(); if ( uin < 1000 ) { // Invalid (or missing) UIN @@ -123,4 +123,4 @@ void ICQAddContactPage::searchDialogDestroyed() #include "icqaddcontactpage.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index c6c22eb2..23c514f6 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -32,13 +32,14 @@ class ICQSearchDialog; class ICQAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - ICQAddContactPage(ICQAccount *owner, TQWidget *parent = 0, const char *name = 0); + ICQAddContactPage(ICQAccount *owner, TQWidget *tqparent = 0, const char *name = 0); ~ICQAddContactPage(); virtual bool validateData(); - virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact); + virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact); void setUINFromSearch( const TQString& ); @@ -57,4 +58,4 @@ private: #endif -//kate: space-indent off; replace-tabs off; indent-mode csands; +//kate: space-indent off; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index a92b33de..a2803f71 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -24,8 +24,8 @@ #include #include -ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool wasRequested ) - : KDialogBase( parent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) +ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *tqparent, const char *name, bool wasRequested ) + : KDialogBase( tqparent, name, true, i18n( "Authorization Reply" ), KDialogBase::Ok | KDialogBase::Cancel ) { m_ui = new ICQAuthReplyUI( this ); setMainWidget( m_ui ); @@ -38,7 +38,7 @@ ICQAuthReplyDialog::ICQAuthReplyDialog( TQWidget *parent, const char *name, bool } else { - this->setWFlags( this->getWFlags() | Qt::WDestructiveClose ); + this->setWFlags( this->getWFlags() | TQt::WDestructiveClose ); } } @@ -50,9 +50,9 @@ void ICQAuthReplyDialog::setUser( const TQString & user ) { if ( m_wasRequested ) m_ui->lblUserReq->setText( - i18n( "%1 requested authorization to add you to his/her contact list." ).arg( user ) ); + i18n( "%1 requested authorization to add you to his/her contact list." ).tqarg( user ) ); else - m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).arg( user ) ); + m_ui->lblUserReq->setText( i18n( "Authorization reply to %1." ).tqarg( user ) ); } void ICQAuthReplyDialog::setRequestReason( const TQString & reason ) diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h index f32d4569..9b801859 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.h @@ -29,8 +29,9 @@ class ICQAuthReplyUI; class ICQAuthReplyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQAuthReplyDialog(TQWidget *parent = 0, const char *name = 0, bool wasRequested = true); + ICQAuthReplyDialog(TQWidget *tqparent = 0, const char *name = 0, bool wasRequested = true); ~ICQAuthReplyDialog(); void setUser( const TQString& user ); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index 12607856..a73b95a2 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -1,6 +1,6 @@ ICQAuthReplyUI - + ICQAuthReplyUI @@ -19,15 +19,15 @@ unnamed - + - layout22 + tqlayout22 unnamed - + lblReason @@ -43,16 +43,16 @@ Reason: - + leReason - + - layout23 + tqlayout23 @@ -68,14 +68,14 @@ Expanding - + 50 20 - + bgAction @@ -100,7 +100,7 @@ unnamed - + rbGrant @@ -111,7 +111,7 @@ true - + rbDecline @@ -131,7 +131,7 @@ Expanding - + 220 21 @@ -140,7 +140,7 @@ - + lblUserReq @@ -148,15 +148,15 @@ %1 requested authorization to add you to his/her contact list. - + - layout24 + tqlayout24 unnamed - + lblReqReason @@ -172,7 +172,7 @@ Request Reason: - + lblRequestReason @@ -192,5 +192,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 3ecc91cb..074e4424 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -1,6 +1,6 @@ ICQEditAccountUI - + ICQEditAccountUI @@ -25,11 +25,11 @@ 0 - + tabWidget7 - + tab @@ -40,7 +40,7 @@ unnamed - + groupBox3 @@ -51,15 +51,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + lblAccountId @@ -76,7 +76,7 @@ The user ID of your ICQ account. This should be in the form of a number (no decimals, no spaces). - + edtAccountId @@ -94,7 +94,7 @@ mPasswordWidget - + chkAutoLogin @@ -108,7 +108,7 @@ If you check that case, the account will not be connected when you press the "Connect All" button, or at startup even if you selected to automatically connect at startup - + chkGlobalIdentity @@ -118,7 +118,7 @@ - + groupBox5 @@ -137,7 +137,7 @@ unnamed - + textLabel6 @@ -149,7 +149,7 @@ 0 - + 0 0 @@ -159,11 +159,11 @@ To connect to the ICQ network, you will need an ICQ account.<br><br> If you do not currently have an ICQ account, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -183,7 +183,7 @@ If you do not currently have an ICQ account, please click the button to create o Expanding - + 20 40 @@ -192,7 +192,7 @@ If you do not currently have an ICQ account, please click the button to create o - + tab @@ -203,7 +203,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + groupBox2 @@ -214,7 +214,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + edtServerPort @@ -237,7 +237,7 @@ If you do not currently have an ICQ account, please click the button to create o The port on the ICQ server that you would like to connect to. Normally this is 5190. - + edtServerAddress @@ -248,13 +248,13 @@ If you do not currently have an ICQ account, please click the button to create o login.icq.com - The IP address or hostmask of the ICQ server you wish to connect to. + The IP address or hosttqmask of the ICQ server you wish to connect to. - The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). + The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). - + lblServerPort @@ -274,7 +274,7 @@ If you do not currently have an ICQ account, please click the button to create o The port on the ICQ server that you would like to connect to. Normally this is 5190. - + lblServer @@ -288,13 +288,13 @@ If you do not currently have an ICQ account, please click the button to create o edtServerAddress - The IP address or hostmask of the ICQ server you wish to connect to. + The IP address or hosttqmask of the ICQ server you wish to connect to. - The IP address or hostmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). + The IP address or hosttqmask of the ICQ server you wish to connect to. Normally you will want the default (login.icq.com). - + optionOverrideServer @@ -304,7 +304,7 @@ If you do not currently have an ICQ account, please click the button to create o - + groupBox65 @@ -315,7 +315,7 @@ If you do not currently have an ICQ account, please click the button to create o unnamed - + chkRequireAuth @@ -329,7 +329,7 @@ If you do not currently have an ICQ account, please click the button to create o Enable authorization requirement, which will not allow users to add you to their contact list without authorization from you. Check this box, and you will have to confirm any users who add you to their list before they may see your online status. - + chkHideIP @@ -343,7 +343,7 @@ If you do not currently have an ICQ account, please click the button to create o Checking this box will not allow people to see what your IP address if they view your ICQ user details such as name, address, or age. - + chkWebAware @@ -372,14 +372,14 @@ If you do not currently have an ICQ account, please click the button to create o Expanding - + 20 40 - + encodingCombo @@ -387,7 +387,7 @@ If you do not currently have an ICQ account, please click the button to create o true - + textLabel1 @@ -404,14 +404,14 @@ If you do not currently have an ICQ account, please click the button to create o - + labelStatusMessage - + AlignCenter @@ -479,7 +479,7 @@ If you do not currently have an ICQ account, please click the button to create o chkHideIP chkWebAware - + kopetepasswordwidget.h diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index 04a312a4..874c2075 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -44,8 +44,8 @@ #include "icqcontact.h" ICQEditAccountWidget::ICQEditAccountWidget(ICQProtocol *protocol, - Kopete::Account *account, TQWidget *parent, const char *name) - : TQWidget(parent, name), KopeteEditAccountWidget(account) + Kopete::Account *account, TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name), KopeteEditAccountWidget(account) { kdDebug(14153) << k_funcinfo << "Called." << endl; @@ -187,4 +187,4 @@ void ICQEditAccountWidget::slotOpenRegister() #include "icqeditaccountwidget.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h index 4bc1a52b..c9affe90 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.h @@ -31,10 +31,11 @@ class ICQEditAccountUI; class ICQEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: ICQEditAccountWidget(ICQProtocol *, Kopete::Account *, - TQWidget *parent=0, const char *name=0); + TQWidget *tqparent=0, const char *name=0); virtual bool validateData(); virtual Kopete::Account *apply(); @@ -49,4 +50,4 @@ protected: }; #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui index 6383bec1..52288b38 100644 --- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui +++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui @@ -1,6 +1,6 @@ ICQGeneralInfoWidget - + ICQGeneralInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel2 @@ -38,7 +38,7 @@ cityEdit - + textLabel1 @@ -49,7 +49,7 @@ addressEdit - + textLabel5 @@ -60,7 +60,7 @@ phoneEdit - + textLabel4 @@ -71,7 +71,7 @@ stateEdit - + cityEdit @@ -87,7 +87,7 @@ true - + textLabel8 @@ -98,7 +98,7 @@ countryEdit - + homepageEdit @@ -114,7 +114,7 @@ true - + textLabel9 @@ -125,7 +125,7 @@ emailEdit - + emailEdit @@ -141,7 +141,7 @@ true - + textLabel10_2 @@ -152,7 +152,7 @@ homepageEdit - + cellEdit @@ -168,7 +168,7 @@ true - + countryEdit @@ -176,7 +176,7 @@ true - + stateEdit @@ -192,7 +192,7 @@ true - + textLabel7_2 @@ -203,7 +203,7 @@ faxEdit - + faxEdit @@ -211,7 +211,7 @@ true - + phoneEdit @@ -222,7 +222,7 @@ true - + textLabel6_2 @@ -233,7 +233,7 @@ cellEdit - + addressEdit @@ -249,7 +249,7 @@ true - + textLabel3 @@ -260,7 +260,7 @@ zipEdit - + zipEdit @@ -281,7 +281,7 @@ - + groupBox4 @@ -292,7 +292,7 @@ unnamed - + uinEdit @@ -308,7 +308,7 @@ true - + fullNameLabel @@ -319,7 +319,7 @@ fullNameEdit - + ipEdit @@ -331,7 +331,7 @@ 0 - + 125 0 @@ -344,7 +344,7 @@ true - + timezoneEdit @@ -352,7 +352,7 @@ true - + nickNameEdit @@ -368,7 +368,7 @@ true - + nickNameLabel @@ -379,7 +379,7 @@ nickNameEdit - + uinLabel @@ -390,7 +390,7 @@ uinEdit - + birthdayLabel @@ -401,12 +401,12 @@ birthday - + ageSpinBox - + textLabel6 @@ -417,7 +417,7 @@ genderEdit - + birthday @@ -425,7 +425,7 @@ true - + fullNameEdit @@ -433,7 +433,7 @@ true - + genderEdit @@ -441,7 +441,7 @@ true - + ipLabel @@ -452,7 +452,7 @@ ipEdit - + textLabel7 @@ -463,7 +463,7 @@ timezoneEdit - + maritalLabel @@ -471,7 +471,7 @@ Marital status: - + textLabel10 @@ -490,7 +490,7 @@ ageSpinBox - + marital @@ -500,7 +500,7 @@ - + groupBox3 @@ -511,7 +511,7 @@ unnamed - + oStateEdit @@ -519,7 +519,7 @@ true - + oCountryEdit @@ -527,7 +527,7 @@ true - + oCityEdit @@ -543,7 +543,7 @@ true - + textLabel2_2 @@ -551,7 +551,7 @@ City: - + textLabel3_2 @@ -559,7 +559,7 @@ Country: - + textLabel1_2 @@ -579,7 +579,7 @@ Expanding - + 21 20 @@ -607,5 +607,5 @@ emailEdit homepageEdit - + diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui index ce4041c9..a8107e44 100644 --- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui @@ -1,6 +1,6 @@ ICQInterestInfoWidget - + ICQInterestInfoWidget @@ -16,7 +16,7 @@ unnamed - + buttonGroup1 @@ -27,7 +27,7 @@ unnamed - + desc1 @@ -35,7 +35,7 @@ true - + desc2 @@ -43,7 +43,7 @@ true - + desc3 @@ -51,7 +51,7 @@ true - + topic2 @@ -59,7 +59,7 @@ true - + topic1 @@ -67,7 +67,7 @@ true - + topic3 @@ -75,7 +75,7 @@ true - + topic4 @@ -83,7 +83,7 @@ true - + desc4 @@ -103,7 +103,7 @@ Expanding - + 20 220 @@ -112,5 +112,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui index 4e5a3a34..2e1079a2 100644 --- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui @@ -1,6 +1,6 @@ ICQOtherInfoWidget - + ICQOtherInfoWidget @@ -26,14 +26,14 @@ Expanding - + 20 30 - + textLabel12 @@ -41,12 +41,12 @@ Email addresses: - + emailListBox - + textLabel13 @@ -54,7 +54,7 @@ Contact notes: - + notesEdit @@ -64,5 +64,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 68e59281..5e2b3bf6 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -1,6 +1,6 @@ ICQSearchBase - + ICQSearchBase @@ -114,18 +114,18 @@ Expanding - + 41 190 - + tabWidget3 - + tab @@ -136,7 +136,7 @@ unnamed - + textLabel1 @@ -147,7 +147,7 @@ uin - + uin @@ -162,7 +162,7 @@ Expanding - + 20 105 @@ -171,7 +171,7 @@ - + tab @@ -182,17 +182,17 @@ unnamed - + lastName - + nickName - + textLabel4 @@ -203,7 +203,7 @@ lastName - + textLabel3 @@ -214,7 +214,7 @@ firstName - + textLabel6 @@ -225,7 +225,7 @@ email - + textLabel2 @@ -236,12 +236,12 @@ nickName - + country - + textLabel9 @@ -252,17 +252,17 @@ language - + language - + city - + textLabel10 @@ -273,17 +273,17 @@ city - + firstName - + email - + textLabel8 @@ -294,12 +294,12 @@ gender - + gender - + onlyOnline @@ -307,7 +307,7 @@ Only search for online contacts - + textLabel11 @@ -328,7 +328,7 @@ Expanding - + 20 16 @@ -345,7 +345,7 @@ Expanding - + 166 20 @@ -479,7 +479,7 @@ closeButton searchResults - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index e52e707f..57c551aa 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -41,8 +41,8 @@ #include "icqcontact.h" #include "icquserinfowidget.h" -ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* parent, const char* name ) -: KDialogBase( parent, name, true, i18n( "ICQ User Search" ), 0, NoDefault ) +ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* tqparent, const char* name ) +: KDialogBase( tqparent, name, true, i18n( "ICQ User Search" ), 0, NoDefault ) { m_account = account; m_searchUI = new ICQSearchBase( this, name ); @@ -171,10 +171,10 @@ void ICQSearchDialog::stopSearch() void ICQSearchDialog::addContact() { - ICQAddContactPage* iacp = dynamic_cast( parent() ); + ICQAddContactPage* iacp = dynamic_cast( tqparent() ); if ( !iacp ) { - kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our parent!!" << endl; + kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "The ICQ ACP is not our tqparent!!" << endl; } else { @@ -296,13 +296,13 @@ void ICQSearchDialog::searchFinished( int numLeft ) void ICQSearchDialog::clearFields() { - m_searchUI->uin->setText( TQString::null ); + m_searchUI->uin->setText( TQString() ); - m_searchUI->firstName->setText( TQString::null ); - m_searchUI->lastName->setText( TQString::null ); - m_searchUI->nickName->setText( TQString::null ); - m_searchUI->email->setText( TQString::null ); - m_searchUI->city->setText( TQString::null ); + m_searchUI->firstName->setText( TQString() ); + m_searchUI->lastName->setText( TQString() ); + m_searchUI->nickName->setText( TQString() ); + m_searchUI->email->setText( TQString() ); + m_searchUI->city->setText( TQString() ); m_searchUI->gender->setCurrentItem( 0 ); // Unspecified m_searchUI->country->setCurrentItem( 0 ); m_searchUI->language->setCurrentItem( 0 ); @@ -315,6 +315,6 @@ void ICQSearchDialog::newSearch() clearFields(); } -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; #include "icqsearchdialog.moc" diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h index aca61ee7..2dcdd502 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.h +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.h @@ -32,8 +32,9 @@ class ICQUserInfoWidget; class ICQSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQSearchDialog( ICQAccount* account, TQWidget* parent = 0, const char* name = 0 ); + ICQSearchDialog( ICQAccount* account, TQWidget* tqparent = 0, const char* name = 0 ); ~ICQSearchDialog(); private slots: @@ -66,4 +67,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 44fd5afd..3c327198 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -40,35 +40,35 @@ #include "icqinterestinfowidget.h" -ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "ICQ User Information" ), Ok ) +ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "ICQ User Information" ), Ok ) { kdDebug(14153) << k_funcinfo << "Creating new icq user info widget" << endl; TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General ICQ Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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::fromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) ); TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo ); m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information" ); interestLayout->addWidget( m_interestInfoWidget ); @@ -186,5 +186,5 @@ void ICQUserInfoWidget::fillMoreInfo( const ICQMoreUserInfo& ui ) #include "icquserinfowidget.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h index ac4048ab..6fd5d84a 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.h +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.h @@ -32,8 +32,9 @@ class ICQContact; class ICQUserInfoWidget : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ICQUserInfoWidget( TQWidget* parent = 0, const char* name = 0 ); + ICQUserInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); void setContact( ICQContact* contact ); public slots: @@ -55,4 +56,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui index a31021ba..bd6b714a 100644 --- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui @@ -1,6 +1,6 @@ ICQWorkInfoWidget - + ICQWorkInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel10 @@ -35,7 +35,7 @@ Phone: - + textLabel11 @@ -43,7 +43,7 @@ Fax: - + textLabel6 @@ -51,7 +51,7 @@ Department: - + departmentEdit @@ -59,7 +59,7 @@ true - + textLabel7 @@ -67,7 +67,7 @@ Position: - + positionEdit @@ -75,7 +75,7 @@ true - + phoneEdit @@ -83,7 +83,7 @@ true - + faxEdit @@ -93,7 +93,7 @@ - + buttonGroup1 @@ -104,7 +104,7 @@ unnamed - + textLabel1 @@ -112,7 +112,7 @@ Name: - + textLabel8 @@ -120,7 +120,7 @@ Homepage: - + textLabel2 @@ -128,7 +128,7 @@ Address: - + textLabel4 @@ -136,7 +136,7 @@ Zip: - + textLabel5 @@ -144,7 +144,7 @@ State: - + textLabel3 @@ -152,7 +152,7 @@ City: - + textLabel9 @@ -168,7 +168,7 @@ Country: - + companyEdit @@ -176,7 +176,7 @@ true - + homepageEdit @@ -184,7 +184,7 @@ true - + addressEdit @@ -192,7 +192,7 @@ true - + cityEdit @@ -200,7 +200,7 @@ true - + stateEdit @@ -208,7 +208,7 @@ true - + zipEdit @@ -216,7 +216,7 @@ true - + countryEdit @@ -236,7 +236,7 @@ Expanding - + 20 70 @@ -245,5 +245,5 @@ - + diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING index 9bd25476..36a6edf5 100644 --- a/kopete/protocols/oscar/liboscar/HACKING +++ b/kopete/protocols/oscar/liboscar/HACKING @@ -101,7 +101,7 @@ Spaces ================================================================================ Spaces should be used between the conditional / loop type and the -conditional statement. They should also not be used after parenthesis. However +conditional statement. They should also not be used after tqparenthesis. However the should be to mark of mathematical or comparative operators. if ( foo == bar ) @@ -122,15 +122,15 @@ not be inline in the headers. The organization of the members in a class should roughly as follows: public: -public slots: +public Q_SLOTS: protected: -protected slots: -signals: +protected Q_SLOTS: +Q_SIGNALS: private: // member funtions -private slots: +private Q_SLOTS: private: // member variables -If there are no private slots there is no need for two private sections, however +If there are no private Q_SLOTS there is no need for two private sections, however private functions and private variables should be clearly separated. The implementations files -- .cpp files -- should follow (when possible) the @@ -188,7 +188,7 @@ written in this document. Those files that don't match will be corrected eventua To make things easier on you, kate modelines are provided at the end of certain files to help enforce the coding style. If you're using the new C S&S Indenter that will be in KDE 3.4, I can provide a patch that will automatically implement the space padding around -parenthesis. Please mail me so I can send it to you. +tqparenthesis. Please mail me so I can send it to you. Matt Rogers diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index da066333..05a63198 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -AimLoginTask::AimLoginTask( Task* parent ) - : Task ( parent ) +AimLoginTask::AimLoginTask( Task* tqparent ) + : Task ( tqparent ) { } @@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest() outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1()); - TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long + TQByteArray digest( 17 ); //aptqparently MD5 digests are 16 bytes long encodePassword( digest ); digest[16] = '\0'; //do this so that addTLV sees a NULL-terminator @@ -189,7 +189,7 @@ void AimLoginTask::handleLoginResponse() if ( !st ) { - setError( -1 , TQString::null ); + setError( -1 , TQString() ); return; } @@ -211,7 +211,7 @@ void AimLoginTask::handleLoginResponse() errorNum << endl; Oscar::SNAC s = { 0, 0, 0, 0 }; client()->fatalTaskError( s, errorNum ); - setError( errorNum, TQString::null ); + setError( errorNum, TQString() ); return; //if there's an error, we'll need to disconnect anyways } @@ -220,7 +220,7 @@ void AimLoginTask::handleLoginResponse() { TQString ip = TQString( server.data ); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << ip << endl; - int index = ip.find( ':' ); + int index = ip.tqfind( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip.left(4); //we only need 4 bytes @@ -233,7 +233,7 @@ void AimLoginTask::handleLoginResponse() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(6) [COOKIE]" << endl; m_cookie.duplicate( cookie.data ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } tlvList.clear(); } diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.h b/kopete/protocols/oscar/liboscar/aimlogintask.h index cc564592..11761ad5 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.h +++ b/kopete/protocols/oscar/liboscar/aimlogintask.h @@ -26,8 +26,9 @@ using namespace Oscar; class AimLoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - AimLoginTask( Task* parent ); + AimLoginTask( Task* tqparent ); ~AimLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp index 0b866de8..b61c5cdd 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.cpp +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.cpp @@ -23,8 +23,8 @@ #include "oscartypes.h" #include "oscarutils.h" -BLMLimitsTask::BLMLimitsTask( Task* parent ) - : Task( parent ) +BLMLimitsTask::BLMLimitsTask( Task* tqparent ) + : Task( tqparent ) { } @@ -71,7 +71,7 @@ bool BLMLimitsTask::take(Transfer* transfer) break; } } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return true; } else diff --git a/kopete/protocols/oscar/liboscar/blmlimitstask.h b/kopete/protocols/oscar/liboscar/blmlimitstask.h index 7ded03a7..49fa11d0 100644 --- a/kopete/protocols/oscar/liboscar/blmlimitstask.h +++ b/kopete/protocols/oscar/liboscar/blmlimitstask.h @@ -28,7 +28,7 @@ Fetch the limits for the BLM service class BLMLimitsTask : public Task { public: - BLMLimitsTask( Task* parent ); + BLMLimitsTask( Task* tqparent ); ~BLMLimitsTask(); diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.cpp b/kopete/protocols/oscar/liboscar/buddyicontask.cpp index facaae1a..1feccdc4 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.cpp +++ b/kopete/protocols/oscar/liboscar/buddyicontask.cpp @@ -27,8 +27,8 @@ #include "oscarutils.h" #include -BuddyIconTask::BuddyIconTask( Task* parent ) - :Task( parent ) +BuddyIconTask::BuddyIconTask( Task* tqparent ) + :Task( tqparent ) { m_seq = 0; m_refNum = -1; @@ -125,7 +125,7 @@ bool BuddyIconTask::take( Transfer* transfer ) else handleICQBuddyIconResponse(); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return true; } @@ -153,7 +153,7 @@ void BuddyIconTask::handleUploadResponse() TQByteArray hash( b->getBlock( iconHashSize ) ); //check the hash kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "hash " << hash << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/buddyicontask.h b/kopete/protocols/oscar/liboscar/buddyicontask.h index f00a5b23..2eb5294a 100644 --- a/kopete/protocols/oscar/liboscar/buddyicontask.h +++ b/kopete/protocols/oscar/liboscar/buddyicontask.h @@ -28,8 +28,9 @@ class Transfer; class BuddyIconTask : public Task { Q_OBJECT + TQ_OBJECT public: - BuddyIconTask( Task* parent ); + BuddyIconTask( Task* tqparent ); void uploadIcon( WORD length, const TQByteArray& data ); void setReferenceNum( WORD num ); diff --git a/kopete/protocols/oscar/liboscar/buffer.cpp b/kopete/protocols/oscar/liboscar/buffer.cpp index 23dca1bb..c778d382 100644 --- a/kopete/protocols/oscar/liboscar/buffer.cpp +++ b/kopete/protocols/oscar/liboscar/buffer.cpp @@ -34,7 +34,7 @@ Buffer::Buffer( const Buffer& other ) mReadPos = other.mReadPos; } -Buffer::Buffer(const char *b, Q_ULONG len) +Buffer::Buffer(const char *b, TQ_ULONG len) { mBuffer.duplicate(b, len); mReadPos=0; @@ -376,7 +376,7 @@ int Buffer::addChatTLV(const WORD type, const WORD exchange, void Buffer::expandBuffer(unsigned int inc) { - mBuffer.resize(mBuffer.size()+inc, TQGArray::SpeedOptim); + mBuffer.tqresize(mBuffer.size()+inc, TQGArray::SpeedOptim); } TQCString Buffer::getLNTS() @@ -451,7 +451,7 @@ TQByteArray Buffer::getBUIN() char *Buffer::buffer() const { - return mBuffer.data(); + return const_cast(mBuffer.data()); } int Buffer::length() const @@ -477,7 +477,7 @@ TQString Buffer::toString() const if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); @@ -485,8 +485,8 @@ TQString Buffer::toString() const { output += hex + " |" + ascii + "|\n"; i=0; - hex=TQString::null; - ascii=TQString::null; + hex=TQString(); + ascii=TQString(); } } diff --git a/kopete/protocols/oscar/liboscar/buffer.h b/kopete/protocols/oscar/liboscar/buffer.h index 1bcf91d9..1bcce492 100644 --- a/kopete/protocols/oscar/liboscar/buffer.h +++ b/kopete/protocols/oscar/liboscar/buffer.h @@ -45,7 +45,7 @@ class Buffer * Constructor that creates a prefilled buffer of @p len length * that contains the data from @p b. */ - Buffer(const char *b, Q_ULONG len); + Buffer(const char *b, TQ_ULONG len); /** * \brief Create a prefilled buffer diff --git a/kopete/protocols/oscar/liboscar/bytestream.cpp b/kopete/protocols/oscar/liboscar/bytestream.cpp index 87603c76..f2fb8e51 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.cpp +++ b/kopete/protocols/oscar/liboscar/bytestream.cpp @@ -63,9 +63,9 @@ public: }; //! -//! Constructs a ByteStream object with parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { d = new Private; } diff --git a/kopete/protocols/oscar/liboscar/bytestream.h b/kopete/protocols/oscar/liboscar/bytestream.h index a990a940..c4dc96e1 100644 --- a/kopete/protocols/oscar/liboscar/bytestream.h +++ b/kopete/protocols/oscar/liboscar/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp index 7c6ff26a..b4dfff4a 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.cpp @@ -30,7 +30,7 @@ #include "transfer.h" -ChangeVisibilityTask::ChangeVisibilityTask(Task* parent): Task(parent) +ChangeVisibilityTask::ChangeVisibilityTask(Task* tqparent): Task(tqparent) { m_sequence = 0; m_visible = true; @@ -64,13 +64,13 @@ bool ChangeVisibilityTask::take(Transfer* transfer) if ( forMe( transfer ) ) { setTransfer( transfer ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return true; } else { - setError( 0, TQString::null ); + setError( 0, TQString() ); return false; } } @@ -82,7 +82,7 @@ void ChangeVisibilityTask::onGo() if ( !item ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Didn't find a visibility item" << endl; - setError( 0, TQString::null ); + setError( 0, TQString() ); return; } @@ -97,7 +97,7 @@ void ChangeVisibilityTask::onGo() if ( Oscar::uptateTLVs( newSSI, tList ) == false ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Visibility didn't change, don't update" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return; } @@ -147,4 +147,4 @@ void ChangeVisibilityTask::sendEditEnd() send( t5 ); } -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/changevisibilitytask.h b/kopete/protocols/oscar/liboscar/changevisibilitytask.h index 0ec5ab04..9d8676b3 100644 --- a/kopete/protocols/oscar/liboscar/changevisibilitytask.h +++ b/kopete/protocols/oscar/liboscar/changevisibilitytask.h @@ -30,7 +30,7 @@ class ChangeVisibilityTask : public Task { public: - ChangeVisibilityTask( Task* parent ); + ChangeVisibilityTask( Task* tqparent ); ~ChangeVisibilityTask(); void setVisible( bool visible = true ); @@ -55,4 +55,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp index 914de496..350c58d1 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.cpp @@ -25,7 +25,7 @@ #include "connection.h" -ChatNavServiceTask::ChatNavServiceTask( Task* parent ) : Task( parent ) +ChatNavServiceTask::ChatNavServiceTask( Task* tqparent ) : Task( tqparent ) { m_type = Limits; } @@ -97,7 +97,7 @@ bool ChatNavServiceTask::take( Transfer* transfer ) } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return true; @@ -262,7 +262,7 @@ void ChatNavServiceTask::handleBasicRoomInfo( const TLV& t ) kdDebug(OSCAR_RAW_DEBUG) << "moderator" << endl; break; case 0x6D: - kdDebug(OSCAR_RAW_DEBUG) << "num children" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "num tqchildren" << endl; break; case 0x06F: kdDebug(OSCAR_RAW_DEBUG) << "occupancy" << endl; diff --git a/kopete/protocols/oscar/liboscar/chatnavservicetask.h b/kopete/protocols/oscar/liboscar/chatnavservicetask.h index 8af63247..4c417e3b 100644 --- a/kopete/protocols/oscar/liboscar/chatnavservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatnavservicetask.h @@ -30,8 +30,9 @@ class Transfer; class ChatNavServiceTask : public Task { Q_OBJECT + TQ_OBJECT public: - ChatNavServiceTask( Task* parent ); + ChatNavServiceTask( Task* tqparent ); ~ChatNavServiceTask(); enum RequestType { Limits = 0x0002, Exchange, Room, ExtRoom, Members, diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp index c8998495..8d9c55e8 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp +++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp @@ -30,8 +30,8 @@ #include "buffer.h" #include "oscartypes.h" -ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ) - : Task( parent ), m_encoding( "us-ascii" ) +ChatServiceTask::ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ) + : Task( tqparent ), m_encoding( "us-ascii" ) { m_exchange = exchange; m_room = room; @@ -56,7 +56,7 @@ void ChatServiceTask::onGo() { if ( !m_message ) { - setSuccess( true, TQString::null ); + setSuccess( true, TQString() ); return; } @@ -158,7 +158,7 @@ bool ChatServiceTask::take( Transfer* t ) break; }; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return true; } @@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage() Oscar::Message omessage; omessage.setReceiver( client()->userId() ); omessage.setSender( sender ); - omessage.setTimestamp( TQDateTime::currentDateTime() ); + omessage.setTimestamp( TQDateTime::tqcurrentDateTime() ); omessage.setText( Oscar::Message::UTF8, msgText ); omessage.setType( 0x03 ); omessage.setExchange( m_exchange ); diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.h b/kopete/protocols/oscar/liboscar/chatservicetask.h index 5f19fcae..d9805068 100644 --- a/kopete/protocols/oscar/liboscar/chatservicetask.h +++ b/kopete/protocols/oscar/liboscar/chatservicetask.h @@ -28,8 +28,9 @@ class Transfer; class ChatServiceTask : public Task { Q_OBJECT + TQ_OBJECT public: - ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room ); + ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room ); ~ChatServiceTask(); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 222d9d69..53e38ed1 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -98,7 +98,7 @@ public: TQValueList redirectionServices; WORD currentRedirect; TQByteArray cookie; - DWORD connectAsStatus; // icq only + DWORD connectAstqStatus; // icq only TQString connectWithMessage; // icq only Oscar::Settings* settings; @@ -128,7 +128,7 @@ public: struct AwayMsgRequest { TQString contact; - ICQStatus contactStatus; + ICQtqStatus contacttqStatus; }; TQValueList awayMsgRequestQueue; TQTimer* awayMsgRequestTimer; @@ -137,8 +137,8 @@ public: const Oscar::ClientVersion* version; }; -Client::Client( TQObject* parent ) -:TQObject( parent, "oscarclient" ) +Client::Client( TQObject* tqparent ) +:TQObject( tqparent, "oscarclient" ) { m_loginTask = 0L; m_loginTaskTwo = 0L; @@ -149,7 +149,7 @@ Client::Client( TQObject* parent ) d->isIcq = false; //default to AIM d->redirectRequested = false; d->currentRedirect = 0; - d->connectAsStatus = 0x0; // default to online + d->connectAstqStatus = 0x0; // default to online d->ssiManager = new SSIManager( this ); d->settings = new Oscar::Settings(); d->errorTask = 0L; @@ -222,8 +222,8 @@ void Client::close() //don't clear the stored status between stage one and two if ( d->stage == ClientPrivate::StageTwo ) { - d->connectAsStatus = 0x0; - d->connectWithMessage = TQString::null; + d->connectAstqStatus = 0x0; + d->connectWithMessage = TQString(); } d->exchanges.clear(); @@ -233,10 +233,10 @@ void Client::close() d->ssiManager->clear(); } -void Client::setStatus( AIMStatus status, const TQString &_message ) +void Client::settqStatus( AIMtqStatus status, const TQString &_message ) { // AIM: you're away exactly when your away message isn't empty. - // can't use TQString::null as a message either; ProfileTask + // can't use TQString() as a message either; ProfileTask // interprets null as "don't change". TQString message; if ( status == Online ) @@ -257,7 +257,7 @@ void Client::setStatus( AIMStatus status, const TQString &_message ) pt->go( true ); } -void Client::setStatus( DWORD status, const TQString &message ) +void Client::settqStatus( 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::setStatus( DWORD status, const TQString &message ) } else { - d->connectAsStatus = status; + d->connectAstqStatus = status; d->connectWithMessage = message; } } @@ -399,7 +399,7 @@ void Client::serviceSetupFinished() d->active = true; if ( isIcq() ) - setStatus( d->connectAsStatus, d->connectWithMessage ); + settqStatus( d->connectAstqStatus, d->connectWithMessage ); d->ownStatusTask->go(); @@ -431,7 +431,7 @@ void Client::receivedIcqInfo( const TQString& contact, unsigned int type ) emit receivedIcqLongInfo( contact ); } -void Client::receivedInfo( Q_UINT16 sequence ) +void Client::receivedInfo( TQ_UINT16 sequence ) { UserDetails details = d->userInfoTask->getInfoFor( sequence ); emit receivedUserInfo( details.userId(), details ); @@ -807,8 +807,8 @@ void Client::sendWarning( const TQString& contact, bool anonymous ) WarningTask* warnTask = new WarningTask( c->rootTask() ); warnTask->setContact( contact ); warnTask->setAnonymous( anonymous ); - TQObject::connect( warnTask, TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ), - this, TQT_SIGNAL( userWarned( const TQString&, Q_UINT16, Q_UINT16 ) ) ); + TQObject::connect( warnTask, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); warnTask->go( true ); } @@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact ) d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage ); } -void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus ) +void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus ) { 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 ( contactStatus ) + switch ( contacttqStatus ) { case ICQAway: msg.setMessageType( 0xE8 ); // away @@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactSt sendMessage( msg ); } -void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus ) +void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ) { 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, ICQStatus contac //remove old request if still exists removeICQAwayMessageRequest( contact ); - ClientPrivate::AwayMsgRequest amr = { contact, contactStatus }; + ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus }; 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.contactStatus ); + requestICQAwayMessage( amr.contact, amr.contacttqStatus ); } void Client::requestStatusInfo( const TQString& contact ) @@ -1099,7 +1099,7 @@ void Client::requestServerRedirect( WORD family, WORD exchange, if ( !c ) return; - if ( d->redirectionServices.findIndex( family ) == -1 ) + if ( d->redirectionServices.tqfindIndex( family ) == -1 ) d->redirectionServices.append( family ); //don't add families twice if ( d->currentRedirect != 0 ) @@ -1125,11 +1125,11 @@ void Client::requestServerRedirect( WORD family, WORD exchange, void Client::haveServerForRedirect( const TQString& host, const TQByteArray& cookie, WORD ) { //nasty sender() usage to get the task with chat room info - TQObject* o = const_cast( sender() ); + TQObject* o = TQT_TQOBJECT(const_cast( sender() )); ServerRedirectTask* srt = dynamic_cast( o ); //create a new connection and set it up - int colonPos = host.find(':'); + int colonPos = host.tqfind(':'); TQString realHost, realPort; if ( colonPos != -1 ) { @@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo else { realHost = host; - realPort = TQString::fromLatin1("5190"); + realPort = TQString::tqfromLatin1("5190"); } Connection* c = createConnection( realHost, realPort ); @@ -1246,7 +1246,7 @@ void Client::determineDisconnection( int code, const TQString& string ) return; //yay for the sender() hack! - TQObject* obj = const_cast( sender() ); + TQObject* obj = TQT_TQOBJECT(const_cast( sender() )); Connection* c = dynamic_cast( obj ); if ( !c ) return; @@ -1350,4 +1350,4 @@ bool Client::hasIconConnection( ) const } #include "client.moc" -//kate: tab-width 4; indent-mode csands; space-indent off; replace-tabs off; +//kate: tab-width 4; indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h index 78597746..5e9cc61b 100644 --- a/kopete/protocols/oscar/liboscar/client.h +++ b/kopete/protocols/oscar/liboscar/client.h @@ -47,9 +47,10 @@ namespace Oscar class Settings; } -class KOPETE_EXPORT Client : public QObject +class KOPETE_EXPORT Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -67,14 +68,14 @@ public: FatalProtocolError = 3 }; - enum AIMStatus { Online = 0, Away }; - enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; + enum AIMtqStatus { Online = 0, Away }; + enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat }; /************* EXTERNAL API *************/ - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); /** @@ -102,9 +103,9 @@ public: /** Logout and disconnect */ void close(); /** Set our status for AIM */ - void setStatus( AIMStatus status, const TQString &message = TQString::null ); + void settqStatus( AIMtqStatus status, const TQString &message = TQString() ); /** Set our status for ICQ */ - void setStatus( DWORD status, const TQString &message = TQString::null ); + void settqStatus( DWORD status, const TQString &message = TQString() ); /** Retrieve our user info */ UserDetails ourInfo() const; @@ -255,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, ICQStatus contactStatus ); + void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus ); /** * Remove the icq away message request from queue @@ -280,7 +281,7 @@ public: //! Start a server redirect for a different service void requestServerRedirect( WORD family, WORD e = 0, TQByteArray c = TQByteArray(), - WORD instance = 0, const TQString& room = TQString::null ); + WORD instance = 0, const TQString& room = TQString() ); //! Start uploading a buddy icon void sendBuddyIcon( const TQByteArray& imageData ); @@ -411,7 +412,7 @@ signals: void receivedUserInfo( const TQString& contact, const UserDetails& details ); /** We warned a user */ - void userWarned( const TQString& contact, Q_UINT16 increase, Q_UINT16 newLevel ); + void userWarned( const TQString& contact, TQ_UINT16 increase, TQ_UINT16 newLevel ); /** Search signals */ void gotSearchResults( const ICQSearchResult& ); @@ -462,7 +463,7 @@ protected slots: void receivedIcqInfo( const TQString& contact, unsigned int type ); /** we have normal user info for a contact */ - void receivedInfo( Q_UINT16 sequence ); + void receivedInfo( TQ_UINT16 sequence ); /** received a message of some kind */ void receivedMessage( const Oscar::Message& msg ); @@ -504,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, ICQStatus contactStatus = ICQAway ); + void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway ); private: class ClientPrivate; diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.cpp b/kopete/protocols/oscar/liboscar/clientreadytask.cpp index d5b65069..0f324f1a 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.cpp +++ b/kopete/protocols/oscar/liboscar/clientreadytask.cpp @@ -28,7 +28,7 @@ using namespace Oscar; -ClientReadyTask::ClientReadyTask(Task* parent): Task(parent) +ClientReadyTask::ClientReadyTask(Task* tqparent): Task(tqparent) { m_classList = client()->rateManager()->classList(); } @@ -102,7 +102,7 @@ void ClientReadyTask::onGo() //with the hell that is oscar login. (just wait until you get a message) Transfer* t = createTransfer( f, s, buffer ); send( t ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/clientreadytask.h b/kopete/protocols/oscar/liboscar/clientreadytask.h index d632351f..ac570895 100644 --- a/kopete/protocols/oscar/liboscar/clientreadytask.h +++ b/kopete/protocols/oscar/liboscar/clientreadytask.h @@ -30,7 +30,7 @@ Fire and forget task to let the server know we're ready class ClientReadyTask : public Task { public: - ClientReadyTask( Task* parent ); + ClientReadyTask( Task* tqparent ); ~ClientReadyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index 3b062b2a..d85ca4df 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -CloseConnectionTask::CloseConnectionTask( Task* parent ) - : Task(parent) +CloseConnectionTask::CloseConnectionTask( Task* tqparent ) + : Task(tqparent) { } @@ -98,7 +98,7 @@ bool CloseConnectionTask::take( Transfer* transfer ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "found TLV(5) [SERVER] " << TQString( server.data ) << endl; TQString ip = server.data; - int index = ip.find( ':' ); + int index = ip.tqfind( ':' ); m_bosHost = ip.left( index ); ip.remove( 0 , index+1 ); //get rid of the colon and everything before it m_bosPort = ip; diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.h b/kopete/protocols/oscar/liboscar/closeconnectiontask.h index c3001ba7..8bda062f 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.h +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.h @@ -31,7 +31,7 @@ class TQString; class CloseConnectionTask : public Task { public: - CloseConnectionTask(Task* parent); + CloseConnectionTask(Task* tqparent); ~CloseConnectionTask(); @@ -59,4 +59,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; tab-width 4; replace-tabs off; +//kate: indent-mode csands; space-indent off; tab-width 4; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp index a4bc4877..03452153 100644 --- a/kopete/protocols/oscar/liboscar/connection.cpp +++ b/kopete/protocols/oscar/liboscar/connection.cpp @@ -96,7 +96,7 @@ void Connection::close() bool Connection::isSupported( int family ) const { - return ( d->familyList.findIndex( family ) != -1 ); + return ( d->familyList.tqfindIndex( family ) != -1 ); } TQValueList Connection::supportedFamilies() const @@ -129,7 +129,7 @@ Oscar::Settings* Connection::settings() const return d->client->clientSettings(); } -Q_UINT16 Connection::flapSequence() +TQ_UINT16 Connection::flapSequence() { d->flapSequence++; if ( d->flapSequence >= 0x8000 ) //the max flap sequence is 0x8000 ( HEX ) @@ -138,7 +138,7 @@ Q_UINT16 Connection::flapSequence() return d->flapSequence; } -Q_UINT32 Connection::snacSequence() +TQ_UINT32 Connection::snacSequence() { d->snacSequence++; return d->snacSequence; diff --git a/kopete/protocols/oscar/liboscar/connection.h b/kopete/protocols/oscar/liboscar/connection.h index f2c1da75..b840a597 100644 --- a/kopete/protocols/oscar/liboscar/connection.h +++ b/kopete/protocols/oscar/liboscar/connection.h @@ -45,9 +45,10 @@ class Settings; * connection to an OSCAR server * @author Matt Rogers */ -class Connection : public QObject +class Connection : public TQObject { Q_OBJECT + TQ_OBJECT public: Connection( Connector* connector, ClientStream* cs, const char* name = 0 ); @@ -125,17 +126,17 @@ public: /** * Get the chat room name for this connection. - * @return the name of the room or TQString::null if not connected to a room + * @return the name of the room or TQString() if not connected to a room */ /** Get the user settings object */ Oscar::Settings* settings() const; /** Get the current FLAP sequence for this connection */ - Q_UINT16 flapSequence(); + TQ_UINT16 flapSequence(); /** Get the current SNAC sequence for this connection */ - Q_UINT32 snacSequence(); + TQ_UINT32 snacSequence(); /** Get the cookie for this connection */ TQByteArray cookie() const; diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.cpp b/kopete/protocols/oscar/liboscar/connectionhandler.cpp index bd4df3c5..3f2c1eff 100644 --- a/kopete/protocols/oscar/liboscar/connectionhandler.cpp +++ b/kopete/protocols/oscar/liboscar/connectionhandler.cpp @@ -112,16 +112,16 @@ Connection* ConnectionHandler::defaultConnection() const void ConnectionHandler::addChatInfoForConnection( Connection* c, Oscar::WORD exchange, const TQString& room ) { - if ( d->connections.findIndex( c ) == -1 ) + if ( d->connections.tqfindIndex( c ) == -1 ) d->connections.append( c ); - ConnectionRoomInfo info = qMakePair( exchange, room ); + ConnectionRoomInfo info = tqMakePair( exchange, room ); d->chatRoomConnections[c] = info; } Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, const TQString& room ) { - ConnectionRoomInfo infoToFind = qMakePair( exchange, room ); + ConnectionRoomInfo infoToFind = tqMakePair( exchange, room ); TQMap::iterator it, itEnd = d->chatRoomConnections.end(); for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it ) { @@ -137,8 +137,8 @@ Connection* ConnectionHandler::connectionForChatRoom( Oscar::WORD exchange, cons TQString ConnectionHandler::chatRoomForConnection( Connection* c ) { - if ( d->connections.findIndex( c ) == -1 ) - return TQString::null; + if ( d->connections.tqfindIndex( c ) == -1 ) + return TQString(); TQMap::iterator it, itEnd = d->chatRoomConnections.end(); for ( it = d->chatRoomConnections.begin(); it != itEnd; ++it ) @@ -150,13 +150,13 @@ TQString ConnectionHandler::chatRoomForConnection( Connection* c ) } } - return TQString::null; + return TQString(); } Oscar::WORD ConnectionHandler::exchangeForConnection( Connection* c ) { - if ( d->connections.findIndex( c ) == -1 ) + if ( d->connections.tqfindIndex( c ) == -1 ) return 0xFFFF; TQMap::iterator it, itEnd = d->chatRoomConnections.end(); diff --git a/kopete/protocols/oscar/liboscar/connectionhandler.h b/kopete/protocols/oscar/liboscar/connectionhandler.h index e8c50b12..c87ee298 100644 --- a/kopete/protocols/oscar/liboscar/connectionhandler.h +++ b/kopete/protocols/oscar/liboscar/connectionhandler.h @@ -26,7 +26,7 @@ class Connection; -typedef QPair ConnectionRoomInfo; +typedef TQPair ConnectionRoomInfo; /** @author Kopete Developers @@ -98,7 +98,7 @@ public: * Get the room name for the chat room based the connection * @return The name of the chat room that this connection is connected to * If the connection passed in by @p c is not a chat room connection then - * TQString::null is returned. + * TQString() is returned. */ TQString chatRoomForConnection( Connection* c ); diff --git a/kopete/protocols/oscar/liboscar/connector.cpp b/kopete/protocols/oscar/liboscar/connector.cpp index c754e2d3..fff59980 100644 --- a/kopete/protocols/oscar/liboscar/connector.cpp +++ b/kopete/protocols/oscar/liboscar/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setPeerAddressNone(); } @@ -40,7 +40,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -52,7 +52,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; diff --git a/kopete/protocols/oscar/liboscar/connector.h b/kopete/protocols/oscar/liboscar/connector.h index 3844ba49..d1d96e4d 100644 --- a/kopete/protocols/oscar/liboscar/connector.h +++ b/kopete/protocols/oscar/liboscar/connector.h @@ -27,11 +27,12 @@ class ByteStream; -class Connector : public QObject +class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -40,7 +41,7 @@ public: bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -48,12 +49,12 @@ signals: protected: void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; #endif diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.cpp b/kopete/protocols/oscar/liboscar/coreprotocol.cpp index 918b3751..472618fe 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/coreprotocol.cpp @@ -54,7 +54,7 @@ static TQString toString( const TQByteArray& buffer ) if ( c < 0x10 ) hex.append("0"); - hex.append(TQString("%1 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); @@ -62,8 +62,8 @@ static TQString toString( const TQByteArray& buffer ) { output += hex + " |" + ascii + "|\n"; i=0; - hex=TQString::null; - ascii=TQString::null; + hex=TQString(); + ascii=TQString(); } } @@ -152,7 +152,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef OSCAR_COREPROTOCOL_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << "contains: " << bytes.count() << " bytes" << endl; + kdDebug(OSCAR_RAW_DEBUG) << "tqcontains: " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); diff --git a/kopete/protocols/oscar/liboscar/coreprotocol.h b/kopete/protocols/oscar/liboscar/coreprotocol.h index bbc9b693..807679ba 100644 --- a/kopete/protocols/oscar/liboscar/coreprotocol.h +++ b/kopete/protocols/oscar/liboscar/coreprotocol.h @@ -29,9 +29,10 @@ class FlapProtocol; class SnacProtocol; class Transfer; -class CoreProtocol : public QObject +class CoreProtocol : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State { NeedMore, Available, NoData, OutOfSync }; diff --git a/kopete/protocols/oscar/liboscar/errortask.cpp b/kopete/protocols/oscar/liboscar/errortask.cpp index 9e9ce95b..3620addb 100644 --- a/kopete/protocols/oscar/liboscar/errortask.cpp +++ b/kopete/protocols/oscar/liboscar/errortask.cpp @@ -20,8 +20,8 @@ #include "oscartypes.h" #include "transfer.h" -ErrorTask::ErrorTask( Task* parent ) - : Task( parent ) +ErrorTask::ErrorTask( Task* tqparent ) + : Task( tqparent ) { } diff --git a/kopete/protocols/oscar/liboscar/errortask.h b/kopete/protocols/oscar/liboscar/errortask.h index f74152db..1199eb92 100644 --- a/kopete/protocols/oscar/liboscar/errortask.h +++ b/kopete/protocols/oscar/liboscar/errortask.h @@ -27,7 +27,7 @@ Handles OSCAR protocol errors received from the server on snac subtype 0x01 class ErrorTask : public Task { public: - ErrorTask( Task* parent ); + ErrorTask( Task* tqparent ); ~ErrorTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.cpp b/kopete/protocols/oscar/liboscar/flapprotocol.cpp index f5e9fa03..eaa12166 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/flapprotocol.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -FlapProtocol::FlapProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +FlapProtocol::FlapProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -57,7 +57,7 @@ Transfer* FlapProtocol::parse( const TQByteArray & packet, uint& bytes ) << " sequence: " << f.sequence << " length: " << f.length << endl; //use pointer arithmatic to skip the flap and snac headers //so we don't have to do double parsing in the tasks - char* charPacket = packet.data(); + char* charPacket = const_cast(packet.data()); char* snacData = charPacket + 6; Buffer *snacBuffer = new Buffer( snacData, f.length ); diff --git a/kopete/protocols/oscar/liboscar/flapprotocol.h b/kopete/protocols/oscar/liboscar/flapprotocol.h index 3d6de53b..2574df50 100644 --- a/kopete/protocols/oscar/liboscar/flapprotocol.h +++ b/kopete/protocols/oscar/liboscar/flapprotocol.h @@ -28,8 +28,9 @@ class FlapTransfer; class FlapProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - FlapProtocol( TQObject *parent = 0, const char *name = 0 ); + FlapProtocol( TQObject *tqparent = 0, const char *name = 0 ); ~FlapProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp index 5b00a8fd..0aee0f98 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.cpp @@ -24,8 +24,8 @@ #include "oscarutils.h" #include "buffer.h" -ICBMParamsTask::ICBMParamsTask( Task* parent ) - : Task( parent ) +ICBMParamsTask::ICBMParamsTask( Task* tqparent ) + : Task( tqparent ) {} @@ -137,7 +137,7 @@ void ICBMParamsTask::sendMessageParams( int channel ) Transfer* st = createTransfer( f, s, buffer ); send( st ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } //kate: tab-width 4; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icbmparamstask.h b/kopete/protocols/oscar/liboscar/icbmparamstask.h index c7bdfb16..b3091fa8 100644 --- a/kopete/protocols/oscar/liboscar/icbmparamstask.h +++ b/kopete/protocols/oscar/liboscar/icbmparamstask.h @@ -28,7 +28,7 @@ Get the parameters we need to follow for instant messages class ICBMParamsTask : public Task { public: - ICBMParamsTask( Task* parent ); + ICBMParamsTask( Task* tqparent ); ~ICBMParamsTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.cpp b/kopete/protocols/oscar/liboscar/icqlogintask.cpp index 76feaf42..9bc58452 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/icqlogintask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -IcqLoginTask::IcqLoginTask( Task* parent ) - : Task( parent ) +IcqLoginTask::IcqLoginTask( Task* tqparent ) + : Task( tqparent ) { } @@ -85,7 +85,7 @@ TQString IcqLoginTask::encodePassword( const TQString& loginPassword ) // TODO: check if latin1 is the right conversion const char *password = loginPassword.latin1(); unsigned int i = 0; - TQString encodedPassword = TQString::null; + TQString encodedPassword = TQString(); //encoding table used in ICQ password XOR transformation unsigned char encoding_table[] = diff --git a/kopete/protocols/oscar/liboscar/icqlogintask.h b/kopete/protocols/oscar/liboscar/icqlogintask.h index 3d865756..e13b1f99 100644 --- a/kopete/protocols/oscar/liboscar/icqlogintask.h +++ b/kopete/protocols/oscar/liboscar/icqlogintask.h @@ -30,8 +30,9 @@ using namespace Oscar; class IcqLoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - IcqLoginTask( Task* parent ); + IcqLoginTask( Task* tqparent ); ~IcqLoginTask(); bool take( Transfer* transfer ); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icqtask.cpp b/kopete/protocols/oscar/liboscar/icqtask.cpp index bb58a9c4..ccedd0d9 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.cpp +++ b/kopete/protocols/oscar/liboscar/icqtask.cpp @@ -24,8 +24,8 @@ #include -ICQTask::ICQTask( Task * parent ) - : Task( parent ) +ICQTask::ICQTask( Task * tqparent ) + : Task( tqparent ) { m_icquin = client()->userId().toULong(); m_sequence = 0; @@ -148,4 +148,4 @@ void ICQTask::setRequestSubType( WORD subType ) #include "icqtask.moc" -//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icqtask.h b/kopete/protocols/oscar/liboscar/icqtask.h index 7d134b49..9397163a 100644 --- a/kopete/protocols/oscar/liboscar/icqtask.h +++ b/kopete/protocols/oscar/liboscar/icqtask.h @@ -28,8 +28,9 @@ class Buffer; class ICQTask : public Task { Q_OBJECT + TQ_OBJECT public: - ICQTask( Task* parent ); + ICQTask( Task* tqparent ); ~ICQTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.cpp b/kopete/protocols/oscar/liboscar/icquserinfo.cpp index bc37d313..a4a5f78c 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfo.cpp @@ -259,4 +259,4 @@ ICQWPSearchInfo::ICQWPSearchInfo() -//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfo.h b/kopete/protocols/oscar/liboscar/icquserinfo.h index 3c3510f4..685859a6 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfo.h +++ b/kopete/protocols/oscar/liboscar/icquserinfo.h @@ -164,7 +164,7 @@ class KOPETE_EXPORT ICQSearchResult public: ICQSearchResult(); void fill( Buffer* buffer ); - Q_UINT32 uin; + TQ_UINT32 uin; TQCString firstName; TQCString lastName; TQCString nickName; @@ -172,7 +172,7 @@ public: bool auth; bool online; char gender; - Q_UINT16 age; + TQ_UINT16 age; }; class KOPETE_EXPORT ICQWPSearchInfo @@ -210,4 +210,4 @@ typedef TQValueList ICQInfoItemList; */ #endif -//kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands; +//kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp index 3635bc71..6a915ca8 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.cpp @@ -23,7 +23,7 @@ #include "buffer.h" -ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* parent ) : ICQTask( parent ) +ICQUserInfoRequestTask::ICQUserInfoRequestTask( Task* tqparent ) : ICQTask( tqparent ) { //by default, request short info. it saves bandwidth m_type = Short; @@ -231,4 +231,4 @@ TQString ICQUserInfoRequestTask::notesInfoFor( const TQString& contact ) #include "icquserinfotask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/icquserinfotask.h b/kopete/protocols/oscar/liboscar/icquserinfotask.h index 613608fd..27aa4a68 100644 --- a/kopete/protocols/oscar/liboscar/icquserinfotask.h +++ b/kopete/protocols/oscar/liboscar/icquserinfotask.h @@ -33,8 +33,9 @@ class Transfer; class ICQUserInfoRequestTask : public ICQTask { Q_OBJECT + TQ_OBJECT public: - ICQUserInfoRequestTask( Task* parent ); + ICQUserInfoRequestTask( Task* tqparent ); ~ICQUserInfoRequestTask(); enum { Long = 0, Short }; @@ -74,4 +75,4 @@ private: }; #endif -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp index b93ede3f..2054ace7 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp @@ -18,8 +18,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) - : TQObject(parent, name) +InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_state = NeedMore; m_bytes = 0; @@ -64,11 +64,11 @@ bool InputProtocolBase::okToProceed() bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) { // read the length of the bytes - Q_UINT32 val; + TQ_UINT32 val; if ( !okToProceed() ) return false; *m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); if ( val > 1024 ) return false; //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); @@ -83,7 +83,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // the rest of the string will be filled with FF, // so look for that in the last position instead of \0 // this caused a crash - guessing that temp.length() is set to the number of bytes actually read... - // if ( (Q_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) + // if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < ( val - 1 ) ) { qDebug( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %i bytes out of %i", temp.length(), val ); diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.h b/kopete/protocols/oscar/liboscar/inputprotocolbase.h index 94072e00..bf2235ef 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.h +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.h @@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se @author Matt Rogers */ -class InputProtocolBase : public QObject +class InputProtocolBase : public TQObject { Q_OBJECT + TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *parent = 0, const char *name = 0); + InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. @@ -57,7 +58,7 @@ protected: */ bool okToProceed(); /** - * read a Q_UINT32 giving the number of following bytes, then a string of that length + * read a TQ_UINT32 giving the number of following bytes, then a string of that length * updates the bytes parsed counter * @return false if the string was broken or there was no data available at all */ diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.cpp b/kopete/protocols/oscar/liboscar/locationrightstask.cpp index f019b961..dec65031 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.cpp +++ b/kopete/protocols/oscar/liboscar/locationrightstask.cpp @@ -26,8 +26,8 @@ using namespace Oscar; -LocationRightsTask::LocationRightsTask( Task* parent ) - : Task( parent ) +LocationRightsTask::LocationRightsTask( Task* tqparent ) + : Task( tqparent ) { } @@ -80,7 +80,7 @@ void LocationRightsTask::sendLocationRightsRequest() void LocationRightsTask::handleLocationRightsResponse() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Ignoring location rights response" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/locationrightstask.h b/kopete/protocols/oscar/liboscar/locationrightstask.h index a3e82767..cbc17e10 100644 --- a/kopete/protocols/oscar/liboscar/locationrightstask.h +++ b/kopete/protocols/oscar/liboscar/locationrightstask.h @@ -36,7 +36,7 @@ This task implements the following SNACS: class LocationRightsTask : public Task { public: - LocationRightsTask( Task* parent ); + LocationRightsTask( Task* tqparent ); ~LocationRightsTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index a153f8f7..10d62e6d 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -37,8 +37,8 @@ * Stage One Task Implementation */ -StageOneLoginTask::StageOneLoginTask( Task* parent ) - : Task ( parent ) +StageOneLoginTask::StageOneLoginTask( Task* tqparent ) + : Task ( tqparent ) { m_aimTask = 0L; m_icqTask = 0L; @@ -137,8 +137,8 @@ const TQString& StageOneLoginTask::bosPort() const /** * Stage Two Task Implementation */ -StageTwoLoginTask::StageTwoLoginTask( Task* parent ) - : Task( parent ) +StageTwoLoginTask::StageTwoLoginTask( Task* tqparent ) + : Task( tqparent ) { //Create our tasks Task* rootTask = client()->rootTask(); @@ -188,7 +188,7 @@ void StageTwoLoginTask::onGo() send( ft ); } else - setError( -1, TQString::null ); + setError( -1, TQString() ); return; } @@ -210,7 +210,7 @@ void StageTwoLoginTask::versionTaskFinished() void StageTwoLoginTask::rateTaskFinished() { - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } #include "logintask.moc" diff --git a/kopete/protocols/oscar/liboscar/logintask.h b/kopete/protocols/oscar/liboscar/logintask.h index 77ee7690..6a61dc9f 100644 --- a/kopete/protocols/oscar/liboscar/logintask.h +++ b/kopete/protocols/oscar/liboscar/logintask.h @@ -44,8 +44,9 @@ class Transfer; class StageOneLoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - StageOneLoginTask( Task* parent ); + StageOneLoginTask( Task* tqparent ); ~StageOneLoginTask(); bool take( Transfer* transfer ); @@ -103,8 +104,9 @@ class RateInfoTask; class StageTwoLoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - StageTwoLoginTask( Task* parent ); + StageTwoLoginTask( Task* tqparent ); ~StageTwoLoginTask(); bool take( Transfer* transfer ); void onGo(); diff --git a/kopete/protocols/oscar/liboscar/md5.c b/kopete/protocols/oscar/liboscar/md5.c index e6273585..1ca18d13 100644 --- a/kopete/protocols/oscar/liboscar/md5.c +++ b/kopete/protocols/oscar/liboscar/md5.c @@ -55,7 +55,7 @@ main() "abc", /*900150983cd24fb0d6963f7d28e17f72*/ "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", /*d174ab98d277d9f5a5611c2c9f419d9f*/ "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ }; diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp index 0dd26e3d..bf8e2350 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp @@ -25,7 +25,7 @@ #include "userdetails.h" -MessageReceiverTask::MessageReceiverTask( Task* parent ) : Task( parent ) +MessageReceiverTask::MessageReceiverTask( Task* tqparent ) : Task( tqparent ) { } @@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message() msg.setSender( m_fromUser ); msg.setReceiver( client()->userId() ); - msg.setTimestamp( TQDateTime::currentDateTime() ); + msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); msg.setType( 0x01 ); emit receivedMessage( msg ); @@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message() } msg.setType( 0x04 ); - msg.setTimestamp( TQDateTime::currentDateTime() ); + msg.setTimestamp( TQDateTime::tqcurrentDateTime() ); msg.setSender( msgSender ); msg.setReceiver( client()->userId() ); msg.setEncoding( Oscar::Message::UserDefined ); @@ -422,7 +422,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg ) break; TQByteArray cap( b->getBlock( capLength ) ); - if ( qstrncmp ( cap.data(), "{0946134E-4C7F-11D1-8222-444553540000}", capLength ) == 0 ) + if ( tqstrncmp ( cap.data(), "{0946134E-4C7F-11D1-8222-444553540000}", capLength ) == 0 ) encoding = Oscar::Message::UTF8; } } @@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg ) msg->setSender( m_fromUser ); msg->setReceiver( client()->userId() ); - msg->setTimestamp( TQDateTime::currentDateTime() ); + msg->setTimestamp( TQDateTime::tqcurrentDateTime() ); msg->setType( 0x02 ); msg->setIcbmCookie( m_icbmCookie ); msg->setProtocolVersion( protocolVersion ); diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.h b/kopete/protocols/oscar/liboscar/messagereceivertask.h index 011243be..55df700a 100644 --- a/kopete/protocols/oscar/liboscar/messagereceivertask.h +++ b/kopete/protocols/oscar/liboscar/messagereceivertask.h @@ -32,9 +32,10 @@ class TQTextCodec; class MessageReceiverTask : public Task { Q_OBJECT + TQ_OBJECT public: - MessageReceiverTask( Task* parent ); + MessageReceiverTask( Task* tqparent ); ~MessageReceiverTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp index 88d41a84..2fc70b45 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.cpp @@ -26,8 +26,8 @@ #include -OfflineMessagesTask::OfflineMessagesTask( Task* parent ) - : ICQTask( parent ) +OfflineMessagesTask::OfflineMessagesTask( Task* tqparent ) + : ICQTask( tqparent ) { tzset(); m_sequence = 0; diff --git a/kopete/protocols/oscar/liboscar/offlinemessagestask.h b/kopete/protocols/oscar/liboscar/offlinemessagestask.h index da2454d3..3433d762 100644 --- a/kopete/protocols/oscar/liboscar/offlinemessagestask.h +++ b/kopete/protocols/oscar/liboscar/offlinemessagestask.h @@ -30,8 +30,9 @@ ICQ Offline messages handling class OfflineMessagesTask : public ICQTask { Q_OBJECT + TQ_OBJECT public: - OfflineMessagesTask( Task* parent ); + OfflineMessagesTask( Task* tqparent ); ~OfflineMessagesTask(); diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp index 6b6b3d05..c3419740 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.cpp @@ -26,7 +26,7 @@ #include -OnlineNotifierTask::OnlineNotifierTask( Task* parent ) : Task( parent ) +OnlineNotifierTask::OnlineNotifierTask( Task* tqparent ) : Task( tqparent ) { } diff --git a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h index 03c1ed43..bc200611 100644 --- a/kopete/protocols/oscar/liboscar/onlinenotifiertask.h +++ b/kopete/protocols/oscar/liboscar/onlinenotifiertask.h @@ -35,8 +35,9 @@ Implements SNACS (0x03, 0x11) and (0x03, 0x12) class OnlineNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - OnlineNotifierTask( Task* parent ); + OnlineNotifierTask( Task* tqparent ); ~OnlineNotifierTask(); diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index 5f39d205..e2387368 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -24,8 +24,8 @@ #include "oscarbytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) - : ByteStream ( parent ) +KNetworkByteStream::KNetworkByteStream( TQObject *tqparent, const char */*name*/ ) + : ByteStream ( tqparent ) { kdDebug( 14151 ) << k_funcinfo << "Instantiating new KNetwork byte stream." << endl; @@ -102,7 +102,7 @@ void KNetworkByteStream::slotConnectionClosed() if ( mClosing ) { kdDebug( 14151 ) << "..by ourselves!" << endl; - kdDebug( 14151 ) << "socket error is " << socket()->errorString( socket()->error() ) << endl; + kdDebug( 14151 ) << "socket error is " << socket()->KSocketBase::errorString( socket()->error() ) << endl; emit connectionClosed (); } else @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "oscarbytestream.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.h b/kopete/protocols/oscar/liboscar/oscarbytestream.h index 2ecd92d9..3b310eab 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.h +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.h @@ -35,9 +35,10 @@ class KNetworkByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - KNetworkByteStream ( TQObject *parent = 0, const char *name = 0 ); + KNetworkByteStream ( TQObject *tqparent = 0, const char *name = 0 ); ~KNetworkByteStream (); @@ -68,5 +69,5 @@ private: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 87da6020..085bac9e 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -59,9 +59,9 @@ public: bs = 0; connection = 0; - username = TQString::null; - password = TQString::null; - server = TQString::null; + username = TQString(); + password = TQString(); + server = TQString(); haveLocalAddr = false; doBinding = true; @@ -80,7 +80,7 @@ public: bool doAuth; //send the initial login sequences to get the cookie bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; bool doBinding; Connector *conn; @@ -104,8 +104,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *parent) -:Stream(parent) +ClientStream::ClientStream(Connector *conn, TQObject *tqparent) +:Stream(tqparent) { //qDebug("CLIENTSTREAM::ClientStream"); @@ -205,7 +205,7 @@ void ClientStream::setNoopTime(int mills) d->noopTimer.start( d->noop_time ); } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "contains: %i bytes ", bytes.count() ); + qDebug( "tqcontains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.h b/kopete/protocols/oscar/liboscar/oscarclientstream.h index fc08f158..f5ab752d 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.h +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.h @@ -34,6 +34,7 @@ class TQHostAddress; class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -73,7 +74,7 @@ public: BindConflict // resource in-use }; - ClientStream(Connector *conn, TQObject *parent=0); + ClientStream(Connector *conn, TQObject *tqparent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); @@ -85,7 +86,7 @@ public: void setUsername(const TQString &s); void setPassword(const TQString &s); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); void close(); @@ -158,7 +159,7 @@ private: /** * convert internal method representation to wire */ - static char* encode_method(Q_UINT8 method); + static char* encode_method(TQ_UINT8 method); }; #endif diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index ec649e08..03db367d 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -24,8 +24,8 @@ #include "oscarconnector.h" #include "oscarbytestream.h" -KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) - : Connector( parent ) +KNetworkConnector::KNetworkConnector( TQObject *tqparent, const char */*name*/ ) + : Connector( tqparent ) { kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl; @@ -94,7 +94,7 @@ void KNetworkConnector::done() mByteStream->close (); } -void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) +void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) { kdDebug ( 14151 ) << k_funcinfo << "Manually specifying host " << host << " and port " << port << endl; @@ -105,4 +105,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) #include "oscarconnector.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.h b/kopete/protocols/oscar/liboscar/oscarconnector.h index 39696a35..20a44123 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.h +++ b/kopete/protocols/oscar/liboscar/oscarconnector.h @@ -37,9 +37,10 @@ class KNetworkConnector : public Connector { Q_OBJECT + TQ_OBJECT public: - KNetworkConnector( TQObject *parent = 0, const char *name = 0 ); + KNetworkConnector( TQObject *tqparent = 0, const char *name = 0 ); virtual ~KNetworkConnector(); @@ -47,7 +48,7 @@ public: virtual ByteStream *stream() const; virtual void done(); - void setOptHostPort( const TQString &host, Q_UINT16 port ); + void setOptHostPort( const TQString &host, TQ_UINT16 port ); int errorCode(); @@ -57,7 +58,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; KNetworkByteStream *mByteStream; @@ -66,4 +67,4 @@ private: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/oscar/liboscar/oscarmessage.cpp b/kopete/protocols/oscar/liboscar/oscarmessage.cpp index 1f263be0..c0b5a1b8 100644 --- a/kopete/protocols/oscar/liboscar/oscarmessage.cpp +++ b/kopete/protocols/oscar/liboscar/oscarmessage.cpp @@ -122,7 +122,7 @@ TQString Oscar::Message::text( TQTextCodec *codec ) const default: break; // Should never happen. } - return TQString::null; + return TQString(); //FIXME: warn at least with kdWarning if an unrecognised encoding style was seen. } diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp index be862872..958a5d49 100644 --- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp +++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp @@ -32,7 +32,7 @@ Oscar::TLV::TLV() length = 0; } -Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, char* newData ) +Oscar::TLV::TLV( TQ_UINT16 newType, TQ_UINT16 newLength, char* newData ) { type = newType; length = newLength; @@ -40,7 +40,7 @@ Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, char* newData ) data.duplicate( newData, length ); } -Oscar::TLV::TLV( Q_UINT16 newType, Q_UINT16 newLength, const TQByteArray& newData ) +Oscar::TLV::TLV( TQ_UINT16 newType, TQ_UINT16 newLength, const TQByteArray& newData ) { type = newType; length = newLength; @@ -114,17 +114,17 @@ TQString Oscar::SSI::name() const return m_name; } -Q_UINT16 Oscar::SSI::gid() const +TQ_UINT16 Oscar::SSI::gid() const { return m_gid; } -Q_UINT16 Oscar::SSI::bid() const +TQ_UINT16 Oscar::SSI::bid() const { return m_bid; } -Q_UINT16 Oscar::SSI::type() const +TQ_UINT16 Oscar::SSI::type() const { return m_type; } @@ -134,12 +134,12 @@ const TQValueList& Oscar::SSI::tlvList() const return m_tlvList; } -void Oscar::SSI::setTLVListLength( Q_UINT16 newLength ) +void Oscar::SSI::setTLVListLength( TQ_UINT16 newLength ) { m_tlvLength = newLength; } -Q_UINT16 Oscar::SSI::tlvListLength() const +TQ_UINT16 Oscar::SSI::tlvListLength() const { return m_tlvLength; } @@ -224,7 +224,7 @@ TQByteArray Oscar::SSI::iconHash( ) const TQString Oscar::SSI::toString() const { - TQString ssiString = TQString::fromLatin1( "name: " ); + TQString ssiString = TQString::tqfromLatin1( "name: " ); ssiString += m_name; ssiString += " gid: "; ssiString += TQString::number( m_gid ); @@ -263,7 +263,7 @@ Oscar::SSI::operator TQByteArray() const // We must provide the explicit length argument to addString() because // we don't need trailing null byte to be added when automatic // conversion from TQCString to TQByteArray is performed. - // This hack will not be needed with Qt 4. + // This hack will not be needed with TQt 4. b.addString( namedata, namelen ); b.addWord( m_gid ); b.addWord( m_bid ); diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.h b/kopete/protocols/oscar/liboscar/oscartypeclasses.h index e4ec6ded..dec69c37 100644 --- a/kopete/protocols/oscar/liboscar/oscartypeclasses.h +++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.h @@ -33,14 +33,14 @@ class KOPETE_EXPORT TLV public: TLV(); - TLV( Q_UINT16, Q_UINT16, char* data ); - TLV( Q_UINT16, Q_UINT16, const TQByteArray& ); + TLV( TQ_UINT16, TQ_UINT16, char* data ); + TLV( TQ_UINT16, TQ_UINT16, const TQByteArray& ); TLV( const TLV& t ); operator bool() const; - Q_UINT16 type; - Q_UINT16 length; + TQ_UINT16 type; + TQ_UINT16 length; TQByteArray data; }; @@ -60,17 +60,17 @@ public: TQString name() const; /** \brief The group id of the SSI item */ - Q_UINT16 gid() const; + TQ_UINT16 gid() const; /** \brief The buddy id of the SSI item */ - Q_UINT16 bid() const; + TQ_UINT16 bid() const; /** * \brief The type of the SSI Item. * see ROSTER_* defines on oscartypes.h * Use a value of 0xFFFF for an SSI item not on the server list */ - Q_UINT16 type() const; + TQ_UINT16 type() const; /** \brief the TLV list for the item */ const TQValueList& tlvList() const; @@ -84,10 +84,10 @@ public: * This is not the number of items in the list!! It's the aggregation of the * sizes of the TLVs */ - void setTLVListLength( Q_UINT16 newLength ); + void setTLVListLength( TQ_UINT16 newLength ); /** \brief Get the TLV list length */ - Q_UINT16 tlvListLength() const; + TQ_UINT16 tlvListLength() const; /** * Get the alias for the SSI item diff --git a/kopete/protocols/oscar/liboscar/oscartypes.h b/kopete/protocols/oscar/liboscar/oscartypes.h index 3819b555..4e13a509 100644 --- a/kopete/protocols/oscar/liboscar/oscartypes.h +++ b/kopete/protocols/oscar/liboscar/oscartypes.h @@ -172,9 +172,9 @@ const cap oscar_caps[] = }; //! Oscar Data Types -typedef Q_UINT8 BYTE; -typedef Q_UINT16 WORD; -typedef Q_UINT32 DWORD; +typedef TQ_UINT8 BYTE; +typedef TQ_UINT16 WORD; +typedef TQ_UINT32 DWORD; struct FLAP diff --git a/kopete/protocols/oscar/liboscar/oscarutils.cpp b/kopete/protocols/oscar/liboscar/oscarutils.cpp index e07e0e12..8dc7d9df 100644 --- a/kopete/protocols/oscar/liboscar/oscarutils.cpp +++ b/kopete/protocols/oscar/liboscar/oscarutils.cpp @@ -291,7 +291,7 @@ DWORD Oscar::getNumericalIP(const TQString &address) TQString Oscar::getDottedDecimal( DWORD address ) { TQHostAddress addr; - addr.setAddress((Q_UINT32)address); + addr.setAddress((TQ_UINT32)address); return addr.toString(); } diff --git a/kopete/protocols/oscar/liboscar/oscarutils.h b/kopete/protocols/oscar/liboscar/oscarutils.h index a9cd921c..1e6b539e 100644 --- a/kopete/protocols/oscar/liboscar/oscarutils.h +++ b/kopete/protocols/oscar/liboscar/oscarutils.h @@ -63,7 +63,7 @@ const TQString capToString(char *cap); * Parse the character array for validness and a version string * \param buffer the buffer we'll be parsing for capabilities * \param versionString a TQString reference that will contain the - * version string of the detected client. Will be TQString::null if + * version string of the detected client. Will be TQString() if * no client is found * \return a DWORD containg a bit array of the capabilities we found */ diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp index 2cf57d53..7731aa51 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.cpp @@ -29,7 +29,7 @@ using namespace Oscar; -OwnUserInfoTask::OwnUserInfoTask( Task* parent ) : Task( parent ) +OwnUserInfoTask::OwnUserInfoTask( Task* tqparent ) : Task( tqparent ) { } @@ -70,7 +70,7 @@ bool OwnUserInfoTask::take( Transfer* transfer ) ud.fill( b ); m_details = ud; emit gotInfo(); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return true; } else @@ -108,7 +108,7 @@ bool OwnUserInfoTask::take( Transfer* transfer ) kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "self available message: " << endl; } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return true; } diff --git a/kopete/protocols/oscar/liboscar/ownuserinfotask.h b/kopete/protocols/oscar/liboscar/ownuserinfotask.h index 35314df0..6b162d00 100644 --- a/kopete/protocols/oscar/liboscar/ownuserinfotask.h +++ b/kopete/protocols/oscar/liboscar/ownuserinfotask.h @@ -29,8 +29,9 @@ Request our user info from the server and handle our user info when it comes bac class OwnUserInfoTask : public Task { Q_OBJECT + TQ_OBJECT public: - OwnUserInfoTask( Task* parent ); + OwnUserInfoTask( Task* tqparent ); ~OwnUserInfoTask(); diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.cpp b/kopete/protocols/oscar/liboscar/prmparamstask.cpp index 43580206..cd4cfddc 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/prmparamstask.cpp @@ -24,8 +24,8 @@ using namespace Oscar; -PRMParamsTask::PRMParamsTask( Task* parent ) - : Task( parent ) +PRMParamsTask::PRMParamsTask( Task* tqparent ) + : Task( tqparent ) { } @@ -52,7 +52,7 @@ bool PRMParamsTask::take( Transfer* transfer ) if ( forMe( transfer ) ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Ignoring PRM Parameters. We don't use them" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return true; } diff --git a/kopete/protocols/oscar/liboscar/prmparamstask.h b/kopete/protocols/oscar/liboscar/prmparamstask.h index eebfdc61..fe0f25c0 100644 --- a/kopete/protocols/oscar/liboscar/prmparamstask.h +++ b/kopete/protocols/oscar/liboscar/prmparamstask.h @@ -28,7 +28,7 @@ class Transfer; class PRMParamsTask : public Task { public: - PRMParamsTask( Task* parent ); + PRMParamsTask( Task* tqparent ); ~PRMParamsTask(); virtual bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/profiletask.cpp b/kopete/protocols/oscar/liboscar/profiletask.cpp index 4b0949ea..09a8b3a0 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.cpp +++ b/kopete/protocols/oscar/liboscar/profiletask.cpp @@ -28,8 +28,8 @@ using namespace Oscar; -ProfileTask::ProfileTask( Task* parent ) - : Task( parent ) +ProfileTask::ProfileTask( Task* tqparent ) + : Task( tqparent ) { } @@ -112,7 +112,7 @@ void ProfileTask::sendProfileUpdate() buffer->addTLV(0x0005, capBuf.length(), capBuf.buffer()); Transfer* st = createTransfer( f, s , buffer ); send( st ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/profiletask.h b/kopete/protocols/oscar/liboscar/profiletask.h index a51075a5..d16a05de 100644 --- a/kopete/protocols/oscar/liboscar/profiletask.h +++ b/kopete/protocols/oscar/liboscar/profiletask.h @@ -32,7 +32,7 @@ The away message will be set only if the away message has been set non-null. class ProfileTask : public Task { public: - ProfileTask( Task* parent ); + ProfileTask( Task* tqparent ); ~ProfileTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp index d035c810..6d050643 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.cpp +++ b/kopete/protocols/oscar/liboscar/rateclass.cpp @@ -22,8 +22,8 @@ using namespace Oscar; -RateClass::RateClass( TQObject* parent ) -: TQObject( parent, 0 ) +RateClass::RateClass( TQObject* tqparent ) +: TQObject( tqparent, 0 ) { m_waitingToSend = false; m_packetTimer.start(); diff --git a/kopete/protocols/oscar/liboscar/rateclass.h b/kopete/protocols/oscar/liboscar/rateclass.h index 78ad8917..122bde8d 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.h +++ b/kopete/protocols/oscar/liboscar/rateclass.h @@ -34,11 +34,12 @@ struct SnacPair class Transfer; -class RateClass : public QObject +class RateClass : public TQObject { Q_OBJECT + TQ_OBJECT public: - RateClass( TQObject* parent = 0 ); + RateClass( TQObject* tqparent = 0 ); ~RateClass(); /** Accessor for classid */ diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp index 59ef735e..0b14c9ec 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp @@ -34,11 +34,11 @@ public: Connection* client; }; -RateClassManager::RateClassManager( Connection* parent, const char* name ) -: TQObject( parent, name ) +RateClassManager::RateClassManager( Connection* tqparent, const char* name ) +: TQObject( tqparent, name ) { d = new RateClassManagerPrivate(); - d->client = parent; + d->client = tqparent; } RateClassManager::~RateClassManager() diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.h b/kopete/protocols/oscar/liboscar/rateclassmanager.h index b1240f07..fe2a8433 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.h +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.h @@ -31,11 +31,12 @@ class Connection; class RateClassManagerPrivate; -class RateClassManager : public QObject +class RateClassManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - RateClassManager( Connection* parent, const char* name = 0 ); + RateClassManager( Connection* tqparent, const char* name = 0 ); ~RateClassManager(); /** Reset the rate manager */ diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp index 08002b8a..a7249a74 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -RateInfoTask::RateInfoTask( Task* parent ) - : Task( parent ) +RateInfoTask::RateInfoTask( Task* tqparent ) + : Task( tqparent ) { connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) ); } @@ -164,7 +164,7 @@ void RateInfoTask::sendRateInfoAck() Transfer* st = createTransfer( f, s, buffer ); send( st ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } #include "rateinfotask.moc" diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.h b/kopete/protocols/oscar/liboscar/rateinfotask.h index 013559f6..407e91b4 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.h +++ b/kopete/protocols/oscar/liboscar/rateinfotask.h @@ -30,8 +30,9 @@ using namespace Oscar; class RateInfoTask : public Task { Q_OBJECT + TQ_OBJECT public: - RateInfoTask( Task* parent ); + RateInfoTask( Task* tqparent ); ~RateInfoTask(); bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index 39c16bc4..7559a253 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -1630,17 +1630,17 @@ void ParStyle::clearFormatting() TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) { TQString str = _str; - str.replace(TQRegExp("&"), "&"); - str.replace(TQRegExp("<"), "<"); - str.replace(TQRegExp(">"), ">"); - str.replace(TQRegExp("\""), """); - str.replace(TQRegExp("\r"), ""); + str.tqreplace(TQRegExp("&"), "&"); + str.tqreplace(TQRegExp("<"), "<"); + str.tqreplace(TQRegExp(">"), ">"); + str.tqreplace(TQRegExp("\""), """); + str.tqreplace(TQRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(TQRegExp("\n"), "
      \n"); + str.tqreplace(TQRegExp("\n"), "
      \n"); break; case quoteXML: - str.replace(TQRegExp("\n"), "
      \n"); + str.tqreplace(TQRegExp("\n"), "
      \n"); break; default: break; @@ -1657,7 +1657,7 @@ TQString RTF2HTML::quoteString(const TQString &_str, quoteMode mode) TQString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -1890,7 +1890,7 @@ void RTF2HTML::FlushParagraph() /* s += "

      "; s += sParagraph; @@ -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. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // 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 c43aeaea..63c04c96 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/kopete/protocols/oscar/liboscar/rtf.ll @@ -67,17 +67,17 @@ void ParStyle::clearFormatting() QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) { QString str = _str; - str.replace(QRegExp("&"), "&"); - str.replace(QRegExp("<"), "<"); - str.replace(QRegExp(">"), ">"); - str.replace(QRegExp("\""), """); - str.replace(QRegExp("\r"), ""); + str.tqreplace(QRegExp("&"), "&"); + str.tqreplace(QRegExp("<"), "<"); + str.tqreplace(QRegExp(">"), ">"); + str.tqreplace(QRegExp("\""), """); + str.tqreplace(QRegExp("\r"), ""); switch (mode){ case quoteHTML: - str.replace(QRegExp("\n"), "
      \n"); + str.tqreplace(QRegExp("\n"), "
      \n"); break; case quoteXML: - str.replace(QRegExp("\n"), "
      \n"); + str.tqreplace(QRegExp("\n"), "
      \n"); break; default: break; @@ -94,7 +94,7 @@ QString RTF2HTML::quoteString(const QString &_str, quoteMode mode) QString s = " "; for (int i = 1; i < len; i++) s += " "; - str.replace(pos, len, s); + str.tqreplace(pos, len, s); } return str; } @@ -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. alignment), + // Since we don't implement any of the paragraph formatting tags (e.g. tqalignment), // 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/safedelete.cpp b/kopete/protocols/oscar/liboscar/safedelete.cpp index 5dde3725..9de147f0 100644 --- a/kopete/protocols/oscar/liboscar/safedelete.cpp +++ b/kopete/protocols/oscar/liboscar/safedelete.cpp @@ -62,13 +62,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/oscar/liboscar/safedelete.h b/kopete/protocols/oscar/liboscar/safedelete.h index 0d4150d9..88cfb3d4 100644 --- a/kopete/protocols/oscar/liboscar/safedelete.h +++ b/kopete/protocols/oscar/liboscar/safedelete.h @@ -57,9 +57,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp index 2b5dbbae..02dd0ba6 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), mStatus(status) +SendDCInfoTask::SendDCInfoTask(Task* tqparent, DWORD status): Task(tqparent), mtqStatus(status) { } @@ -70,7 +70,7 @@ void SendDCInfoTask::onGo() statusFlag |= 0x10000000; // Direct connection upon authorization, hides IP } - buffer->addDWord( statusFlag | mStatus ); + buffer->addDWord( statusFlag | mtqStatus ); /* Fill in the DC Info * We don't support Direct Connection yet. So fill in some @@ -100,7 +100,7 @@ void SendDCInfoTask::onGo() Transfer* t = createTransfer( f, s, buffer ); send( t ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h index d130cc40..e967cb18 100644 --- a/kopete/protocols/oscar/liboscar/senddcinfotask.h +++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h @@ -28,12 +28,12 @@ Fire and forget task that sends our direct connection info class SendDCInfoTask : public Task { public: - SendDCInfoTask( Task* parent, DWORD status ); + SendDCInfoTask( Task* tqparent, DWORD status ); ~SendDCInfoTask(); virtual void onGo(); private: - DWORD mStatus; + DWORD mtqStatus; }; #endif diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp index ba753471..a4bc61e2 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.cpp @@ -23,7 +23,7 @@ #include "oscarutils.h" #include "transfer.h" -SendIdleTimeTask::SendIdleTimeTask( Task* parent ) : Task( parent ) +SendIdleTimeTask::SendIdleTimeTask( Task* tqparent ) : Task( tqparent ) { m_idleTime = 0; } @@ -45,7 +45,7 @@ void SendIdleTimeTask::onGo() Transfer *t = createTransfer( f, s, buffer ); send( t ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } diff --git a/kopete/protocols/oscar/liboscar/sendidletimetask.h b/kopete/protocols/oscar/liboscar/sendidletimetask.h index beba74c2..4ba9e588 100644 --- a/kopete/protocols/oscar/liboscar/sendidletimetask.h +++ b/kopete/protocols/oscar/liboscar/sendidletimetask.h @@ -29,7 +29,7 @@ Sends the idle time to the server class SendIdleTimeTask : public Task { public: - SendIdleTimeTask( Task* parent ); + SendIdleTimeTask( Task* tqparent ); ~SendIdleTimeTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index 1b8cbfbc..b3a4a36e 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" -SendMessageTask::SendMessageTask(Task* parent): Task(parent) +SendMessageTask::SendMessageTask(Task* tqparent): Task(tqparent) { m_autoResponse = false; m_cookieCount = 0x7FFF; @@ -379,8 +379,8 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) ) utfMessage=new unsigned char[length]; for(unsigned int l=0; lencoding() != 0) charset=0x0003; //send as ISO-8859-1 } -if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec so far! +if(!codec && charset != 0x0002) // it's neither tqunicode 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/sendmessagetask.h b/kopete/protocols/oscar/liboscar/sendmessagetask.h index 18e03c73..a6a0e598 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.h +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.h @@ -26,7 +26,7 @@ class SendMessageTask : public Task { public: - SendMessageTask( Task* parent ); + SendMessageTask( Task* tqparent ); ~SendMessageTask(); //! Set the message to be sent diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp index 5875e6a8..4e3ffa86 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.cpp +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.cpp @@ -25,8 +25,8 @@ #include "connection.h" #include "transfer.h" -ServerRedirectTask::ServerRedirectTask( Task* parent ) - :Task( parent ), m_service( 0 ) +ServerRedirectTask::ServerRedirectTask( Task* tqparent ) + :Task( tqparent ), m_service( 0 ) { } @@ -75,7 +75,7 @@ bool ServerRedirectTask::take( Transfer* transfer ) setTransfer( transfer ); bool value = handleRedirect(); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return value; } diff --git a/kopete/protocols/oscar/liboscar/serverredirecttask.h b/kopete/protocols/oscar/liboscar/serverredirecttask.h index 972e28ce..936ff582 100644 --- a/kopete/protocols/oscar/liboscar/serverredirecttask.h +++ b/kopete/protocols/oscar/liboscar/serverredirecttask.h @@ -32,8 +32,9 @@ class Transfer; class ServerRedirectTask : public Task { Q_OBJECT + TQ_OBJECT public: - ServerRedirectTask( Task* parent ); + ServerRedirectTask( Task* tqparent ); void setService( WORD family ); void setChatParams( WORD exchange, TQByteArray cookie, WORD instance ); diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.cpp b/kopete/protocols/oscar/liboscar/serverversionstask.cpp index b2e7dfa6..a6dc557c 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.cpp +++ b/kopete/protocols/oscar/liboscar/serverversionstask.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -ServerVersionsTask::ServerVersionsTask( Task* parent ) - : Task( parent ) +ServerVersionsTask::ServerVersionsTask( Task* tqparent ) + : Task( tqparent ) { m_family = 0; } @@ -101,7 +101,7 @@ void ServerVersionsTask::handleFamilies() Buffer* outbuf = transfer()->buffer(); if ( outbuf->length() % 2 != 0 ) { - setError( -1, TQString::null ); + setError( -1, TQString() ); return; } @@ -163,7 +163,7 @@ void ServerVersionsTask::handleServerVersions() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "server version=" << buffer->getWord() << ", server family=" << buffer->getWord() << endl; } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } #include "serverversionstask.moc" diff --git a/kopete/protocols/oscar/liboscar/serverversionstask.h b/kopete/protocols/oscar/liboscar/serverversionstask.h index f3a72a38..532fcec0 100644 --- a/kopete/protocols/oscar/liboscar/serverversionstask.h +++ b/kopete/protocols/oscar/liboscar/serverversionstask.h @@ -31,8 +31,9 @@ class Transfer; class ServerVersionsTask : public Task { Q_OBJECT + TQ_OBJECT public: - ServerVersionsTask( Task* parent ); + ServerVersionsTask( Task* tqparent ); ~ServerVersionsTask(); diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp index 61f53279..39da3531 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp @@ -34,18 +34,18 @@ #include "ssiparamstask.h" #include "transfer.h" -ServiceSetupTask::ServiceSetupTask( Task* parent ) - : Task( parent ) +ServiceSetupTask::ServiceSetupTask( Task* tqparent ) + : Task( tqparent ) { m_finishedTaskCount = 0; - m_locRightsTask = new LocationRightsTask( parent ); - m_profileTask = new ProfileTask( parent ); - m_blmLimitsTask = new BLMLimitsTask( parent ); - m_icbmTask = new ICBMParamsTask( parent ); - m_prmTask = new PRMParamsTask( parent ); - m_ssiParamTask = new SSIParamsTask( parent ); - m_ssiListTask = new SSIListTask( parent ); - m_ssiActivateTask = new SSIActivateTask( parent ); + m_locRightsTask = new LocationRightsTask( tqparent ); + m_profileTask = new ProfileTask( tqparent ); + m_blmLimitsTask = new BLMLimitsTask( tqparent ); + m_icbmTask = new ICBMParamsTask( tqparent ); + m_prmTask = new PRMParamsTask( tqparent ); + m_ssiParamTask = new SSIParamsTask( tqparent ); + m_ssiListTask = new SSIListTask( tqparent ); + m_ssiActivateTask = new SSIActivateTask( tqparent ); TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); @@ -114,7 +114,7 @@ void ServiceSetupTask::childTaskFinished() if ( m_finishedTaskCount == 8 ) { kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Service setup finished" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } } diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.h b/kopete/protocols/oscar/liboscar/servicesetuptask.h index c5bf5a70..ed364353 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.h +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.h @@ -38,8 +38,9 @@ Set up the various services for the BOS connection class ServiceSetupTask : public Task { Q_OBJECT + TQ_OBJECT public: - ServiceSetupTask( Task* parent ); + ServiceSetupTask( Task* tqparent ); ~ServiceSetupTask(); bool forMe( const Transfer* transfer ) const; diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.cpp b/kopete/protocols/oscar/liboscar/snacprotocol.cpp index 3ec5c348..e7021c4f 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.cpp +++ b/kopete/protocols/oscar/liboscar/snacprotocol.cpp @@ -29,8 +29,8 @@ using namespace Oscar; -SnacProtocol::SnacProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +SnacProtocol::SnacProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -82,7 +82,7 @@ Transfer* SnacProtocol::parse( const TQByteArray & packet, uint& bytes ) //use pointer arithmatic to skip the flap and snac headers //so we don't have to do double parsing in the tasks - char* charPacket = packet.data(); + char* charPacket = const_cast(packet.data()); char* snacData; int snacOffset = 10; //default if ( s.flags >= 0x8000 ) //skip the next 8 bytes, we don't care about the snac version ATM diff --git a/kopete/protocols/oscar/liboscar/snacprotocol.h b/kopete/protocols/oscar/liboscar/snacprotocol.h index 18c6aaaa..a9b10cbd 100644 --- a/kopete/protocols/oscar/liboscar/snacprotocol.h +++ b/kopete/protocols/oscar/liboscar/snacprotocol.h @@ -28,8 +28,9 @@ class SnacTransfer; class SnacProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - SnacProtocol( TQObject *parent = 0, const char *name = 0 ); + SnacProtocol( TQObject *tqparent = 0, const char *name = 0 ); ~SnacProtocol(); /** diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp index 795d9999..c03d70d4 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.cpp @@ -26,7 +26,7 @@ -SSIActivateTask::SSIActivateTask(Task* parent): Task(parent) +SSIActivateTask::SSIActivateTask(Task* tqparent): Task(tqparent) { } @@ -44,7 +44,7 @@ void SSIActivateTask::onGo() Buffer* buffer = new Buffer(); Transfer* t = createTransfer( f, s, buffer ); send( t ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } // kate: tab-width 4; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/ssiactivatetask.h b/kopete/protocols/oscar/liboscar/ssiactivatetask.h index 66f0a67b..7ca44896 100644 --- a/kopete/protocols/oscar/liboscar/ssiactivatetask.h +++ b/kopete/protocols/oscar/liboscar/ssiactivatetask.h @@ -28,7 +28,7 @@ A fire and forget task to send the activation SNAC for the SSI list to the serve class SSIActivateTask : public Task { public: - SSIActivateTask( Task* parent ); + SSIActivateTask( Task* tqparent ); ~SSIActivateTask(); void onGo(); }; diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp index bccb754e..8a33bb56 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.cpp @@ -25,10 +25,10 @@ #include -SSIAuthTask::SSIAuthTask( Task* parent ) - : Task( parent ) +SSIAuthTask::SSIAuthTask( Task* tqparent ) + : Task( tqparent ) { - m_manager = parent->client()->ssiManager(); + m_manager = tqparent->client()->ssiManager(); } SSIAuthTask::~SSIAuthTask() diff --git a/kopete/protocols/oscar/liboscar/ssiauthtask.h b/kopete/protocols/oscar/liboscar/ssiauthtask.h index 1760f344..d7e7c78a 100644 --- a/kopete/protocols/oscar/liboscar/ssiauthtask.h +++ b/kopete/protocols/oscar/liboscar/ssiauthtask.h @@ -29,8 +29,9 @@ class SSIManager; class SSIAuthTask : public Task { Q_OBJECT + TQ_OBJECT public: - SSIAuthTask( Task* parent ); + SSIAuthTask( Task* tqparent ); ~SSIAuthTask(); diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp index d52f7f4e..6b10e3fa 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp +++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp @@ -23,7 +23,7 @@ #include "ssimanager.h" #include "transfer.h" -SSIListTask::SSIListTask( Task* parent ) : Task( parent ) +SSIListTask::SSIListTask( Task* tqparent ) : Task( tqparent ) { m_ssiManager = client()->ssiManager(); TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) ); @@ -136,7 +136,7 @@ void SSIListTask::handleSSIListReply() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "SSI List complete" << endl; client()->ssiManager()->setListComplete( true ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } else kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Awaiting another SSI packet" << endl; @@ -154,7 +154,7 @@ void SSIListTask::handleSSIUpToDate() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Number of items in SSI list: " << ssiItems << endl; client()->ssiManager()->setListComplete( true ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } void SSIListTask::checkSSITimestamp() diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.h b/kopete/protocols/oscar/liboscar/ssilisttask.h index 96a4c3d8..24ee179d 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.h +++ b/kopete/protocols/oscar/liboscar/ssilisttask.h @@ -35,8 +35,9 @@ class SSIManager; class SSIListTask : public Task { Q_OBJECT + TQ_OBJECT public: - SSIListTask( Task* parent ); + SSIListTask( Task* tqparent ); ~SSIListTask(); virtual bool take( Transfer* transfer ); diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp index 1351c237..630b8f6b 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.cpp +++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp @@ -42,8 +42,8 @@ public: WORD nextGroupId; }; -SSIManager::SSIManager( TQObject *parent, const char *name ) - : TQObject( parent, name ) +SSIManager::SSIManager( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ) { d = new SSIManagerPrivate; d->complete = false; @@ -97,7 +97,7 @@ WORD SSIManager::nextContactId() return 0xFFFF; } - if ( d->itemIdList.contains( d->nextContactId ) == 0 ) + if ( d->itemIdList.tqcontains( d->nextContactId ) == 0 ) d->itemIdList.append( d->nextContactId ); return d->nextContactId++; @@ -116,7 +116,7 @@ WORD SSIManager::nextGroupId() return 0xFFFF; } - if ( d->groupIdList.contains( d->nextGroupId ) == 0 ) + if ( d->groupIdList.tqcontains( d->nextGroupId ) == 0 ) d->groupIdList.append( d->nextGroupId ); return d->nextGroupId++; @@ -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::fromLatin1( "[void SSIManager::setParameters] " ); + TQString funcName = TQString::tqfromLatin1( "[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: " @@ -214,7 +214,7 @@ Oscar::SSI SSIManager::findContact( const TQString &contact, const TQString &gro return m_dummyItem; } - Oscar::SSI gr = findGroup( group ); // find the parent group + Oscar::SSI gr = findGroup( group ); // find the tqparent group if ( gr.isValid() ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "gr->name= " << gr.name() << @@ -449,7 +449,7 @@ bool SSIManager::updateGroup( const Oscar::SSI& group ) d->SSIList.remove( oldGroup ); } - if ( d->SSIList.findIndex( group ) != -1 ) + if ( d->SSIList.tqfindIndex( group ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New group is already in list." << endl; return false; @@ -496,7 +496,7 @@ bool SSIManager::removeGroup( const TQString &group ) bool SSIManager::newContact( const Oscar::SSI& contact ) { - if ( d->SSIList.findIndex( contact ) == -1 ) + if ( d->SSIList.tqfindIndex( contact ) == -1 ) { kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Adding contact '" << contact.name() << "' to SSI list" << endl; addID( contact ); @@ -518,7 +518,7 @@ bool SSIManager::updateContact( const Oscar::SSI& contact ) d->SSIList.remove( oldContact ); } - if ( d->SSIList.findIndex( contact ) != -1 ) + if ( d->SSIList.tqfindIndex( contact ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New contact is already in list." << endl; return false; @@ -562,7 +562,7 @@ bool SSIManager::removeContact( const TQString &contact ) bool SSIManager::newItem( const Oscar::SSI& item ) { - if ( d->SSIList.findIndex( item ) != -1 ) + if ( d->SSIList.tqfindIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Item is already in list." << endl; return false; @@ -584,7 +584,7 @@ bool SSIManager::updateItem( const Oscar::SSI& item ) d->SSIList.remove( oldItem ); } - if ( d->SSIList.findIndex( item ) != -1 ) + if ( d->SSIList.tqfindIndex( item ) != -1 ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "New item is already in list." << endl; return false; @@ -614,12 +614,12 @@ void SSIManager::addID( const Oscar::SSI& item ) { if ( item.type() == ROSTER_GROUP ) { - if ( d->groupIdList.contains( item.gid() ) == 0 ) + if ( d->groupIdList.tqcontains( item.gid() ) == 0 ) d->groupIdList.append( item.gid() ); } else { - if ( d->itemIdList.contains( item.bid() ) == 0 ) + if ( d->itemIdList.tqcontains( item.bid() ) == 0 ) d->itemIdList.append( item.bid() ); } } @@ -646,7 +646,7 @@ WORD SSIManager::findFreeId( const TQValueList& idList, WORD fromId ) cons { for ( WORD id = fromId; id < 0x8000; id++ ) { - if ( idList.contains( id ) == 0 ) + if ( idList.tqcontains( id ) == 0 ) return id; } diff --git a/kopete/protocols/oscar/liboscar/ssimanager.h b/kopete/protocols/oscar/liboscar/ssimanager.h index df39268c..d75d1e17 100644 --- a/kopete/protocols/oscar/liboscar/ssimanager.h +++ b/kopete/protocols/oscar/liboscar/ssimanager.h @@ -38,11 +38,12 @@ SSI management @author Gustavo Pichorim Boiko @author Matt Rogers */ -class KOPETE_EXPORT SSIManager : public QObject +class KOPETE_EXPORT SSIManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - SSIManager( TQObject* parent = 0, const char* name = 0 ); + SSIManager( TQObject* tqparent = 0, const char* name = 0 ); ~SSIManager(); diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp index b4194b5e..23164bc0 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp @@ -28,9 +28,9 @@ #include "transfer.h" -SSIModifyTask::SSIModifyTask( Task* parent, bool staticTask ) : Task( parent ) +SSIModifyTask::SSIModifyTask( Task* tqparent, bool staticTask ) : Task( tqparent ) { - m_ssiManager = parent->client()->ssiManager(); + m_ssiManager = tqparent->client()->ssiManager(); m_static = staticTask; m_opType = NoType; m_opSubject = NoSubject; @@ -254,23 +254,23 @@ void SSIModifyTask::handleSSIAck() break; case 0x0002: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item to modify not found in list" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; case 0x0003: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Item already exists in SSI" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; case 0x000A: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Error adding item ( invalid id, already in list, invalid data )" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; case 0x000C: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add item. Limit exceeded." << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; case 0x000D: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Can't add ICQ item to AIM list ( and vice versa )" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; case 0x000E: { @@ -283,7 +283,7 @@ void SSIModifyTask::handleSSIAck() } default: kdDebug( OSCAR_RAW_DEBUG ) << k_funcinfo << "Unknown acknowledgement code" << endl; - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); break; } }; @@ -466,7 +466,7 @@ void SSIModifyTask::updateSSIManager() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "and adding " << m_newItem.name() << " to SSI manager" << endl; m_ssiManager->newItem( m_newItem ); } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return; } @@ -479,7 +479,7 @@ void SSIModifyTask::updateSSIManager() m_ssiManager->removeContact( m_oldItem.name() ); else if ( m_opSubject == NoSubject ) m_ssiManager->removeItem( m_oldItem ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return; } @@ -492,11 +492,11 @@ void SSIModifyTask::updateSSIManager() m_ssiManager->newContact( m_newItem ); else if ( m_opSubject == NoSubject ) m_ssiManager->newItem( m_newItem ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); return; } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } void SSIModifyTask::freeIdOnError() diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.h b/kopete/protocols/oscar/liboscar/ssimodifytask.h index 70486cbc..3093c159 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.h +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.h @@ -51,7 +51,7 @@ This task implements the following SNACs from the SSI family (0x0013): class SSIModifyTask : public Task { public: - SSIModifyTask( Task* parent, bool staticTask = false ); + SSIModifyTask( Task* tqparent, bool staticTask = false ); ~SSIModifyTask(); virtual void onGo(); diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp index d279061c..11239533 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.cpp +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.cpp @@ -27,7 +27,7 @@ using namespace Oscar; -SSIParamsTask::SSIParamsTask(Task* parent): Task(parent) +SSIParamsTask::SSIParamsTask(Task* tqparent): Task(tqparent) { } @@ -81,7 +81,7 @@ void SSIParamsTask::handleParamReply() //manually parse the TLV out of the packet, since we only want certain things if ( buf->getWord() != 0x0004 ) { - setError( -1, TQString::null ); + setError( -1, TQString() ); return; //no TLV of type 0x0004, bad packet. do nothing. } else @@ -95,7 +95,7 @@ void SSIParamsTask::handleParamReply() WORD maxIgnore = buf->getWord(); client()->ssiManager()->setParameters( maxContacts, maxGroups, maxVisible, maxInvisible, maxIgnore ); } - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } // kate: tab-width 4; indent-mode csands; diff --git a/kopete/protocols/oscar/liboscar/ssiparamstask.h b/kopete/protocols/oscar/liboscar/ssiparamstask.h index abf12aa2..e0244c6d 100644 --- a/kopete/protocols/oscar/liboscar/ssiparamstask.h +++ b/kopete/protocols/oscar/liboscar/ssiparamstask.h @@ -26,7 +26,7 @@ class SSIParamsTask : public Task { public: - SSIParamsTask(Task* parent); + SSIParamsTask(Task* tqparent); ~SSIParamsTask(); diff --git a/kopete/protocols/oscar/liboscar/stream.cpp b/kopete/protocols/oscar/liboscar/stream.cpp index 2fb302c1..517bde68 100644 --- a/kopete/protocols/oscar/liboscar/stream.cpp +++ b/kopete/protocols/oscar/liboscar/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/oscar/liboscar/stream.h b/kopete/protocols/oscar/liboscar/stream.h index d5bfabad..2ea1f871 100644 --- a/kopete/protocols/oscar/liboscar/stream.h +++ b/kopete/protocols/oscar/liboscar/stream.h @@ -25,9 +25,10 @@ class Transfer; -class Stream : public QObject +class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond { @@ -42,7 +43,7 @@ public: SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index 2ec342ac..cc988ebe 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -31,7 +31,7 @@ class Task::TaskPrivate public: TaskPrivate() {} - Q_UINT32 id; + TQ_UINT32 id; bool success; int statusCode; TQString statusString; @@ -41,19 +41,19 @@ public: Transfer* transfer; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); - d->client = parent->client(); + d->client = tqparent->client(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Connection* parent, bool) +Task::Task(Connection* tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->id = 0; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Connection *Task::client() const @@ -124,12 +124,12 @@ void Task::go(bool autoDelete) bool Task::take( Transfer * transfer) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; - // pass along the transfer to our children - TQObjectListIt it(*p); + // pass along the transfer to our tqchildren + TQObjectListIt it(p); Task *t; for(; it.current(); ++it) { TQObject *obj = it.current(); @@ -271,7 +271,7 @@ void Task::debug(const TQString &str) { //black hole Q_UNUSED( str ); - //client()->debug(TQString("%1: ").arg(className()) + str); + //client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const @@ -280,7 +280,7 @@ bool Task::forMe( const Transfer * transfer ) const return false; } -void Task::setId( Q_UINT32 id ) +void Task::setId( TQ_UINT32 id ) { d->id = id; } diff --git a/kopete/protocols/oscar/liboscar/task.h b/kopete/protocols/oscar/liboscar/task.h index ebc26fb8..184abd45 100644 --- a/kopete/protocols/oscar/liboscar/task.h +++ b/kopete/protocols/oscar/liboscar/task.h @@ -34,16 +34,17 @@ class Transfer; using namespace Oscar; -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task( Connection*, bool isRoot ); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Connection* client() const; Transfer *transfer() const; @@ -74,7 +75,7 @@ signals: protected: virtual void onGo(); virtual void onDisconnect(); - void setId( Q_UINT32 id ); + void setId( TQ_UINT32 id ); void send( Transfer * request ); void setSuccess( int code=0, const TQString &str="" ); void setError( int code=0, const TQString &str="" ); diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index a7c16cea..6f62ebe6 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::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("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/clientstream_test.h b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h index 47aeac86..80c68446 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.h +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.h @@ -19,11 +19,12 @@ #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class ClientStreamTest : public QApplication +class ClientStreamTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: ClientStreamTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h index f2fa0fec..6aff018c 100644 --- a/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h +++ b/kopete/protocols/oscar/liboscar/tests/ipaddrtest.h @@ -16,9 +16,9 @@ #include "oscarutils.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class IPAddrTest : public QApplication +class IPAddrTest : public TQApplication { public: IPAddrTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp index 2181fda3..d40f0069 100644 --- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/kunittest.cpp @@ -62,7 +62,7 @@ KUnitTest::KUnitTest() void KUnitTest::checkRun() { // if ( m_qtests.isEmpty() ) -// qApp->exit(); +// tqApp->exit(); } int KUnitTest::runTests() @@ -150,7 +150,7 @@ int KUnitTest::runTests() return m_tests.count(); } -//void KUnitTest::addTester( QTester *test ) +//void KUnitTest::addTester( TQTester *test ) //{ // m_qtests.insert( test, test ); // connect( test, TQT_SIGNAL(destroyed(TQObject*)), @@ -161,7 +161,7 @@ void KUnitTest::qtesterDone( TQObject *obj ) { // m_qtests.remove( obj ); // if ( m_qtests.isEmpty() ) -// qApp->quit(); +// tqApp->quit(); } #include "kunittest.moc" diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/kunittest.h index d2d6a04a..c2149992 100644 --- a/kopete/protocols/oscar/liboscar/tests/kunittest.h +++ b/kopete/protocols/oscar/liboscar/tests/kunittest.h @@ -34,11 +34,12 @@ #include #define ADD_TEST(x) addTester( #x, new x ) -#define ADD_QTEST(x) addTester( new x ) +#define ADD_TQTEST(x) addTester( new x ) -class KUnitTest : public QObject +class KUnitTest : public TQObject { Q_OBJECT + TQ_OBJECT public: KUnitTest(); @@ -48,7 +49,7 @@ public: { m_tests.insert( name, test ); } -// void addTester( QTester *test ); +// void addTester( TQTester *test ); private slots: void qtesterDone( TQObject *obj ); @@ -59,7 +60,7 @@ private: private: TQAsciiDict m_tests; -// TQPtrDict m_qtests; +// TQPtrDict m_qtests; int globalTests; int globalPasses; int globalFails; diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index 1d3728aa..540aa35c 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::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("login.oscar.aol.com"); // connect to server qDebug( "connecting to server "); diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.h b/kopete/protocols/oscar/liboscar/tests/logintest.h index d97c336d..661ae49d 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.h +++ b/kopete/protocols/oscar/liboscar/tests/logintest.h @@ -20,11 +20,12 @@ #include "connection.h" #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class LoginTest : public QApplication +class LoginTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: LoginTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/redirecttest.h b/kopete/protocols/oscar/liboscar/tests/redirecttest.h index 785d61c8..0989529c 100644 --- a/kopete/protocols/oscar/liboscar/tests/redirecttest.h +++ b/kopete/protocols/oscar/liboscar/tests/redirecttest.h @@ -19,9 +19,9 @@ #include "serverredirecttask.h" #include "task.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class RedirectTest : public QApplication +class RedirectTest : public TQApplication { public: RedirectTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 6ca733cc..9849bbbb 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::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("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::fromLatin1( "dummygroup" ); + TQString group = TQString::tqfromLatin1( "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::fromLatin1( "dummygroup" ); + TQString group = TQString::tqfromLatin1( "dummygroup" ); myClient->removeGroup( group ); } diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h index 291698ec..e997b9db 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.h @@ -20,11 +20,12 @@ #include "connection.h" #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class LoginTest : public QApplication +class LoginTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: LoginTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp index 7669a945..9c2202a6 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").arg( ssi->gid() ).latin1()); + qDebug( TQString("Found group SecondGroup with gid=%1").tqarg( 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").arg( ssi->name() ).latin1() ); + qDebug( TQString("Found group 3 with name=%1").tqarg( 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" ).arg( ssi->gid() ).latin1() ); + qDebug( TQString( "Found contact ThirdContact with gid=%1" ).tqarg( 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").arg( ssi->bid() ).latin1() ); + qDebug( TQString("Found contact FourthContact with bid=%1").tqarg( ssi->bid() ).latin1() ); else qDebug( "Oops, contact FourthContact not found" ); @@ -89,13 +89,13 @@ void SSITest::testIt() TQValueList::iterator it; qDebug( "Contacts from group FirtsGroup:" ); for ( it = list.begin(); it != list.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").tqarg( (*it)->name() ).latin1() ); //the group list TQValueList list2 = m_manager->groupList(); qDebug( "Group list:" ); for ( it = list2.begin(); it != list2.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + qDebug( TQString(" name=%1").tqarg( (*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/ssitest.h b/kopete/protocols/oscar/liboscar/tests/ssitest.h index fbdcf2fb..db7e8697 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssitest.h +++ b/kopete/protocols/oscar/liboscar/tests/ssitest.h @@ -16,11 +16,12 @@ #include "ssimanager.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class SSITest : public QApplication +class SSITest : public TQApplication { Q_OBJECT + TQ_OBJECT public: SSITest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index fb346d26..663ec2fb 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::fromLatin1("login.oscar.aol.com"); + TQString server = TQString::tqfromLatin1("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::fromLatin1( "userid" ); + TQString contact = TQString::tqfromLatin1( "userid" ); myClient->requestFullInfo( contact ); } diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.h b/kopete/protocols/oscar/liboscar/tests/userinfotest.h index 76450466..a17818e6 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.h +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.h @@ -20,11 +20,12 @@ #include "connection.h" #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class LoginTest : public QApplication +class LoginTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: LoginTest(int argc, char ** argv); diff --git a/kopete/protocols/oscar/liboscar/transfer.cpp b/kopete/protocols/oscar/liboscar/transfer.cpp index ac83ac06..100bcf9d 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 ").arg(c, 0, 16)); + hex.append(TQString("%1 ").tqarg(c, 0, 16)); ascii.append(isprint(c) ? c : '.'); @@ -98,8 +98,8 @@ TQString Transfer::toString() const { output += hex + " |" + ascii + "|\n"; i=0; - hex=TQString::null; - ascii=TQString::null; + hex=TQString(); + ascii=TQString(); } } diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp index f3c34f96..536f2f39 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.cpp +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.cpp @@ -25,8 +25,8 @@ -TypingNotifyTask::TypingNotifyTask( Task* parent ) -: Task( parent ) +TypingNotifyTask::TypingNotifyTask( Task* tqparent ) +: Task( tqparent ) { m_notificationType = 0x0000; } @@ -79,7 +79,7 @@ void TypingNotifyTask::onGo() Transfer* t = createTransfer( f, s, b ); send( t ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } void TypingNotifyTask::handleNotification() @@ -87,12 +87,12 @@ void TypingNotifyTask::handleNotification() /* NB ICQ5 (windows) seems to only send 0x0002 and 0x0001, so I'm interpreting 0x001 as typing finished here - Will */ Buffer* b = transfer()->buffer(); - //I don't care about the QWORD or the channel + //I don't care about the TQWORD or the channel b->skipBytes( 10 ); TQString contact( b->getBUIN() ); - Q_UINT32 word = b->getWord(); + TQ_UINT32 word = b->getWord(); switch ( word ) { case 0x0000: @@ -120,5 +120,5 @@ void TypingNotifyTask::setParams( const TQString& contact, int notifyType ) #include "typingnotifytask.moc" -// kate: indent-mode csands; space-indent off; replace-tabs off; +// kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/typingnotifytask.h b/kopete/protocols/oscar/liboscar/typingnotifytask.h index 34c5d86a..e99951fc 100644 --- a/kopete/protocols/oscar/liboscar/typingnotifytask.h +++ b/kopete/protocols/oscar/liboscar/typingnotifytask.h @@ -28,10 +28,11 @@ class TypingNotifyTask : public Task { Q_OBJECT + TQ_OBJECT public: enum { Finished = 0x0000, Typed = 0x0001, Begin = 0x0002 }; - TypingNotifyTask( Task* parent ); + TypingNotifyTask( Task* tqparent ); ~TypingNotifyTask(); virtual bool forMe( const Transfer* transfer) const; @@ -59,4 +60,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; replace-tabs off; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index 8a1b6c4e..77a6c72b 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_extendedStatus = 0; + m_extendedtqStatus = 0; m_capabilities = 0; m_dcPort = 0; m_dcType = 0; @@ -107,9 +107,9 @@ int UserDetails::userClass() const return m_userClass; } -DWORD UserDetails::extendedStatus() const +DWORD UserDetails::extendedtqStatus() const { - return m_extendedStatus; + return m_extendedtqStatus; } 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").arg(m_clientName, m_clientVersion); + "%1 %2").tqarg(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_extendedStatus = b.getDWord(); + m_extendedtqStatus = b.getDWord(); m_extendedStatusSpecified = true; #ifdef OSCAR_USERINFO_DEBUG - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl; + kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 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::fromLatin1("Miranda alpha"); + m_clientName=TQString::tqfromLatin1("Miranda alpha"); else - m_clientName=TQString::fromLatin1("Miranda"); + m_clientName=TQString::tqfromLatin1("Miranda"); DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF); BYTE major1 = ((version >> 24) & 0xFF); @@ -391,25 +391,25 @@ void UserDetails::detectClient() } break; case 0xFFFFFF8FL: - m_clientName = TQString::fromLatin1("StrICQ"); + m_clientName = TQString::tqfromLatin1("StrICQ"); break; case 0xFFFFFF42L: - m_clientName = TQString::fromLatin1("mICQ"); + m_clientName = TQString::tqfromLatin1("mICQ"); break; case 0xFFFFFFBEL: - m_clientName = TQString::fromLatin1("alicq"); + m_clientName = TQString::tqfromLatin1("alicq"); break; case 0xFFFFFF7FL: - m_clientName = TQString::fromLatin1("&RQ"); + m_clientName = TQString::tqfromLatin1("&RQ"); break; case 0xFFFFFFABL: - m_clientName = TQString::fromLatin1("YSM"); + m_clientName = TQString::tqfromLatin1("YSM"); break; case 0x3AA773EEL: if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) && (m_dcLastExtInfoUpdateTime == 0x3A877A42L)) { - m_clientName=TQString::fromLatin1("libicq2000"); + m_clientName=TQString::tqfromLatin1("libicq2000"); } break; default: @@ -427,48 +427,48 @@ void UserDetails::detectClient() switch (m_dcProtoVersion) { case 10: - m_clientName=TQString::fromLatin1("ICQ 2003b"); + m_clientName=TQString::tqfromLatin1("ICQ 2003b"); break; case 9: - m_clientName=TQString::fromLatin1("ICQ Lite"); + m_clientName=TQString::tqfromLatin1("ICQ Lite"); break; case 8: - m_clientName=TQString::fromLatin1("Miranda"); + m_clientName=TQString::tqfromLatin1("Miranda"); break; default: - m_clientName=TQString::fromLatin1("ICQ2go"); + m_clientName=TQString::tqfromLatin1("ICQ2go"); } } else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ { - m_clientName = TQString::fromLatin1("Gaim"); + m_clientName = TQString::tqfromLatin1("Gaim"); } else if (hasCap(CAP_XTRAZ)) { - m_clientName = TQString::fromLatin1("ICQ 4.0 Lite"); + m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_IS_2001)) { - m_clientName = TQString::fromLatin1( "ICQ 2001"); + m_clientName = TQString::tqfromLatin1( "ICQ 2001"); } else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) && hasCap(CAP_STR_2002)) { - m_clientName = TQString::fromLatin1("ICQ 2002"); + m_clientName = TQString::tqfromLatin1("ICQ 2002"); } else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) && hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName = TQString::fromLatin1("ICQ 2003a"); + m_clientName = TQString::tqfromLatin1("ICQ 2003a"); } else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ)) { - m_clientName =TQString::fromLatin1("ICQ 2001b"); + m_clientName =TQString::tqfromLatin1("ICQ 2001b"); } else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS)) { - m_clientName = TQString::fromLatin1("GnomeICU"); + m_clientName = TQString::tqfromLatin1("GnomeICU"); } } @@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud ) } if ( ud.m_extendedStatusSpecified ) { - m_extendedStatus = ud.m_extendedStatus; + m_extendedtqStatus = ud.m_extendedtqStatus; m_extendedStatusSpecified = true; } if ( ud.m_capabilitiesSpecified ) diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h index 8835f6f9..367d8999 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 extendedStatus() const; //!User status accessor + DWORD extendedtqStatus() 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_extendedStatus; /// the extended status of the contact - TLV 0x06 + DWORD m_extendedtqStatus; /// 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/liboscar/userinfotask.cpp b/kopete/protocols/oscar/liboscar/userinfotask.cpp index 66197316..4cda87a0 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/userinfotask.cpp @@ -26,8 +26,8 @@ Kopete (c) 2002-2005 by the Kopete developers -UserInfoTask::UserInfoTask( Task* parent ) -: Task( parent ) +UserInfoTask::UserInfoTask( Task* tqparent ) +: Task( tqparent ) { } @@ -44,7 +44,7 @@ bool UserInfoTask::forMe( const Transfer * transfer ) const if ( st->snacService() == 0x0002 && st->snacSubtype() == 0x0006 ) { - if ( m_contactSequenceMap.find( st->snacRequest() ) == m_contactSequenceMap.end() ) + if ( m_contactSequenceMap.tqfind( st->snacRequest() ) == m_contactSequenceMap.end() ) return false; else { @@ -61,7 +61,7 @@ bool UserInfoTask::take( Transfer * transfer ) if ( forMe( transfer ) ) { setTransfer( transfer ); - Q_UINT16 seq = 0; + TQ_UINT16 seq = 0; SnacTransfer* st = dynamic_cast( transfer ); if ( st ) seq = st->snacRequest(); @@ -135,7 +135,7 @@ void UserInfoTask::onGo() void UserInfoTask::requestInfoFor( const TQString& contact, unsigned int types ) { - Q_UINT16 seq = client()->snacSequence(); + TQ_UINT16 seq = client()->snacSequence(); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting sequence " << seq << " for contact " << contact << endl; m_contactSequenceMap[seq] = contact; m_typesSequenceMap[seq] = types; @@ -143,7 +143,7 @@ void UserInfoTask::requestInfoFor( const TQString& contact, unsigned int types ) onGo(); } -UserDetails UserInfoTask::getInfoFor( Q_UINT16 sequence ) const +UserDetails UserInfoTask::getInfoFor( TQ_UINT16 sequence ) const { return m_sequenceInfoMap[sequence]; } diff --git a/kopete/protocols/oscar/liboscar/userinfotask.h b/kopete/protocols/oscar/liboscar/userinfotask.h index 4b973a04..4eadc90c 100644 --- a/kopete/protocols/oscar/liboscar/userinfotask.h +++ b/kopete/protocols/oscar/liboscar/userinfotask.h @@ -33,8 +33,9 @@ Handles user information requests that are done via SNAC 02,05 and 02,06 class UserInfoTask : public Task { Q_OBJECT + TQ_OBJECT public: - UserInfoTask( Task* parent ); + UserInfoTask( Task* tqparent ); ~UserInfoTask(); enum { Profile = 0x0001, General = 0x0002, AwayMessage = 0x0003, Capabilities = 0x0004 }; @@ -45,20 +46,20 @@ public: void onGo(); void requestInfoFor( const TQString& userId, unsigned int types ); - UserDetails getInfoFor( Q_UINT16 sequence ) const; - TQString contactForSequence( Q_UINT16 sequence ) const; + UserDetails getInfoFor( TQ_UINT16 sequence ) const; + TQString contactForSequence( TQ_UINT16 sequence ) const; signals: - void gotInfo( Q_UINT16 seqNumber ); + void gotInfo( TQ_UINT16 seqNumber ); void receivedProfile( const TQString& contact, const TQString& profile ); void receivedAwayMessage( const TQString& contact, const TQString& message ); private: - TQMap m_sequenceInfoMap; - TQMap m_contactSequenceMap; - TQMap m_typesSequenceMap; - Q_UINT16 m_seq; + TQMap m_sequenceInfoMap; + TQMap m_contactSequenceMap; + TQMap m_typesSequenceMap; + TQ_UINT16 m_seq; }; diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.cpp b/kopete/protocols/oscar/liboscar/usersearchtask.cpp index 545706a5..a386d8cf 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.cpp +++ b/kopete/protocols/oscar/liboscar/usersearchtask.cpp @@ -22,8 +22,8 @@ #include "buffer.h" #include "connection.h" -UserSearchTask::UserSearchTask( Task* parent ) - : ICQTask( parent ) +UserSearchTask::UserSearchTask( Task* tqparent ) + : ICQTask( tqparent ) { } @@ -61,7 +61,7 @@ bool UserSearchTask::take( Transfer* t ) { setTransfer( t ); - Q_UINT16 seq = 0; + TQ_UINT16 seq = 0; SnacTransfer* st = dynamic_cast( t ); if ( st ) seq = st->snacRequest(); @@ -98,7 +98,7 @@ bool UserSearchTask::take( Transfer* t ) { int moreUsersCount = buffer->getLEDWord(); emit searchFinished( moreUsersCount ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); } setTransfer( 0 ); } @@ -312,4 +312,4 @@ void UserSearchTask::searchWhitePages( const ICQWPSearchInfo& info ) #include "usersearchtask.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/oscar/liboscar/usersearchtask.h b/kopete/protocols/oscar/liboscar/usersearchtask.h index 781a311a..4cef65d0 100644 --- a/kopete/protocols/oscar/liboscar/usersearchtask.h +++ b/kopete/protocols/oscar/liboscar/usersearchtask.h @@ -31,8 +31,9 @@ Search for contacts class UserSearchTask : public ICQTask { Q_OBJECT + TQ_OBJECT public: - UserSearchTask( Task* parent ); + UserSearchTask( Task* tqparent ); ~UserSearchTask(); @@ -54,7 +55,7 @@ signals: private: TQValueList m_results; TQString m_uin; - Q_UINT16 m_seq; + TQ_UINT16 m_seq; SearchType m_type; }; diff --git a/kopete/protocols/oscar/liboscar/warningtask.cpp b/kopete/protocols/oscar/liboscar/warningtask.cpp index 7b895b5c..00a0294d 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.cpp +++ b/kopete/protocols/oscar/liboscar/warningtask.cpp @@ -23,7 +23,7 @@ #include "transfer.h" #include "connection.h" -WarningTask::WarningTask( Task* parent ): Task( parent ) +WarningTask::WarningTask( Task* tqparent ): Task( tqparent ) { } @@ -65,13 +65,13 @@ bool WarningTask::take( Transfer* transfer ) kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Warning level increased " << m_increase << " to " << m_newLevel << endl; emit userWarned( m_contact, m_increase, m_newLevel ); - setSuccess( 0, TQString::null ); + setSuccess( 0, TQString() ); setTransfer( 0 ); return true; } else { - setError( 0, TQString::null ); + setError( 0, TQString() ); return false; } } @@ -91,6 +91,6 @@ void WarningTask::onGo() send( t ); } -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; #include "warningtask.moc" diff --git a/kopete/protocols/oscar/liboscar/warningtask.h b/kopete/protocols/oscar/liboscar/warningtask.h index af56968c..d5e720be 100644 --- a/kopete/protocols/oscar/liboscar/warningtask.h +++ b/kopete/protocols/oscar/liboscar/warningtask.h @@ -29,8 +29,9 @@ class WarningTask : public Task { Q_OBJECT + TQ_OBJECT public: - WarningTask( Task* parent ); + WarningTask( Task* tqparent ); ~WarningTask(); void setContact( const TQString& contact ); @@ -44,7 +45,7 @@ public: virtual void onGo(); signals: - void userWarned( const TQString&, Q_UINT16, Q_UINT16 ); + void userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ); private: TQString m_contact; @@ -56,4 +57,4 @@ private: #endif -//kate: indent-mode csands; space-indent off; replace-tabs off; tab-width 4; +//kate: indent-mode csands; space-indent off; tqreplace-tabs off; tab-width 4; diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 2a9b4e82..4ff71b1c 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -69,7 +69,7 @@ public: //The liboscar hook for the account Client* engine; - Q_UINT32 ssiLastModTime; + TQ_UINT32 ssiLastModTime; //contacts waiting on SSI add ack and their metacontact TQMap addContactMap; @@ -94,8 +94,8 @@ public: } }; -OscarAccount::OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name, bool isICQ) -: Kopete::PasswordedAccount( parent, accountID, isICQ ? 8 : 16, name ) +OscarAccount::OscarAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name, bool isICQ) +: Kopete::PasswordedAccount( tqparent, accountID, isICQ ? 8 : 16, name ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << " accountID='" << accountID << "', isICQ=" << isICQ << endl; @@ -245,7 +245,7 @@ void OscarAccount::processSSIList() oc->setSSIItem( item ); } else - addContact( ( *bit ).name(), TQString::null, group, Kopete::Account::DontChangeKABC ); + addContact( ( *bit ).name(), TQString(), group, Kopete::Account::DontChangeKABC ); } TQObject::connect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), @@ -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::fromLatin1("ShowMissingContactsDialog"), true); + bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::tqfromLatin1("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::fromLatin1("ShowMissingContactsDialog") , !showOnce); + configGroup()->writeEntry( TQString::tqfromLatin1("ShowMissingContactsDialog") , !showOnce); configGroup()->sync(); d->olnscDialog->delayedDestruct(); @@ -389,7 +389,7 @@ void OscarAccount::messageReceived( const Oscar::Message& message ) if ( !contacts()[sender] ) { kdDebug(OSCAR_RAW_DEBUG) << "Adding '" << sender << "' as temporary contact" << endl; - addContact( sender, TQString::null, 0, Kopete::Account::Temporary ); + addContact( sender, TQString(), 0, Kopete::Account::Temporary ); } OscarContact* ocSender = static_cast ( contacts()[sender] ); //should exist now @@ -429,15 +429,15 @@ void OscarAccount::messageReceived( const Oscar::Message& message ) void OscarAccount::setServerAddress(const TQString &server) { - configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server ); } void OscarAccount::setServerPort(int port) { if ( port > 0 ) - configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port ); else //set to default 5190 - configGroup()->writeEntry( TQString::fromLatin1( "Port" ), 5190 ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), 5190 ); } TQTextCodec* OscarAccount::defaultCodec() const @@ -475,7 +475,7 @@ void OscarAccount::setBuddyIcon( KURL url ) const TQSize size = ( d->engine->isIcq() ) ? TQSize( 52, 64 ) : TQSize( 48, 48 ); - image = image.smoothScale( size, TQImage::ScaleMax ); + image = image.smoothScale( size, TQ_ScaleMax ); if( image.width() > size.width()) image = image.copy( ( image.width() - size.width() ) / 2, 0, size.width(), image.height() ); @@ -555,7 +555,7 @@ Connection* OscarAccount::setupConnection( const TQString& server, uint port ) bool OscarAccount::createContact(const TQString &contactId, - Kopete::MetaContact *parentContact) + Kopete::MetaContact *tqparentContact) { /* We're not even online or connecting * (when getting server contacts), so don't bother @@ -577,10 +577,10 @@ bool OscarAccount::createContact(const TQString &contactId, */ TQValueList dummyList; - if ( parentContact->isTemporary() ) + if ( tqparentContact->isTemporary() ) { SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 ); - return createNewContact( contactId, parentContact, tempItem ); + return createNewContact( contactId, tqparentContact, tempItem ); } SSI ssiItem = d->engine->ssiManager()->findContact( contactId ); @@ -597,7 +597,7 @@ bool OscarAccount::createContact(const TQString &contactId, else { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Didn't find contact in list, creating new contact" << endl; - return createNewContact( contactId, parentContact, ssiItem ); + return createNewContact( contactId, tqparentContact, ssiItem ); } } else @@ -608,7 +608,7 @@ bool OscarAccount::createContact(const TQString &contactId, kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Adding " << contactId << " to server side list" << endl; TQString groupName; - Kopete::GroupList kopeteGroups = parentContact->groups(); //get the group list + Kopete::GroupList kopeteGroups = tqparentContact->groups(); //get the group list if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() ) { @@ -617,7 +617,7 @@ bool OscarAccount::createContact(const TQString &contactId, } else { - //apparently kopeteGroups.first() can be invalid. Attempt to prevent + //aptqparently kopeteGroups.first() can be invalid. Attempt to prevent //crashes in SSIData::findGroup(const TQString& name) groupName = kopeteGroups.first() ? kopeteGroups.first()->displayName() : i18n("Buddies"); @@ -631,7 +631,7 @@ bool OscarAccount::createContact(const TQString &contactId, return false; } - d->addContactMap[Oscar::normalize( contactId )] = parentContact; + d->addContactMap[Oscar::normalize( contactId )] = tqparentContact; addContactToSSI( Oscar::normalize( contactId ), groupName, true ); return true; } @@ -644,7 +644,7 @@ void OscarAccount::updateVersionUpdaterStamp() void OscarAccount::ssiContactAdded( const Oscar::SSI& item ) { - if ( d->addContactMap.contains( Oscar::normalize( item.name() ) ) ) + if ( d->addContactMap.tqcontains( Oscar::normalize( item.name() ) ) ) { kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Received confirmation from server. adding " << item.name() << " to the contact list" << endl; @@ -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" ).arg( accountId() ), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), errString, - myself()->onlineStatus().protocolIcon(), + myself()->onlinetqStatus().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" ).arg( accountId() ), - message, myself()->onlineStatus().protocolIcon(), + KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ), + message, myself()->onlinetqStatus().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()->onlineStatus().protocolIcon(), + KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlinetqStatus().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.") - .arg( acctDescription ).arg( accountId() ); + .tqarg( acctDescription ).tqarg( 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.") - .arg( acctDescription ).arg( accountId() ); + .tqarg( acctDescription ).tqarg( accountId() ); } break; case 0x0002: // Service temporarily unavailable case 0x0014: // Reservation map error reason = i18n("The %1 service is temporarily unavailable. Please try again later.") - .arg( acctType ); + .tqarg( 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.").arg( acctType ).arg( accountId() ); + "password was incorrect.").tqarg( acctType ).tqarg( accountId() ); break; case 0x0007: // non-existant ICQ# case 0x0008: // non-existant ICQ# reason = i18n("Could not sign on to %1 with nonexistent account %2.") - .arg( acctType ).arg( accountId() ); + .tqarg( acctType ).tqarg( accountId() ); break; case 0x0009: // Expired account reason = i18n("Sign on to %1 failed because your account %2 expired.") - .arg( acctType ).arg( accountId() ); + .tqarg( acctType ).tqarg( accountId() ); break; case 0x0011: // Suspended account reason = i18n("Sign on to %1 failed because your account %2 is " \ - "currently suspended.").arg( acctType ).arg( accountId() ); + "currently suspended.").tqarg( acctType ).tqarg( 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.").arg( acctType ); + " from the same computer.").tqarg( 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.") - .arg( accountId() ).arg( acctType ); + .tqarg( accountId() ).tqarg( 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.") - .arg( accountId() ).arg( acctType) ; + .tqarg( accountId() ).tqarg( 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.") - .arg( acctType ).arg( accountId() ); + .tqarg( acctType ).tqarg( 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") - .arg( acctType ); + .tqarg( 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).") - .arg( accountId() ).arg( acctType ); + .tqarg( accountId() ).tqarg( acctType ); break; default: if ( !isConnected() ) { reason = i18n("Sign on to %1 with your account %2 failed.") - .arg( acctType ).arg( accountId() ); + .tqarg( acctType ).tqarg( accountId() ); } break; } diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h index 9998bed8..bccaa9a1 100644 --- a/kopete/protocols/oscar/oscaraccount.h +++ b/kopete/protocols/oscar/oscaraccount.h @@ -42,9 +42,10 @@ class TQTextCodec; class KDE_EXPORT OscarAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: - OscarAccount(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L, bool isICQ=false); + OscarAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L, bool isICQ=false); virtual ~OscarAccount(); /** Provide the derived accounts and contacts with access to the backend */ @@ -67,7 +68,7 @@ public: /** * Sets the account away */ - virtual void setAway( bool away, const TQString &awayMessage = TQString::null ) = 0; + virtual void setAway( bool away, const TQString &awayMessage = TQString() ) = 0; /** * Accessor method for the action menu @@ -133,16 +134,16 @@ protected: * Adds a contact to a meta contact */ virtual bool createContact(const TQString &contactId, - Kopete::MetaContact *parentContact ); + Kopete::MetaContact *tqparentContact ); /** * Protocols using Oscar must implement this to perform the instantiation * of their contact for Kopete. Called by @ref createContact(). * @param contactId theprotocol unique id of the contact - * @param parentContact the parent metacontact + * @param tqparentContact the tqparent metacontact * @return whether the creation succeeded or not */ - virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0; + virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) = 0; virtual TQString sanitizedMessage( const TQString& message ) = 0; diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index cb9f06c6..e1b63a8f 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -44,8 +44,8 @@ #include OscarContact::OscarContact( Kopete::Account* account, const TQString& name, - Kopete::MetaContact* parent, const TQString& icon, const SSI& ssiItem ) -: Kopete::Contact( account, name, parent, icon ) + Kopete::MetaContact* tqparent, const TQString& icon, const SSI& ssiItem ) +: Kopete::Contact( account, name, tqparent, icon ) { mAccount = static_cast(account); mName = name; @@ -66,7 +66,7 @@ void OscarContact::serialize(TQMap &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::fromLatin1( "true" ) : TQString::fromLatin1( "false" ); + serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::tqfromLatin1( "true" ) : TQString::tqfromLatin1( "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").arg( m_details.clientName() ); + "%1").tqarg( m_details.clientName() ); } } diff --git a/kopete/protocols/oscar/oscarcontact.h b/kopete/protocols/oscar/oscarcontact.h index e2948f1e..6f76567e 100644 --- a/kopete/protocols/oscar/oscarcontact.h +++ b/kopete/protocols/oscar/oscarcontact.h @@ -60,10 +60,11 @@ class KToggleAction; class KDE_EXPORT OscarContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: OscarContact( Kopete::Account* account, const TQString& name, - Kopete::MetaContact* parent, const TQString& icon = TQString::null, const Oscar::SSI& ssiItem = Oscar::SSI() ); + Kopete::MetaContact* tqparent, const TQString& icon = TQString(), const Oscar::SSI& ssiItem = Oscar::SSI() ); virtual ~OscarContact(); diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui index 1388b2d2..bf10a6ca 100644 --- a/kopete/protocols/oscar/oscarencodingselectionbase.ui +++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui @@ -1,6 +1,6 @@ OscarEncodingBaseUI - + OscarEncodingBaseUI @@ -19,7 +19,7 @@ 0 - + textLabel2 @@ -30,7 +30,7 @@ encodingCombo - + encodingCombo @@ -45,7 +45,7 @@ Maximum - + 20 0 @@ -54,5 +54,5 @@ - + diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp index 7a1826cb..10f6edb3 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp @@ -24,8 +24,8 @@ #include #include -OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, int initialEncoding ) - : KDialogBase( parent, 0, false, i18n( "Select Encoding" ), Ok | Cancel ) +OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* tqparent, int initialEncoding ) + : KDialogBase( tqparent, 0, false, i18n( "Select Encoding" ), Ok | Cancel ) { int initialEncodingIndex; @@ -81,7 +81,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, in m_encodings.insert(1015, i18n("UTF-16 Unicode")); m_encodingUI->encodingCombo->insertStringList( m_encodings.values() ); - if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 ) + if( (initialEncodingIndex = m_encodings.keys().tqfindIndex(initialEncoding)) == -1 ) { kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding << " not in encoding list - defaulting to first encoding item" @@ -100,7 +100,7 @@ OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, in int OscarEncodingSelectionDialog::selectedEncoding() const { TQString encoding = m_encodingUI->encodingCombo->currentText(); - int mib = m_encodings.keys()[ m_encodings.values().findIndex(encoding) ]; + int mib = m_encodings.keys()[ m_encodings.values().tqfindIndex(encoding) ]; if( mib == -1 ) return 0; diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.h b/kopete/protocols/oscar/oscarencodingselectiondialog.h index 2ab8d529..12d16fb7 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.h +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.h @@ -27,8 +27,9 @@ class OscarEncodingBaseUI; class KOPETE_EXPORT OscarEncodingSelectionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - OscarEncodingSelectionDialog( TQWidget* parent = 0, int initialEncoding = 4); + OscarEncodingSelectionDialog( TQWidget* tqparent = 0, int initialEncoding = 4); ~OscarEncodingSelectionDialog() {} int selectedEncoding() const; diff --git a/kopete/protocols/oscar/oscarlistcontactsbase.ui b/kopete/protocols/oscar/oscarlistcontactsbase.ui index 7a6d8f85..a5415391 100644 --- a/kopete/protocols/oscar/oscarlistcontactsbase.ui +++ b/kopete/protocols/oscar/oscarlistcontactsbase.ui @@ -1,6 +1,6 @@ OscarListContactsBase - + OscarListContactsBase @@ -16,7 +16,7 @@ unnamed - + textLabel1 @@ -24,7 +24,7 @@ The following contacts are not on your contact list. Would you like to add them? - + notServerContacts @@ -35,7 +35,7 @@ Sunken - + doNotShowAgain @@ -45,5 +45,5 @@ - + diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp index 4529f562..aec5096e 100644 --- a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp +++ b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp @@ -24,8 +24,8 @@ #include #include -OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* parent) - : KDialogBase( parent, 0, false, i18n( "Add Contacts to Server List" ), +OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* tqparent) + : KDialogBase( tqparent, 0, false, i18n( "Add Contacts to Server List" ), Ok | Cancel ) { m_contactsList = new OscarListContactsBase( this ); diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.h b/kopete/protocols/oscar/oscarlistnonservercontacts.h index 8975dd20..ffdfe692 100644 --- a/kopete/protocols/oscar/oscarlistnonservercontacts.h +++ b/kopete/protocols/oscar/oscarlistnonservercontacts.h @@ -28,8 +28,9 @@ class TQStringList; class KOPETE_EXPORT OscarListNonServerContacts : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - OscarListNonServerContacts( TQWidget* parent ); + OscarListNonServerContacts( TQWidget* tqparent ); ~OscarListNonServerContacts(); void addContacts( const TQStringList& contactList ); diff --git a/kopete/protocols/oscar/oscarmyselfcontact.h b/kopete/protocols/oscar/oscarmyselfcontact.h index 3e3eabe4..922637e5 100644 --- a/kopete/protocols/oscar/oscarmyselfcontact.h +++ b/kopete/protocols/oscar/oscarmyselfcontact.h @@ -37,6 +37,7 @@ class KToggleAction; class KDE_EXPORT OscarMyselfContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: OscarMyselfContact( OscarAccount* account ); diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 92c7a5e2..90981434 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -223,15 +223,15 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; // clear structure - version.clientString = TQString::null; + version.clientString = TQString(); version.clientId = 0x0000; version.major = 0x0000; version.minor = 0x0000; version.point = 0x0000; version.build = 0x0000; version.other = 0x00000000; - version.country = TQString::null; - version.lang = TQString::null; + version.country = TQString(); + version.lang = TQString(); TQDomElement versionChild = element.firstChild().toElement(); while ( !versionChild.isNull() ) diff --git a/kopete/protocols/oscar/oscarversionupdater.h b/kopete/protocols/oscar/oscarversionupdater.h index c89b4b90..0bfbc4c4 100644 --- a/kopete/protocols/oscar/oscarversionupdater.h +++ b/kopete/protocols/oscar/oscarversionupdater.h @@ -34,9 +34,10 @@ class TQDomDocument; @author Roman Jarosz */ -class OscarVersionUpdater : public QObject +class OscarVersionUpdater : public TQObject { Q_OBJECT + TQ_OBJECT public: OscarVersionUpdater(); diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui index a6b98799..fe70ffe1 100644 --- a/kopete/protocols/oscar/oscarvisibilitybase.ui +++ b/kopete/protocols/oscar/oscarvisibilitybase.ui @@ -1,6 +1,6 @@ OscarVisibilityBase - + OscarVisibilityBase @@ -16,7 +16,7 @@ unnamed - + textLabel2 @@ -24,7 +24,7 @@ Always visible: - + textLabel1 @@ -32,7 +32,7 @@ Contacts: - + contacts @@ -47,14 +47,14 @@ Expanding - + 31 40 - + visibleAdd @@ -62,7 +62,7 @@ Add - + visibleRemove @@ -80,19 +80,19 @@ Expanding - + 21 40 - + visibleContacts - + invisibleRemove @@ -110,14 +110,14 @@ Expanding - + 21 40 - + invisibleAdd @@ -125,7 +125,7 @@ Add - + invisibleContacts @@ -140,14 +140,14 @@ Expanding - + 21 40 - + textLabel3 @@ -166,5 +166,5 @@ visibleContacts invisibleContacts - + diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index 77f3894a..c2fa021e 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -25,8 +25,8 @@ #include "client.h" -OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* parent ) - : KDialogBase( parent, 0, false, i18n( "Add Contacts to Visible or Invisible List" ), +OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* tqparent ) + : KDialogBase( tqparent, 0, false, i18n( "Add Contacts to Visible or Invisible List" ), Ok | Cancel ), m_client( client ) { m_visibilityUI = new OscarVisibilityBase( this ); @@ -70,7 +70,7 @@ void OscarVisibilityDialog::slotAddToVisible() TQString contactId = m_contactMap[itm->text()]; m_visibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->visibleContacts->findItem( itm->text(), Qt::CaseSensitive | Qt::ExactMatch ) ) + if ( !m_visibilityUI->visibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->visibleContacts->insertItem( itm->text() ); } @@ -94,7 +94,7 @@ void OscarVisibilityDialog::slotAddToInvisible() TQString contactId = m_contactMap[itm->text()]; m_invisibleListChangesMap[contactId] = Add; - if ( !m_visibilityUI->invisibleContacts->findItem( itm->text(), Qt::CaseSensitive | Qt::ExactMatch ) ) + if ( !m_visibilityUI->invisibleContacts->tqfindItem( itm->text(), TQt::CaseSensitive | TQt::ExactMatch ) ) m_visibilityUI->invisibleContacts->insertItem( itm->text() ); } diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.h b/kopete/protocols/oscar/oscarvisibilitydialog.h index 874a1e08..114b36f8 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.h +++ b/kopete/protocols/oscar/oscarvisibilitydialog.h @@ -30,10 +30,11 @@ class Client; class KOPETE_EXPORT OscarVisibilityDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: typedef TQMap ContactMap; - OscarVisibilityDialog( Client* client, TQWidget* parent ); + OscarVisibilityDialog( Client* client, TQWidget* tqparent ); ~OscarVisibilityDialog() {} void addContacts( const ContactMap& contacts ); diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index 0ebbe7fa..b3f497be 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.").arg(name), + KMessageBox::sorry(Kopete::UI::Global::mainWidget(), i18n("Could not load service %1.").tqarg(name), i18n("Error Loading Service")); s = 0L; } diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index 7f129473..35d7c274 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -67,10 +67,10 @@ void GSMLibEvent::setSubType(GSMLibEvent::SubType t) } ///////////////////////////////////////////////////////////////////// -GSMLibThread::GSMLibThread(TQString dev, GSMLib* parent) +GSMLibThread::GSMLibThread(TQString dev, GSMLib* tqparent) { m_device = dev; - m_parent = parent; + m_parent = tqparent; m_run = true; m_MeTa = NULL; } @@ -308,7 +308,7 @@ void GSMLib::saveConfig() { KConfigGroup* c = m_account->configGroup(); - c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device); + c->writeEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), m_device); } } @@ -320,8 +320,8 @@ void GSMLib::loadConfig() TQString temp; KConfigGroup* c = m_account->configGroup(); - temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString::null); - if( temp != TQString::null ) + temp = c->readEntry(TQString("%1:%2").tqarg("GSMLib").tqarg("Device"), TQString()); + if( temp != TQString() ) m_device = temp; } } @@ -348,12 +348,12 @@ void GSMLib::disconnect() } -void GSMLib::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void GSMLib::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - m_parent = parent; - m_layout = layout; - TQWidget *configWidget = configureWidget(parent); - layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + m_parent = tqparent; + m_layout = tqlayout; + TQWidget *configWidget = configureWidget(tqparent); + tqlayout->addMultiCellWidget(configWidget, 0, 1, 0, 1); configWidget->show(); } @@ -362,11 +362,11 @@ void GSMLib::send(const Kopete::Message& msg) m_thread->send(msg); } -TQWidget* GSMLib::configureWidget(TQWidget* parent) +TQWidget* GSMLib::configureWidget(TQWidget* tqparent) { if (prefWidget == 0L) - prefWidget = new GSMLibPrefsUI(parent); + prefWidget = new GSMLibPrefsUI(tqparent); loadConfig(); prefWidget->device->setURL(m_device); @@ -419,7 +419,7 @@ void GSMLib::customEvent(TQCustomEvent* e) TQString text = ge->Text; // Locate a contact - SMSContact* contact = static_cast( m_account->contacts().find( nr )); + SMSContact* contact = static_cast( m_account->contacts().tqfind( nr )); if ( contact==NULL ) { // No contact found, make a new one @@ -444,7 +444,7 @@ void GSMLib::customEvent(TQCustomEvent* e) const TQString& GSMLib::description() { TQString url = "http://www.pxh.de/fs/gsmlib/"; - m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").arg(url).arg(url); + m_description = i18n("GSMLib is a library (and utilities) for sending SMS via a GSM device. The program can be found on %1").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index b3c9951f..a3f01995 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -46,12 +46,13 @@ class GSMLibThread; class GSMLib : public SMSService { Q_OBJECT + TQ_OBJECT public: GSMLib(Kopete::Account* account); ~GSMLib(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -66,7 +67,7 @@ public slots: protected: virtual void customEvent(TQCustomEvent* e); - TQWidget* configureWidget(TQWidget* parent); + TQWidget* configureWidget(TQWidget* tqparent); void saveConfig(); void loadConfig(); @@ -83,7 +84,7 @@ protected: /// Custom event for async-events -class GSMLibEvent : public QCustomEvent +class GSMLibEvent : public TQCustomEvent { public: enum SubType { CONNECTED, DISCONNECTED, NEW_MESSAGE, MSG_SENT, MSG_NOT_SENT }; @@ -107,7 +108,7 @@ protected: class GSMLibThread : public TQThread, gsmlib::GsmEvent { public: - GSMLibThread(TQString dev, GSMLib* parent); + GSMLibThread(TQString dev, GSMLib* tqparent); virtual ~GSMLibThread(); virtual void run(); diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index 108f6326..49545bc5 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -1,6 +1,6 @@ GSMLibPrefsUI - + GSMLibPrefsUI @@ -29,14 +29,14 @@ Expanding - + 321 16 - + textLabel8 @@ -63,15 +63,15 @@ Horizontal - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -91,7 +91,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index c40f831b..e8650de0 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -280,13 +280,13 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, // for the first call getLine() waits only 3 seconds // because of _timeoutVal = 3 string s = getLine(); - if (s.find("OK") != string::npos || - s.find("CABLE: GSM") != string::npos) + if (s.tqfind("OK") != string::npos || + s.tqfind("CABLE: GSM") != string::npos) { foundOK = true; readTries = 0; // found OK, exit loop } - else if (s.find("ERROR") != string::npos) + else if (s.tqfind("ERROR") != string::npos) readTries = 0; // error, exit loop } @@ -301,8 +301,8 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, while (readTries-- > 0) { string s = getLine(); - if (s.find("OK") != string::npos || - s.find("CABLE: GSM") != string::npos) + if (s.tqfind("OK") != string::npos || + s.tqfind("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); diff --git a/kopete/protocols/sms/services/kopete_unix_serial.h b/kopete/protocols/sms/services/kopete_unix_serial.h index fb1d73c4..048e8ce8 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.h +++ b/kopete/protocols/sms/services/kopete_unix_serial.h @@ -32,7 +32,7 @@ namespace gsmlib class KopeteUnixSerialPort : public TQObject, public Port { - Q_OBJECT; + TQ_OBJECT; protected: int _fd; // file descriptor for device diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 17a27066..b45793d1 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -41,13 +41,13 @@ SMSClient::~SMSClient() { } -void SMSClient::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void SMSClient::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; - m_parent = parent; - m_layout = layout; - TQWidget *configWidget = configureWidget(parent); - layout->addMultiCellWidget(configWidget, 0, 1, 0, 1); + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; + m_parent = tqparent; + m_layout = tqlayout; + TQWidget *configWidget = configureWidget(tqparent); + tqlayout->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").arg("SMSClient").arg("ProviderName"), TQString::null); + TQString provider = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProviderName"), TQString()); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"). TQString::null); + TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -87,25 +87,25 @@ void SMSClient::send(const Kopete::Message& msg) p->start(KProcess::Block, KProcess::AllOutput); } -TQWidget* SMSClient::configureWidget(TQWidget* parent) +TQWidget* SMSClient::configureWidget(TQWidget* tqparent) { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be ok if zero!!)" << endl; if (prefWidget == 0L) - prefWidget = new SMSClientPrefsUI(parent); + prefWidget = new SMSClientPrefsUI(tqparent); prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString::null); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").arg("SMSClient").arg("ProgramName"), - TQString::null); + programName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), + TQString()); if (programName.isNull()) programName = "/usr/bin/sms_client"; prefWidget->program->setURL(programName); @@ -114,7 +114,7 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) if (m_account) { - TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); + TQString pName = m_account->configGroup()->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("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").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()); + 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()); } } @@ -147,7 +147,7 @@ TQStringList SMSClient::providers() TQStringList p; TQDir d; - d.setPath(TQString("%1/services/").arg(prefWidget->configDir->url())); + d.setPath(TQString("%1/services/").tqarg(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("SMSClient is a program for sending SMS with the modem. The program can be found on %1").arg(url).arg(url); + m_description = i18n("SMSClient is a program for sending SMS with the modem. The program can be found on %1").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smsclient.h b/kopete/protocols/sms/services/smsclient.h index 00ad5041..f922a011 100644 --- a/kopete/protocols/sms/services/smsclient.h +++ b/kopete/protocols/sms/services/smsclient.h @@ -31,12 +31,13 @@ class KProcess; class SMSClient : public SMSService { Q_OBJECT + TQ_OBJECT public: SMSClient(Kopete::Account* account); ~SMSClient(); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); @@ -51,7 +52,7 @@ signals: void messageSent(const Kopete::Message &); private: - TQWidget* configureWidget(TQWidget* parent); + TQWidget* configureWidget(TQWidget* tqparent); SMSClientPrefsUI* prefWidget; TQStringList providers(); diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 363081e3..40dffc4e 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -1,6 +1,6 @@ SMSClientPrefsUI - + SMSClientPrefsUI @@ -29,14 +29,14 @@ Expanding - + 321 16 - + textLabel8 @@ -63,15 +63,15 @@ Horizontal - + - layout13 + tqlayout13 unnamed - + textLabel1 @@ -82,7 +82,7 @@ program - + textLabel3 @@ -103,12 +103,12 @@ configDir - + provider - + textLabel2 @@ -123,7 +123,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 2e843dea..8249948a 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -50,7 +50,7 @@ SMSSend::~SMSSend() void SMSSend::send(const Kopete::Message& msg) { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; - TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + TQString provider = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); if (provider.length() < 1) { @@ -58,7 +58,7 @@ void SMSSend::send(const Kopete::Message& msg) return; } - TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) { KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("No prefix set for SMSSend, please change it in the configuration dialog."), i18n("No Prefix")); @@ -73,23 +73,23 @@ void SMSSend::send(const Kopete::Message& msg) m_provider->send(msg); } -void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) +void SMSSend::setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) { - kdWarning( 14160 ) << k_funcinfo << "ml: " << layout << ", " << "mp: " << parent << endl; - m_parent = parent; - m_layout = layout; + kdWarning( 14160 ) << k_funcinfo << "ml: " << tqlayout << ", " << "mp: " << tqparent << endl; + m_parent = tqparent; + m_layout = tqlayout; // could end up being deleted twice?? delete prefWidget; - prefWidget = new SMSSendPrefsUI(parent); - layout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); + prefWidget = new SMSSendPrefsUI(tqparent); + tqlayout->addMultiCellWidget(prefWidget, 0, 1, 0, 1); prefWidget->program->setMode(KFile::Directory); - TQString prefix = TQString::null; + TQString prefix = TQString(); if (m_account) - prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) { TQDir d("/usr/share/smssend"); @@ -140,7 +140,7 @@ void SMSSend::loadProviders(const TQString &prefix) TQDir d(prefix + "/share/smssend"); if (!d.exists()) { - setOptions(TQString::null); + setOptions(TQString()); return; } @@ -160,7 +160,7 @@ void SMSSend::loadProviders(const TQString &prefix) bool found = false; if (m_account) - { TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + { TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); for (int i=0; i < prefWidget->provider->count(); i++) { if (prefWidget->provider->text(i) == pName) @@ -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").arg(name)); + prefWidget->providerLabel->setText(i18n("%1 Settings").tqarg(name)); labels.setAutoDelete(true); labels.clear(); @@ -222,10 +222,10 @@ int SMSSend::maxSize() { kdWarning( 14160 ) << k_funcinfo << "m_account = " << m_account << " (should be non-zero!!)" << endl; - TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString::null); + TQString pName = m_account->configGroup()->readEntry("SMSSend:ProviderName", TQString()); if (pName.length() < 1) return 160; - TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString::null); + TQString prefix = m_account->configGroup()->readEntry("SMSSend:Prefix", TQString()); if (prefix.isNull()) prefix = "/usr"; // quick sanity check @@ -237,7 +237,7 @@ int SMSSend::maxSize() const TQString& SMSSend::description() { TQString url = "http://zekiller.skytech.org/smssend_en.php"; - m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").arg(url).arg(url); + m_description = i18n("SMSSend is a program for sending SMS through gateways on the web. It can be found on %2").tqarg(url).tqarg(url); return m_description; } diff --git a/kopete/protocols/sms/services/smssend.h b/kopete/protocols/sms/services/smssend.h index 2ffd4fd5..14adbd20 100644 --- a/kopete/protocols/sms/services/smssend.h +++ b/kopete/protocols/sms/services/smssend.h @@ -33,6 +33,7 @@ class TQGridLayout; class SMSSend : public SMSService { Q_OBJECT + TQ_OBJECT public: SMSSend(Kopete::Account* account); ~SMSSend(); @@ -40,7 +41,7 @@ public: virtual void setAccount(Kopete::Account* account); void send(const Kopete::Message& msg); - void setWidgetContainer(TQWidget* parent, TQGridLayout* container); + void setWidgetContainer(TQWidget* tqparent, TQGridLayout* container); int maxSize(); const TQString& description(); diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index faf3a306..b9b1b06a 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -1,6 +1,6 @@ SMSSendPrefsUI - + SMSSendPrefsUI @@ -29,14 +29,14 @@ Expanding - + 311 16 - + textLabel7_2 @@ -63,15 +63,15 @@ Horizontal - + - layout12 + tqlayout12 unnamed - + provider @@ -89,7 +89,7 @@ - + textLabel2 @@ -108,7 +108,7 @@ provider - + textLabel1 @@ -139,14 +139,14 @@ Expanding - + 351 16 - + providerLabel @@ -179,7 +179,7 @@ program provider - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 5f0f37ee..c886cb3d 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -32,8 +32,8 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent, const char *name) - : TQObject( parent, name ), m_account(account) +SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent, const char *name) + : TQObject( tqparent, name ), m_account(account) { kdWarning( 14160 ) << k_funcinfo << "this = " << this << ", m_account = " << m_account << " (should be ok if zero!!)" << endl; @@ -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").arg(provider); + TQString group = TQString("SMSSend-%1").tqarg(provider); bool exactNumberMatch = false; TQStringList numberWords; numberWords.append("Tel"); @@ -71,7 +71,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p TQStringList args = TQStringList::split(':',s); TQStringList options = TQStringList::split(' ', args[0]); - names.append(options[0].replace(0,1,"")); + names.append(options[0].tqreplace(0,1,"")); bool hidden = false; for(unsigned i = 1; i < options.count(); i++) @@ -87,21 +87,21 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p descriptions.append(args[1]); if (m_account) - values.append(m_account->configGroup()->readEntry(TQString("%1:%2").arg(group).arg(names[names.count()-1]), - TQString::null)); + values.append(m_account->configGroup()->readEntry(TQString("%1:%2").tqarg(group).tqarg(names[names.count()-1]), + TQString())); else values.append(""); - if( args[0].contains("Message") || args[0].contains("message") - || args[0].contains("message") || args[0].contains("nachricht") - || args[0].contains("Msg") || args[0].contains("Mensagem") ) + if( args[0].tqcontains("Message") || args[0].tqcontains("message") + || args[0].tqcontains("message") || args[0].tqcontains("nachricht") + || args[0].tqcontains("Msg") || args[0].tqcontains("Mensagem") ) { for( unsigned i = 0; i < options.count(); i++) { - if (options[i].contains("Size=")) + if (options[i].tqcontains("Size=")) { TQString option = options[i]; - option.replace(0,5,""); + option.tqreplace(0,5,""); m_maxSize = option.toInt(); } } @@ -111,7 +111,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p { for (TQStringList::Iterator it=numberWords.begin(); it != numberWords.end(); ++it) { - if (args[0].contains(*it)) + if (args[0].tqcontains(*it)) { telPos = names.count() - 1; if (args[0] == *it) @@ -119,7 +119,7 @@ SMSSendProvider::SMSSendProvider(const TQString& providerName, const TQString& p // kdDebug(14160) << "Exact match for " << args[0] << endl; exactNumberMatch = true; } -// kdDebug(14160) << "args[0] (" << args[0] << ") contains " << *it << endl; +// kdDebug(14160) << "args[0] (" << args[0] << ") tqcontains " << *it << endl; } } } @@ -150,7 +150,7 @@ void SMSSendProvider::setAccount(Kopete::Account *account) const TQString& SMSSendProvider::name(int i) { if ( telPos == i || messagePos == i) - return TQString::null; + return TQString(); else return names[i]; } @@ -175,7 +175,7 @@ void SMSSendProvider::save(TQPtrList& 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").arg(provider); + TQString group = TQString("SMSSend-%1").tqarg(provider); int namesI=0; for (unsigned i=0; i < args.count(); i++) @@ -194,7 +194,7 @@ void SMSSendProvider::save(TQPtrList& 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").arg(group).arg(names[namesI]), values[namesI]); + m_account->configGroup()->writeEntry(TQString("%1:%2").tqarg(group).tqarg(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").arg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; + kdWarning( 14160 ) << "Executing " << TQString("%1/bin/smssend").tqarg(prefix) << " \"" << provider << "\" " << values.join("\" \"") << "\"" << endl; - *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; + *p << TQString("%1/bin/smssend").tqarg(prefix) << provider << values; output = ""; connect( p, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(slotSendFinished(KProcess *))); diff --git a/kopete/protocols/sms/services/smssendprovider.h b/kopete/protocols/sms/services/smssendprovider.h index bd046104..9d899ce8 100644 --- a/kopete/protocols/sms/services/smssendprovider.h +++ b/kopete/protocols/sms/services/smssendprovider.h @@ -33,11 +33,12 @@ class KProcess; namespace Kopete { class Account; } class SMSContact; -class SMSSendProvider : public QObject +class SMSSendProvider : public TQObject { Q_OBJECT + TQ_OBJECT public: - SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* parent = 0, const char* name = 0); + SMSSendProvider(const TQString& providerName, const TQString& prefixValue, Kopete::Account* account, TQObject* tqparent = 0, const char* name = 0); ~SMSSendProvider(); void setAccount(Kopete::Account *account); diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 8fea6a12..f4cf21f5 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -34,14 +34,14 @@ #include "smsprotocol.h" #include "smscontact.h" -SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name ) - : Kopete::Account( parent, accountID, name ) +SMSAccount::SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name ) + : Kopete::Account( tqparent, accountID, name ) { setMyself( new SMSContact(this, accountID, accountID, Kopete::ContactList::self()->myself()) ); loadConfig(); myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - TQString sName = configGroup()->readEntry("ServiceName", TQString::null); + TQString sName = configGroup()->readEntry("ServiceName", TQString()); theService = ServiceLoader::loadService(sName, this); if( theService ) @@ -65,14 +65,14 @@ SMSAccount::~SMSAccount() void SMSAccount::loadConfig() { theSubEnable = configGroup()->readBoolEntry("SubEnable", false); - theSubCode = configGroup()->readEntry("SubCode", TQString::null); + theSubCode = configGroup()->readEntry("SubCode", TQString()); theLongMsgAction = (SMSMsgAction)configGroup()->readNumEntry("MsgAction", 0); } void SMSAccount::translateNumber(TQString &theNumber) { if(theNumber[0] == TQChar('0') && theSubEnable) - theNumber.replace(0, 1, theSubCode); + theNumber.tqreplace(0, 1, theSubCode); } const bool SMSAccount::splitNowMsgTooLong(int msgLength) @@ -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?").arg(max).arg(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?").tqarg(max).tqarg(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 ); - setAllContactsStatus( SMSProtocol::protocol()->SMSOnline ); + setAllContactstqStatus( SMSProtocol::protocol()->SMSOnline ); } void SMSAccount::disconnect() @@ -116,7 +116,7 @@ void SMSAccount::disconnect() void SMSAccount::slotDisconnected() { myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - setAllContactsStatus( SMSProtocol::protocol()->SMSOffline ); + setAllContactstqStatus( SMSProtocol::protocol()->SMSOffline ); } void SMSAccount::slotSendMessage(Kopete::Message &msg) @@ -170,9 +170,9 @@ void SMSAccount::slotSendingFailure(const Kopete::Message &msg, const TQString & } bool SMSAccount::createContact( const TQString &contactId, - Kopete::MetaContact * parentContact ) + Kopete::MetaContact * tqparentContact ) { - if (new SMSContact(this, contactId, parentContact->displayName(), parentContact)) + if (new SMSContact(this, contactId, tqparentContact->displayName(), tqparentContact)) return true; else return false; @@ -186,11 +186,11 @@ KActionMenu* SMSAccount::actionMenu() void SMSAccount::setOnlineStatus( const Kopete::OnlineStatus & status , const TQString &reason) { - if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online ) connect(); - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) disconnect(); - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away ) setAway( true, reason ); } diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index 1df8a63f..7ab7dbd4 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -30,9 +30,10 @@ enum SMSMsgAction { ACT_ASK = 0, ACT_CANCEL, ACT_SPLIT }; class SMSAccount : public Kopete::Account { Q_OBJECT + TQ_OBJECT public: - SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L ); + SMSAccount( SMSProtocol *tqparent, const TQString &accountID, const char *name = 0L ); ~SMSAccount(); virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar @@ -52,7 +53,7 @@ public: public slots: void loadConfig(); - void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString()); public slots: virtual void connect(const Kopete::OnlineStatus& initial= Kopete::OnlineStatus()); @@ -67,7 +68,7 @@ protected slots: protected: - bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); + bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); private: bool theSubEnable; diff --git a/kopete/protocols/sms/smsaddcontactpage.cpp b/kopete/protocols/sms/smsaddcontactpage.cpp index c18e5866..a1be6890 100644 --- a/kopete/protocols/sms/smsaddcontactpage.cpp +++ b/kopete/protocols/sms/smsaddcontactpage.cpp @@ -22,8 +22,8 @@ -SMSAddContactPage::SMSAddContactPage(TQWidget *parent, const char *name ) - : AddContactPage(parent,name) +SMSAddContactPage::SMSAddContactPage(TQWidget *tqparent, const char *name ) + : AddContactPage(tqparent,name) { (new TQVBoxLayout(this))->setAutoAdd(true); smsdata = new smsAddUI(this); diff --git a/kopete/protocols/sms/smsaddcontactpage.h b/kopete/protocols/sms/smsaddcontactpage.h index 6f6f4290..4c4899d9 100644 --- a/kopete/protocols/sms/smsaddcontactpage.h +++ b/kopete/protocols/sms/smsaddcontactpage.h @@ -26,8 +26,9 @@ class SMSProtocol; class SMSAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - SMSAddContactPage(TQWidget *parent=0, const char *name=0); + SMSAddContactPage(TQWidget *tqparent=0, const char *name=0); ~SMSAddContactPage(); smsAddUI *smsdata; virtual bool validateData(); diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index f47a0b46..19a42549 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -32,8 +32,8 @@ #include "smsuserpreferences.h" SMSContact::SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *parent ) -: Kopete::Contact( _account, phoneNumber, parent ), m_phoneNumber( phoneNumber ) + const TQString &displayName, Kopete::MetaContact *tqparent ) +: Kopete::Contact( _account, phoneNumber, tqparent ), m_phoneNumber( phoneNumber ) { // kdWarning( 14160 ) << k_funcinfo << " this = " << this << ", phone = " << phoneNumber << endl; setNickName( displayName ); diff --git a/kopete/protocols/sms/smscontact.h b/kopete/protocols/sms/smscontact.h index 548aa063..1c77f25f 100644 --- a/kopete/protocols/sms/smscontact.h +++ b/kopete/protocols/sms/smscontact.h @@ -32,9 +32,10 @@ class KAction; class SMSContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: SMSContact( Kopete::Account* _account, const TQString &phoneNumber, - const TQString &displayName, Kopete::MetaContact *parent ); + const TQString &displayName, Kopete::MetaContact *tqparent ); TQPtrList* customContextMenuActions(); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 97379e75..94d480c2 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -35,8 +35,8 @@ #include "smsprotocol.h" #include "smsaccount.h" -SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *parent, const char */*name*/) - : TQWidget(parent), KopeteEditAccountWidget(account) +SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *account, TQWidget *tqparent, const char */*name*/) + : TQWidget(tqparent), KopeteEditAccountWidget(account) { TQVBoxLayout *l = new TQVBoxLayout(this, TQBoxLayout::Down); preferencesDialog = new smsActPrefsUI(this); @@ -55,9 +55,9 @@ SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Accoun //Disable changing the account ID for now //FIXME: Remove this when we can safely change the account ID (Matt) preferencesDialog->accountId->setDisabled(true); - sName = account->configGroup()->readEntry("ServiceName", TQString::null); + sName = account->configGroup()->readEntry("ServiceName", TQString()); preferencesDialog->subEnable->setChecked(account->configGroup()->readBoolEntry("SubEnable", false)); - preferencesDialog->subCode->setText(account->configGroup()->readEntry("SubCode", TQString::null)); + preferencesDialog->subCode->setText(account->configGroup()->readEntry("SubCode", TQString())); preferencesDialog->ifMessageTooLong->setCurrentItem(SMSMsgAction(account->configGroup()->readNumEntry("MsgAction", 0))); } diff --git a/kopete/protocols/sms/smseditaccountwidget.h b/kopete/protocols/sms/smseditaccountwidget.h index 497bfce8..de8ef844 100644 --- a/kopete/protocols/sms/smseditaccountwidget.h +++ b/kopete/protocols/sms/smseditaccountwidget.h @@ -29,8 +29,9 @@ class TQGridLayout; class SMSEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); + SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); ~SMSEditAccountWidget(); bool validateData(); diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index 361eba57..5e17e7ed 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -32,11 +32,11 @@ K_EXPORT_COMPONENT_FACTORY( kopete_sms, SMSProtocolFactory( "kopete_sms" ) ) SMSProtocol* SMSProtocol::s_protocol = 0L; -SMSProtocol::SMSProtocol(TQObject *parent, const char *name, const TQStringList &/*args*/) -: Kopete::Protocol( SMSProtocolFactory::instance(), parent, name ), - SMSOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), - SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString::null, i18n( "Connecting" ) ), - SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ) +SMSProtocol::SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &/*args*/) +: Kopete::Protocol( SMSProtocolFactory::instance(), tqparent, name ), + SMSOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), + SMSConnecting( Kopete::OnlineStatus::Connecting,2, this, 3, TQString(), i18n( "Connecting" ) ), + SMSOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ) { if (s_protocol) kdWarning( 14160 ) << k_funcinfo << "s_protocol already defined!" << endl; @@ -51,14 +51,14 @@ SMSProtocol::~SMSProtocol() s_protocol = 0L; } -AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account */*i*/) +AddContactPage *SMSProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account */*i*/) { - return new SMSAddContactPage(parent); + return new SMSAddContactPage(tqparent); } -KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget* SMSProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new SMSEditAccountWidget(this, account, parent); + return new SMSEditAccountWidget(this, account, tqparent); } SMSProtocol* SMSProtocol::protocol() diff --git a/kopete/protocols/sms/smsprotocol.h b/kopete/protocols/sms/smsprotocol.h index 411fa934..5785407d 100644 --- a/kopete/protocols/sms/smsprotocol.h +++ b/kopete/protocols/sms/smsprotocol.h @@ -40,9 +40,10 @@ class SMSContact; class SMSProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - SMSProtocol(TQObject *parent, const char *name, const TQStringList &args); + SMSProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~SMSProtocol(); static SMSProtocol *protocol(); @@ -53,8 +54,8 @@ public: virtual Kopete::Contact *deserializeContact(Kopete::MetaContact *metaContact, const TQMap &serializedData, const TQMap &addressBookData ); - virtual AddContactPage *createAddContactWidget(TQWidget *parent , Kopete::Account *i); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget(TQWidget *tqparent , Kopete::Account *i); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); const Kopete::OnlineStatus SMSOnline; diff --git a/kopete/protocols/sms/smsservice.h b/kopete/protocols/sms/smsservice.h index c1d46563..d448570b 100644 --- a/kopete/protocols/sms/smsservice.h +++ b/kopete/protocols/sms/smsservice.h @@ -28,9 +28,10 @@ namespace Kopete { class Account; } class TQGridLayout; class TQWidget; -class SMSService : public QObject +class SMSService : public TQObject { Q_OBJECT + TQ_OBJECT public: SMSService(Kopete::Account* account = 0); virtual ~SMSService(); @@ -44,11 +45,11 @@ public: virtual void setAccount(Kopete::Account* account); /** - * Called when the settings widget has a place to be. @param parent is the - * settings widget's parent and @param layout is the 2xn grid layout it may + * Called when the settings widget has a place to be. @param tqparent is the + * settings widget's tqparent and @param tqlayout is the 2xn grid tqlayout it may * use. */ - virtual void setWidgetContainer(TQWidget* parent, TQGridLayout* layout) = 0; + virtual void setWidgetContainer(TQWidget* tqparent, TQGridLayout* tqlayout) = 0; virtual void send(const Kopete::Message& msg) = 0; virtual int maxSize() = 0; diff --git a/kopete/protocols/sms/smsuserpreferences.h b/kopete/protocols/sms/smsuserpreferences.h index 7331c53a..5dee2d19 100644 --- a/kopete/protocols/sms/smsuserpreferences.h +++ b/kopete/protocols/sms/smsuserpreferences.h @@ -27,6 +27,7 @@ class SMSContact; class SMSUserPreferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: SMSUserPreferences(SMSContact* contact); ~SMSUserPreferences(); diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index 62e53800..5f8eb9f4 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -1,7 +1,7 @@ smsActPrefsUI Richard Lärkäng - + smsActPrefsUI @@ -34,7 +34,7 @@ 0 - + middleFrame @@ -48,11 +48,11 @@ 0 - + tabWidget9 - + tab @@ -63,7 +63,7 @@ unnamed - + groupBox61 @@ -74,7 +74,7 @@ unnamed - + textLabel2 @@ -91,7 +91,7 @@ A unique name for this SMS account. - + textLabel1 @@ -108,7 +108,7 @@ The delivery service that you would like to use. Note that you will need to have this software installed prior to using this account. - + accountId @@ -116,15 +116,15 @@ A unique name for this SMS account. - + - layout35 + tqlayout35 unnamed - + serviceName @@ -143,7 +143,7 @@ The delivery service that you would like to use. Note that you will need to have this software installed prior to using this account. - + descButton @@ -161,7 +161,7 @@ - + groupBox22 @@ -172,7 +172,7 @@ unnamed - + textLabel12 @@ -187,7 +187,7 @@ To use SMS, you will need an account with a delivery service. - + WordBreak|AlignTop @@ -203,7 +203,7 @@ Expanding - + 20 181 @@ -212,7 +212,7 @@ - + tab @@ -223,7 +223,7 @@ unnamed - + groupBox62 @@ -234,15 +234,15 @@ unnamed - + - layout119 + tqlayout119 unnamed - + textLabel2_2 @@ -259,7 +259,7 @@ What should happen if you type a message that is too long to fit in a single SMS message. You can either choose to break it up into smaller messages automatically, cancel the message from being sent entirely, or have Kopete prompt you each time you enter a message that is too long. - + Prompt (recommended) @@ -287,7 +287,7 @@ - + subEnable @@ -301,15 +301,15 @@ Check if you would like to enable phone number internationalization. Without this option, you will only be able to use SMS for accounts within your country. - + - layout56 + tqlayout56 unnamed - + textLabel2_3 @@ -379,7 +379,7 @@ Expanding - + 20 20 @@ -389,14 +389,14 @@ - + labelStatusMessage - + AlignCenter @@ -428,7 +428,7 @@ knuminput.h - + krestrictedline.h diff --git a/kopete/protocols/sms/ui/smsadd.ui b/kopete/protocols/sms/ui/smsadd.ui index 0ee71281..4b05727b 100644 --- a/kopete/protocols/sms/ui/smsadd.ui +++ b/kopete/protocols/sms/ui/smsadd.ui @@ -1,6 +1,6 @@ smsAddUI - + smsAddUI @@ -30,23 +30,23 @@ 6 - + - layout35 + tqlayout35 unnamed - + - layout33 + tqlayout33 unnamed - + textLabel1 @@ -63,7 +63,7 @@ The telephone number of the contact you would like to add. This should be a number with SMS service available. - + textLabel1_2 @@ -82,15 +82,15 @@ - + - layout34 + tqlayout34 unnamed - + addNr @@ -101,7 +101,7 @@ The telephone number of the contact you would like to add. This should be a number with SMS service available. - + addName @@ -126,7 +126,7 @@ Expanding - + 31 170 @@ -139,5 +139,5 @@ addNr addName - + diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui index 8a912792..a21c5037 100644 --- a/kopete/protocols/sms/ui/smsuserprefs.ui +++ b/kopete/protocols/sms/ui/smsuserprefs.ui @@ -1,6 +1,6 @@ SMSUserPrefsUI - + SMSUserPrefsUI @@ -27,7 +27,7 @@ 0 - + title @@ -54,15 +54,15 @@ Horizontal - + - layout11 + tqlayout11 unnamed - + textLabel3 @@ -102,7 +102,7 @@ Expanding - + 20 40 @@ -111,7 +111,7 @@ - + klineedit.h diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index cc906447..e722bed2 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -29,8 +29,8 @@ #include "testbedprotocol.h" -TestbedAccount::TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name ) -: Kopete::Account ( parent, accountID , name ) +TestbedAccount::TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name ) +: Kopete::Account ( tqparent, accountID , name ) { // Init the myself contact setMyself( new TestbedContact( this, accountId(), TestbedContact::Null, accountId(), Kopete::ContactList::self()->myself() ) ); @@ -58,9 +58,9 @@ KActionMenu* TestbedAccount::actionMenu() return mActionMenu; } -bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact) +bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact) { - TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact ); + TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, tqparentContact->displayName(), tqparentContact ); return newContact != 0L; } @@ -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()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) + myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) slotGoOnline(); else if (status.status() == Kopete::OnlineStatus::Online && - myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) + myself()->onlinetqStatus().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& /* initialStatus */ ) +void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialtqStatus */ ) { kdDebug ( 14210 ) << k_funcinfo << endl; myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); @@ -114,7 +114,7 @@ void TestbedAccount::slotGoOnline () connect (); else myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); - updateContactStatus(); + updateContacttqStatus(); } void TestbedAccount::slotGoAway () @@ -125,7 +125,7 @@ void TestbedAccount::slotGoAway () connect(); myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedAway ); - updateContactStatus(); + updateContacttqStatus(); } @@ -135,7 +135,7 @@ void TestbedAccount::slotGoOffline () if (isConnected ()) disconnect (); - updateContactStatus(); + updateContacttqStatus(); } void TestbedAccount::slotShowVideo () @@ -144,7 +144,7 @@ void TestbedAccount::slotShowVideo () if (isConnected ()) TestbedWebcamDialog *testbedWebcamDialog = new TestbedWebcamDialog(0, 0, "Testbed video window"); - updateContactStatus(); + updateContacttqStatus(); } 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::updateContactStatus() +void TestbedAccount::updateContacttqStatus() { TQDictIterator itr( contacts() ); for ( ; itr.current(); ++itr ) - itr.current()->setOnlineStatus( myself()->onlineStatus() ); + itr.current()->setOnlineStatus( myself()->onlinetqStatus() ); } diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h index b58249c6..76e2790a 100644 --- a/kopete/protocols/testbed/testbedaccount.h +++ b/kopete/protocols/testbed/testbedaccount.h @@ -35,8 +35,9 @@ class TestbedFakeServer; class TestbedAccount : public Kopete::Account { Q_OBJECT + TQ_OBJECT public: - TestbedAccount( TestbedProtocol *parent, const TQString& accountID, const char *name = 0 ); + TestbedAccount( TestbedProtocol *tqparent, const TQString& accountID, const char *name = 0 ); ~TestbedAccount(); /** * Construct the context menu used for the status bar icon @@ -47,7 +48,7 @@ public: * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie * Kopete::MetaContact */ - virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact); /** * Called when Kopete is set globally away */ @@ -55,11 +56,11 @@ public: /** * Called when Kopete status is changed globally */ - virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const TQString &reason = TQString::null); + virtual void setOnlineStatus(const Kopete::OnlineStatus& status , const TQString &reason = TQString()); /** * 'Connect' to the testbed server. Only sets myself() online. */ - virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ); + virtual void connect( const Kopete::OnlineStatus& initialtqStatus = Kopete::OnlineStatus() ); /** * Disconnect from the server. Only sets myself() offline. */ @@ -79,7 +80,7 @@ protected: /** * This simulates contacts going on and offline in sync with the account's status changes */ - void updateContactStatus(); + void updateContacttqStatus(); TestbedFakeServer* m_server; protected slots: diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index e1c75ca6..7437db6a 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -1,6 +1,6 @@ TestbedAccountPreferences - + TestbedAccountPreferences @@ -25,11 +25,11 @@ 0 - + tabWidget11 - + tab @@ -40,7 +40,7 @@ unnamed - + groupBox55_2 @@ -51,15 +51,15 @@ unnamed - + - layout1_2 + tqlayout1_2 unnamed - + accountLabel @@ -76,7 +76,7 @@ The account name of your account. - + m_acctName @@ -91,7 +91,7 @@ - + groupBox22 @@ -102,7 +102,7 @@ unnamed - + textLabel12 @@ -117,7 +117,7 @@ To use the testbed protocol, just make up an account name. This protocol has no real networking capability. - + WordBreak|AlignTop @@ -133,7 +133,7 @@ Expanding - + 20 131 @@ -143,18 +143,18 @@ - + labelStatusMessage - + AlignCenter - + diff --git a/kopete/protocols/testbed/testbedaddcontactpage.cpp b/kopete/protocols/testbed/testbedaddcontactpage.cpp index bb016453..1ee83466 100644 --- a/kopete/protocols/testbed/testbedaddcontactpage.cpp +++ b/kopete/protocols/testbed/testbedaddcontactpage.cpp @@ -26,8 +26,8 @@ #include "testbedaddui.h" -TestbedAddContactPage::TestbedAddContactPage( TQWidget* parent, const char* name ) - : AddContactPage(parent, name) +TestbedAddContactPage::TestbedAddContactPage( TQWidget* tqparent, const char* name ) + : AddContactPage(tqparent, name) { kdDebug(14210) << k_funcinfo << endl; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); @@ -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::fromLatin1( "Echo Contact" ); + name = TQString::tqfromLatin1( "Echo Contact" ); ok = true; } if ( ok ) diff --git a/kopete/protocols/testbed/testbedaddcontactpage.h b/kopete/protocols/testbed/testbedaddcontactpage.h index f430f559..3189a635 100644 --- a/kopete/protocols/testbed/testbedaddcontactpage.h +++ b/kopete/protocols/testbed/testbedaddcontactpage.h @@ -30,8 +30,9 @@ class TestbedAddUI; class TestbedAddContactPage : public AddContactPage { Q_OBJECT + TQ_OBJECT public: - TestbedAddContactPage( TQWidget* parent = 0, const char* name = 0 ); + TestbedAddContactPage( TQWidget* tqparent = 0, const char* name = 0 ); ~TestbedAddContactPage(); /** diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui index c81a4d2f..429b20b1 100644 --- a/kopete/protocols/testbed/testbedaddui.ui +++ b/kopete/protocols/testbed/testbedaddui.ui @@ -1,6 +1,6 @@ TestbedAddUI - + TestbedAddUI @@ -16,15 +16,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -41,7 +41,7 @@ The account name of the account you would like to add. - + m_uniqueName @@ -54,7 +54,7 @@ - + buttonGroup1 @@ -65,7 +65,7 @@ unnamed - + m_rbEcho @@ -94,7 +94,7 @@ Expanding - + 20 252 @@ -103,5 +103,5 @@ - + diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index bf110872..ee816474 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -29,8 +29,8 @@ #include "testbedprotocol.h" TestbedContact::TestbedContact( Kopete::Account* _account, const TQString &uniqueName, - const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *parent ) -: Kopete::Contact( _account, uniqueName, parent ) + const TestbedContactType type, const TQString &displayName, Kopete::MetaContact *tqparent ) +: Kopete::Contact( _account, uniqueName, tqparent ) { kdDebug( 14210 ) << k_funcinfo << " uniqueName: " << uniqueName << ", displayName: " << displayName << endl; m_type = type; diff --git a/kopete/protocols/testbed/testbedcontact.h b/kopete/protocols/testbed/testbedcontact.h index f6efa7ee..f5ac9ed6 100644 --- a/kopete/protocols/testbed/testbedcontact.h +++ b/kopete/protocols/testbed/testbedcontact.h @@ -33,6 +33,7 @@ namespace Kopete { class MetaContact; } class TestbedContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: /** * The range of possible contact types @@ -41,7 +42,7 @@ public: TestbedContact( Kopete::Account* _account, const TQString &uniqueName, const TestbedContact::TestbedContactType type, const TQString &displayName, - Kopete::MetaContact *parent ); + Kopete::MetaContact *tqparent ); ~TestbedContact(); diff --git a/kopete/protocols/testbed/testbededitaccountwidget.cpp b/kopete/protocols/testbed/testbededitaccountwidget.cpp index 98a52dfc..888a05f9 100644 --- a/kopete/protocols/testbed/testbededitaccountwidget.cpp +++ b/kopete/protocols/testbed/testbededitaccountwidget.cpp @@ -24,8 +24,8 @@ #include "testbedaccount.h" #include "testbedprotocol.h" -TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account) -: TQWidget( parent ), KopeteEditAccountWidget( account ) +TestbedEditAccountWidget::TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account) +: TQWidget( tqparent ), KopeteEditAccountWidget( account ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); kdDebug(14210) << k_funcinfo << endl; diff --git a/kopete/protocols/testbed/testbededitaccountwidget.h b/kopete/protocols/testbed/testbededitaccountwidget.h index 5c56560d..4c9d20e4 100644 --- a/kopete/protocols/testbed/testbededitaccountwidget.h +++ b/kopete/protocols/testbed/testbededitaccountwidget.h @@ -31,8 +31,9 @@ class TestbedAccountPreferences; class TestbedEditAccountWidget : public TQWidget, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT public: - TestbedEditAccountWidget( TQWidget* parent, Kopete::Account* account); + TestbedEditAccountWidget( TQWidget* tqparent, Kopete::Account* account); ~TestbedEditAccountWidget(); diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp index 9a4116ca..7740b858 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::fromLatin1( "echo: " ) + message ); - TQString messageId = contactId + TQString::fromLatin1(": "); + //emit messageReceived( TQString::tqfromLatin1( "echo: " ) + message ); + TQString messageId = contactId + TQString::tqfromLatin1(": "); TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message ); m_incomingMessages.append( msg ); TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) ); diff --git a/kopete/protocols/testbed/testbedfakeserver.h b/kopete/protocols/testbed/testbedfakeserver.h index 1e58031a..1fff7104 100644 --- a/kopete/protocols/testbed/testbedfakeserver.h +++ b/kopete/protocols/testbed/testbedfakeserver.h @@ -26,9 +26,10 @@ class TestbedIncomingMessage; * This is a interface to a dummy IM server * @author Will Stephenson */ -class TestbedFakeServer : public QObject +class TestbedFakeServer : public TQObject { Q_OBJECT + TQ_OBJECT public: TestbedFakeServer(); ~TestbedFakeServer(); diff --git a/kopete/protocols/testbed/testbedincomingmessage.h b/kopete/protocols/testbed/testbedincomingmessage.h index 3f27510a..cacace11 100644 --- a/kopete/protocols/testbed/testbedincomingmessage.h +++ b/kopete/protocols/testbed/testbedincomingmessage.h @@ -25,9 +25,10 @@ * Kopete side 'client' of the simulated IM system. * @author Will Stephenson */ -class TestbedIncomingMessage : public QObject +class TestbedIncomingMessage : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Create a new incoming message diff --git a/kopete/protocols/testbed/testbedprotocol.cpp b/kopete/protocols/testbed/testbedprotocol.cpp index 97ecaf02..e8c564e2 100644 --- a/kopete/protocols/testbed/testbedprotocol.cpp +++ b/kopete/protocols/testbed/testbedprotocol.cpp @@ -29,11 +29,11 @@ K_EXPORT_COMPONENT_FACTORY( kopete_testbed, TestbedProtocolFactory( "kopete_test TestbedProtocol *TestbedProtocol::s_protocol = 0L; -TestbedProtocol::TestbedProtocol( TQObject* parent, const char *name, const TQStringList &/*args*/ ) - : Kopete::Protocol( TestbedProtocolFactory::instance(), parent, name ), - testbedOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "O&nline" ) ), +TestbedProtocol::TestbedProtocol( TQObject* tqparent, const char *name, const TQStringList &/*args*/ ) + : Kopete::Protocol( TestbedProtocolFactory::instance(), tqparent, name ), + testbedOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "O&nline" ) ), testbedAway( Kopete::OnlineStatus::Away, 25, this, 1, "msn_away", i18n( "Away" ), i18n( "&Away" ) ), - testbedOffline( Kopete::OnlineStatus::Offline, 25, this, 2, TQString::null, i18n( "Offline" ), i18n( "O&ffline" ) ) + testbedOffline( Kopete::OnlineStatus::Offline, 25, this, 2, TQString(), i18n( "Offline" ), i18n( "O&ffline" ) ) { kdDebug( 14210 ) << k_funcinfo << endl; @@ -55,9 +55,9 @@ Kopete::Contact *TestbedProtocol::deserializeContact( TQString type = serializedData[ "contactType" ]; TestbedContact::TestbedContactType tbcType; - if ( type == TQString::fromLatin1( "echo" ) ) + if ( type == TQString::tqfromLatin1( "echo" ) ) tbcType = TestbedContact::Echo; - if ( type == TQString::fromLatin1( "null" ) ) + if ( type == TQString::tqfromLatin1( "null" ) ) tbcType = TestbedContact::Null; else tbcType = TestbedContact::Null; @@ -74,16 +74,16 @@ Kopete::Contact *TestbedProtocol::deserializeContact( return new TestbedContact(account, contactId, tbcType, displayName, metaContact); } -AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *parent, Kopete::Account * /* account */ ) +AddContactPage * TestbedProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * /* account */ ) { kdDebug( 14210 ) << "Creating Add Contact Page" << endl; - return new TestbedAddContactPage( parent ); + return new TestbedAddContactPage( tqparent ); } -KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent ) +KopeteEditAccountWidget * TestbedProtocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ) { kdDebug(14210) << "Creating Edit Account Page" << endl; - return new TestbedEditAccountWidget( parent, account ); + return new TestbedEditAccountWidget( tqparent, account ); } Kopete::Account *TestbedProtocol::createNewAccount( const TQString &accountId ) diff --git a/kopete/protocols/testbed/testbedprotocol.h b/kopete/protocols/testbed/testbedprotocol.h index d688e130..44a6ba2a 100644 --- a/kopete/protocols/testbed/testbedprotocol.h +++ b/kopete/protocols/testbed/testbedprotocol.h @@ -27,8 +27,9 @@ class TestbedProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - TestbedProtocol(TQObject *parent, const char *name, const TQStringList &args); + TestbedProtocol(TQObject *tqparent, const char *name, const TQStringList &args); ~TestbedProtocol(); /** * Convert the serialised data back into a TestbedContact and add this @@ -42,11 +43,11 @@ public: /** * Generate the widget needed to add TestbedContacts */ - virtual AddContactPage * createAddContactWidget( TQWidget *parent, Kopete::Account *account ); + virtual AddContactPage * createAddContactWidget( TQWidget *tqparent, Kopete::Account *account ); /** * Generate the widget needed to add/edit accounts for this protocol */ - virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent ); + virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent ); /** * Generate a TestbedAccount */ diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index b6a5a3b6..fd6f6743 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -27,8 +27,8 @@ #include #include -TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, Qt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ), +TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, tqparent, name, false, i18n( "Webcam for %1" ).tqarg( 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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + mImageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( mImageContainer ); show(); diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.h b/kopete/protocols/testbed/ui/testbedwebcamdialog.h index 1ae898b3..93223866 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.h +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.h @@ -40,8 +40,9 @@ namespace Kopete { class TestbedWebcamDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TestbedWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); + TestbedWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); ~TestbedWebcamDialog(); public slots: diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 9bdbee27..497429f9 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -88,7 +88,7 @@ bool WinPopupLib::checkHost(const TQString &Name) TQMap::Iterator end = theGroups.end(); for(TQMap::Iterator i = theGroups.begin(); i != end && !ret; i++) { - if ((*i).Hosts().contains(Name.upper())) { + if ((*i).Hosts().tqcontains(Name.upper())) { ret = true; break; } @@ -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)").arg(WP_POPUP_DIR), - TQString::fromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); + "Should the directory be created? (May need root password)").tqarg(WP_POPUP_DIR), + TQString::tqfromLatin1("Winpopup"), i18n("Create Directory"), i18n("Do Not Create")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c mkdir -p -m 0777 " + WP_POPUP_DIR)); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 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)").arg(WP_POPUP_DIR), - TQString::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); + "Fix? (May need root password)").tqarg(WP_POPUP_DIR), + TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0777 " + WP_POPUP_DIR)); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) return true; @@ -148,7 +148,7 @@ void WinPopupLib::slotUpdateGroupData() passedInitialHost = false; todo.clear(); currentGroupsMap.clear(); - currentHost = TQString::fromLatin1("LOCALHOST"); + currentHost = TQString::tqfromLatin1("LOCALHOST"); startReadProcess(currentHost); } @@ -173,7 +173,7 @@ void WinPopupLib::startReadProcess(const TQString &Host) void WinPopupLib::slotReadProcessReady(KProcIO *r) { - TQString tmpLine = TQString::null; + TQString tmpLine = TQString(); TQRegExp group("^Workgroup\\|(.*)\\|(.*)$"), host("^Server\\|(.*)\\|(.*)$"), info("^Domain=\\[([^\\]]+)\\] OS=\\[([^\\]]+)\\] Server=\\[([^\\]]+)\\]"), error("Connection.*failed"); @@ -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::fromLatin1("LOCALHOST")) currentHost = TQString::fromLatin1("failed"); // to be sure + if (currentHost == TQString::tqfromLatin1("LOCALHOST")) currentHost = TQString::tqfromLatin1("failed"); // to be sure } } } @@ -208,7 +208,7 @@ void WinPopupLib::slotReadProcessExited(KProcess *r) TQMap::ConstIterator end = currentGroups.end(); for (TQMap::ConstIterator i = currentGroups.begin(); i != end; i++) { TQString groupMaster = i.data(); - if (!done.contains(groupMaster)) todo += groupMaster; + if (!done.tqcontains(groupMaster)) todo += groupMaster; } } @@ -229,11 +229,11 @@ void WinPopupLib::slotReadProcessExited(KProcess *r) todo += groupMaster; } } else { - if (currentHost == TQString::fromLatin1("failed")) + if (currentHost == TQString::tqfromLatin1("failed")) KMessageBox::error(Kopete::UI::Global::mainWidget(), i18n("Connection to localhost failed!\n" "Is your samba server running?"), - TQString::fromLatin1("Winpopup")); + TQString::tqfromLatin1("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::fromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); + TQString::tqfromLatin1("Winpopup"), i18n("Fix"), i18n("Do Not Fix")); if (tmpYesNo == KMessageBox::Yes) { TQStringList kdesuArgs = TQStringList(TQString("-c chmod 0666 " + tmpItem->url().path())); if (KApplication::kdeinitExecWait("kdesu", kdesuArgs) == 0) { @@ -360,4 +360,4 @@ void WinPopupLib::settingsChanged(const TQString &smbClient, int groupFreq) #include "libwinpopup.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h index 0e594932..1392dd46 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.h +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.h @@ -29,7 +29,7 @@ #include #include -const TQString WP_POPUP_DIR = TQString::fromLatin1("/var/lib/winpopup"); +const TQString WP_POPUP_DIR = TQString::tqfromLatin1("/var/lib/winpopup"); class KDirLister; @@ -44,9 +44,10 @@ public: void addHosts(const TQStringList &newHosts) { groupHosts = newHosts; } }; -class WinPopupLib : public QObject +class WinPopupLib : public TQObject { Q_OBJECT + TQ_OBJECT public: WinPopupLib(const TQString &smbClient,int groupFreq); @@ -89,4 +90,4 @@ signals: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index 21286d54..c9f63825 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -1,6 +1,6 @@ WPAddContactBase - + WPAddContactBase @@ -26,23 +26,23 @@ 6 - + - layout59 + tqlayout59 unnamed - + - layout57 + tqlayout57 unnamed - + TextLabel2_2 @@ -59,7 +59,7 @@ The hostname you would like to use to send WinPopup messages to. - + TextLabel1_2 @@ -78,9 +78,9 @@ - + - layout58 + tqlayout58 @@ -115,9 +115,9 @@ - + - layout11 + tqlayout11 @@ -133,7 +133,7 @@ Expanding - + 20 20 @@ -166,7 +166,7 @@ Expanding - + 20 50 @@ -180,7 +180,7 @@ mHostGroup mRefresh - + kcombobox.h klineedit.h diff --git a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui index 464c426d..b12e9c2c 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -1,6 +1,6 @@ WPEditAccountBase - + WPEditAccountBase @@ -25,22 +25,22 @@ 0 - + labelStatusMessage - + AlignCenter - + tabWidget10 - + tab @@ -51,7 +51,7 @@ unnamed - + groupBox51 @@ -62,15 +62,15 @@ unnamed - + - layout40 + tqlayout40 unnamed - + label1 @@ -87,7 +87,7 @@ The hostname you would like to use to send WinPopup messages as. Note that this does not have to be the actual hostname of the machine to send messages, but it does to receive them. - + mHostName @@ -116,7 +116,7 @@ - + groupBox22 @@ -127,7 +127,7 @@ unnamed - + textLabel12 @@ -142,11 +142,11 @@ To receive WinPopup messages sent from other machines, the hostname above must be set to this machine's hostname. - + WordBreak|AlignTop - + textLabel1_3 @@ -154,7 +154,7 @@ The samba server must be configured and running. - + textLabel1_2 @@ -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 &' (substitute _PATH_TO_ by the real path) to your smb.conf [global]-section. - + WordBreak|AlignTop @@ -179,7 +179,7 @@ However, the recommended way is to ask your administrator to create this directo Expanding - + 21 16 @@ -188,7 +188,7 @@ However, the recommended way is to ask your administrator to create this directo - + TabPage @@ -209,14 +209,14 @@ However, the recommended way is to ask your administrator to create this directo Expanding - + 20 135 - + groupBox5 @@ -227,7 +227,7 @@ However, the recommended way is to ask your administrator to create this directo unnamed - + textLabel2_2 @@ -237,7 +237,7 @@ However, the recommended way is to ask your administrator to create this directo - + groupBox4 @@ -248,7 +248,7 @@ However, the recommended way is to ask your administrator to create this directo unnamed - + textLabel4 @@ -256,7 +256,7 @@ However, the recommended way is to ask your administrator to create this directo Host check frequency: - + textLabel1 @@ -264,17 +264,17 @@ However, the recommended way is to ask your administrator to create this directo Path to 'smbclient' executable: - + - layout6 + tqlayout6 unnamed - + - layout5 + tqlayout5 @@ -299,7 +299,7 @@ However, the recommended way is to ask your administrator to create this directo 1 - + textLabel6 @@ -344,10 +344,10 @@ However, the recommended way is to ask your administrator to create this directo mHostName doInstallSamba - + installSamba() - - + + kpushbutton.h knuminput.h diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui index a899e3ca..d717c9c4 100644 --- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui +++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui @@ -1,6 +1,6 @@ WPUserInfoWidget - + WPUserInfoWidget @@ -24,23 +24,23 @@ unnamed - + - layout6 + tqlayout6 unnamed - + - layout5 + tqlayout5 unnamed - + lblComputerName @@ -57,7 +57,7 @@ The hostname of the computer for this contact. - + textLabel2_2 @@ -65,7 +65,7 @@ Comment: - + textLabel2 @@ -82,7 +82,7 @@ The workgroup or domain the contact's computer is on. - + textLabel3 @@ -99,7 +99,7 @@ The operating system the contact's computer is running. - + textLabel1 @@ -118,9 +118,9 @@ - + - layout4 + tqlayout4 @@ -208,7 +208,7 @@ sOS sServer - + klineedit.h klineedit.h diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index d7439628..addb88bb 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -34,8 +34,8 @@ class KPopupMenu; -WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name) - : Kopete::Account(parent, accountID, name) +WPAccount::WPAccount(WPProtocol *tqparent, const TQString &accountID, const char *name) + : Kopete::Account(tqparent, accountID, name) { // kdDebug(14170) << "WPAccount::WPAccount()" << endl; @@ -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::fromLatin1("LOCALHOST")) { + if (Name.upper() == TQString::tqfromLatin1("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; @@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name) } } -bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) +bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) { // kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl; if (!contacts()[contactId]) { - WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact); + WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact); return newContact != 0; } else { kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl; @@ -159,8 +159,8 @@ KActionMenu* WPAccount::actionMenu() /// How to remove an action from Kopete::Account::actionMenu()? GF - KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); - theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); + KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlinetqStatus().iconFor(this), this); + theActionMenu->popupMenu()->insertTitle(myself()->onlinetqStatus().iconFor(this), i18n("WinPopup (%1)").tqarg(accountId())); if (mProtocol) { @@ -189,21 +189,21 @@ void WPAccount::slotSendMessage(const TQString &Body, const TQString &Destinatio { kdDebug(14170) << "WPAccount::slotSendMessage(" << Body << ", " << Destination << ")" << endl; - if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); + if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away) myself()->setOnlineStatus(mProtocol->WPOnline); mProtocol->sendMessage(Body, Destination); } void WPAccount::setOnlineStatus(const Kopete::OnlineStatus &status, const TQString &reason) { - if (myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) + if (myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Online) connect( status ); - else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) + else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline) disconnect(); - else if (myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) + else if (myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Away) setAway( true, reason ); } #include "wpaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index ae3744de..eb343541 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -48,10 +48,11 @@ class KopeteWinPopup; class WPAccount : public Kopete::Account { Q_OBJECT + TQ_OBJECT // Kopete::Account overloading public: - WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0); + WPAccount(WPProtocol *tqparent, const TQString& accountID, const char *name = 0); ~WPAccount(); virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar @@ -61,8 +62,8 @@ public slots: virtual void connect(const Kopete::OnlineStatus &); // Connect to server virtual void disconnect(); // Disconnect from server - void goAvailable() { setAway(false, TQString::null); } // Two convenience slots - void goAway() { setAway(true, TQString::null); } // for available and away + void goAvailable() { setAway(false, TQString()); } // Two convenience slots + void goAway() { setAway(true, TQString()); } // for available and away // Stuff used internally & by colleague classes public: @@ -88,10 +89,10 @@ public slots: void slotGotNewMessage(const TQString &Body, const TQDateTime &Arrival, const TQString &From); /* Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString()); protected: - virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); private slots: // void updateAccountId(); @@ -104,4 +105,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index e5912c14..c463cc02 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -36,9 +36,9 @@ #include "wpaccount.h" #include "wpaddcontact.h" -WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name) : AddContactPage(parent, name) +WPAddContact::WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name) : AddContactPage(tqparent, name) { -// kdDebug(14170) << "WPAddContact::WPAddContact(, " << newAccount << ", , " << name << ")" << endl; +// kdDebug(14170) << "WPAddContact::WPAddContact(, " << newAccount << ", , " << name << ")" << endl; (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new WPAddContactBase(this); @@ -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::fromLatin1("LOCALHOST")) { + if (tmpHostName.upper() == TQString::tqfromLatin1("LOCALHOST")) { KMessageBox::sorry(this, i18n("LOCALHOST is not allowed as contact."), i18n("WinPopup")); return false; } @@ -112,4 +112,4 @@ bool WPAddContact::apply(Kopete::Account *theAccount, Kopete::MetaContact *theMe #include "wpaddcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpaddcontact.h b/kopete/protocols/winpopup/wpaddcontact.h index 156e7db9..1828bcf9 100644 --- a/kopete/protocols/winpopup/wpaddcontact.h +++ b/kopete/protocols/winpopup/wpaddcontact.h @@ -34,13 +34,14 @@ namespace Kopete { class MetaContact; } class WPAddContact: public AddContactPage { Q_OBJECT + TQ_OBJECT private: WPAccount *theAccount; WPAddContactBase *theDialog; public: - WPAddContact(TQWidget *parent, WPAccount *newAccount, const char *name = 0); + WPAddContact(TQWidget *tqparent, WPAccount *newAccount, const char *name = 0); ~WPAddContact(); virtual bool validateData(); @@ -55,4 +56,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index 801b9865..3e70b349 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt Includes +// TQt Includes #include // KDE Includes @@ -30,7 +30,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, const TQString &nickName, Kopete::MetaContact *metaContact) : Kopete::Contact(account, newHostName, metaContact) { -// kdDebug(14170) << "WPContact::WPContact(, " << newHostName << ", " << nickName << ", )" << endl; +// kdDebug(14170) << "WPContact::WPContact(, " << newHostName << ", " << nickName << ", )" << endl; kdDebug(14170) << "WPContact::WPContact: " << this << endl; TQString theNickName = nickName; @@ -38,7 +38,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons if (theNickName.isEmpty()) { // Construct nickname from hostname with first letter to upper. GF theNickName = newHostName.lower(); - theNickName = theNickName.replace(0, 1, theNickName[0].upper()); + theNickName = theNickName.tqreplace(0, 1, theNickName[0].upper()); } setNickName(theNickName); @@ -51,13 +51,13 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons // Initialise and start the periodical checking for contact's status setOnlineStatus(static_cast(protocol())->WPOffline); - connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); - checkStatus.start(1000, false); + connect(&checktqStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotChecktqStatus())); + checktqStatus.start(1000, false); } TQPtrList * WPContact::customContextMenuActions() { - //myActionCollection = new KActionCollection(parent); + //myActionCollection = new KActionCollection(tqparent); return 0; } @@ -89,14 +89,14 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr bool WPContact::isOnline() const { kdDebug(14170) << "[WPContact::isOnline()]" << endl; - return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; + return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; } */ bool WPContact::isReachable() { // kdDebug(14170) << "[WPContact::isReachable()]" << endl; - return onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; + return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().status() != Kopete::OnlineStatus::Unknown; } void WPContact::slotChatSessionDestroyed() @@ -131,7 +131,7 @@ void deleteContact() } */ -void WPContact::slotCheckStatus() +void WPContact::slotChecktqStatus() { bool oldWasConnected = myWasConnected; bool newIsOnline = false; @@ -141,11 +141,11 @@ void WPContact::slotCheckStatus() if (acct) newIsOnline = acct->checkHost(contactId()); if(newIsOnline != isOnline() || myWasConnected != oldWasConnected) { - Kopete::OnlineStatus tmpStatus = WPProtocol::protocol()->WPOffline; + Kopete::OnlineStatus tmptqStatus = WPProtocol::protocol()->WPOffline; if (myWasConnected && newIsOnline) { - tmpStatus = WPProtocol::protocol()->WPOnline; + tmptqStatus = WPProtocol::protocol()->WPOnline; } - setOnlineStatus(tmpStatus); + setOnlineStatus(tmptqStatus); } } @@ -186,4 +186,4 @@ void WPContact::slotSendMessage( Kopete::Message& message ) #include "wpcontact.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpcontact.h b/kopete/protocols/winpopup/wpcontact.h index 93d18c53..c7bc336f 100644 --- a/kopete/protocols/winpopup/wpcontact.h +++ b/kopete/protocols/winpopup/wpcontact.h @@ -21,7 +21,7 @@ // KDE Includes #include -// Qt Includes +// TQt Includes //#include #include #include @@ -49,6 +49,7 @@ namespace Kopete { class MetaContact; } class WPContact: public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: WPContact(Kopete::Account *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact); @@ -61,7 +62,7 @@ public: public slots: virtual void slotUserInfo(); - void slotCheckStatus(); // the call back for the checkStatus timer + void slotChecktqStatus(); // the call back for the checktqStatus timer void slotNewMessage(const TQString &Body, const TQDateTime &Arrival); private slots: @@ -72,7 +73,7 @@ private slots: private: bool myWasConnected; // true if protocol connected at last check - TQTimer checkStatus; // checks the status of this contact every second or so + TQTimer checktqStatus; // checks the status of this contact every second or so // KActionCollection *myActionCollection; // holds all the protocol specific actions (not many!) Kopete::ChatSession *m_manager; @@ -83,4 +84,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index 6e1d1aba..2fa5775c 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -45,10 +45,10 @@ #include "wpeditaccount.h" #include "wpprotocol.h" -WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) - : WPEditAccountBase(parent), KopeteEditAccountWidget(theAccount) +WPEditAccount::WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount) + : WPEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount) { - kdDebug(14170) << "WPEditAccount::WPEditAccount(, )"; + kdDebug(14170) << "WPEditAccount::WPEditAccount(, )"; mProtocol = WPProtocol::protocol(); @@ -65,13 +65,13 @@ WPEditAccount::WPEditAccount(TQWidget *parent, Kopete::Account *theAccount) } else { // no QT/KDE function? GF - TQString theHostName = TQString::null; + TQString theHostName = TQString(); char *tmp = new char[255]; if (tmp != 0) { gethostname(tmp, 255); theHostName = tmp; - if (theHostName.contains('.') != 0) theHostName.remove(theHostName.find('.'), theHostName.length()); + if (theHostName.tqcontains('.') != 0) theHostName.remove(theHostName.tqfind('.'), theHostName.length()); theHostName = theHostName.upper(); } @@ -135,4 +135,4 @@ Kopete::Account *WPEditAccount::apply() #include "wpeditaccount.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpeditaccount.h b/kopete/protocols/winpopup/wpeditaccount.h index 4714e197..5817709a 100644 --- a/kopete/protocols/winpopup/wpeditaccount.h +++ b/kopete/protocols/winpopup/wpeditaccount.h @@ -35,13 +35,14 @@ namespace Kopete { class Account; } class WPEditAccount: public WPEditAccountBase, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT private: WPProtocol *mProtocol; WPAccount *mAccount; public: - WPEditAccount(TQWidget *parent, Kopete::Account *theAccount); + WPEditAccount(TQWidget *tqparent, Kopete::Account *theAccount); virtual bool validateData(); void writeConfig(); @@ -54,4 +55,4 @@ public slots: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 71d4a76a..66ef7fac 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -48,17 +48,17 @@ typedef KGenericFactory WPProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_wp, WPProtocolFactory( "kopete_wp" ) ) // WP Protocol -WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) -: Kopete::Protocol( WPProtocolFactory::instance(), parent, name ), - WPOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n("Online"), i18n("Online")), +WPProtocol::WPProtocol( TQObject *tqparent, const char *name, const TQStringList & /* args */ ) +: Kopete::Protocol( WPProtocolFactory::instance(), tqparent, name ), + WPOnline( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n("Online"), i18n("Online")), WPAway( Kopete::OnlineStatus::Away, 20, this, 1, "wp_away", i18n("Away"), i18n("Away")), - WPOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString::null, i18n("Offline"), i18n("Offline")) + WPOffline( Kopete::OnlineStatus::Offline, 0, this, 2, TQString(), i18n("Offline"), i18n("Offline")) { // kdDebug(14170) << "WPProtocol::WPProtocol()" << endl; sProtocol = this; - // Load Status Actions + // Load tqStatus Actions // initActions(); // TODO: Maybe use this in the future? @@ -79,11 +79,11 @@ WPProtocol::~WPProtocol() sProtocol = 0; } -AddContactPage *WPProtocol::createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount) +AddContactPage *WPProtocol::createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount) { -// kdDebug(14170) << "WPProtocol::createAddContactWidget(, " << theAccount << ")" << endl; +// kdDebug(14170) << "WPProtocol::createAddContactWidget(, " << theAccount << ")" << endl; - return new WPAddContact(parent, dynamic_cast(theAccount)); + return new WPAddContact(tqparent, dynamic_cast(theAccount)); } Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContact, @@ -108,9 +108,9 @@ Kopete::Contact *WPProtocol::deserializeContact( Kopete::MetaContact *metaContac return theAccount->contacts()[contactId]; } -KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *WPProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new WPEditAccount(parent, account); + return new WPEditAccount(tqparent, account); } Kopete::Account *WPProtocol::createNewAccount(const TQString &accountId) @@ -152,7 +152,7 @@ void WPProtocol::installSamba() void WPProtocol::slotReceivedMessage(const TQString &Body, const TQDateTime &Time, const TQString &From) { bool foundContact = false; - TQString accountKey = TQString::null; + TQString accountKey = TQString(); TQDict Accounts = Kopete::AccountManager::self()->accounts(protocol()); for (TQDictIterator it(Accounts); it.current(); ++it) { TQDict Contacts = it.current()->contacts(); @@ -184,4 +184,4 @@ void WPProtocol::sendMessage(const TQString &Body, const TQString &Destination) #include "wpprotocol.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpprotocol.h b/kopete/protocols/winpopup/wpprotocol.h index b54f4972..aa7f6955 100644 --- a/kopete/protocols/winpopup/wpprotocol.h +++ b/kopete/protocols/winpopup/wpprotocol.h @@ -48,14 +48,15 @@ class WPAccount; class WPProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT // Kopete::Protocol overloading public: - WPProtocol( TQObject *parent, const char *name, const TQStringList &args ); + WPProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); ~WPProtocol(); - virtual AddContactPage *createAddContactWidget(TQWidget *parent, Kopete::Account *theAccount); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget(TQWidget *tqparent, Kopete::Account *theAccount); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); const TQStringList getGroups() {return popupClient->getGroups(); } @@ -91,4 +92,4 @@ private: #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index e50805f5..5090836d 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -32,13 +32,13 @@ #include "wpaccount.h" #include "wpcontact.h" -WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *parent, const char* name ) - : KDialogBase( parent, name, false, TQString::null, Close, Close, false ), m_contact(contact), +WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *tqparent, const char* name ) + : KDialogBase( tqparent, name, false, TQString(), Close, Close, false ), m_contact(contact), Comment(i18n("N/A")), Workgroup(i18n("N/A")), OS(i18n("N/A")), Software(i18n("N/A")) { // kdDebug( 14170 ) << k_funcinfo << endl; - setCaption( i18n( "User Info for %1" ).arg( m_contact->nickName() ) ); + setCaption( i18n( "User Info for %1" ).tqarg( m_contact->nickName() ) ); m_mainWidget = new WPUserInfoWidget( this, "WPUserInfo::m_mainWidget" ); setMainWidget( m_mainWidget ); @@ -76,7 +76,7 @@ void WPUserInfo::startDetailsProcess(const TQString &host) void WPUserInfo::slotDetailsProcessReady(KProcIO *d) { - TQString tmpLine = TQString::null; + TQString tmpLine = TQString(); TQRegExp info("^Domain=\\[(.*)\\]\\sOS=\\[(.*)\\]\\sServer=\\[(.*)\\]$"), host("^Server\\|(.*)\\|(.*)$"); while (d->readln(tmpLine) > -1) { @@ -111,4 +111,4 @@ void WPUserInfo::slotCloseClicked() #include "wpuserinfo.moc" // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/winpopup/wpuserinfo.h b/kopete/protocols/winpopup/wpuserinfo.h index 2059ba2c..c0bd533c 100644 --- a/kopete/protocols/winpopup/wpuserinfo.h +++ b/kopete/protocols/winpopup/wpuserinfo.h @@ -34,9 +34,10 @@ class WPContact; class WPUserInfo : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - WPUserInfo( WPContact *, WPAccount *, TQWidget *parent = 0, const char* name = "WPUserInfo" ); + WPUserInfo( WPContact *, WPAccount *, TQWidget *tqparent = 0, const char* name = "WPUserInfo" ); void startDetailsProcess(const TQString &host); @@ -58,4 +59,4 @@ class WPUserInfo : public KDialogBase #endif // vim: set noet ts=4 sts=4 sw=4: -// kate: tab-width 4; indent-width 4; replace-trailing-space-save on; +// kate: tab-width 4; indent-width 4; tqreplace-trailing-space-save on; diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp index 8ca3a4cd..384402e9 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp @@ -64,9 +64,9 @@ public: }; //! -//! Constructs a ByteStream object with parent \a parent. -ByteStream::ByteStream(TQObject *parent) -:TQObject(parent) +//! Constructs a ByteStream object with tqparent \a tqparent. +ByteStream::ByteStream(TQObject *tqparent) +:TQObject(tqparent) { // kdDebug(14181) << k_funcinfo << endl; d = new Private; diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.h b/kopete/protocols/yahoo/libkyahoo/bytestream.h index a990a940..c4dc96e1 100644 --- a/kopete/protocols/yahoo/libkyahoo/bytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/bytestream.h @@ -27,12 +27,13 @@ // CS_NAMESPACE_BEGIN // CS_EXPORT_BEGIN -class ByteStream : public QObject +class ByteStream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; - ByteStream(TQObject *parent=0); + ByteStream(TQObject *tqparent=0); virtual ~ByteStream()=0; virtual bool isOpen() const; diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp index 1943aa6b..757f7d98 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.cpp @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our Status + Change our tqStatus Copyright (c) 2005-2006 André Duffeck @@ -22,7 +22,7 @@ #include -ChangeStatusTask::ChangeStatusTask(Task* parent) : Task(parent) +ChangeStatusTask::ChangeStatusTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -41,7 +41,7 @@ void ChangeStatusTask::onGo() } else { - YMSGTransfer *t = new YMSGTransfer( Yahoo::ServiceStatus ); + YMSGTransfer *t = new YMSGTransfer( Yahoo::ServicetqStatus ); t->setId( client()->sessionID() ); if( !m_message.isEmpty() ) @@ -55,7 +55,7 @@ void ChangeStatusTask::onGo() send( t ); - if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> Status + if( client()->status() == Yahoo::StatusInvisible ) // Invisible --> tqStatus sendVisibility( Visible ); } setSuccess(); @@ -74,7 +74,7 @@ void ChangeStatusTask::setMessage( const TQString &msg ) m_message = msg; } -void ChangeStatusTask::setStatus( Yahoo::Status status ) +void ChangeStatusTask::settqStatus( Yahoo::tqStatus status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/changestatustask.h b/kopete/protocols/yahoo/libkyahoo/changestatustask.h index 200a6f34..50a2051b 100644 --- a/kopete/protocols/yahoo/libkyahoo/changestatustask.h +++ b/kopete/protocols/yahoo/libkyahoo/changestatustask.h @@ -1,6 +1,6 @@ /* Kopete Yahoo Protocol - Change our Status + Change our tqStatus Copyright (c) 2005 André Duffeck @@ -30,18 +30,18 @@ class ChangeStatusTask : public Task { public: enum Type { Available, Away }; - ChangeStatusTask(Task *parent); + ChangeStatusTask(Task *tqparent); ~ChangeStatusTask(); virtual void onGo(); void setMessage( const TQString &msg ); - void setStatus( Yahoo::Status status ); + void settqStatus( Yahoo::tqStatus status ); void setType( Yahoo::StatusType type ); private: enum Visibility { Visible = 1, Invisible = 2 }; TQString m_message; - Yahoo::Status m_status; + Yahoo::tqStatus m_status; Yahoo::StatusType m_type; void sendVisibility( Visibility visible ); diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp index 3be83a79..6d7a987d 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.cpp @@ -24,7 +24,7 @@ #include #include -ChatSessionTask::ChatSessionTask(Task* parent) : Task(parent) +ChatSessionTask::ChatSessionTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h index eee7cdc9..e1f9f498 100644 --- a/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h +++ b/kopete/protocols/yahoo/libkyahoo/chatsessiontask.h @@ -30,7 +30,7 @@ class ChatSessionTask : public Task { public: enum Type { RegisterSession, UnregisterSession }; - ChatSessionTask(Task *parent); + ChatSessionTask(Task *tqparent); ~ChatSessionTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index d2a4b8dd..df261869 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::Status status; - Yahoo::Status statusOnConnect; + Yahoo::tqStatus status; + Yahoo::tqStatus statusOnConnect; TQString statusMessageOnConnect; - Yahoo::PictureStatus pictureFlag; + Yahoo::PicturetqStatus 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; - setStatus( Yahoo::StatusDisconnected ); + settqStatus( 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::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); } 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; - setStatus( Yahoo::StatusConnecting ); + settqStatus( 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() ) - changeStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); - d->statusMessageOnConnect = TQString::null; - setStatus( d->statusOnConnect ); + changetqStatus( d->statusOnConnect, d->statusMessageOnConnect, Yahoo::StatusTypeAway ); + d->statusMessageOnConnect = TQString(); + settqStatus( 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::fromLatin1( "" ) ); + smt->setText( TQString::tqfromLatin1( "" ) ); smt->setPicureFlag( pictureFlag() ); smt->go( true ); } @@ -404,13 +404,13 @@ void Client::cancelFileTransfer( unsigned int transferId ) emit fileTransferCanceled( transferId ); } -void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo::StatusType type ) +void Client::changetqStatus( Yahoo::tqStatus 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->setStatus( status ); + cst->settqStatus( status ); cst->setMessage( message ); cst->setType( type ); cst->go( true ); @@ -418,7 +418,7 @@ void Client::changeStatus( Yahoo::Status status, const TQString &message, Yahoo: if( status == Yahoo::StatusInvisible ) stealthContact( TQString(), Yahoo::StealthOnline, Yahoo::StealthClear ); - setStatus( status ); + settqStatus( 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::StealthStatus state) +void Client::stealthContact(TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state) { StealthTask *st = new StealthTask( d->root ); st->setTarget( userId ); @@ -575,16 +575,16 @@ void Client::sendPictureInformation( const TQString &userId, const TQString &url spt->go( true ); } -void Client::setPictureStatus( Yahoo::PictureStatus status ) +void Client::setPicturetqStatus( Yahoo::PicturetqStatus status ) { if( d->pictureFlag == status ) return; - kdDebug(YAHOO_RAW_DEBUG) << "Setting PictureStatus to: " << status << endl; + kdDebug(YAHOO_RAW_DEBUG) << "Setting PicturetqStatus to: " << status << endl; d->pictureFlag = status; SendPictureTask *spt = new SendPictureTask( d->root ); - spt->setType( SendPictureTask::SendStatus ); - spt->setStatus( status ); + spt->setType( SendPictureTask::SendtqStatus ); + spt->settqStatus( 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::fromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") - .arg(info).arg(errorString).arg(level) << endl; + kdDebug(YAHOO_RAW_DEBUG) << TQString::tqfromLatin1("\nThe following error occurred: %1\n Reason: %2\n LogLevel: %3") + .tqarg(info).tqarg(errorString).tqarg(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::Status Client::status() +Yahoo::tqStatus Client::status() { return d->status; } -void Client::setStatus( Yahoo::Status status ) +void Client::settqStatus( Yahoo::tqStatus status ) { d->status = status; } -void Client::setStatusOnConnect( Yahoo::Status status ) +void Client::setStatusOnConnect( Yahoo::tqStatus 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::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ), + TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ) ) ); 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 ee8e1a43..9fc4825e 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.h +++ b/kopete/protocols/yahoo/libkyahoo/client.h @@ -40,9 +40,10 @@ class Task; class KTemporaryFile; struct YABEntry; -class Client : public QObject +class Client : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -52,7 +53,7 @@ Q_OBJECT enum LogLevel { Debug, Info, Notice, Warning, Error, Critical }; - Client(TQObject *parent=0); + Client(TQObject *tqparent=0); ~Client(); /** @@ -99,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::Status status ); + void setStatusOnConnect( Yahoo::tqStatus status ); /** * Specifies the status message we connect with. @@ -146,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 changeStatus(Yahoo::Status status, const TQString &message, Yahoo::StatusType type); + void changetqStatus(Yahoo::tqStatus status, const TQString &message, Yahoo::StatusType type); /** * Set the verification word that is needed for a account verification after @@ -161,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::fromLatin1("Please add me") ); + void addBuddy( const TQString &userId, const TQString &group, const TQString &message = TQString::tqfromLatin1("Please add me") ); /** * Remove a buddy from the contact list @@ -184,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::StealthStatus state ); + void stealthContact( TQString const &userId, Yahoo::StealthMode mode, Yahoo::StealthtqStatus state ); /** * Request the buddy's picture @@ -225,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 setPictureStatus( Yahoo::PictureStatus flag ); + void setPicturetqStatus( Yahoo::PicturetqStatus flag ); /** * Send a response to the webcam invite ( Accept / Decline ) @@ -431,13 +432,13 @@ Q_OBJECT int pictureChecksum(); /** Get our status */ - Yahoo::Status status(); + Yahoo::tqStatus status(); /** * Set our status * @param status the new status */ - void setStatus( Yahoo::Status status ); + void settqStatus( Yahoo::tqStatus status ); /** Access the root Task for this client, so tasks may be added to it. */ Task* rootTask(); @@ -502,7 +503,7 @@ Q_OBJECT /** * Notifies about the stealth status of buddies */ - void stealthStatusChanged( const TQString &, Yahoo::StealthStatus ); + void stealthStatusChanged( const TQString &, Yahoo::StealthtqStatus ); /** * Notifies about mails */ diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp index 59d3b3fa..105d9de6 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.cpp @@ -23,7 +23,7 @@ #include #include -ConferenceTask::ConferenceTask(Task* parent) : Task(parent) +ConferenceTask::ConferenceTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -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").arg( who[i] ); + whoList += TQString(",%1").tqarg( who[i] ); t->setParam( 51, whoList.local8Bit() ); t->setParam( 57, room.local8Bit() ); diff --git a/kopete/protocols/yahoo/libkyahoo/conferencetask.h b/kopete/protocols/yahoo/libkyahoo/conferencetask.h index 5f027c0f..aff52228 100644 --- a/kopete/protocols/yahoo/libkyahoo/conferencetask.h +++ b/kopete/protocols/yahoo/libkyahoo/conferencetask.h @@ -27,8 +27,9 @@ class YMSGTransfer; class ConferenceTask : public Task { Q_OBJECT + TQ_OBJECT public: - ConferenceTask(Task *parent); + ConferenceTask(Task *tqparent); ~ConferenceTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/connector.cpp b/kopete/protocols/yahoo/libkyahoo/connector.cpp index cc7dcfa3..36912011 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/connector.cpp @@ -20,8 +20,8 @@ #include "connector.h" -Connector::Connector(TQObject *parent) -:TQObject(parent) +Connector::Connector(TQObject *tqparent) +:TQObject(tqparent) { setPeerAddressNone(); } @@ -40,7 +40,7 @@ TQHostAddress Connector::peerAddress() const return addr; } -Q_UINT16 Connector::peerPort() const +TQ_UINT16 Connector::peerPort() const { return port; } @@ -52,7 +52,7 @@ void Connector::setPeerAddressNone() port = 0; } -void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port) +void Connector::setPeerAddress(const TQHostAddress &_addr, TQ_UINT16 _port) { haveaddr = true; addr = _addr; diff --git a/kopete/protocols/yahoo/libkyahoo/connector.h b/kopete/protocols/yahoo/libkyahoo/connector.h index 02b47019..f5b1917a 100644 --- a/kopete/protocols/yahoo/libkyahoo/connector.h +++ b/kopete/protocols/yahoo/libkyahoo/connector.h @@ -27,11 +27,12 @@ class ByteStream; -class Connector : public QObject +class Connector : public TQObject { Q_OBJECT + TQ_OBJECT public: - Connector(TQObject *parent=0); + Connector(TQObject *tqparent=0); virtual ~Connector(); virtual void connectToServer(const TQString &server)=0; @@ -40,7 +41,7 @@ public: bool havePeerAddress() const; TQHostAddress peerAddress() const; - Q_UINT16 peerPort() const; + TQ_UINT16 peerPort() const; signals: void connected(); @@ -48,12 +49,12 @@ signals: protected: void setPeerAddressNone(); - void setPeerAddress(const TQHostAddress &addr, Q_UINT16 port); + void setPeerAddress(const TQHostAddress &addr, TQ_UINT16 port); private: bool haveaddr; TQHostAddress addr; - Q_UINT16 port; + TQ_UINT16 port; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp index 573c5ccf..c9c5828b 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp @@ -115,7 +115,7 @@ Transfer* CoreProtocol::incomingTransfer() void cp_dump( const TQByteArray &bytes ) { #ifdef YAHOO_COREPROTOCOL_DEBUG - kdDebug(YAHOO_RAW_DEBUG) << " contains " << bytes.count() << " bytes" << endl; + kdDebug(YAHOO_RAW_DEBUG) << " tqcontains " << bytes.count() << " bytes" << endl; for ( uint i = 0; i < bytes.count(); ++i ) { printf( "%02x ", bytes[ i ] ); @@ -196,7 +196,7 @@ int CoreProtocol::wireToTransfer( const TQByteArray& wire ) kdDebug(YAHOO_RAW_DEBUG) << " - not a valid YMSG packet. Trying to recover." << endl; TQTextStream s( wire, IO_ReadOnly ); TQString remaining = s.read(); - int pos = remaining.find( "YMSG", bytesParsed ); + int pos = remaining.tqfind( "YMSG", bytesParsed ); if( pos >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << "Recover successful." << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h index c1c05d89..fc4c2be6 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.h +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.h @@ -27,9 +27,10 @@ class Transfer; class YMSGProtocol; -class CoreProtocol : public QObject +class CoreProtocol : public TQObject { Q_OBJECT + TQ_OBJECT public: enum State { NeedMore, Available, NoData, OutOfSync }; diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c index ee15c345..76620bc4 100644 --- a/kopete/protocols/yahoo/libkyahoo/crypt.c +++ b/kopete/protocols/yahoo/libkyahoo/crypt.c @@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$"; /* Table with characters for base64 transformation. */ static const char b64t[64] = -"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; +"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; char *yahoo_crypt(const char *key, const char *salt); diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp index fd9657f7..10056a61 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.cpp @@ -25,7 +25,7 @@ #include //#include -FileTransferNotifierTask::FileTransferNotifierTask(Task* parent) : Task(parent) +FileTransferNotifierTask::FileTransferNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -104,8 +104,8 @@ void FileTransferNotifierTask::parseFileTransfer( YMSGTransfer *t ) return; - unsigned int left = url.findRev( '/' ) + 1; - unsigned int right = url.findRev( '?' ); + unsigned int left = url.tqfindRev( '/' ) + 1; + unsigned int right = url.tqfindRev( '?' ); filename = url.mid( left, right - left ); emit incomingFileTransfer( from, url, expires, msg, filename, size, TQPixmap() ); diff --git a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h index 429c3668..84b50849 100644 --- a/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/filetransfernotifiertask.h @@ -30,8 +30,9 @@ class TQPixmap; class FileTransferNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - FileTransferNotifierTask(Task *parent); + FileTransferNotifierTask(Task *tqparent); ~FileTransferNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp index 15c3b078..53068b58 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp @@ -19,8 +19,8 @@ #include "inputprotocolbase.h" -InputProtocolBase::InputProtocolBase(TQObject *parent, const char *name) - : TQObject(parent, name) +InputProtocolBase::InputProtocolBase(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -64,11 +64,11 @@ bool InputProtocolBase::okToProceed() bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) { // read the length of the bytes - Q_UINT32 val; + TQ_UINT32 val; if ( !okToProceed() ) return false; *m_din >> val; - m_bytes += sizeof( Q_UINT32 ); + m_bytes += sizeof( TQ_UINT32 ); if ( val > 1024 ) return false; //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h index e236bc68..3c610cdf 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.h @@ -27,12 +27,13 @@ Defines a basic interface for protocols dealing with input from the GroupWise se @author Kopete Developers */ -class InputProtocolBase : public QObject +class InputProtocolBase : public TQObject { Q_OBJECT + TQ_OBJECT public: enum EventProtocolState { Success, NeedMore, OutOfSync, ProtocolError }; - InputProtocolBase(TQObject *parent = 0, const char *name = 0); + InputProtocolBase(TQObject *tqparent = 0, const char *name = 0); ~InputProtocolBase(); /** * Returns a value describing the state of the object. diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c index a97e7be7..56b5f968 100644 --- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c +++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c @@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *); void yahooBase64(unsigned char *out, const unsigned char *in, int inlen) /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */ { - char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + char base64digits[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz" "0123456789._"; @@ -152,7 +152,7 @@ void authresp_0x0b(const char *seed, const char *sn, const char *password, char while (*magic_ptr != (int)NULL) { const char *loc; - /* Ignore parentheses. */ + /* Ignore tqparentheses. */ if (*magic_ptr == '(' || *magic_ptr == ')') { magic_ptr++; diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.cpp b/kopete/protocols/yahoo/libkyahoo/listtask.cpp index d299f963..a368ac5b 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/listtask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include -ListTask::ListTask(Task* parent) : Task(parent) +ListTask::ListTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/listtask.h b/kopete/protocols/yahoo/libkyahoo/listtask.h index 067868a2..2c487c0c 100644 --- a/kopete/protocols/yahoo/libkyahoo/listtask.h +++ b/kopete/protocols/yahoo/libkyahoo/listtask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class ListTask : public Task { Q_OBJECT + TQ_OBJECT public: - ListTask(Task *parent); + ListTask(Task *tqparent); ~ListTask(); bool take(Transfer *transfer); @@ -40,7 +41,7 @@ protected: void parseStealthList( YMSGTransfer *transfer ); signals: void gotBuddy(const TQString&, const TQString&, const TQString&); - void stealthStatusChanged( const TQString&, Yahoo::StealthStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 3c3127b2..439b39f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -37,7 +37,7 @@ extern "C" #include "libyahoo.h" } -LoginTask::LoginTask(Task* parent) : Task(parent) +LoginTask::LoginTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; mState = InitialState; @@ -209,10 +209,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) { const TQString YahooTokenUrl = "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3"; kdDebug(YAHOO_RAW_DEBUG) << "seed:" << seed << endl; - m_stage1Data= TQString::null; + m_stage1Data= TQString(); /* construct a URL from the seed and request tokens */ TQByteArray encodedUrl; - TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); + TQString fullUrl = YahooTokenUrl.tqarg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); KIO::Job* job = KIO::get(tokenUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -291,8 +291,8 @@ 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::null; - TQString fullUrl = YahooLoginUrl.arg(token); + m_stage2Data = TQString(); + TQString fullUrl = YahooLoginUrl.tqarg(token); KURL loginUrl(fullUrl); KIO::Job* job = KIO::get(loginUrl, true, false); connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), @@ -353,15 +353,15 @@ void LoginTask::sendAuthSixteenStage3(const TQString& cryptString) { kdDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString << endl; - //TQByteArray cryptStringHash = QCryptographicHash::hash( cryptString.toAscii(), - // QCryptographicHash::Md5 ); + //TQByteArray cryptStringHash = TQCryptographicHash::hash( cryptString.toAscii(), + // TQCryptographicHash::Md5 ); //cryptStringHash = cryptStringHash.toBase64(); TQString cryptStringHash = KMD5( cryptString.ascii() ).base64Digest(); - cryptStringHash = cryptStringHash.replace('+', '.'); - cryptStringHash = cryptStringHash.replace('/', '_'); - cryptStringHash = cryptStringHash.replace('=', '-'); + cryptStringHash = cryptStringHash.tqreplace('+', '.'); + cryptStringHash = cryptStringHash.tqreplace('/', '_'); + cryptStringHash = cryptStringHash.tqreplace('=', '-'); YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp, m_stateOnConnect); t->setId( m_sessionID ); @@ -404,7 +404,7 @@ void LoginTask::handleAuthResp(YMSGTransfer *t) mState = InitialState; } -void LoginTask::setStateOnConnect( Yahoo::Status status ) +void LoginTask::setStateOnConnect( Yahoo::tqStatus status ) { m_stateOnConnect = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.h b/kopete/protocols/yahoo/libkyahoo/logintask.h index eb2e8fc9..88fc53d3 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.h +++ b/kopete/protocols/yahoo/libkyahoo/logintask.h @@ -38,15 +38,16 @@ namespace KIO class LoginTask : public Task { Q_OBJECT + TQ_OBJECT public: - LoginTask(Task *parent); + LoginTask(Task *tqparent); ~LoginTask(); bool take(Transfer* transfer); virtual void onGo(); void reset(); - void setStateOnConnect( Yahoo::Status status ); + void setStateOnConnect( Yahoo::tqStatus status ); void setVerificationWord( const TQString &word ); const TQString &yCookie(); @@ -79,7 +80,7 @@ signals: void buddyListReady(); private: State mState; - Yahoo::Status m_stateOnConnect; + Yahoo::tqStatus m_stateOnConnect; TQString m_yCookie; TQString m_tCookie; TQString m_cCookie; diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp index 4816ba44..07fc1ae4 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.cpp @@ -22,7 +22,7 @@ #include #include -LogoffTask::LogoffTask(Task* parent) : Task(parent) +LogoffTask::LogoffTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/logofftask.h b/kopete/protocols/yahoo/libkyahoo/logofftask.h index b04f8f53..af29512a 100644 --- a/kopete/protocols/yahoo/libkyahoo/logofftask.h +++ b/kopete/protocols/yahoo/libkyahoo/logofftask.h @@ -26,7 +26,7 @@ class LogoffTask : public Task { public: - LogoffTask(Task *parent); + LogoffTask(Task *tqparent); ~LogoffTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp index de6a1080..4c86bb20 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include -MailNotifierTask::MailNotifierTask(Task* parent) : Task(parent) +MailNotifierTask::MailNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -68,7 +68,7 @@ void MailNotifierTask::parseMail( YMSGTransfer *t ) TQString subject = t->firstParam( 18 ); if( !mail.isEmpty() && !from.isEmpty() && !subject.isEmpty() ) - emit mailNotify( TQString::fromLatin1( "%1 <%2>").arg( from, mail ), subject, count.toInt() ); + emit mailNotify( TQString::tqfromLatin1( "%1 <%2>").tqarg( from, mail ), subject, count.toInt() ); else emit mailNotify( TQString(), TQString(), count.toInt()); } diff --git a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h index 0e1d6028..7faba303 100644 --- a/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/mailnotifiertask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class MailNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - MailNotifierTask(Task *parent); + MailNotifierTask(Task *tqparent); ~MailNotifierTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c index 5a537e04..5bc2c13b 100644 --- a/kopete/protocols/yahoo/libkyahoo/md5.c +++ b/kopete/protocols/yahoo/libkyahoo/md5.c @@ -69,7 +69,7 @@ main() "abc", /*900150983cd24fb0d6963f7d28e17f72*/ "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", /*d174ab98d277d9f5a5611c2c9f419d9f*/ "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ }; diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp index 769b4abe..522f407f 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.cpp @@ -23,7 +23,7 @@ #include "client.h" #include -MessageReceiverTask::MessageReceiverTask(Task* parent) : Task(parent) +MessageReceiverTask::MessageReceiverTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h index 80c4fa44..459b851e 100644 --- a/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h +++ b/kopete/protocols/yahoo/libkyahoo/messagereceivertask.h @@ -28,8 +28,9 @@ class YMSGTransfer; class MessageReceiverTask : public Task { Q_OBJECT + TQ_OBJECT public: - MessageReceiverTask(Task *parent); + MessageReceiverTask(Task *tqparent); ~MessageReceiverTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp index e83b1e4b..84b7f012 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.cpp @@ -22,7 +22,7 @@ #include -ModifyBuddyTask::ModifyBuddyTask(Task* parent) : Task(parent) +ModifyBuddyTask::ModifyBuddyTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } diff --git a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h index 1d2393a6..3d353086 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifybuddytask.h @@ -27,9 +27,10 @@ class TQString; class ModifyBuddyTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { AddBuddy, RemoveBuddy, MoveBuddy }; - ModifyBuddyTask(Task *parent); + ModifyBuddyTask(Task *tqparent); ~ModifyBuddyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 1264272a..b456746a 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -31,7 +31,7 @@ #include using namespace KNetwork; -ModifyYABTask::ModifyYABTask(Task* parent) : Task(parent) +ModifyYABTask::ModifyYABTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; m_socket = 0; @@ -68,7 +68,7 @@ void ModifyYABTask::setEntry( const YABEntry &entry ) doc.appendChild( root ); TQDomElement contact = doc.createElement( "ct" ); - entry.fillQDomElement( contact ); + entry.fillTQDomElement( contact ); switch( m_action ) { case EditEntry: @@ -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").arg(i).arg(static_cast( sender() )->errorString()), Client::Error ); + TQString( "%1 - %2").tqarg(i).tqarg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); } void ModifyYABTask::connectSucceeded() @@ -99,14 +99,14 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) ; KBufferedSocket* socket = const_cast( static_cast( sender() ) ); - TQString header = TQString::fromLatin1("POST /yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1& HTTP/1.1\r\n" + TQString header = TQString::tqfromLatin1("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") - .arg(client()->yCookie()).arg(client()->tCookie()) - .arg(client()->cCookie()).arg(m_postData.utf8().size()); + .tqarg(client()->yCookie()).tqarg(client()->tCookie()) + .tqarg(client()->cCookie()).tqarg(m_postData.utf8().size()); TQByteArray buffer; TQByteArray paket; @@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded() kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl; else { - client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->errorString(), Client::Error ); + client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error ); setError(); return; } @@ -132,9 +132,9 @@ void ModifyYABTask::slotRead() TQByteArray ar( socket->bytesAvailable() ); socket->readBlock( ar.data (), ar.size () ); TQString data( ar ); - data = data.right( data.length() - data.find("") < 0 ) + if( m_data.tqfind("") < 0 ) return; // Need more data m_socket->close(); @@ -166,7 +166,7 @@ void ModifyYABTask::slotRead() e = list.item( it ).toElement(); YABEntry *entry = new YABEntry; - entry->fromQDomElement( e ); + entry->fromTQDomElement( e ); entry->source = YABEntry::SourceYAB; switch( m_action ) @@ -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").arg( e.attribute("es") ).arg( e.attribute("ee") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be saved:\n%1 - %2").tqarg( e.attribute("es") ).tqarg( 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").arg( e.attribute("as") ).arg( e.attribute("ae") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be created:\n%1 - %2").tqarg( e.attribute("as") ).tqarg( 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").arg( e.attribute("ds") ).arg( e.attribute("de") ) ); + emit error( entry, i18n("The Yahoo Address Book entry could not be deleted:\n%1 - %2").tqarg( e.attribute("ds") ).tqarg( e.attribute("de") ) ); continue; } break; diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h index 543b582c..ef1a97eb 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.h @@ -35,9 +35,10 @@ namespace KNetwork { class ModifyYABTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Action { AddEntry, EditEntry, DeleteEntry }; - ModifyYABTask(Task *parent); + ModifyYABTask(Task *tqparent); ~ModifyYABTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp index d924b3a6..cf7a6e34 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp @@ -25,7 +25,7 @@ #include -PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent) +PictureNotifierTask::PictureNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -47,8 +47,8 @@ bool PictureNotifierTask::take( Transfer* transfer ) switch( t->service() ) { - case Yahoo::ServicePictureStatus: - parsePictureStatus( t ); + case Yahoo::ServicePicturetqStatus: + parsePicturetqStatus( t ); parsePicture( t ); break; case Yahoo::ServicePictureChecksum: @@ -80,17 +80,17 @@ bool PictureNotifierTask::forMe( const Transfer* transfer ) const t->service() == Yahoo::ServicePicture || t->service() == Yahoo::ServicePictureUpdate || t->service() == Yahoo::ServicePictureUpload || - t->service() == Yahoo::ServicePictureStatus ) + t->service() == Yahoo::ServicePicturetqStatus ) return true; else return false; } -void PictureNotifierTask::parsePictureStatus( YMSGTransfer *t ) +void PictureNotifierTask::parsePicturetqStatus( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int state; /* key = 213 */ nick = t->firstParam( 4 ); @@ -103,7 +103,7 @@ void PictureNotifierTask::parsePictureChecksum( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int checksum; /* key = 192 */ nick = t->firstParam( 4 ); @@ -117,7 +117,7 @@ void PictureNotifierTask::parsePicture( YMSGTransfer *t ) { kdDebug(YAHOO_RAW_DEBUG) ; - QString nick; /* key = 4 */ + TQString nick; /* key = 4 */ int type; /* key = 13: 1 = request, 2 = notification, 0 = Just changed */ TQString url; /* key = 20 */ int checksum; /* key = 192 */ diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h index 22bbaddb..bfd03303 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.h @@ -29,8 +29,9 @@ class YMSGTransfer; class PictureNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - PictureNotifierTask(Task *parent); + PictureNotifierTask(Task *tqparent); ~PictureNotifierTask(); bool take(Transfer *transfer); @@ -38,7 +39,7 @@ public: protected: virtual bool forMe( const Transfer *transfer ) const; void parsePictureChecksum( YMSGTransfer *transfer ); - void parsePictureStatus( YMSGTransfer *transfer ); + void parsePicturetqStatus( YMSGTransfer *transfer ); void parsePicture( YMSGTransfer *transfer ); void parsePictureUploadResponse( YMSGTransfer *transfer ); signals: diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp index c453ff9d..25b80abe 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.cpp @@ -24,7 +24,7 @@ #include #include -PingTask::PingTask(Task* parent) : Task(parent) +PingTask::PingTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/pingtask.h b/kopete/protocols/yahoo/libkyahoo/pingtask.h index f1c2f6a7..47453709 100644 --- a/kopete/protocols/yahoo/libkyahoo/pingtask.h +++ b/kopete/protocols/yahoo/libkyahoo/pingtask.h @@ -27,7 +27,7 @@ class PingTask : public Task { public: - PingTask(Task *parent); + PingTask(Task *tqparent); ~PingTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index ec2e9f5f..a614f0b8 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -28,7 +28,7 @@ #include #include -ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent) +ReceiveFileTask::ReceiveFileTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; @@ -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::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 = 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->addMetaData("cookies", "manual"); - 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_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_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 ); + 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 ); 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::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") - .arg(client()->tCookie()).arg(client()->yCookie()) ); + 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()) ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h index ac828658..93f3261e 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.h @@ -36,9 +36,10 @@ class YMSGTransfer; class ReceiveFileTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { FileTransferAccept, FileTransfer7Accept, FileTransfer7Reject }; - ReceiveFileTask(Task *parent); + ReceiveFileTask(Task *tqparent); ~ReceiveFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp index 55fb046e..59173389 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.cpp @@ -22,7 +22,7 @@ #include -RequestPictureTask::RequestPictureTask(Task* parent) : Task(parent) +RequestPictureTask::RequestPictureTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h index eccaa652..d2a901bb 100644 --- a/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/requestpicturetask.h @@ -27,8 +27,9 @@ class TQString; class RequestPictureTask : public Task { Q_OBJECT + TQ_OBJECT public: - RequestPictureTask(Task *parent); + RequestPictureTask(Task *tqparent); virtual ~RequestPictureTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp index 0b12c370..714b0960 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp @@ -63,13 +63,7 @@ void SafeDelete::deleteAll() void SafeDelete::deleteSingle(TQObject *o) { -#if QT_VERSION < 0x030000 - // roll our own TQObject::deleteLater() - SafeDeleteLater *sdl = SafeDeleteLater::ensureExists(); - sdl->deleteItLater(o); -#else o->deleteLater(); -#endif } //---------------------------------------------------------------------------- diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.h b/kopete/protocols/yahoo/libkyahoo/safedelete.h index ded0cb31..8e6d5abd 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.h +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.h @@ -57,9 +57,10 @@ private: void unlock(); }; -class SafeDeleteLater : public QObject +class SafeDeleteLater : public TQObject { Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp index 34e94c69..1f23a40b 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.cpp @@ -23,7 +23,7 @@ #include #include -SendAuthRespTask::SendAuthRespTask(Task* parent) : Task(parent) +SendAuthRespTask::SendAuthRespTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h index cbdadf48..8740cf50 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendauthresptask.h @@ -28,8 +28,9 @@ class TQString; class SendAuthRespTask : public Task { Q_OBJECT + TQ_OBJECT public: - SendAuthRespTask(Task *parent); + SendAuthRespTask(Task *tqparent); ~SendAuthRespTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index 48af8684..11844cd8 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -29,7 +29,7 @@ using namespace KNetwork; -SendFileTask::SendFileTask(Task* parent) : Task(parent) +SendFileTask::SendFileTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_transmitted = 0; @@ -205,7 +205,7 @@ void SendFileTask::connectSucceeded() } else { - kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Error opening file: " << m_file.errorString().data() << endl; client()->notifyError( i18n( "An error occurred while sending the file." ), m_file.errorString(), Client::Error ); setError(); return; @@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded() if( !m_socket->writeBlock( buffer, buffer.size() ) ) { - emit error( m_transferId, m_socket->error(), m_socket->errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); m_socket->close(); } else @@ -255,7 +255,7 @@ void SendFileTask::transmitData() if( written != read ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl; - emit error( m_transferId, m_socket->error(), m_socket->errorString() ); + emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() ); setError(); return; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h index c9052125..49f7fbaf 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.h @@ -32,8 +32,9 @@ namespace KNetwork{ class SendFileTask : public Task { Q_OBJECT + TQ_OBJECT public: - SendFileTask(Task *parent); + SendFileTask(Task *tqparent); ~SendFileTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp index 828c6832..438c330f 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp @@ -23,7 +23,7 @@ #include #include -SendMessageTask::SendMessageTask(Task* parent) : Task(parent) +SendMessageTask::SendMessageTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h index e21d9029..52846a3d 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.h @@ -27,7 +27,7 @@ class TQString; class SendMessageTask : public Task { public: - SendMessageTask(Task *parent); + SendMessageTask(Task *tqparent); ~SendMessageTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp index 638a1811..00055725 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.cpp @@ -22,7 +22,7 @@ #include -SendNotifyTask::SendNotifyTask(Task* parent) : Task(parent) +SendNotifyTask::SendNotifyTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; } @@ -35,7 +35,7 @@ void SendNotifyTask::onGo() { YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceNotify); t->setId( client()->sessionID() ); - t->setStatus( Yahoo::StatusNotify ); + t->settqStatus( Yahoo::StatusNotify ); switch( m_type ) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h index d235e858..b4e84658 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendnotifytask.h @@ -27,11 +27,12 @@ class TQString; class SendNotifyTask : public Task { Q_OBJECT + TQ_OBJECT public: enum Type { NotifyTyping, NotifyWebcamInvite, NotifyGame }; enum State { Active = 1, NotActive = 0 }; - SendNotifyTask(Task *parent); + SendNotifyTask(Task *tqparent); ~SendNotifyTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index ab10873a..32500f1c 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -31,7 +31,7 @@ using namespace KNetwork; -SendPictureTask::SendPictureTask(Task* parent) : Task(parent) +SendPictureTask::SendPictureTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_socket = 0; @@ -55,8 +55,8 @@ void SendPictureTask::onGo() case SendInformation: sendInformation(); break; - case SendStatus: - sendStatus(); + case SendtqStatus: + sendtqStatus(); break; } } @@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload() void SendPictureTask::connectFailed( int i) { - kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast( sender() )->errorString() << endl; + kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast( sender() )->KSocketBase::errorString() << endl; - client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast( sender() )->errorString()), Client::Error ); + client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").tqarg(i).tqarg(static_cast( sender() )->KSocketBase::errorString()), Client::Error ); setError(); } @@ -104,22 +104,22 @@ void SendPictureTask::connectSucceeded() } else { - kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString() << endl; - client()->notifyError(i18n("Error opening file: %1").arg(m_path), file.errorString(), Client::Error ); + kdDebug(YAHOO_RAW_DEBUG) << "Error opening file: " << file.errorString().data() << endl; + client()->notifyError(i18n("Error opening file: %1").tqarg(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::fromLatin1("POST /notifyft HTTP/1.1\r\n" + TQString header = TQString::tqfromLatin1("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").arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()).arg(file.size()+4+paket.size()); + "Cache-Control: no-cache\r\n\r\n").tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(client()->cCookie()).tqarg(file.size()+4+paket.size()); stream.writeRawBytes( header.local8Bit(), header.length() ); stream.writeRawBytes( paket.data(), paket.size() ); - stream << (Q_INT8)0x32 << (Q_INT8)0x39 << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0x32 << (TQ_INT8)0x39 << (TQ_INT8)0xc0 << (TQ_INT8)0x80; stream.writeRawBytes( file.readAll(), file.size() ); kdDebug(YAHOO_RAW_DEBUG) << "Buffersize: " << buffer.size() << endl; @@ -163,7 +163,7 @@ void SendPictureTask::readResult() TQString buf( ar ); m_socket->close(); - if( buf.find( "error", 0, false ) >= 0 ) + if( buf.tqfind( "error", 0, false ) >= 0 ) { kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Picture upload failed" << endl; setSuccess( false ); @@ -208,11 +208,11 @@ void SendPictureTask::sendInformation() setSuccess(); } -void SendPictureTask::sendStatus() +void SendPictureTask::sendtqStatus() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePictureStatus); + YMSGTransfer *t = new YMSGTransfer(Yahoo::ServicePicturetqStatus); 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::setStatus( int status ) +void SendPictureTask::settqStatus( int status ) { m_status = status; } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h index dc20a34c..40e80378 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.h @@ -35,10 +35,11 @@ namespace KNetwork { class SendPictureTask : public Task { Q_OBJECT + TQ_OBJECT public: - enum Type { UploadPicture, SendChecksum, SendInformation, SendStatus }; + enum Type { UploadPicture, SendChecksum, SendInformation, SendtqStatus }; - SendPictureTask(Task *parent); + SendPictureTask(Task *tqparent); virtual ~SendPictureTask(); virtual void onGo(); @@ -49,13 +50,13 @@ public: void setFilesize( int ); void setPath( const TQString & ); void setChecksum( int ); - void setStatus( int ); + void settqStatus( int ); void setUrl( const TQString & ); private: void initiateUpload(); void sendChecksum(); void sendInformation(); - void sendStatus(); + void sendtqStatus(); private slots: void connectSucceeded(); void connectFailed( int ); diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index 35796666..3d0802d1 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -24,7 +24,7 @@ #include #include -StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent) +StatusNotifierTask::StatusNotifierTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -42,11 +42,11 @@ bool StatusNotifierTask::take( Transfer* transfer ) YMSGTransfer *t = static_cast(transfer); if( t->service() == Yahoo::ServiceStealthOffline ) - parseStealthStatus( t ); + parseStealthtqStatus( t ); else if( t->service() == Yahoo::ServiceAuthorization ) parseAuthorization( t ); else - parseStatus( t ); + parsetqStatus( 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::ServiceStatus || + t->service() == Yahoo::ServicetqStatus || t->service() == Yahoo::ServiceStealthOffline || t->service() == Yahoo::ServiceAuthorization || - t->service() == Yahoo::ServiceBuddyStatus + t->service() == Yahoo::ServiceBuddytqStatus ) return true; else return false; } -void StatusNotifierTask::parseStatus( YMSGTransfer* t ) +void StatusNotifierTask::parsetqStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -87,7 +87,7 @@ void StatusNotifierTask::parseStatus( YMSGTransfer* t ) emit loginResponse( Yahoo::LoginDupl, TQString() ); } - QString myNick; /* key = 1 */ + TQString myNick; /* key = 1 */ TQString customError; /* key = 16 */ TQString nick; /* key = 7 */ int state; /* key = 10 */ @@ -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").arg(fname).arg(lname); + name = TQString("%1 %2").tqarg(fname).tqarg(lname); kdDebug(YAHOO_RAW_DEBUG) << "Emitting gotAuthorizationRequest( " << nick<< ", " << msg << ", " << name << " )" << endl; emit gotAuthorizationRequest( nick, msg, name ); } } -void StatusNotifierTask::parseStealthStatus( YMSGTransfer* t ) +void StatusNotifierTask::parseStealthtqStatus( YMSGTransfer* t ) { kdDebug(YAHOO_RAW_DEBUG) ; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h index 0d9e1d5a..62668947 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.h @@ -29,20 +29,21 @@ class YMSGTransfer; class StatusNotifierTask : public Task { Q_OBJECT + TQ_OBJECT public: - StatusNotifierTask(Task *parent); + StatusNotifierTask(Task *tqparent); ~StatusNotifierTask(); bool take(Transfer *transfer); protected: virtual bool forMe( const Transfer *transfer ) const; - void parseStatus( YMSGTransfer *transfer ); - void parseStealthStatus( YMSGTransfer *transfer ); + void parsetqStatus( YMSGTransfer *transfer ); + void parseStealthtqStatus( 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::StealthStatus ); + void stealthStatusChanged( const TQString&, Yahoo::StealthtqStatus ); 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 6eba854a..ee9bb6d3 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.cpp @@ -21,7 +21,7 @@ #include "client.h" #include -StealthTask::StealthTask(Task* parent) : Task(parent) +StealthTask::StealthTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -70,7 +70,7 @@ void StealthTask::setTarget( const TQString &to ) m_target = to; } -void StealthTask::setState( Yahoo::StealthStatus state) +void StealthTask::setState( Yahoo::StealthtqStatus state) { m_state = state; } diff --git a/kopete/protocols/yahoo/libkyahoo/stealthtask.h b/kopete/protocols/yahoo/libkyahoo/stealthtask.h index 370f06bc..6a1b0b2e 100644 --- a/kopete/protocols/yahoo/libkyahoo/stealthtask.h +++ b/kopete/protocols/yahoo/libkyahoo/stealthtask.h @@ -29,18 +29,18 @@ class TQString; class StealthTask : public Task { public: - StealthTask(Task *parent); + StealthTask(Task *tqparent); ~StealthTask(); virtual void onGo(); void setTarget( const TQString &to ); - void setState( Yahoo::StealthStatus state ); + void setState( Yahoo::StealthtqStatus state ); void setMode( Yahoo::StealthMode mode ); private: TQString m_target; Yahoo::StealthMode m_mode; - Yahoo::StealthStatus m_state; + Yahoo::StealthtqStatus m_state; }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/stream.cpp b/kopete/protocols/yahoo/libkyahoo/stream.cpp index 82d6fe52..240a8144 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/stream.cpp @@ -19,8 +19,8 @@ #include "stream.h" -Stream::Stream(TQObject *parent) -:TQObject(parent) +Stream::Stream(TQObject *tqparent) +:TQObject(tqparent) { } diff --git a/kopete/protocols/yahoo/libkyahoo/stream.h b/kopete/protocols/yahoo/libkyahoo/stream.h index c7f9eeae..244519f7 100644 --- a/kopete/protocols/yahoo/libkyahoo/stream.h +++ b/kopete/protocols/yahoo/libkyahoo/stream.h @@ -25,9 +25,10 @@ class Transfer; -class Stream : public QObject +class Stream : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; enum StreamCond @@ -43,7 +44,7 @@ public: SystemShutdown }; - Stream(TQObject *parent=0); + Stream(TQObject *tqparent=0); virtual ~Stream(); virtual void close()=0; diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index b604219b..c17568ee 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -40,22 +40,22 @@ public: Transfer * transfer; }; -Task::Task(Task *parent) -:TQObject(parent) +Task::Task(Task *tqparent) +:TQObject(tqparent) { init(); d->transfer = 0; - d->client = parent->client(); + d->client = tqparent->client(); //d->id = client()->genUniqueId(); connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } -Task::Task(Client *parent, bool) +Task::Task(Client *tqparent, bool) :TQObject(0) { init(); - d->client = parent; + d->client = tqparent; connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); } @@ -75,9 +75,9 @@ void Task::init() d->transfer = 0; } -Task *Task::parent() const +Task *Task::tqparent() const { - return (Task *)TQObject::parent(); + return (Task *)TQObject::tqparent(); } Client *Task::client() const @@ -124,12 +124,12 @@ void Task::go(bool autoDelete) bool Task::take( Transfer * transfer) { - const TQObjectList *p = children(); - if(!p) + const TQObjectList p = childrenListObject(); + if(p.isEmpty()) return false; - // pass along the transfer to our children - TQObjectListIt it(*p); + // pass along the transfer to our tqchildren + 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: ").arg(className()) + str); + client()->debug(TQString("%1: ").tqarg(className()) + str); } bool Task::forMe( const Transfer * transfer ) const diff --git a/kopete/protocols/yahoo/libkyahoo/task.h b/kopete/protocols/yahoo/libkyahoo/task.h index c977f3bc..fcdaf9ef 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.h +++ b/kopete/protocols/yahoo/libkyahoo/task.h @@ -27,16 +27,17 @@ class TQString; class Client; class Transfer; -class Task : public QObject +class Task : public TQObject { Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; - Task(Task *parent); + Task(Task *tqparent); Task( Client *, bool isRoot ); virtual ~Task(); - Task *parent() const; + Task *tqparent() const; Client *client() 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 efcd63cf..6d8d9e0d 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::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("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/clientstream_test.h b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h index 8842fcc2..e09c89bb 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.h @@ -19,11 +19,12 @@ #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class ClientStreamTest : public QApplication +class ClientStreamTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: ClientStreamTest(int argc, char ** argv); diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index 5e9b04a5..ecf96906 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::fromLatin1("scs.msg.yahoo.com"); + TQString server = TQString::tqfromLatin1("scs.msg.yahoo.com"); // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h index 68a40b24..1fd43976 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.h +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.h @@ -32,11 +32,12 @@ #include "coreprotocol.h" -#define QT_FATAL_ASSERT 1 +#define TQT_FATAL_ASSERT 1 -class LoginTest : public QApplication +class LoginTest : public TQApplication { Q_OBJECT + TQ_OBJECT public: LoginTest(int argc, char ** argv); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 2ad978f2..41d5019d 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -33,7 +33,7 @@ using namespace KNetwork; -WebcamTask::WebcamTask(Task* parent) : Task(parent) +WebcamTask::WebcamTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; transmittingData = false; @@ -94,7 +94,7 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t ) info.sender = keyPending; info.server = t->firstParam( 102 ); info.key = t->firstParam( 61 ); - info.status = InitialStatus; + info.status = InitialtqStatus; info.dataLength = 0; info.buffer = 0L; info.headerRead = false; @@ -135,7 +135,7 @@ void WebcamTask::slotConnectionStage1Established() if( socketMap[socket].direction == Incoming ) { socket->writeBlock( TQCString("").data(), 8 ); - s = TQString("g=%1\r\n").arg(socketMap[socket].sender); + s = TQString("g=%1\r\n").tqarg(socketMap[socket].sender); } else { @@ -144,7 +144,7 @@ void WebcamTask::slotConnectionStage1Established() } // Header: 08 00 01 00 00 00 00 - stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length(); + stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); stream.writeRawBytes( s.local8Bit(), s.length() ); socket->writeBlock( buffer.data(), buffer.size() ); @@ -168,24 +168,24 @@ void WebcamTask::slotConnectionStage2Established() if( socketMap[socket].direction == Incoming ) { - // Send -Packet - socket->writeBlock( TQCString("").data(), 8 ); + // Send -Packet + socket->writeBlock( TQCString("").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") - .arg(client()->userId()).arg(socketMap[socket].key).arg(socketMap[socket].sender); + .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socketMap[socket].sender); // Header: 08 00 01 00 00 00 00 - stream << (Q_INT8)0x08 << (Q_INT8)0x00 << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT32)s.length(); + stream << (TQ_INT8)0x08 << (TQ_INT8)0x00 << (TQ_INT8)0x01 << (TQ_INT8)0x00 << (TQ_INT32)s.length(); } else { - // Send -Packet + // Send -Packet socket->writeBlock( TQCString("").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") - .arg(client()->userId()).arg(socketMap[socket].key).arg(socket->localAddress().nodeName()); + .tqarg(client()->userId()).tqarg(socketMap[socket].key).tqarg(socket->localAddress().nodeName()); // Header: 08 00 05 00 00 00 00 01 00 00 00 01 - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)s.length() - << (Q_INT8)0x01 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01; + 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; } socket->writeBlock( buffer.data(), buffer.size() ); @@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established() void WebcamTask::slotConnectionFailed( int error ) { KStreamSocket* socket = const_cast( dynamic_cast( sender() ) ); - kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->errorString() << endl; + 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.") - .arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->errorString()), Client::Error ); + .tqarg(socketMap[socket].sender), TQString("%1 - %2").tqarg(error).tqarg( socket->KSocketBase::errorString()), Client::Error ); socketMap.remove( socket ); socket->deleteLater(); } @@ -237,12 +237,12 @@ void WebcamTask::connectStage2( KStreamSocket *socket ) KStreamSocket *newSocket; switch( (const char)data[2] ) { - case (Q_INT8)0x06: + case (TQ_INT8)0x06: emit webcamNotAvailable(socketMap[socket].sender); break; - case (Q_INT8)0x04: - case (Q_INT8)0x07: - while( (const char)data[i] != (Q_INT8)0x00 ) + case (TQ_INT8)0x04: + case (TQ_INT8)0x07: + while( (const char)data[i] != (TQ_INT8)0x00 ) server += data[i++]; kdDebug(YAHOO_RAW_DEBUG) << "Server:" << server << endl; if( server.isEmpty() ) @@ -355,7 +355,7 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) // Send Invitation packets for(it = pendingInvitations.begin(); it != pendingInvitations.end(); it++) { - SendNotifyTask *snt = new SendNotifyTask( parent() ); + SendNotifyTask *snt = new SendNotifyTask( tqparent() ); snt->setTarget( *it ); snt->setType( SendNotifyTask::NotifyWebcamInvite ); snt->go( true ); @@ -425,9 +425,9 @@ void WebcamTask::parseData( TQByteArray &data, KStreamSocket *socket ) case UserRequest: { who.append( info->buffer->buffer() ); - who = who.mid( 2, who.find('\n') - 3); - kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.findIndex( who ) << endl; - if( accessGranted.findIndex( who ) >= 0 ) + who = who.mid( 2, who.tqfind('\n') - 3); + kdDebug(YAHOO_RAW_DEBUG) << "User wants to view webcam: " << who << " len: " << who.length() << " Index: " << accessGranted.tqfindIndex( who ) << endl; + if( accessGranted.tqfindIndex( who ) >= 0 ) { grantAccess( who ); } @@ -579,10 +579,10 @@ void WebcamTask::grantAccess( const TQString &userId ) } TQByteArray ar; TQDataStream stream( ar, IO_WriteOnly ); - TQString user = TQString("u=%1").arg(userId); + TQString user = TQString("u=%1").tqarg(userId); - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)user.length() - << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x00 << (Q_INT8)0x01; + 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; socket->writeBlock( ar.data(), ar.size() ); socket->writeBlock( user.local8Bit(), user.length() ); } @@ -689,8 +689,8 @@ void WebcamTask::transmitWebcamImage() socket->enableWrite( false ); TQByteArray buffer; TQDataStream stream( buffer, IO_WriteOnly ); - stream << (Q_INT8)0x0d << (Q_INT8)0x00 << (Q_INT8)0x05 << (Q_INT8)0x00 << (Q_INT32)pictureBuffer.size() - << (Q_INT8)0x02 << (Q_INT32)timestamp++; + stream << (TQ_INT8)0x0d << (TQ_INT8)0x00 << (TQ_INT8)0x05 << (TQ_INT8)0x00 << (TQ_INT32)pictureBuffer.size() + << (TQ_INT8)0x02 << (TQ_INT32)timestamp++; socket->writeBlock( buffer.data(), buffer.size() ); if( pictureBuffer.size() ) socket->writeBlock( pictureBuffer.data(), pictureBuffer.size() ); diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.h b/kopete/protocols/yahoo/libkyahoo/webcamtask.h index 7c232642..db3756ff 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.h +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.h @@ -30,21 +30,21 @@ namespace KNetwork { } using namespace KNetwork; -enum ConnectionStatus{ InitialStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; +enum ConnectiontqStatus{ InitialtqStatus, ConnectedStage1, ConnectedStage2, Receiving, Sending, SendingEmpty }; enum PacketType { Image, ConnectionClosed, UserRequest, NewWatcher, WatcherLeft }; enum Direction { Incoming, Outgoing }; struct YahooWebcamInformation { - QString sender; - QString server; - QString key; - ConnectionStatus status; + TQString sender; + TQString server; + TQString key; + ConnectiontqStatus status; PacketType type; Direction direction; uchar reason; - Q_INT32 dataLength; - Q_INT32 timestamp; + TQ_INT32 dataLength; + TQ_INT32 timestamp; bool headerRead; TQBuffer *buffer; }; @@ -57,8 +57,9 @@ typedef TQMap< KStreamSocket *, YahooWebcamInformation > SocketInfoMap; class WebcamTask : public Task { Q_OBJECT + TQ_OBJECT public: - WebcamTask(Task *parent); + WebcamTask(Task *tqparent); ~WebcamTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp index b9a4d72b..cee71da6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.cpp @@ -16,7 +16,7 @@ #include "yabentry.h" -void YABEntry::fromQDomElement( const TQDomElement &e ) +void YABEntry::fromTQDomElement( const TQDomElement &e ) { yahooId = e.attribute("yi"); YABId = e.attribute("id", "-1").toInt(); @@ -36,13 +36,13 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) privateURL = e.attribute("pu"); title = e.attribute("ti"); corporation = e.attribute("co"); - workAdress = e.attribute("wa").replace( " ", "\n" ); + workAdress = e.attribute("wa").tqreplace( " ", "\n" ); workCity = e.attribute("wc"); workState = e.attribute("ws"); workZIP = e.attribute("wz"); workCountry = e.attribute("wn"); workURL = e.attribute("wu"); - privateAdress = e.attribute("ha").replace( " ", "\n" ); + privateAdress = e.attribute("ha").tqreplace( " ", "\n" ); privateCity = e.attribute("hc"); privateState = e.attribute("hs"); privateZIP = e.attribute("hz"); @@ -55,7 +55,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) additional2 = e.attribute("c2"); additional3 = e.attribute("c3"); additional4 = e.attribute("c4"); - notes = e.attribute("cm").replace( " ", "\n" ); + notes = e.attribute("cm").tqreplace( " ", "\n" ); imAIM = e.attribute("ima"); imGoogleTalk = e.attribute("img"); imICQ = e.attribute("imq"); @@ -65,7 +65,7 @@ void YABEntry::fromQDomElement( const TQDomElement &e ) imSkype = e.attribute("imk"); } -void YABEntry::fromQDomDocument( const TQDomDocument &d ) +void YABEntry::fromTQDomDocument( const TQDomDocument &d ) { kdDebug() << d.toString() << d.elementsByTagName("yi").item(0).toElement().text() << endl; @@ -86,13 +86,13 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) privateURL = d.elementsByTagName("pu").item(0).toElement().text(); title = d.elementsByTagName("ti").item(0).toElement().text(); corporation = d.elementsByTagName("co").item(0).toElement().text(); - workAdress = d.elementsByTagName("wa").item(0).toElement().text().replace( " ", "\n" ); + workAdress = d.elementsByTagName("wa").item(0).toElement().text().tqreplace( " ", "\n" ); workCity = d.elementsByTagName("wc").item(0).toElement().text(); workState = d.elementsByTagName("ws").item(0).toElement().text(); workZIP = d.elementsByTagName("wz").item(0).toElement().text(); workCountry = d.elementsByTagName("wn").item(0).toElement().text(); workURL = d.elementsByTagName("wu").item(0).toElement().text(); - privateAdress = d.elementsByTagName("ha").item(0).toElement().text().replace( " ", "\n" ); + privateAdress = d.elementsByTagName("ha").item(0).toElement().text().tqreplace( " ", "\n" ); privateCity = d.elementsByTagName("hc").item(0).toElement().text(); privateState = d.elementsByTagName("hs").item(0).toElement().text(); privateZIP = d.elementsByTagName("hz").item(0).toElement().text(); @@ -105,7 +105,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) additional2 = d.elementsByTagName("c2").item(0).toElement().text(); additional3 = d.elementsByTagName("c3").item(0).toElement().text(); additional4 = d.elementsByTagName("c4").item(0).toElement().text(); - notes = d.elementsByTagName("cm").item(0).toElement().text().replace( " ", "\n" ); + notes = d.elementsByTagName("cm").item(0).toElement().text().tqreplace( " ", "\n" ); imAIM = d.elementsByTagName("ima").item(0).toElement().text(); imGoogleTalk = d.elementsByTagName("img").item(0).toElement().text(); imICQ = d.elementsByTagName("imq").item(0).toElement().text(); @@ -115,7 +115,7 @@ void YABEntry::fromQDomDocument( const TQDomDocument &d ) imSkype = d.elementsByTagName("imk").item(0).toElement().text(); } -void YABEntry::fillQDomElement( TQDomElement &e ) const +void YABEntry::fillTQDomElement( TQDomElement &e ) const { e.setAttribute( "yi", yahooId ); e.setAttribute( "id", YABId ); @@ -135,24 +135,24 @@ void YABEntry::fillQDomElement( TQDomElement &e ) const e.setAttribute( "pu", privateURL ); e.setAttribute( "ti", title ); e.setAttribute( "co", corporation ); - e.setAttribute( "wa", TQString( workAdress ).replace( '\n', " " ) ); + e.setAttribute( "wa", TQString( workAdress ).tqreplace( '\n', " " ) ); e.setAttribute( "wc", workCity ); e.setAttribute( "ws", workState ); e.setAttribute( "wz", workZIP ); e.setAttribute( "wn", workCountry ); e.setAttribute( "wu", workURL ); - e.setAttribute( "ha", TQString( privateAdress ).replace( '\n', " " ) ); + e.setAttribute( "ha", TQString( privateAdress ).tqreplace( '\n', " " ) ); e.setAttribute( "hc", privateCity ); e.setAttribute( "hs", privateState ); e.setAttribute( "hz", privateZIP ); e.setAttribute( "hn", privateCountry ); - 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( "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( "c1", additional1 ); e.setAttribute( "c2", additional2 ); e.setAttribute( "c3", additional3 ); e.setAttribute( "c4", additional4 ); - e.setAttribute( "cm", TQString( notes ).replace( '\n', " " ) ); + e.setAttribute( "cm", TQString( notes ).tqreplace( '\n', " " ) ); e.setAttribute( "ima", imAIM ); e.setAttribute( "img", imGoogleTalk ); e.setAttribute( "imq", imICQ ); @@ -191,8 +191,8 @@ void YABEntry::dump() const "workZIP: " << workZIP << endl << "workCountry: " << workCountry << endl << "workURL: " << workURL << endl << - "birthday: " << birthday.toString() << endl << - "anniversary: " << anniversary.toString() << endl << + "birthday: " << TQString(birthday.toString()) << endl << + "anniversary: " << TQString(anniversary.toString()) << endl << "notes: " << notes << endl << "additional1: " << additional1 << endl << "additional2: " << additional2 << endl << diff --git a/kopete/protocols/yahoo/libkyahoo/yabentry.h b/kopete/protocols/yahoo/libkyahoo/yabentry.h index 35620911..14cacef8 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabentry.h +++ b/kopete/protocols/yahoo/libkyahoo/yabentry.h @@ -25,65 +25,65 @@ struct YABEntry enum Source { SourceYAB, SourceContact }; // Personal - QString firstName; - QString secondName; - QString lastName; - QString nickName; - QString title; + TQString firstName; + TQString secondName; + TQString lastName; + TQString nickName; + TQString title; // Primary Information - QString phoneMobile; - QString email; - QString yahooId; + TQString phoneMobile; + TQString email; + TQString yahooId; int YABId; Source source; // Additional Information - QString pager; - QString fax; - QString additionalNumber; - QString altEmail1; - QString altEmail2; - QString imAIM; - QString imICQ; - QString imMSN; - QString imGoogleTalk; - QString imSkype; - QString imIRC; - QString imQQ; + TQString pager; + TQString fax; + TQString additionalNumber; + TQString altEmail1; + TQString altEmail2; + TQString imAIM; + TQString imICQ; + TQString imMSN; + TQString imGoogleTalk; + TQString imSkype; + TQString imIRC; + TQString imQQ; // Private Information - QString privateAdress; - QString privateCity; - QString privateState; - QString privateZIP; - QString privateCountry; - QString privatePhone; - QString privateURL; + TQString privateAdress; + TQString privateCity; + TQString privateState; + TQString privateZIP; + TQString privateCountry; + TQString privatePhone; + TQString privateURL; // Work Information - QString corporation; - QString workAdress; - QString workCity; - QString workState; - QString workZIP; - QString workCountry; - QString workPhone; - QString workURL; + TQString corporation; + TQString workAdress; + TQString workCity; + TQString workState; + TQString workZIP; + TQString workCountry; + TQString workPhone; + TQString workURL; // Miscellaneous - QDate birthday; - QDate anniversary; - QString notes; - QString additional1; - QString additional2; - QString additional3; - QString additional4; + TQDate birthday; + TQDate anniversary; + TQString notes; + TQString additional1; + TQString additional2; + TQString additional3; + TQString additional4; - void fromQDomElement( const TQDomElement &e ); - void fromQDomDocument( const TQDomDocument &e ); - void fillQDomElement( TQDomElement &e ) const; + void fromTQDomElement( const TQDomElement &e ); + void fromTQDomDocument( const TQDomDocument &e ); + void fillTQDomElement( TQDomElement &e ) const; void dump() const; }; diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 1066640e..be274230 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -27,7 +27,7 @@ #include #include -YABTask::YABTask(Task* parent) : Task(parent) +YABTask::YABTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; } @@ -82,7 +82,7 @@ void YABTask::parseContactDetails( YMSGTransfer* t ) TQDomDocument doc; doc.setContent( s ); YABEntry *entry = new YABEntry; - entry->fromQDomDocument( doc ); + entry->fromTQDomDocument( doc ); entry->source = YABEntry::SourceContact; entry->dump(); emit gotEntry( entry ); @@ -93,14 +93,14 @@ void YABTask::parseContactDetails( YMSGTransfer* t ) void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) { kdDebug(YAHOO_RAW_DEBUG) << "LastMerge: " << lastMerge << " LastRemoteRevision: " << lastRemoteRevision << endl; - m_data = TQString::null; - 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_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 ); m_transferJob = KIO::get( url , false, false ); m_transferJob->addMetaData("cookies", "manual"); - m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") - .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); + m_transferJob->addMetaData("setcookies", TQString::tqfromLatin1("Cookie: Y=%1; T=%2; C=%3;") + .tqarg(client()->yCookie()).tqarg(client()->tCookie()).tqarg(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* ) ) ); } @@ -149,7 +149,7 @@ void YABTask::slotResult( KIO::Job* job ) e = list.item( it ).toElement(); YABEntry *entry = new YABEntry; - entry->fromQDomElement( e ); + entry->fromTQDomElement( e ); entry->source = YABEntry::SourceYAB; emit gotEntry( entry ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.h b/kopete/protocols/yahoo/libkyahoo/yabtask.h index 3086a01a..16620fcd 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.h +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.h @@ -34,8 +34,9 @@ namespace KIO { class YABTask : public Task { Q_OBJECT + TQ_OBJECT public: - YABTask(Task *parent); + YABTask(Task *tqparent); ~YABTask(); bool take(Transfer *transfer); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 025386f0..81b2f53e 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -45,8 +45,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl; KIO::TransferJob *transfer; TQString Url = url.url(); - TQString ext = Url.left( Url.findRev( "?" ) ); - ext = ext.right( ext.length() - ext.findRev( "." ) ); + TQString ext = Url.left( Url.tqfindRev( "?" ) ); + ext = ext.right( ext.length() - ext.tqfindRev( "." ) ); transfer = KIO::get( url, false, false ); connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) ); @@ -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)").arg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); + m_client->notifyError( i18n( "An error occurred while downloading a buddy icon (%1)").tqarg( m_jobs[transfer].url.url() ), job->errorString(), Client::Info ); } else { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h index f200725d..4726f1ec 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h @@ -45,9 +45,10 @@ struct IconLoadJob { * If the download was succesfull it emits a signal with a pointer * to the temporary file, the icon was stored at */ -class YahooBuddyIconLoader : public QObject +class YahooBuddyIconLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: YahooBuddyIconLoader( Client *c ); ~YahooBuddyIconLoader(); diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index 028396c2..ed673c2f 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -22,8 +22,8 @@ #include "yahoobytestream.h" -KNetworkByteStream::KNetworkByteStream( TQObject *parent ) - : ByteStream ( parent ) +KNetworkByteStream::KNetworkByteStream( TQObject *tqparent ) + : ByteStream ( tqparent ) { kdDebug( 14181 ) << "Instantiating new KNetwork byte stream." << endl; @@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed() if ( mClosing ) { kdDebug( 14181 ) << "..by ourselves!" << endl; - kdDebug( 14181 ) << "socket error is " << socket()->errorString() << endl; + kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl; emit connectionClosed (); } else @@ -138,4 +138,4 @@ void KNetworkByteStream::slotError( int code ) #include "yahoobytestream.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h index 5f7f0206..4ed96d3a 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.h @@ -32,9 +32,10 @@ class KNetworkByteStream : public ByteStream { Q_OBJECT + TQ_OBJECT public: - KNetworkByteStream ( TQObject *parent = 0 ); + KNetworkByteStream ( TQObject *tqparent = 0 ); ~KNetworkByteStream (); @@ -65,4 +66,4 @@ private: #endif // YAHOOBYTESTREAM_H -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 1c9528ff..3f3af310 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -27,7 +27,7 @@ #include #include -YahooChatTask::YahooChatTask(Task* parent) : Task(parent) +YahooChatTask::YahooChatTask(Task* tqparent) : Task(tqparent) { kdDebug(YAHOO_RAW_DEBUG) ; m_loggedIn = false; @@ -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").arg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(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").arg( category.id )), false, false ); + transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").tqarg( 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").arg(client()->tCookie(), client()->yCookie()) ); + transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").tqarg(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").arg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); + t->setParam( 135, TQString("ym%1").tqarg(YMSG_PROGRAM_VERSION_STRING).local8Bit() ); send( t ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h index 94101d33..ef20a815 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.h +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.h @@ -41,8 +41,9 @@ struct YahooChatJob { class YahooChatTask : public Task { Q_OBJECT + TQ_OBJECT public: - YahooChatTask(Task *parent); + YahooChatTask(Task *tqparent); virtual ~YahooChatTask(); virtual void onGo(); diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 34eb649e..45716e35 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -58,9 +58,9 @@ public: conn = 0; bs = 0; - username = TQString::null; - password = TQString::null; - server = TQString::null; + username = TQString(); + password = TQString(); + server = TQString(); haveLocalAddr = false; doBinding = true; @@ -79,7 +79,7 @@ public: bool doAuth; //send the initial login sequences to get the cookie bool haveLocalAddr; TQHostAddress localAddr; - Q_UINT16 localPort; + TQ_UINT16 localPort; bool doBinding; Connector *conn; @@ -102,8 +102,8 @@ public: int noop_time; }; -ClientStream::ClientStream(Connector *conn, TQObject *parent) -:Stream(parent), d(new Private()) +ClientStream::ClientStream(Connector *conn, TQObject *tqparent) +:Stream(tqparent), d(new Private()) { kdDebug(YAHOO_RAW_DEBUG) ; @@ -203,7 +203,7 @@ void ClientStream::setNoopTime(int mills) d->noopTimer.start(d->noop_time); } -void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port) +void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port) { d->haveLocalAddr = true; d->localAddr = addr; @@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "contains: %i bytes ", bytes.count() ); + qDebug( "tqcontains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h index 89a116fd..bc56eafd 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.h @@ -32,6 +32,7 @@ class Transfer; class ClientStream : public Stream { Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up @@ -71,7 +72,7 @@ public: BindConflict // resource in-use }; - explicit ClientStream(Connector *conn, TQObject *parent=0); + explicit ClientStream(Connector *conn, TQObject *tqparent=0); ~ClientStream(); void connectToServer(const TQString& server, bool auth=true); @@ -83,7 +84,7 @@ public: void setUsername(const TQString &s); void setPassword(const TQString &s); - void setLocalAddr(const TQHostAddress &addr, Q_UINT16 port); + void setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port); void close(); @@ -152,7 +153,7 @@ private: /** * convert internal method representation to wire */ - static char* encode_method(Q_UINT8 method); + static char* encode_method(TQ_UINT8 method); }; #endif diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 9b7c8d8a..0e0f8436 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -25,8 +25,8 @@ #include "yahoobytestream.h" #include "yahootypes.h" -KNetworkConnector::KNetworkConnector( TQObject *parent ) - : Connector( parent ) +KNetworkConnector::KNetworkConnector( TQObject *tqparent ) + : Connector( tqparent ) { kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl; @@ -97,7 +97,7 @@ void KNetworkConnector::done() mByteStream->close (); } -void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) +void KNetworkConnector::setOptHostPort( const TQString &host, TQ_UINT16 port ) { kdDebug ( YAHOO_RAW_DEBUG ) << "Manually specifying host " << host << " and port " << port << endl; @@ -108,4 +108,4 @@ void KNetworkConnector::setOptHostPort( const TQString &host, Q_UINT16 port ) #include "yahooconnector.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h index b4758e72..9a33a2e7 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.h +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.h @@ -34,9 +34,10 @@ class KNetworkConnector : public Connector { Q_OBJECT + TQ_OBJECT public: - KNetworkConnector( TQObject *parent = 0 ); + KNetworkConnector( TQObject *tqparent = 0 ); virtual ~KNetworkConnector(); @@ -44,7 +45,7 @@ public: virtual ByteStream *stream() const; virtual void done(); - void setOptHostPort( const TQString &host, Q_UINT16 port ); + void setOptHostPort( const TQString &host, TQ_UINT16 port ); int errorCode(); @@ -54,7 +55,7 @@ private slots: private: TQString mHost; - Q_UINT16 mPort; + TQ_UINT16 mPort; int mErrorCode; KNetworkByteStream *mByteStream; @@ -63,4 +64,4 @@ private: #endif -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/kopete/protocols/yahoo/libkyahoo/yahootypes.h b/kopete/protocols/yahoo/libkyahoo/yahootypes.h index 0e8858c5..a5017609 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 */ - ServiceStatus = 0xc6, /* YMSG13 */ - ServicePictureStatus = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */ + ServicetqStatus = 0xc6, /* YMSG13 */ + ServicePicturetqStatus = 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 */ - ServiceBuddyStatus = 0xf0, + ServiceBuddytqStatus = 0xf0, ServiceBuddyList = 0xf1 }; - enum Status + enum tqStatus { StatusConnecting = -2, StatusDisconnected = -1, @@ -134,7 +134,7 @@ namespace Yahoo StatusTypeAway }; - enum LoginStatus { + enum LogintqStatus { LoginOk = 0, LoginUname = 3, LoginPasswd = 13, @@ -150,7 +150,7 @@ namespace Yahoo StealthPermOffline }; - enum StealthStatus { + enum StealthtqStatus { StealthActive = 1, StealthNotActive = 2, StealthClear = 3 @@ -161,15 +161,15 @@ namespace Yahoo ResponseDecline }; - enum PictureStatus { + enum PicturetqStatus { NoPicture = 0, Avatar = 1, Picture = 2 }; - typedef Q_UINT8 BYTE; - typedef Q_UINT16 WORD; - typedef Q_UINT32 DWORD; + typedef TQ_UINT8 BYTE; + typedef TQ_UINT16 WORD; + typedef TQ_UINT32 DWORD; struct ChatRoom { TQString name; diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp index b1e6e4e3..5517c3f2 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.cpp @@ -36,8 +36,8 @@ using namespace Yahoo; -YMSGProtocol::YMSGProtocol(TQObject *parent, const char *name) - : InputProtocolBase(parent, name) +YMSGProtocol::YMSGProtocol(TQObject *tqparent, const char *name) + : InputProtocolBase(tqparent, name) { } @@ -64,7 +64,7 @@ Transfer* YMSGProtocol::parse( const TQByteArray & packet, uint& bytes ) int pos = 0; int len = 0; - Yahoo::Status status = Yahoo::StatusAvailable; + Yahoo::tqStatus 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::ServiceStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceStatus " << servicenum << endl; - service = Yahoo::ServiceStatus; + case (Yahoo::ServicetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicetqStatus " << servicenum << endl; + service = Yahoo::ServicetqStatus; 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::ServicePictureStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePictureStatus " << servicenum << endl; - service = Yahoo::ServicePictureStatus; + case (Yahoo::ServicePicturetqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServicePicturetqStatus " << servicenum << endl; + service = Yahoo::ServicePicturetqStatus; 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::ServiceBuddyStatus) : - kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddyStatus " << servicenum << endl; - service = Yahoo::ServiceBuddyStatus; + case (Yahoo::ServiceBuddytqStatus) : + kdDebug(YAHOO_RAW_DEBUG) << " Parsed packet service - This means ServiceBuddytqStatus " << servicenum << endl; + service = Yahoo::ServiceBuddytqStatus; 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 - ServiceStatus = 0xc6, // YMSG13 + ServicetqStatus = 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->setStatus(status); + t->settqStatus(status); t->setPacketLength(len); TQString d = TQString::fromAscii( packet.data() + pos, packet.size() - pos ); diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h index a3ac04a6..1703e36f 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgprotocol.h @@ -25,10 +25,11 @@ class YMSGProtocol : public InputProtocolBase { Q_OBJECT + TQ_OBJECT public: - YMSGProtocol( TQObject *parent = 0, const char *name = 0 ); + YMSGProtocol( TQObject *tqparent = 0, const char *name = 0 ); ~YMSGProtocol(); /** diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.cpp index dcee98d9..3ed2192a 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::Status status; + Yahoo::tqStatus 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::Status status) +YMSGTransfer::YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status) { d = new YMSGTransferPrivate; d->valid = true; @@ -96,12 +96,12 @@ void YMSGTransfer::setService(Yahoo::Service service) d->service = service; } -Yahoo::Status YMSGTransfer::status() const +Yahoo::tqStatus YMSGTransfer::status() const { return d->status; } -void YMSGTransfer::setStatus(Yahoo::Status status) +void YMSGTransfer::settqStatus(Yahoo::tqStatus status) { d->status = status; } @@ -222,27 +222,27 @@ TQByteArray YMSGTransfer::serialize() const TQByteArray buffer; TQDataStream stream( buffer, IO_WriteOnly ); - stream << (Q_INT8)'Y' << (Q_INT8)'M' << (Q_INT8)'S' << (Q_INT8)'G'; + stream << (TQ_INT8)'Y' << (TQ_INT8)'M' << (TQ_INT8)'S' << (TQ_INT8)'G'; if( d->service == Yahoo::ServicePictureUpload ) - stream << (Q_INT16)0x0f00; + stream << (TQ_INT16)0x0f00; else - stream << (Q_INT16)0x000f; - stream << (Q_INT16)0x0000; + stream << (TQ_INT16)0x000f; + stream << (TQ_INT16)0x0000; if( d->service == Yahoo::ServicePictureUpload || d->service == Yahoo::ServiceFileTransfer ) - stream << (Q_INT16)(length()+4); + stream << (TQ_INT16)(length()+4); else - stream << (Q_INT16)length(); - stream << (Q_INT16)d->service; - stream << (Q_INT32)d->status; - stream << (Q_INT32)d->id; + stream << (TQ_INT16)length(); + stream << (TQ_INT16)d->service; + stream << (TQ_INT32)d->status; + stream << (TQ_INT32)d->id; for (ParamList::ConstIterator it = d->data.constBegin(); it != d->data.constEnd(); ++it) { kdDebug(YAHOO_RAW_DEBUG) << " Serializing key " << (*it).first << " value " << (*it).second << endl; stream.writeRawBytes ( TQString::number( (*it).first ).local8Bit(), TQString::number( (*it).first ).length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; stream.writeRawBytes( (*it).second, (*it).second.length() ); - stream << (Q_INT8)0xc0 << (Q_INT8)0x80; + stream << (TQ_INT8)0xc0 << (TQ_INT8)0x80; } kdDebug(YAHOO_RAW_DEBUG) << " pos=" << pos << " (packet size)" << buffer << endl; return buffer; diff --git a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h index 0b157792..953d3993 100644 --- a/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h +++ b/kopete/protocols/yahoo/libkyahoo/ymsgtransfer.h @@ -30,7 +30,7 @@ class YMSGTransferPrivate; -typedef QPair< int, TQCString > Param; +typedef TQPair< int, TQCString > Param; typedef TQValueList< Param > ParamList; /** @@ -40,7 +40,7 @@ class YMSGTransfer : public Transfer { public: YMSGTransfer(Yahoo::Service service); - YMSGTransfer(Yahoo::Service service, Yahoo::Status status); + YMSGTransfer(Yahoo::Service service, Yahoo::tqStatus status); YMSGTransfer(); ~YMSGTransfer(); @@ -51,8 +51,8 @@ public: bool isValid() const; Yahoo::Service service() const; void setService(Yahoo::Service service); - Yahoo::Status status() const; - void setStatus(Yahoo::Status status); + Yahoo::tqStatus status() const; + void settqStatus(Yahoo::tqStatus 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 ff3ef8f6..7aa1bd78 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -1,6 +1,6 @@ YahooAddContactBase - + Form1 @@ -25,15 +25,15 @@ 6 - + - layout53 + tqlayout53 unnamed - + textLabel1 @@ -50,7 +50,7 @@ The account name of the Yahoo account you would like to add. This should be in the form of an alphanumeric string (no spaces). - + contactID @@ -63,14 +63,14 @@ - + textLabel3_2 <i>(for example: joe8752)</i> - + AlignVCenter|AlignRight @@ -84,7 +84,7 @@ Expanding - + 20 80 @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index 4b98f8be..a9102967 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -1,6 +1,6 @@ YahooEditAccountBase - + YahooEditAccountBase @@ -25,17 +25,17 @@ 0 - + tabWidget11 - + 460 0 - + tab @@ -46,7 +46,7 @@ unnamed - + mAccountInfo @@ -57,15 +57,15 @@ unnamed - + - layout81 + tqlayout81 unnamed - + label1 @@ -82,7 +82,7 @@ The account name of your Yahoo account. This should be in the form of an alphanumeric string (no spaces). - + mScreenName @@ -95,7 +95,7 @@ - + mAutoConnect @@ -106,7 +106,7 @@ Check to disable automatic connection. If checked, you may connect to this account manually using the icon in the bottom of the main Kopete window - + mGlobalIdentity @@ -116,7 +116,7 @@ - + groupBox5 @@ -135,7 +135,7 @@ unnamed - + textLabel6 @@ -147,7 +147,7 @@ 0 - + 0 0 @@ -156,11 +156,11 @@ To connect to the Yahoo network, you will need a Yahoo account.<br><br>If you do not currently have a Yahoo account, please click the button to create one. - + WordBreak|AlignVCenter - + buttonRegister @@ -189,7 +189,7 @@ Expanding - + 20 81 @@ -198,7 +198,7 @@ - + TabPage @@ -219,14 +219,14 @@ Expanding - + 20 110 - + groupBox73 @@ -237,7 +237,7 @@ unnamed - + optionOverrideServer @@ -248,15 +248,15 @@ false - + - layout58 + tqlayout58 unnamed - + lblServer @@ -270,13 +270,13 @@ edtServerAddress - The IP address or hostmask of the Yahoo server you wish to connect to. + The IP address or hosttqmask of the Yahoo server you wish to connect to. - The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). + The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). - + editServerAddress @@ -287,13 +287,13 @@ scs.msg.yahoo.com - The IP address or hostmask of the Yahoo server you wish to connect to. + The IP address or hosttqmask of the Yahoo server you wish to connect to. - The IP address or hostmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). + The IP address or hosttqmask of the Yahoo server you wish to connect to. Normally you will want the default (scs.msg.yahoo.com). - + lblPort @@ -313,7 +313,7 @@ The port on the Yahoo server that you would like to connect to. Normally this is 5050, but Yahoo also allows port 80 in case you are behind a firewall. - + sbxServerPort @@ -340,7 +340,7 @@ - + groupBox4 @@ -351,12 +351,12 @@ unnamed - + editPictureUrl - + buttonSelectPicture @@ -367,17 +367,17 @@ - + m_Picture - + 96 96 - + 96 96 @@ -396,7 +396,7 @@ true - + optionSendBuddyIcon @@ -409,14 +409,14 @@ - + labelStatusMessage - + AlignCenter @@ -460,8 +460,8 @@ mAutoConnect buttonRegister - + slotSelectPicture() - - + + diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui index b74dc94b..a9b93dcf 100644 --- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui @@ -1,6 +1,6 @@ YahooGeneralInfoWidget - + YahooGeneralInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox4 @@ -27,7 +27,7 @@ unnamed - + fullNameLabel_2 @@ -38,7 +38,7 @@ fullNameEdit - + fullNameLabel_2_2 @@ -49,7 +49,7 @@ fullNameEdit - + LastNameLabel @@ -60,7 +60,7 @@ fullNameEdit - + lastNameEdit @@ -68,7 +68,7 @@ false - + nickNameEdit @@ -84,7 +84,7 @@ false - + nickNameLabel @@ -95,7 +95,7 @@ nickNameEdit - + firstNameEdit @@ -103,7 +103,7 @@ false - + secondNameEdit @@ -111,7 +111,7 @@ false - + yahooIdLabel @@ -122,7 +122,7 @@ uinEdit - + yahooIdLabel_2 @@ -133,7 +133,7 @@ uinEdit - + birthdayLabel_2 @@ -144,7 +144,7 @@ birthday - + yahooIdEdit @@ -163,7 +163,7 @@ true - + titleEdit @@ -179,7 +179,7 @@ false - + birthdayEdit @@ -187,7 +187,7 @@ false - + anniversaryEdit @@ -195,7 +195,7 @@ false - + birthdayLabel @@ -218,14 +218,14 @@ Expanding - + 21 30 - + groupBox5 @@ -236,7 +236,7 @@ unnamed - + textLabel6_2_2 @@ -247,7 +247,7 @@ cellEdit - + textLabel10_2 @@ -258,7 +258,7 @@ homepageEdit - + emailEdit_3 @@ -274,7 +274,7 @@ false - + textLabel9 @@ -285,7 +285,7 @@ emailEdit - + textLabel9_3 @@ -296,7 +296,7 @@ emailEdit - + textLabel9_2 @@ -307,7 +307,7 @@ emailEdit - + emailEdit_2 @@ -323,7 +323,7 @@ false - + homepageEdit @@ -339,7 +339,7 @@ false - + emailEdit @@ -355,7 +355,7 @@ false - + faxEdit @@ -363,7 +363,7 @@ false - + textLabel7_2 @@ -374,7 +374,7 @@ faxEdit - + textLabel6_2_2_2 @@ -385,7 +385,7 @@ cellEdit - + pagerEdit @@ -401,7 +401,7 @@ false - + additionalEdit @@ -417,7 +417,7 @@ false - + textLabel5 @@ -428,7 +428,7 @@ phoneEdit - + cellEdit @@ -444,7 +444,7 @@ false - + textLabel6_2 @@ -455,7 +455,7 @@ cellEdit - + phoneEdit @@ -468,7 +468,7 @@ - + groupBox2 @@ -479,7 +479,7 @@ unnamed - + textLabel1 @@ -490,7 +490,7 @@ addressEdit - + textLabel8 @@ -501,7 +501,7 @@ countryEdit - + addressEdit @@ -516,14 +516,14 @@ Expanding - + 20 78 - + textLabel4 @@ -534,7 +534,7 @@ stateEdit - + stateEdit @@ -550,7 +550,7 @@ false - + textLabel2 @@ -561,7 +561,7 @@ cityEdit - + cityEdit @@ -577,7 +577,7 @@ false - + countryEdit @@ -585,7 +585,7 @@ false - + textLabel3 @@ -596,7 +596,7 @@ zipEdit - + zipEdit @@ -643,5 +643,5 @@ homepageEdit yahooIdEdit - + diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 09a3cd15..6c83ac64 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -1,6 +1,6 @@ YahooInviteListBase - + YahooInviteListBase @@ -19,15 +19,15 @@ unnamed - + - layout19 + tqlayout19 unnamed - + groupBox3 @@ -38,15 +38,15 @@ unnamed - + - layout5 + tqlayout5 unnamed - + textLabel2 @@ -54,7 +54,7 @@ Friend List - + New Item @@ -63,7 +63,7 @@ listFriends - + 0 180 @@ -72,15 +72,15 @@ - + - layout4 + tqlayout4 unnamed - + textLabel2_2 @@ -88,7 +88,7 @@ Chat Invitation List - + New Item @@ -97,27 +97,27 @@ listInvited - + 0 150 - + - layout2 + tqlayout2 unnamed - + editBuddyAdd - + btnCustomAdd @@ -129,9 +129,9 @@ - + - layout10 + tqlayout10 @@ -147,14 +147,14 @@ Expanding - + 20 20 - + btn_Add @@ -162,7 +162,7 @@ Add >> - + btn_Remove @@ -180,7 +180,7 @@ Expanding - + 20 90 @@ -191,15 +191,15 @@ - + - layout14 + tqlayout14 unnamed - + txtInvMsg @@ -217,29 +217,29 @@ Fixed - + 20 21 - + editMessage - + - layout18 + tqlayout18 unnamed - + btnCancel @@ -265,14 +265,14 @@ Maximum - + 350 31 - + btnInvite @@ -326,12 +326,12 @@ btnRemove_clicked() - + btnAdd_clicked() btnRemove_clicked() btnAddCustom_clicked() btnCancel_clicked() btnInvite_clicked() - - + + diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp index 594e7a01..a5f27b86 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.cpp @@ -22,7 +22,7 @@ #include #include -YahooInviteListImpl::YahooInviteListImpl(TQWidget *parent, const char *name) : YahooInviteListBase(parent,name) +YahooInviteListImpl::YahooInviteListImpl(TQWidget *tqparent, const char *name) : YahooInviteListBase(tqparent,name) { listFriends->setSelectionMode( TQListBox::Extended ); listInvited->setSelectionMode( TQListBox::Extended ); @@ -65,9 +65,9 @@ void YahooInviteListImpl::addInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_inviteeList.find( *it ) == m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) == m_inviteeList.end() ) m_inviteeList.push_back( *it ); - if( m_buddyList.find( *it ) != m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) != m_buddyList.end() ) m_buddyList.remove( *it ); } @@ -80,9 +80,9 @@ void YahooInviteListImpl::removeInvitees( const TQStringList &invitees ) for( TQStringList::const_iterator it = invitees.begin(); it != invitees.end(); it++ ) { - if( m_buddyList.find( *it ) == m_buddyList.end() ) + if( m_buddyList.tqfind( *it ) == m_buddyList.end() ) m_buddyList.push_back( *it ); - if( m_inviteeList.find( *it ) != m_inviteeList.end() ) + if( m_inviteeList.tqfind( *it ) != m_inviteeList.end() ) m_inviteeList.remove( *it ); } diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h index 94fa6402..270fef08 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h +++ b/kopete/protocols/yahoo/ui/yahooinvitelistimpl.h @@ -25,8 +25,9 @@ class YahooInviteListImpl : public YahooInviteListBase { Q_OBJECT + TQ_OBJECT public: - YahooInviteListImpl(TQWidget *parent=0, const char *name=0); + YahooInviteListImpl(TQWidget *tqparent=0, const char *name=0); ~YahooInviteListImpl(); void fillFriendList( const TQStringList &buddies ); diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui index db2e4a8f..98d754d6 100644 --- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui @@ -1,6 +1,6 @@ YahooOtherInfoWidget - + YahooOtherInfoWidget @@ -16,7 +16,7 @@ unnamed - + textLabel13 @@ -24,7 +24,7 @@ Contact comments: - + commentsEdit @@ -32,7 +32,7 @@ false - + textLabel2 @@ -40,7 +40,7 @@ Note 1: - + note1Edit @@ -48,7 +48,7 @@ false - + textLabel3 @@ -56,7 +56,7 @@ Note 2: - + note2Edit @@ -64,7 +64,7 @@ false - + note3Edit @@ -72,7 +72,7 @@ false - + textLabel4 @@ -80,7 +80,7 @@ Note 3: - + note4Edit @@ -88,7 +88,7 @@ false - + textLabel5 @@ -106,7 +106,7 @@ Expanding - + 20 130 @@ -115,5 +115,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui index 6c9a6fc0..f83b2050 100644 --- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui +++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui @@ -1,6 +1,6 @@ YahooStealthSetting - + YahooStealthSetting @@ -12,7 +12,7 @@ 114 - + 195 75 @@ -22,14 +22,14 @@ unnamed - + buttonGroup1 Show Me As - + radioPermOffline @@ -45,7 +45,7 @@ Perma&nently offline - + radioOnline @@ -64,7 +64,7 @@ true - + radioOffline @@ -92,5 +92,5 @@ radioOnline - + diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 700c91e5..536f975b 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -39,29 +39,29 @@ #include "yahoootherinfowidget.h" #include "yahoocontact.h" -YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::IconList, 0, parent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) +YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::IconList, 0, tqparent, name, false, i18n( "Yahoo User Information" ), User2|User1|Cancel, Cancel, false, i18n("Save and Close"), i18n("Merge with existing entry") ) { kdDebug(14180) << k_funcinfo << "Creating new yahoo user info widget" << endl; m_contact = c; showButton( User2, false ); TQFrame* genInfo = addPage( i18n( "General Info" ), i18n( "General Yahoo Information" ), - KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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::fromLatin1( "attach" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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::fromLatin1( "email" ), KIcon::Desktop ) ); + KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "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").arg( yab.birthday.day() ).arg( yab.birthday.month() ).arg( yab.birthday.year() )); + m_genInfoWidget->birthdayEdit->setText( TQString("%1/%2/%3").tqarg( yab.birthday.day() ).tqarg( yab.birthday.month() ).tqarg( yab.birthday.year() )); if( yab.anniversary.isValid() ) - m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").arg( yab.anniversary.day() ).arg( yab.anniversary.month() ).arg( yab.anniversary.year() )); + m_genInfoWidget->anniversaryEdit->setText( TQString("%1/%2/%3").tqarg( yab.anniversary.day() ).tqarg( yab.anniversary.month() ).tqarg( yab.anniversary.year() )); m_genInfoWidget->addressEdit->setText( yab.privateAdress ); m_genInfoWidget->cityEdit->setText( yab.privateCity ); @@ -256,5 +256,5 @@ void YahooUserInfoDialog::setData( const YABEntry &yab ) #include "yahoouserinfodialog.moc" -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h index e8529033..a2cff58e 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.h +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.h @@ -32,8 +32,9 @@ class YahooContact; class YahooUserInfoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooUserInfoDialog( YahooContact *c, TQWidget* parent = 0, const char* name = 0 ); + YahooUserInfoDialog( YahooContact *c, TQWidget* tqparent = 0, const char* name = 0 ); void setAccountConnected( bool isOnline ); signals: void saveYABEntry( YABEntry & ); @@ -53,4 +54,4 @@ private: #endif -//kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off; +//kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off; diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 73eb827a..10eccd2e 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -1,6 +1,6 @@ YahooVerifyAccountBase - + YahooVerifyAccountBase @@ -12,7 +12,7 @@ 200 - + 450 200 @@ -22,7 +22,7 @@ unnamed - + textLabel1 @@ -30,15 +30,15 @@ Your Account has to be verified because of too many false login attempts.<br> - + - layout0 + tqlayout0 unnamed - + textLabel2 @@ -46,7 +46,7 @@ Please enter the chars shown in the picture: - + mWord @@ -61,7 +61,7 @@ Expanding - + 110 20 @@ -80,16 +80,16 @@ Expanding - + 20 16 - + - layout16 + tqlayout16 @@ -105,18 +105,18 @@ Expanding - + 72 20 - + mPicture - + 240 75 @@ -139,7 +139,7 @@ Expanding - + 72 20 @@ -155,5 +155,5 @@ 789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8 - + diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index caa3c75a..9c37c07d 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -27,9 +27,9 @@ #include -YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) -: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).arg( contactId ), - KDialogBase::Close, KDialogBase::Close, parent, name, false, true /*seperator*/ ) +YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * tqparent, const char * name ) +: KDialogBase( KDialogBase::Plain, i18n( "Webcam for %1" ).tqarg( contactId ), + KDialogBase::Close, KDialogBase::Close, tqparent, 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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_imageContainer->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); topLayout->add( m_imageContainer ); m_Viewer = new TQLabel( page ); - m_Viewer->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_Viewer->tqsetSizePolicy(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::fromLatin1("*** Webcam paused ***") ); + m_imageContainer->setText( TQString::tqfromLatin1("*** 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" ).arg( contactName ); break; + closeReason = i18n( "%1 has stopped broadcasting" ).tqarg( contactName ); break; case 2: - closeReason = i18n( "%1 has cancelled viewing permission" ).arg( contactName ); break; + closeReason = i18n( "%1 has cancelled viewing permission" ).tqarg( contactName ); break; case 3: - closeReason = i18n( "%1 has declined permission to view webcam" ).arg( contactName ); break; + closeReason = i18n( "%1 has declined permission to view webcam" ).tqarg( contactName ); break; case 4: - closeReason = i18n( "%1 does not have his/her webcam online" ).arg( contactName ); break; + closeReason = i18n( "%1 does not have his/her webcam online" ).tqarg( contactName ); break; default: - closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).arg( contactName); + closeReason = i18n( "Unable to view the webcam of %1 for an unknown reason" ).tqarg( 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)" ).arg( viewer.size() ); + TQString s = i18n( "%1 viewer(s)" ).tqarg( viewer.size() ); if( viewer.size() ) { s += ": "; diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h index 67380d1f..eb8e1626 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.h +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.h @@ -33,8 +33,9 @@ namespace Kopete class YahooWebcamDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - YahooWebcamDialog( const TQString &, TQWidget* parent = 0, const char* name = 0 ); + YahooWebcamDialog( const TQString &, TQWidget* tqparent = 0, const char* name = 0 ); ~YahooWebcamDialog(); void setViewer( const TQStringList & ); diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui index 0be88f61..5a61311a 100644 --- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui @@ -1,6 +1,6 @@ YahooWorkInfoWidget - + YahooWorkInfoWidget @@ -16,7 +16,7 @@ unnamed - + groupBox2 @@ -27,7 +27,7 @@ unnamed - + textLabel10 @@ -35,7 +35,7 @@ Phone: - + phoneEdit @@ -53,7 +53,7 @@ - + buttonGroup1 @@ -64,7 +64,7 @@ unnamed - + textLabel1 @@ -72,7 +72,7 @@ Name: - + textLabel8 @@ -80,7 +80,7 @@ Homepage: - + companyEdit @@ -88,7 +88,7 @@ false - + homepageEdit @@ -96,7 +96,7 @@ false - + textLabel9 @@ -112,7 +112,7 @@ Country: - + countryEdit @@ -120,12 +120,12 @@ false - + addressEdit - + textLabel2 @@ -143,14 +143,14 @@ Expanding - + 20 20 - + cityEdit @@ -158,7 +158,7 @@ false - + stateEdit @@ -166,7 +166,7 @@ false - + textLabel5 @@ -174,7 +174,7 @@ State: - + textLabel3 @@ -182,7 +182,7 @@ City: - + textLabel4 @@ -190,7 +190,7 @@ Zip: - + zipEdit @@ -210,7 +210,7 @@ Expanding - + 20 150 @@ -229,5 +229,5 @@ stateEdit countryEdit - + diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index ae33f264..fb2c3447 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -66,14 +66,14 @@ #include "yabentry.h" #include "yahoouserinfodialog.h" -YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, const char *name) - : Kopete::PasswordedAccount(parent, accountId, 0, name) +YahooAccount::YahooAccount(YahooProtocol *tqparent, const TQString& accountId, const char *name) + : Kopete::PasswordedAccount(tqparent, accountId, 0, name) { // first things first - initialise internals stateOnConnection = 0; theHaveContactList = false; - m_protocol = parent; + m_protocol = tqparent; m_session = new Client( this ); m_lastDisconnectCode = 0; m_currentMailCount = 0; @@ -101,7 +101,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); - _myself->setOnlineStatus( parent->Offline ); + _myself->setOnlineStatus( tqparent->Offline ); myself()->setProperty( YahooProtocol::protocol()->iconRemoteUrl, configGroup()->readEntry( "iconRemoteUrl", "" ) ); myself()->setProperty( Kopete::Global::Properties::self()->photo(), configGroup()->readEntry( "iconLocalUrl", "" ) ); myself()->setProperty( YahooProtocol::protocol()->iconCheckSum, configGroup()->readEntry( "iconCheckSum", 0 ) ); @@ -109,7 +109,7 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con // initConnectionSignals( MakeConnections ); - TQString displayName = configGroup()->readEntry(TQString::fromLatin1("displayName"), TQString()); + TQString displayName = configGroup()->readEntry(TQString::tqfromLatin1("displayName"), TQString()); if(!displayName.isEmpty()) _myself->setNickName(displayName); @@ -130,17 +130,17 @@ YahooAccount::~YahooAccount() void YahooAccount::setServer( const TQString &server ) { - configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server ); } void YahooAccount::setPort( int port ) { - configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port ); + configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port ); } -void YahooAccount::slotGoStatus( int status, const TQString &awayMessage) +void YahooAccount::slotGotqStatus( int status, const TQString &awayMessage) { - kdDebug(YAHOO_GEN_DEBUG) << "GoStatus: " << status << " msg: " << awayMessage << endl; + kdDebug(YAHOO_GEN_DEBUG) << "GotqStatus: " << status << " msg: " << awayMessage << endl; if( !isConnected() ) { connect( m_protocol->statusFromYahoo( status ) ); @@ -148,7 +148,7 @@ void YahooAccount::slotGoStatus( int status, const TQString &awayMessage) } else { - m_session->changeStatus( Yahoo::Status( status ), awayMessage, + m_session->changetqStatus( Yahoo::tqStatus( 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 @@ -167,16 +167,16 @@ TQString YahooAccount::stripMsgColorCodes(const TQString& msg) TQString filteredMsg = msg; //Handle bold, underline and italic messages - filteredMsg.replace( "\033[1m", "" ); - filteredMsg.replace( "\033[x1m", "" ); - filteredMsg.replace( "\033[2m", "" ); - filteredMsg.replace( "\033[x2m", "" ); - filteredMsg.replace( "\033[4m", "" ); - filteredMsg.replace( "\033[x4m", "" ); + filteredMsg.tqreplace( "\033[1m", "" ); + filteredMsg.tqreplace( "\033[x1m", "" ); + filteredMsg.tqreplace( "\033[2m", "" ); + filteredMsg.tqreplace( "\033[x2m", "" ); + filteredMsg.tqreplace( "\033[4m", "" ); + filteredMsg.tqreplace( "\033[x4m", "" ); //GAIM doesn't check for ^[[3m. Does this ever get sent? - filteredMsg.replace( "\033[3m", "" ); - filteredMsg.replace( "\033[x3m", "" ); + filteredMsg.tqreplace( "\033[3m", "" ); + filteredMsg.tqreplace( "\033[x3m", "" ); //Strip link tags filteredMsg.remove( "\033[lm" ); @@ -196,30 +196,30 @@ TQColor YahooAccount::getMsgColor(const TQString& msg) //kdDebug(YAHOO_GEN_DEBUG) << "msg is " << msg; //Please note that some of the colors are hard-coded to //match the yahoo colors - if ( msg.find("\033[38m") != -1 ) - return Qt::red; - if ( msg.find("\033[34m") != -1 ) - return Qt::green; - if ( msg.find("\033[31m") != -1 ) - return Qt::blue; - if ( msg.find("\033[39m") != -1 ) - return Qt::yellow; - if ( msg.find("\033[36m") != -1 ) - return Qt::darkMagenta; - if ( msg.find("\033[32m") != -1 ) - return Qt::cyan; - if ( msg.find("\033[37m") != -1 ) + if ( msg.tqfind("\033[38m") != -1 ) + return TQt::red; + if ( msg.tqfind("\033[34m") != -1 ) + return TQt::green; + if ( msg.tqfind("\033[31m") != -1 ) + return TQt::blue; + if ( msg.tqfind("\033[39m") != -1 ) + return TQt::yellow; + if ( msg.tqfind("\033[36m") != -1 ) + return TQt::darkMagenta; + if ( msg.tqfind("\033[32m") != -1 ) + return TQt::cyan; + if ( msg.tqfind("\033[37m") != -1 ) return TQColor("#FFAA39"); - if ( msg.find("\033[35m") != -1 ) + if ( msg.tqfind("\033[35m") != -1 ) return TQColor("#FFD8D8"); - if ( msg.find("\033[#") != -1 ) + if ( msg.tqfind("\033[#") != -1 ) { - kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.find("\033[#")+2,7) << endl; - return TQColor(msg.mid(msg.find("\033[#")+2,7)); + kdDebug(YAHOO_GEN_DEBUG) << "Custom color is " << msg.mid(msg.tqfind("\033[#")+2,7) << endl; + return TQColor(msg.mid(msg.tqfind("\033[#")+2,7)); } //return a default value just in case - return Qt::black; + return TQt::black; } void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) @@ -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::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + 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(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::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + 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(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()->onlineStatus() == m_protocol->Connecting ) + myself()->onlinetqStatus() == 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( myself() )->setOnlineStatus( m_protocol->Connecting ); - m_session->setStatusOnConnect( Yahoo::Status( initialStatus().internalStatus() ) ); + m_session->setStatusOnConnect( Yahoo::tqStatus( initialtqStatus().internalStatus() ) ); m_session->connect( server, port, accountId().lower(), passwd ); } @@ -567,7 +567,7 @@ void YahooAccount::disconnect() static_cast( myself() )->setOnlineStatus( m_protocol->Offline ); // FIXME: to check - //QHash::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash::ConstIterator it, itEnd = contacts().constEnd(); //for ( it = contacts().constBegin(); it != itEnd; ++it ) // static_cast( it.value() )->setOnlineStatus( m_protocol->Offline ); for ( TQDictIterator i( contacts() ); i.current(); ++i ) @@ -581,7 +581,7 @@ void YahooAccount::disconnect() m_session->cancelConnect(); // FIXME: to check - //QHash::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash::ConstIterator it, itEnd = contacts().constEnd(); //for ( it = contacts().constBegin(); it != itEnd; ++it ) // static_cast( it.value() )->setOnlineStatus( m_protocol->Offline ); for ( TQDictIterator i(contacts()); i.current(); ++i ) @@ -607,9 +607,9 @@ void YahooAccount::setAway(bool status, const TQString &awayMessage) kdDebug(YAHOO_GEN_DEBUG) ; if( awayMessage.isEmpty() ) - slotGoStatus( status ? 2 : 0 ); + slotGotqStatus( status ? 2 : 0 ); else - slotGoStatus( status ? 99 : 0, awayMessage ); + slotGotqStatus( status ? 99 : 0, awayMessage ); } void YahooAccount::slotConnected() @@ -623,7 +623,7 @@ void YahooAccount::slotGoOnline() if( !isConnected() ) connect( m_protocol->Online ); else - slotGoStatus(0); + slotGotqStatus(0); } void YahooAccount::slotGoOffline() @@ -663,7 +663,7 @@ YahooContact *YahooAccount::contact( const TQString &id ) return static_cast(contacts()[id]); } -bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) +bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) { // kdDebug(YAHOO_GEN_DEBUG) << " contactId: " << contactId; @@ -674,7 +674,7 @@ bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact // -- actualy (oct 2004) this method is only called when new contact are added. but this will // maybe change and you will be noticed --Olivier YahooContact *newContact = new YahooContact( this, contactId, - parentContact->displayName(), parentContact ); + tqparentContact->displayName(), tqparentContact ); return newContact != 0; } else @@ -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 ( initialStatus().internalStatus() ) + if ( initialtqStatus().internalStatus() ) { - static_cast( myself() )->setOnlineStatus( initialStatus() ); + static_cast( myself() )->setOnlineStatus( initialtqStatus() ); } 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.").arg(url); + errorMsg = i18n("Could not log into the Yahoo service: your account has been locked.\nVisit %1 to reactivate it.").tqarg(url); KMessageBox::queuedMessageBox(Kopete::UI::Global::mainWidget(), KMessageBox::Error, errorMsg); static_cast( 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" ) - .arg( accountId() ).arg( m_session->error() ).arg( m_session->errorString() ); - KNotification::event( "connection_lost", message, myself()->onlineStatus().protocolIcon() ); + .tqarg( accountId() ).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + KNotification::event( "connection_lost", message, myself()->onlinetqStatus().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" ) - .arg( accountId()).arg( m_session->error() ).arg( m_session->errorString() ); - KNotification::event( "cannot_connect", message, myself()->onlineStatus().protocolIcon() ); + .tqarg( accountId()).tqarg( m_session->error() ).tqarg( m_session->errorString() ); + KNotification::event( "cannot_connect", message, myself()->onlinetqStatus().protocolIcon() ); } void YahooAccount::slotError( int level ) @@ -825,17 +825,17 @@ void YahooAccount::slotError( int level ) return; else if( level <= Client::Warning ) KMessageBox::information( Kopete::UI::Global::mainWidget(), - i18n( "%1\n\nReason: %2").arg( m_session->errorInformation() ).arg( m_session->errorString() ), + i18n( "%1\n\nReason: %2").tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); else KMessageBox::error( Kopete::UI::Global::mainWidget(), i18n( "%1\n\nReason: %2" ) - .arg( m_session->errorInformation() ).arg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); + .tqarg( m_session->errorInformation() ).tqarg( m_session->errorString() ), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotBuddy( const TQString &userid, const TQString &alias, const TQString &group ) { kdDebug(YAHOO_GEN_DEBUG) ; - IDs[userid] = QPair(group, alias); + IDs[userid] = TQPair(group, alias); // Serverside -> local if ( !contact( userid ) ) @@ -854,7 +854,7 @@ void YahooAccount::slotBuddyAddResult( const TQString &userid, const TQString &g kdDebug(YAHOO_GEN_DEBUG) << success << endl; if(success) - IDs[userid] = QPair(group, TQString()); + IDs[userid] = TQPair(group, TQString()); // FIXME (same) //kdDebug(YAHOO_GEN_DEBUG) << IDs << endl; @@ -878,7 +878,7 @@ void YahooAccount::slotBuddyChangeGroupResult(const TQString &userid, const TQSt kdDebug(YAHOO_GEN_DEBUG); if(success) - IDs[userid] = QPair(group, TQString()); + IDs[userid] = TQPair(group, TQString()); // FIXME //kdDebug(YAHOO_GEN_DEBUG) << IDs << endl; @@ -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." ).arg( who ); - KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); + message = i18n( "User %1 has granted your authorization request." ).tqarg( who ); + KNotification::event( TQString::tqfromLatin1("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" ) - .arg( who ).arg( msg ); - KNotification::event( TQString::fromLatin1("kopete_authorization"), message ); + .tqarg( who ).tqarg( msg ); + KNotification::event( TQString::tqfromLatin1("kopete_authorization"), message ); } void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQString &msg, const TQString &name ) @@ -932,7 +932,7 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt hideFlags |= Kopete::UI::ContactAddedNotifyDialog::AddCheckBox | Kopete::UI::ContactAddedNotifyDialog::AddGroupBox ; Kopete::UI::ContactAddedNotifyDialog *dialog= - new Kopete::UI::ContactAddedNotifyDialog( user,TQString::null,this, hideFlags ); + new Kopete::UI::ContactAddedNotifyDialog( user,TQString(),this, hideFlags ); TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); @@ -946,7 +946,7 @@ void YahooAccount::slotContactAddedNotifyDialogClosed( const TQString &user ) if(!dialog || !isConnected()) return; - m_session->sendAuthReply( user, dialog->authorized(), TQString::null ); + m_session->sendAuthReply( user, dialog->authorized(), TQString() ); if(dialog->added()) { @@ -995,24 +995,24 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr if ( kc ) { - Kopete::OnlineStatus newStatus = m_protocol->statusFromYahoo( stat ); - Kopete::OnlineStatus oldStatus = kc->onlineStatus(); + Kopete::OnlineStatus newtqStatus = m_protocol->statusFromYahoo( stat ); + Kopete::OnlineStatus oldtqStatus = kc->onlinetqStatus(); - if( newStatus == m_protocol->Custom ) { + if( newtqStatus == m_protocol->Custom ) { if( away == 0 ) - newStatus =m_protocol->Online; + newtqStatus =m_protocol->Online; kc->setProperty( m_protocol->awayMessage, msg); } else kc->removeProperty( m_protocol->awayMessage ); // from original file - if( newStatus != m_protocol->Offline && oldStatus == m_protocol->Offline && contact(who) != myself() ) + if( newtqStatus != m_protocol->Offline && oldtqStatus == 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()->onlineStatus() != m_protocol->Invisible && + myself()->onlinetqStatus() != m_protocol->Invisible && !kc->stealthed() ) { kc->sendBuddyIconUpdate( m_session->pictureFlag() ); @@ -1020,21 +1020,21 @@ void YahooAccount::slotStatusChanged( const TQString &who, int stat, const TQStr } } - //if( newStatus == static_cast( m_protocol )->Idle ) { - if( newStatus == m_protocol->Idle ) + //if( newtqStatus == static_cast( m_protocol )->Idle ) { + if( newtqStatus == m_protocol->Idle ) kc->setIdleTime( idle ? idle : 1 ); else kc->setIdleTime( 0 ); - kc->setOnlineStatus( newStatus ); + kc->setOnlineStatus( newtqStatus ); slotGotBuddyIconChecksum( who, pictureChecksum ); } } -void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthStatus state ) +void YahooAccount::slotStealthStatusChanged( const TQString &who, Yahoo::StealthtqStatus state ) { - //kdDebug(YAHOO_GEN_DEBUG) << "Stealth Status of " << who << "changed to " << state; + //kdDebug(YAHOO_GEN_DEBUG) << "Stealth tqStatus of " << who << "changed to " << state; YahooContact* kc = contact( who ); if ( kc == NULL ) { @@ -1053,7 +1053,7 @@ TQString YahooAccount::prepareIncomingMessage( const TQString &messageText ) kdDebug(YAHOO_GEN_DEBUG) << "Message after stripping color codes '" << newMsgText << "'" << endl; - newMsgText.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); + newMsgText.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); // 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::fromLatin1("" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("" ) ); } } @@ -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::fromLatin1("<" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("<" ) ); } } 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::fromLatin1("\\1>" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1>" ) ); } } // add closing tags when needed regExp.setMinimal( false ); regExp.setPattern( "(.*)(?!)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1      " ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1      " ) ); regExp.setPattern( "(.*)(?!)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1      " ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1      " ) ); regExp.setPattern( "(.*)(?!)" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1" ) ); regExp.setPattern( "()" ); - newMsgText.replace( regExp, TQString::fromLatin1("\\1" ) ); + newMsgText.tqreplace( regExp, TQString::tqfromLatin1("\\1" ) ); - newMsgText.replace( TQString::fromLatin1( "\r" ), TQString::fromLatin1( "
      " ) ); + newMsgText.tqreplace( TQString::tqfromLatin1( "\r" ), TQString::tqfromLatin1( "
      " ) ); 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::currentDate(), TQTime::currentTime(), Qt::LocalTime ); + //msgDT = TQDateTime( TQDate::tqcurrentDate(), 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::currentDate(), TQTime::currentTime(), Qt::LocalTime ); + //msgDT = TQDateTime( TQDate::tqcurrentDate(), TQTime::currentTime(), TQt::LocalTime ); msgDT.setTime_t(time(0L)); else //msgDT = TQDateTime::fromTime_t(tm); @@ -1192,7 +1192,7 @@ void YahooAccount::slotGotBuzz( const TQString &who, long tm ) TQString buzzMsgText = i18n("This string is shown when the user is buzzed by a contact", "Buzz"); Kopete::Message kmsg(msgDT, contact(who), justMe, buzzMsgText, Kopete::Message::Inbound, - Kopete::Message::PlainText, TQString::null, Kopete::Message::TypeAction); + Kopete::Message::PlainText, TQString(), Kopete::Message::TypeAction); TQColor fgColor( "gold" ); kmsg.setFg( fgColor ); @@ -1208,7 +1208,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo kdDebug(YAHOO_GEN_DEBUG) << who << " has invited you to join the conference \"" << room << "\" : " << msg << endl; kdDebug(YAHOO_GEN_DEBUG) << "Members: " << members << endl; - if( !m_pendingConfInvites.contains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host + if( !m_pendingConfInvites.tqcontains( room ) ) // We have to keep track of the invites as the server will send the same invite twice if it gets canceled by the host m_pendingConfInvites.push_back( room ); else { @@ -1222,13 +1222,13 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo { if( *it != m_session->userId() ) { - m.append( TQString(", %1").arg( *it ) ); + m.append( TQString(", %1").tqarg( *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?") - .arg(who).arg(m).arg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) + .tqarg(who).tqarg(m).tqarg(msg), TQString(), i18n("Accept"), i18n("Ignore") ) ) { m_session->joinConference( room, myMembers ); if( !m_conferences[room] ) @@ -1267,13 +1267,13 @@ void YahooAccount::prepareConference( const TQString &who ) char c = rand()%52; room += (c > 25) ? c + 71 : c + 65; } - room = TQString("%1-%2--").arg(accountId()).arg(room); + room = TQString("%1-%2--").tqarg(accountId()).tqarg(room); kdDebug(YAHOO_GEN_DEBUG) << "The generated roomname is: " << room << endl; TQStringList buddies; // FIXME: to check - //QHash::ConstIterator it, itEnd = contacts().constEnd(); + //TQHash::ConstIterator it, itEnd = contacts().constEnd(); //for( it = contacts().constBegin(); it != itEnd; ++it ) //{ // buddies.push_back( it.value()->contactId() ); @@ -1321,7 +1321,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -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\"").arg( who ).arg( msg ); + TQString body = i18n( "%1 has declined to join the conference: \"%2\"").tqarg( who ).tqarg( msg ); Kopete::Message message = Kopete::Message( contact( who ), myself(), body, Kopete::Message::Internal, Kopete::Message::PlainText ); session->appendMessage( message ); @@ -1338,7 +1338,7 @@ void YahooAccount::slotConfUserDecline( const TQString &who, const TQString &roo void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1355,7 +1355,7 @@ void YahooAccount::slotConfUserJoin( const TQString &who, const TQString &room ) void YahooAccount::slotConfUserLeave( const TQString & who, const TQString &room ) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1390,7 +1390,7 @@ void YahooAccount::slotConfMessage( const TQString &who, const TQString &room, c { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_conferences.contains( room ) ) + if( !m_conferences.tqcontains( room ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Error. No chatsession for this conference found." << endl; return; @@ -1445,13 +1445,13 @@ void YahooAccount::slotGotYABRevision( long rev, bool merged ) if( merged ) { kdDebug(YAHOO_GEN_DEBUG) << "Merge Revision received: " << rev << endl; - configGroup()->writeEntry( "YABLastMerge", (Q_INT64)rev ); + configGroup()->writeEntry( "YABLastMerge", (TQ_INT64)rev ); m_YABLastMerge = rev; } else { kdDebug(YAHOO_GEN_DEBUG) << "Remote Revision received: " << rev << endl; - configGroup()->writeEntry( "YABLastRemoteRevision", (Q_INT64)rev ); + configGroup()->writeEntry( "YABLastRemoteRevision", (TQ_INT64)rev ); m_YABLastRemoteRevision = rev; } } @@ -1522,7 +1522,7 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQString& fileName) { kdDebug(YAHOO_GEN_DEBUG) ; - if( !m_pendingFileTransfers.contains( transfer->info().internalId() ) ) + if( !m_pendingFileTransfers.tqcontains( transfer->info().internalId() ) ) return; m_pendingFileTransfers.remove( transfer->info().internalId() ); @@ -1531,7 +1531,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS //Create directory if it doesn't already exist TQDir dir; TQString path = TQFileInfo( fileName ).dirPath(); - for( int i = 1; i <= path.contains('/'); ++i ) + for( int i = 1; i <= path.tqcontains('/'); ++i ) { if( !dir.exists( path.section( '/', 0, i ) ) ) { @@ -1554,7 +1554,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info ) { - if( !m_pendingFileTransfers.contains( info.internalId() ) ) + if( !m_pendingFileTransfers.tqcontains( info.internalId() ) ) return; m_pendingFileTransfers.remove( info.internalId() ); @@ -1642,7 +1642,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec if ( cnt > 0 && from.isEmpty() ) { - TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", + TQObject::connect(KNotification::event( TQString::tqfromLatin1("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::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox.

      Subject: %2").arg( from ).arg( subject ), + TQObject::connect(KNotification::event( TQString::tqfromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox.

      Subject: %2").tqarg( from ).tqarg( subject ), TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; @@ -1676,12 +1676,12 @@ void YahooAccount::slotGotWebcamInvite( const TQString& who ) return; } - if( m_pendingWebcamInvites.contains( who ) ) + if( m_pendingWebcamInvites.tqcontains( who ) ) return; m_pendingWebcamInvites.append( who ); - if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").arg( who ), + if( KMessageBox::Yes == KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. Accept?").tqarg( 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.").arg(who), i18n( "Yahoo Plugin" ) ); + KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n("Webcam for %1 is not available.").tqarg(who), i18n( "Yahoo Plugin" ) ); } void YahooAccount::slotGotWebcamImage( const TQString& who, const TQPixmap& image ) @@ -1723,7 +1723,7 @@ void YahooAccount::slotGotBuddyIconChecksum(const TQString &who, int checksum) } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) ) ) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ) ) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not request it again." << endl; return; @@ -1741,7 +1741,7 @@ void YahooAccount::slotGotBuddyIconInfo(const TQString &who, KURL url, int check } if ( checksum == kc->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt() && - TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().replace(TQRegExp("[./~]"),"-") +".png" ) )) + TQFile::exists( locateLocal( "appdata", "yahoopictures/"+ who.lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) )) { kdDebug(YAHOO_GEN_DEBUG) << "Icon already exists. I will not download it again." << endl; return; @@ -1777,7 +1777,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) myself()->removeProperty( YahooProtocol::protocol()->iconExpire ); if ( m_session ) - m_session->setPictureStatus( Yahoo::NoPicture ); + m_session->setPicturetqStatus( Yahoo::NoPicture ); } else { @@ -1791,7 +1791,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n( "The selected buddy icon could not be opened.
      Please set a new buddy icon.      " ), i18n( "Yahoo Plugin" ) ); return; } - image = image.smoothScale( 96, 96, TQImage::ScaleMin ); + image = image.smoothScale( 96, 96, TQ_ScaleMin ); if(image.width() < image.height()) { image = image.copy((image.width()-image.height())/2, 0, 96, 96); @@ -1827,7 +1827,7 @@ void YahooAccount::setBuddyIcon( const KURL &url ) configGroup()->writeEntry( "iconLocalUrl", newlocation ); if ( checksum != static_cast(myself()->property( YahooProtocol::protocol()->iconCheckSum ).value().toInt()) || - TQDateTime::currentDateTime().toTime_t() > expire ) + TQDateTime::tqcurrentDateTime().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->setPictureStatus( Yahoo::Picture ); + m_session->setPicturetqStatus( 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?") - .arg(viewer), TQString::null, i18n("Accept"), i18n("Ignore") ) ) + .tqarg(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()->onlineStatus().status() == Kopete::OnlineStatus::Offline && + if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline && status.status() != Kopete::OnlineStatus::Offline ) { if( !reason.isEmpty() ) m_session->setStatusMessageOnConnect( reason ); connect( status ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.status() == Kopete::OnlineStatus::Offline ) { disconnect(); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 2 && !reason.isEmpty()) { - slotGoStatus( 99, reason ); + slotGotqStatus( 99, reason ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline && + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline && status.internalStatus() == 99 && reason.isEmpty()) { - slotGoStatus( 2, reason ); + slotGotqStatus( 2, reason ); } - else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline ) + else if ( myself()->onlinetqStatus().status() != Kopete::OnlineStatus::Offline ) { - slotGoStatus( status.internalStatus(), reason ); + slotGotqStatus( status.internalStatus(), reason ); } } /* FIXME: not ported yet void YahooAccount::setStatusMessage(const Kopete::StatusMessage &statusMessage) { - int currentStatus = myself()->onlineStatus().internalStatus(); - m_session->changeStatus( Yahoo::Status( currentStatus ), statusMessage.message(), - (currentStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); + int currenttqStatus = myself()->onlinetqStatus().internalStatus(); + m_session->changetqStatus( Yahoo::tqStatus( currenttqStatus ), statusMessage.message(), + (currenttqStatus == Yahoo::StatusAvailable)? Yahoo::StatusTypeAvailable : Yahoo::StatusTypeAway ); myself()->setStatusMessage( statusMessage ); } */ void YahooAccount::slotOpenInbox() { - KRun::runURL( KURL( TQString::fromLatin1("http://mail.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::tqfromLatin1("http://mail.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotOpenYAB() { - KRun::runURL( KURL( TQString::fromLatin1("http://address.yahoo.com/") ) , "text/html" ); + KRun::runURL( KURL( TQString::tqfromLatin1("http://address.yahoo.com/") ) , "text/html" ); } void YahooAccount::slotEditOwnYABEntry() diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 5332794f..4269a6cd 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -21,7 +21,7 @@ #ifndef YAHOOACCOUNT_H #define YAHOOACCOUNT_H -// Qt +// TQt #include #include #include @@ -64,12 +64,13 @@ namespace KIO{ class YahooAccount : public Kopete::PasswordedAccount { Q_OBJECT + TQ_OBJECT public: enum SignalConnectionType { MakeConnections, DeleteConnections }; - YahooAccount(YahooProtocol *parent,const TQString& accountID, const char *name = 0); + YahooAccount(YahooProtocol *tqparent,const TQString& accountID, const char *name = 0); ~YahooAccount(); /* @@ -92,7 +93,7 @@ public: /** * Returns true if contact @p id is on the server-side contact list */ - bool isOnServer(const TQString &id) { return IDs.contains(id); } + bool isOnServer(const TQString &id) { return IDs.tqcontains(id); } /** * Returns true if we have the server-side contact list @@ -135,7 +136,7 @@ public slots: virtual void disconnect(); /** Reimplemented from Kopete::Account */ - void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString::null); + void setOnlineStatus( const Kopete::OnlineStatus&, const TQString &reason = TQString()); signals: /** @@ -152,7 +153,7 @@ protected: /** * Adds our Yahoo contact to a metacontact */ - virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); virtual bool createChatContact( const TQString &nick ); @@ -175,7 +176,7 @@ protected slots: void slotJoinChatRoom(); void slotChatCategorySelected( const Yahoo::ChatCategory &category ); - void slotGoStatus(int status, const TQString &awayMessage = TQString()); + void slotGotqStatus(int status, const TQString &awayMessage = TQString()); void slotLoginResponse(int succ, const TQString &url); void slotDisconnected(); void slotLoginFailed(); @@ -191,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::StealthStatus state); + void slotStealthStatusChanged(const TQString &who, Yahoo::StealthtqStatus 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); @@ -261,7 +262,7 @@ private: * internal (to the plugin) controls/flags * This should be kept in sync with server - if a buddy is removed, this should be changed accordingly. */ - TQMap > IDs; + TQMap > IDs; /** * Conferences list, maped by room name (id) diff --git a/kopete/protocols/yahoo/yahooaddcontact.cpp b/kopete/protocols/yahoo/yahooaddcontact.cpp index af3e1bc5..df9bca6d 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.cpp +++ b/kopete/protocols/yahoo/yahooaddcontact.cpp @@ -33,9 +33,9 @@ #include "yahooaccount.h" // Yahoo Add Contact page -YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *parent, const char *name): AddContactPage(parent, name) +YahooAddContact::YahooAddContact(YahooProtocol *owner, TQWidget *tqparent, const char *name): AddContactPage(tqparent, name) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(, , " << name << ")" << endl; + kdDebug(YAHOO_GEN_DEBUG) << "YahooAddContact::YahooAddContact(, , " << name << ")" << endl; (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new YahooAddContactBase(this); diff --git a/kopete/protocols/yahoo/yahooaddcontact.h b/kopete/protocols/yahoo/yahooaddcontact.h index 796c82ce..ad07eb69 100644 --- a/kopete/protocols/yahoo/yahooaddcontact.h +++ b/kopete/protocols/yahoo/yahooaddcontact.h @@ -34,13 +34,14 @@ namespace Kopete { class MetaContact; } class YahooAddContact: public AddContactPage { Q_OBJECT + TQ_OBJECT private: YahooProtocol *theProtocol; YahooAddContactBase *theDialog; public: - YahooAddContact(YahooProtocol *owner, TQWidget *parent = 0, const char *name = 0); + YahooAddContact(YahooProtocol *owner, TQWidget *tqparent = 0, const char *name = 0); ~YahooAddContact(); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 5402919c..ef0bf09e 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( view(false)->mainWidget()->topLevelWidget() ) : 0L; + KMainWindow *w= view(false) ? dynamic_cast( view(false)->mainWidget()->tqtopLevelWidget() ) : 0L; if(w) { //We connected that in the constructor. we don't need to keep this slot active. diff --git a/kopete/protocols/yahoo/yahoochatsession.h b/kopete/protocols/yahoo/yahoochatsession.h index 43ab7288..e20bb257 100644 --- a/kopete/protocols/yahoo/yahoochatsession.h +++ b/kopete/protocols/yahoo/yahoochatsession.h @@ -30,6 +30,7 @@ class TQLabel; class KOPETE_EXPORT YahooChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: YahooChatSession( Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 ); diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 8d34689b..b9b510a9 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -95,7 +95,7 @@ void YahooConferenceChatSession::slotInviteOthers() Kopete::Contact *myself = account()->myself(); for( ; it.current(); ++it ) { - if( (*it) != myself && !members().contains( *it ) ) + if( (*it) != myself && !members().tqcontains( *it ) ) buddies.push_back( (*it)->contactId() ); } diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.h b/kopete/protocols/yahoo/yahooconferencemessagemanager.h index 086d229a..1f54ac5b 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.h +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.h @@ -32,6 +32,7 @@ class KActionMenu; class YahooConferenceChatSession : public Kopete::ChatSession { Q_OBJECT + TQ_OBJECT public: YahooConferenceChatSession( const TQString &m_yahooRoom, Kopete::Protocol *protocol, const Kopete::Contact *user, Kopete::ContactPtrList others, const char *name = 0 ); diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index d26eb739..377103c8 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").arg( status.description() ) ) ); + i18n("%1|Stealthed").tqarg( 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( onlineStatus() ); + setOnlineStatus( onlinetqStatus() ); } 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 onlineStatus().status() != Kopete::OnlineStatus::Offline && onlineStatus().status() != Kopete::OnlineStatus::Unknown; + return onlinetqStatus().status() != Kopete::OnlineStatus::Offline && onlinetqStatus().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::fromLatin1("\033[1m\\3\033[x1m" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\033[1m\\3\033[x1m" ) ); } } @@ -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::fromLatin1("\033[4m\\3\033[x4m" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\033[4m\\3\033[x4m" ) ); } } @@ -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::fromLatin1("\033[2m\\3\033[x2m" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\033[2m\\3\033[x2m" ) ); } } @@ -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::fromLatin1("\033[#\\2m\\4\033[#000000m" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\033[#\\2m\\4\033[#000000m" ) ); } } @@ -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::fromLatin1("\\4" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\4" ) ); } } @@ -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::fromLatin1("\\4" ) ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\4" ) ); } } @@ -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::fromLatin1("\\2") ); + newMsg.tqreplace( regExp, TQString::tqfromLatin1("\\2") ); } } // convert escaped chars - newMsg.replace( TQString::fromLatin1( ">" ), TQString::fromLatin1( ">" ) ); - newMsg.replace( TQString::fromLatin1( "<" ), TQString::fromLatin1( "<" ) ); - newMsg.replace( TQString::fromLatin1( """ ), TQString::fromLatin1( "\"" ) ); - newMsg.replace( TQString::fromLatin1( " " ), TQString::fromLatin1( " " ) ); - newMsg.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&" ) ); - newMsg.replace( TQString::fromLatin1( "
      " ), TQString::fromLatin1( "\r" ) ); - newMsg.replace( TQString::fromLatin1( "
      " ), TQString::fromLatin1( "\r" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( ">" ), TQString::tqfromLatin1( ">" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "<" ), TQString::tqfromLatin1( "<" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( """ ), TQString::tqfromLatin1( "\"" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( " " ), TQString::tqfromLatin1( " " ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "
      " ), TQString::tqfromLatin1( "\r" ) ); + newMsg.tqreplace( TQString::tqfromLatin1( "
      " ), TQString::tqfromLatin1( "\r" ) ); return newMsg; } @@ -447,7 +447,7 @@ void YahooContact::slotUserProfile() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString profileSiteString = TQString::fromLatin1("http://profiles.yahoo.com/") + userId(); + TQString profileSiteString = TQString::tqfromLatin1("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()->onlineStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlinetqStatus() == 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()->onlineStatus() == YahooProtocol::protocol()->Invisible ) + if( m_account->myself()->onlinetqStatus() == YahooProtocol::protocol()->Invisible ) { if( stealthWidget->radioOnline->isChecked() ) { @@ -518,7 +518,7 @@ void YahooContact::buzzContact() Kopete::Message msg = Kopete::Message( manager(Kopete::Contact::CannotCreate)->myself() , manager(Kopete::Contact::CannotCreate)->members(), i18n("Buzzz!!!"), Kopete::Message::Outbound, Kopete::Message::PlainText, - TQString::null , Kopete::Message::TypeAction); + TQString() , Kopete::Message::TypeAction); view->appendMessage( msg ); } } @@ -549,7 +549,7 @@ void YahooContact::setDisplayPicture(const TQByteArray &data, int checksum) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << data.size() << endl; - TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; + TQString newlocation = locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; setProperty( YahooProtocol::protocol()->iconCheckSum, checksum ); TQFile f( newlocation ); @@ -590,8 +590,8 @@ const YABEntry *YahooContact::yabEntry() void YahooContact::slotEmitDisplayPictureChanged() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; - TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ; - setProperty( Kopete::Global::Properties::self()->photo(), TQString::null ); + TQString newlocation=locateLocal( "appdata", "yahoopictures/"+ contactId().lower().tqreplace(TQRegExp("[./~]"),"-") +".png" ) ; + setProperty( Kopete::Global::Properties::self()->photo(), TQString() ); setProperty( Kopete::Global::Properties::self()->photo() , newlocation ); emit displayPictureChanged(); } @@ -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.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").tqarg("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.").arg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); + "\nPlease see %1 for further information.").tqarg("http://wiki.kde.org/tiki-index.php?page=Kopete%20Webcam%20Support") ); return; } @@ -763,8 +763,8 @@ void YahooContact::writeYABEntry() setProperty( YahooProtocol::protocol()->propWorkURL, m_YABEntry->workURL ); // Miscellanous - setProperty( YahooProtocol::protocol()->propBirthday, m_YABEntry->birthday.toString( Qt::ISODate ) ); - setProperty( YahooProtocol::protocol()->propAnniversary, m_YABEntry->anniversary.toString( Qt::ISODate ) ); + setProperty( YahooProtocol::protocol()->propBirthday, TQString(m_YABEntry->birthday.toString( Qt::ISODate )) ); + setProperty( YahooProtocol::protocol()->propAnniversary, TQString(m_YABEntry->anniversary.toString( Qt::ISODate )) ); setProperty( YahooProtocol::protocol()->propNotes, m_YABEntry->notes ); setProperty( YahooProtocol::protocol()->propAdditional1, m_YABEntry->additional1 ); setProperty( YahooProtocol::protocol()->propAdditional2, m_YABEntry->additional2 ); @@ -838,5 +838,5 @@ void YahooContact::readYABEntry() #include "yahoocontact.moc" // vim: set noet ts=4 sts=4 sw=4: -//kate: space-indent off; replace-tabs off; indent-mode csands; +//kate: space-indent off; tqreplace-tabs off; indent-mode csands; diff --git a/kopete/protocols/yahoo/yahoocontact.h b/kopete/protocols/yahoo/yahoocontact.h index 092a2c93..e9f8b517 100644 --- a/kopete/protocols/yahoo/yahoocontact.h +++ b/kopete/protocols/yahoo/yahoocontact.h @@ -41,6 +41,7 @@ struct KURL; class YahooContact : public Kopete::Contact { Q_OBJECT + TQ_OBJECT public: YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact ); ~YahooContact(); @@ -53,7 +54,7 @@ public: virtual void serialize( TQMap &serializedData, TQMap &addressBookData ); void setOnlineStatus(const Kopete::OnlineStatus &status); - void setYahooStatus( const Kopete::OnlineStatus& ); + void setYahootqStatus( const Kopete::OnlineStatus& ); void setStealthed( bool ); bool stealthed(); @@ -77,7 +78,7 @@ public slots: virtual void slotUserInfo(); virtual void slotSendFile( const KURL &file ); virtual void deleteContact(); - virtual void sendFile( const KURL &sourceURL = KURL(), const TQString &fileName = TQString::null, uint fileSize = 0L ); + virtual void sendFile( const KURL &sourceURL = KURL(), const TQString &fileName = TQString(), uint fileSize = 0L ); void slotUserProfile(); void stealthContact(); void requestWebcam(); diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index c2508a58..b43fb476 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -47,7 +47,7 @@ #include "yahooeditaccount.h" // Yahoo Add Contact page -YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent, const char* /*name*/): YahooEditAccountBase(parent), KopeteEditAccountWidget(theAccount) +YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent, const char* /*name*/): YahooEditAccountBase(tqparent), KopeteEditAccountWidget(theAccount) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -148,7 +148,7 @@ Kopete::Account *YahooEditAccount::apply() } else { - yahooAccount->setBuddyIcon( KURL( TQString::null ) ); + yahooAccount->setBuddyIcon( KURL( TQString() ) ); } // Global Identity @@ -164,7 +164,7 @@ void YahooEditAccount::slotOpenRegister() void YahooEditAccount::slotSelectPicture() { - KURL file = KFileDialog::getImageOpenURL( TQString::null, this, i18n( "Yahoo Buddy Icon" ) ); + KURL file = KFileDialog::getImageOpenURL( TQString(), this, i18n( "Yahoo Buddy Icon" ) ); if ( file.isEmpty() ) return; diff --git a/kopete/protocols/yahoo/yahooeditaccount.h b/kopete/protocols/yahoo/yahooeditaccount.h index a64d88f7..47a445f8 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.h +++ b/kopete/protocols/yahoo/yahooeditaccount.h @@ -35,13 +35,14 @@ namespace Kopete { class Account; } class YahooEditAccount: public YahooEditAccountBase, public KopeteEditAccountWidget { Q_OBJECT + TQ_OBJECT private: YahooProtocol *theProtocol; Kopete::UI::PasswordWidget *mPasswordWidget; public: - YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *parent = 0, const char *name = 0); + YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, TQWidget *tqparent = 0, const char *name = 0); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index dc2e3cdc..fc132701 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory YahooProtocolFactory; K_EXPORT_COMPONENT_FACTORY( kopete_yahoo, YahooProtocolFactory( "kopete_yahoo" ) ) -YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & ) - : Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ), - Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), - Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), +YahooProtocol::YahooProtocol( TQObject *tqparent, const char *name, const TQStringList & ) + : Kopete::Protocol( YahooProtocolFactory::instance(), tqparent, name ), + Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString(), i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), + Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString(), i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ), Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", i18n( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", i18n( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ), @@ -55,51 +55,51 @@ YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQString Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", i18n( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ), Connecting( Kopete::OnlineStatus::Connecting,2, this, 555, "yahoo_connecting", i18n( "Connecting" ) ), awayMessage(Kopete::Global::Properties::self()->awayMessage()), - iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString::null, true, false, true), - iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString::null, true, false, true), - iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString::null, true, false, true), + iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString(), true, false, true), + iconExpire("iconExpire", i18n("Buddy Icon Expire"), TQString(), true, false, true), + iconRemoteUrl("iconRemoteUrl", i18n("Buddy Icon Remote Url"), TQString(), true, false, true), propfirstName(Kopete::Global::Properties::self()->firstName()), propSecondName(), propLastName(Kopete::Global::Properties::self()->lastName()), propNickName(Kopete::Global::Properties::self()->nickName()), - propTitle("YABTitle", i18n("Title"), TQString::null, true, false), + propTitle("YABTitle", i18n("Title"), TQString(), true, false), propPhoneMobile(Kopete::Global::Properties::self()->privateMobilePhone()), propEmail(Kopete::Global::Properties::self()->emailAddress()), - propYABId("YABId", i18n("YAB Id"), TQString::null, true, false, true), - propPager("YABPager", i18n("Pager number"), TQString::null, true, false), - propFax("YABFax", i18n("Fax number"), TQString::null, true, false), - propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString::null, true, false), - propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString::null, true, false), - propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString::null, true, false), - propImAIM("YABIMAIM", i18n("AIM"), TQString::null, true, false), - propImICQ("YABIMICQ", i18n("ICQ"), TQString::null, true, false), - propImMSN("YABIMMSN", i18n("MSN"), TQString::null, true, false), - propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString::null, true, false), - propImSkype("YABIMSkype", i18n("Skype"), TQString::null, true, false), - propImIRC("YABIMIRC", i18n("IRC"), TQString::null, true, false), - propImQQ("YABIMQQ", i18n("QQ"), TQString::null, true, false), - propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString::null, true, false), - propPrivateCity("YABPrivateCity", i18n("Private City"), TQString::null, true, false), - propPrivateState("YABPrivateState", i18n("Private State"), TQString::null, true, false), - propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString::null, true, false), - propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString::null, true, false), + propYABId("YABId", i18n("YAB Id"), TQString(), true, false, true), + propPager("YABPager", i18n("Pager number"), TQString(), true, false), + propFax("YABFax", i18n("Fax number"), TQString(), true, false), + propAdditionalNumber("YABAdditionalNumber", i18n("Additional number"), TQString(), true, false), + propAltEmail1("YABAlternativeEmail1", i18n("Alternative email 1"), TQString(), true, false), + propAltEmail2("YABAlternativeEmail2", i18n("Alternative email 1"), TQString(), true, false), + propImAIM("YABIMAIM", i18n("AIM"), TQString(), true, false), + propImICQ("YABIMICQ", i18n("ICQ"), TQString(), true, false), + propImMSN("YABIMMSN", i18n("MSN"), TQString(), true, false), + propImGoogleTalk("YABIMGoogleTalk", i18n("GoogleTalk"), TQString(), true, false), + propImSkype("YABIMSkype", i18n("Skype"), TQString(), true, false), + propImIRC("YABIMIRC", i18n("IRC"), TQString(), true, false), + propImQQ("YABIMQQ", i18n("QQ"), TQString(), true, false), + propPrivateAddress("YABPrivateAddress", i18n("Private Address"), TQString(), true, false), + propPrivateCity("YABPrivateCity", i18n("Private City"), TQString(), true, false), + propPrivateState("YABPrivateState", i18n("Private State"), TQString(), true, false), + propPrivateZIP("YABPrivateZIP", i18n("Private ZIP"), TQString(), true, false), + propPrivateCountry("YABPrivateCountry", i18n("Private Country"), TQString(), true, false), propPrivatePhone(Kopete::Global::Properties::self()->privatePhone()), - propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString::null, true, false), - propCorporation("YABCorporation", i18n("Corporation"), TQString::null, true, false), - propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString::null, true, false), - propWorkCity("YABWorkCity", i18n("Work City"), TQString::null, true, false), - propWorkState("YABWorkState", i18n("Work State"), TQString::null, true, false), - propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString::null, true, false), - propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString::null, true, false), + propPrivateURL("YABPrivateURL", i18n("Private URL"), TQString(), true, false), + propCorporation("YABCorporation", i18n("Corporation"), TQString(), true, false), + propWorkAddress("YABWorkAddress", i18n("Work Address"), TQString(), true, false), + propWorkCity("YABWorkCity", i18n("Work City"), TQString(), true, false), + propWorkState("YABWorkState", i18n("Work State"), TQString(), true, false), + propWorkZIP("YABWorkZIP", i18n("Work ZIP"), TQString(), true, false), + propWorkCountry("YABWorkCountry", i18n("Work Country"), TQString(), true, false), propWorkPhone(Kopete::Global::Properties::self()->workPhone()), - propWorkURL("YABWorkURL", i18n("Work URL"), TQString::null, true, false), - propBirthday("YABBirthday", i18n("Birthday"), TQString::null, true, false), - propAnniversary("YABAnniversary", i18n("Anniversary"), TQString::null, true, false), - propNotes("YABNotes", i18n("Notes"), TQString::null, true, false), - propAdditional1("YABAdditional1", i18n("Additional 1"), TQString::null, true, false), - propAdditional2("YABAdditional2", i18n("Additional 2"), TQString::null, true, false), - propAdditional3("YABAdditional3", i18n("Additional 3"), TQString::null, true, false), - propAdditional4("YABAdditional4", i18n("Additional 4"), TQString::null, true, false) + propWorkURL("YABWorkURL", i18n("Work URL"), TQString(), true, false), + propBirthday("YABBirthday", i18n("Birthday"), TQString(), true, false), + propAnniversary("YABAnniversary", i18n("Anniversary"), TQString(), true, false), + propNotes("YABNotes", i18n("Notes"), TQString(), true, false), + propAdditional1("YABAdditional1", i18n("Additional 1"), TQString(), true, false), + propAdditional2("YABAdditional2", i18n("Additional 2"), TQString(), true, false), + propAdditional3("YABAdditional3", i18n("Additional 3"), TQString(), true, false), + propAdditional4("YABAdditional4", i18n("Additional 4"), TQString(), true, false) { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; @@ -187,15 +187,15 @@ Kopete::Contact *YahooProtocol::deserializeContact( Kopete::MetaContact *metaCon return theAccount->contacts()[contactId]; } -AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * parent , Kopete::Account* ) +AddContactPage *YahooProtocol::createAddContactWidget( TQWidget * tqparent , Kopete::Account* ) { - kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget()" << endl; - return new YahooAddContact(this, parent); + kdDebug(YAHOO_GEN_DEBUG) << "YahooProtocol::createAddContactWidget()" << endl; + return new YahooAddContact(this, tqparent); } -KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *parent) +KopeteEditAccountWidget *YahooProtocol::createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent) { - return new YahooEditAccount(this, account, parent); + return new YahooEditAccount(this, account, tqparent); } Kopete::Account *YahooProtocol::createNewAccount(const TQString &accountId) diff --git a/kopete/protocols/yahoo/yahooprotocol.h b/kopete/protocols/yahoo/yahooprotocol.h index 4b597243..f454e4c6 100644 --- a/kopete/protocols/yahoo/yahooprotocol.h +++ b/kopete/protocols/yahoo/yahooprotocol.h @@ -42,8 +42,9 @@ namespace Kopete { class OnlineStatus; } class YahooProtocol : public Kopete::Protocol { Q_OBJECT + TQ_OBJECT public: - YahooProtocol( TQObject *parent, const char *name, const TQStringList &args ); + YahooProtocol( TQObject *tqparent, const char *name, const TQStringList &args ); ~YahooProtocol(); //Online Statuses @@ -132,8 +133,8 @@ public: Kopete::OnlineStatus statusFromYahoo( int status ); public slots: - virtual AddContactPage *createAddContactWidget(TQWidget * parent, Kopete::Account* a); - virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *parent); + virtual AddContactPage *createAddContactWidget(TQWidget * tqparent, Kopete::Account* a); + virtual KopeteEditAccountWidget *createEditAccountWidget(Kopete::Account *account, TQWidget *tqparent); virtual Kopete::Account *createNewAccount(const TQString &accountId); diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 7d50e900..5ea7b340 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -37,8 +37,8 @@ #include "yahooverifyaccount.h" #include "yahooaccount.h" -YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *parent, const char *name) -: KDialogBase(parent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, +YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent, const char *name) +: KDialogBase(tqparent, name, true, i18n("Account Verification - Yahoo"), Cancel|Apply, Apply, true ) { mTheAccount = account; diff --git a/kopete/protocols/yahoo/yahooverifyaccount.h b/kopete/protocols/yahoo/yahooverifyaccount.h index c179a4c6..c78d6e11 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.h +++ b/kopete/protocols/yahoo/yahooverifyaccount.h @@ -31,12 +31,13 @@ class KTempFile; class YahooVerifyAccount : public KDialogBase { Q_OBJECT + TQ_OBJECT private: Kopete::Account *mTheAccount; KTempFile *mFile; YahooVerifyAccountBase *mTheDialog; public: - YahooVerifyAccount(Kopete::Account *account, TQWidget *parent = 0, const char *name = 0); + YahooVerifyAccount(Kopete::Account *account, TQWidget *tqparent = 0, const char *name = 0); ~YahooVerifyAccount(); virtual bool validateData(); diff --git a/kopete/protocols/yahoo/yahoowebcam.h b/kopete/protocols/yahoo/yahoowebcam.h index cd4cfd21..09b519ed 100644 --- a/kopete/protocols/yahoo/yahoowebcam.h +++ b/kopete/protocols/yahoo/yahoowebcam.h @@ -31,9 +31,10 @@ namespace Kopete { } } -class YahooWebcam : public QObject +class YahooWebcam : public TQObject { Q_OBJECT + TQ_OBJECT public: YahooWebcam( YahooAccount *account ); ~YahooWebcam(); diff --git a/kopete/styles/Hacker/gpl.txt b/kopete/styles/Hacker/gpl.txt index 3912109b..fa85e301 100644 --- a/kopete/styles/Hacker/gpl.txt +++ b/kopete/styles/Hacker/gpl.txt @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include -- cgit v1.2.1

EventChanges to databaseoldStatusEventChanges to databaseoldtqStatus
John 17:44 Away (connexion) - (oldstatus was offline)oldstatus = away