From d0be1721b4656109c9e21cc0ecb6f23b343b7c26 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../advanced/kcm_sambaconf/expertuserdlg.ui | 2 +- .../advanced/kcm_sambaconf/filemodedlg.ui | 2 +- .../advanced/kcm_sambaconf/groupselectdlg.ui | 2 +- .../advanced/kcm_sambaconf/joindomaindlg.ui | 2 +- .../advanced/kcm_sambaconf/kcminterface.ui | 2 +- .../advanced/kcm_sambaconf/kcmprinterdlg.ui | 2 +- .../advanced/kcm_sambaconf/konqinterface.ui | 2 +- filesharing/advanced/kcm_sambaconf/share.ui | 2 +- .../kcm_sambaconf/socketoptionsdlg.ui | 2 +- .../advanced/kcm_sambaconf/userselectdlg.ui | 2 +- filesharing/advanced/kcm_sambaconf/usertab.ui | 2 +- filesharing/advanced/nfs/hostprops.ui | 2 +- filesharing/advanced/nfs/nfsdialoggui.ui | 2 +- .../propsdlgplugin/propertiespagegui.ui | 2 +- filesharing/simple/controlcenter.ui | 2 +- filesharing/simple/groupconfiggui.ui | 2 +- kdict/options.cpp | 6 +-- kdict/options.h | 2 +- kdict/queryview.cpp | 4 +- kdict/queryview.h | 2 +- kget/dlgadvancedbase.ui | 4 +- kget/dlgautomationbase.ui | 4 +- kget/dlgconnectionbase.ui | 4 +- kget/dlgdirectoriesbase.ui | 4 +- kget/dlglimitsbase.ui | 4 +- kget/dlgsystembase.ui | 4 +- kget/docking.cpp | 2 +- knewsticker/knewstickerconfig.cpp | 8 ++-- knewsticker/knewstickerconfig.h | 2 +- knewsticker/knewstickerconfigwidget.ui | 14 +++---- .../kntsrcfilepropsdlgwidget.ui | 6 +-- knewsticker/newssourcedlg.ui | 10 ++--- .../addaccountwizard/addaccountwizardpage1.ui | 2 +- .../addaccountwizard/addaccountwizardpage2.ui | 2 +- .../addaccountwizard/addaccountwizardpage3.ui | 2 +- .../addcontactwizard/addcontactwizard_base.ui | 2 +- .../fastaddcontactwizard_base.ui | 2 +- kopete/kopete/chatwindow/chatmessagepart.cpp | 2 +- kopete/kopete/chatwindow/emoticonselector.cpp | 6 +-- .../tests/chatwindowstylerendering_test.cpp | 2 +- .../accounts/kopeteaccountconfigbase.ui | 2 +- .../config/appearance/appearanceconfig.cpp | 16 +++---- .../appearance/appearanceconfig_chatwindow.ui | 2 +- .../appearance/appearanceconfig_colors.ui | 2 +- .../appearanceconfig_contactlist.ui | 2 +- .../appearance/appearanceconfig_emoticons.ui | 2 +- .../config/appearance/emoticonseditwidget.ui | 2 +- .../config/appearance/tooltipeditwidget.ui | 2 +- .../avdevice/avdeviceconfig_videoconfig.ui | 2 +- .../config/behavior/behaviorconfig_chat.ui | 4 +- .../config/behavior/behaviorconfig_events.ui | 2 +- .../config/behavior/behaviorconfig_general.ui | 2 +- .../config/behavior/kopeteawayconfigbase.ui | 2 +- .../identity/kopeteidentityconfigbase.ui | 2 +- .../kopete/contactlist/customnotifications.ui | 2 +- kopete/kopete/contactlist/kabcexport_base.ui | 2 +- .../contactlist/kopeteaddrbookexportui.ui | 2 +- .../contactlist/kopetecontactlistview.cpp | 8 ++-- .../contactlist/kopetegvipropswidget.ui | 2 +- .../kopete/contactlist/kopetemetacontactlvi.h | 4 +- .../contactlist/kopetemetalvipropswidget.ui | 2 +- kopete/kopete/groupkabcselectorwidget.ui | 2 +- kopete/kopete/kopeteiface.h | 2 +- kopete/libkopete/knotification.cpp | 2 +- kopete/libkopete/kopeteaccount.cpp | 24 +++++------ kopete/libkopete/kopeteaccount.h | 6 +-- kopete/libkopete/kopetecontactlist.h | 2 +- kopete/libkopete/kopetemimesourcefactory.cpp | 2 +- kopete/libkopete/kopeteonlinestatus.h | 2 +- kopete/libkopete/kopetepluginmanager.cpp | 2 +- kopete/libkopete/networkstatuscommon.cpp | 4 +- kopete/libkopete/networkstatuscommon.h | 4 +- kopete/libkopete/private/kopeteemoticons.cpp | 2 +- .../tests/mock/kopeteaccount_mock.cpp | 2 +- .../libkopete/tests/mock/kopeteaccount_mock.h | 2 +- .../ui/addressbooklinkwidget_base.ui | 2 +- .../ui/addressbookselectorwidget_base.ui | 4 +- .../libkopete/ui/contactaddednotifywidget.ui | 2 +- kopete/libkopete/ui/fileconfirmbase.ui | 2 +- kopete/libkopete/ui/kopeteawaydialogbase.ui | 2 +- kopete/libkopete/ui/kopetelistview.cpp | 4 +- kopete/libkopete/ui/kopetelistviewitem.cpp | 42 +++++++++---------- kopete/libkopete/ui/kopetepassworddialog.ui | 2 +- .../libkopete/ui/kopetepasswordwidgetbase.ui | 2 +- .../ui/metacontactselectorwidget_base.ui | 4 +- .../addbookmarks/addbookmarksprefsui.ui | 2 +- kopete/plugins/alias/aliasdialog.ui | 2 +- kopete/plugins/alias/aliasdialogbase.ui | 2 +- .../plugins/autoreplace/autoreplaceprefs.ui | 2 +- .../cryptography/cryptographyprefsbase.ui | 2 +- .../cryptography/cryptographyuserkey_ui.ui | 2 +- kopete/plugins/cryptography/popuppublic.cpp | 8 ++-- .../plugins/highlight/highlightprefsbase.ui | 2 +- kopete/plugins/history/historyprefsui.ui | 2 +- kopete/plugins/history/historyviewer.ui | 2 +- kopete/plugins/latex/latexprefsbase.ui | 2 +- .../plugins/motionautoaway/motionawayprefs.ui | 2 +- .../plugins/netmeeting/netmeetingprefs_ui.ui | 2 +- .../nowlistening/nowlisteningplugin.cpp | 4 +- .../plugins/nowlistening/nowlisteningprefs.ui | 2 +- kopete/plugins/smpppdcs/smpppdcsprefs.ui | 2 +- kopete/plugins/smpppdcs/smpppdlocationui.ui | 2 +- kopete/plugins/statistics/statisticswidget.ui | 2 +- kopete/plugins/texteffect/texteffectprefs.ui | 2 +- .../plugins/translator/translatorprefsbase.ui | 2 +- .../plugins/webpresence/webpresenceprefs.ui | 2 +- kopete/protocols/gadu/gaduaccount.cpp | 4 +- kopete/protocols/gadu/gaduaccount.h | 2 +- kopete/protocols/gadu/gaducontact.cpp | 4 +- kopete/protocols/gadu/gaducontact.h | 2 +- kopete/protocols/gadu/ui/gaduadd.ui | 2 +- kopete/protocols/gadu/ui/gaduawayui.ui | 2 +- kopete/protocols/gadu/ui/gadueditaccountui.ui | 2 +- .../gadu/ui/gaduregisteraccountui.ui | 4 +- kopete/protocols/gadu/ui/gadusearch.ui | 2 +- kopete/protocols/groupwise/gwaccount.cpp | 40 +++++++++--------- kopete/protocols/groupwise/gwaccount.h | 2 +- kopete/protocols/groupwise/gwaddui.ui | 2 +- kopete/protocols/groupwise/gwcontact.cpp | 4 +- kopete/protocols/groupwise/gwcontact.h | 8 ++-- kopete/protocols/groupwise/gwprotocol.cpp | 4 +- .../groupwise/libgroupwise/coreprotocol.cpp | 2 +- .../groupwise/libgroupwise/coreprotocol.h | 2 +- .../groupwise/libgroupwise/gwerror.h | 4 +- .../groupwise/libgroupwise/gwfield.h | 2 +- .../tasks/createcontactinstancetask.cpp | 12 +++--- .../tasks/createcontactinstancetask.h | 6 +-- .../libgroupwise/tasks/createcontacttask.cpp | 4 +- .../libgroupwise/tasks/createcontacttask.h | 2 +- .../libgroupwise/tasks/createfoldertask.cpp | 4 +- .../libgroupwise/tasks/createfoldertask.h | 2 +- .../libgroupwise/tasks/deleteitemtask.cpp | 4 +- .../libgroupwise/tasks/deleteitemtask.h | 2 +- .../libgroupwise/tasks/logintask.cpp | 10 ++--- .../tasks/modifycontactlisttask.cpp | 4 +- .../libgroupwise/tasks/movecontacttask.cpp | 2 +- .../tasks/pollsearchresultstask.cpp | 2 +- .../libgroupwise/tasks/updatecontacttask.cpp | 4 +- .../groupwise/ui/gwaccountpreferences.ui | 2 +- .../groupwise/ui/gwaddcontactpage.cpp | 4 +- kopete/protocols/groupwise/ui/gwaddui.ui | 2 +- .../groupwise/ui/gwchatpropswidget.ui | 2 +- .../groupwise/ui/gwchatsearchwidget.ui | 2 +- .../groupwise/ui/gwcontactpropswidget.ui | 2 +- .../protocols/groupwise/ui/gwcontactsearch.ui | 2 +- .../groupwise/ui/gwcustomstatusedit.ui | 2 +- .../groupwise/ui/gwcustomstatuswidget.ui | 2 +- kopete/protocols/groupwise/ui/gwprivacy.ui | 2 +- .../groupwise/ui/gwshowinvitation.ui | 2 +- kopete/protocols/irc/ircaccount.h | 2 +- kopete/protocols/irc/ui/channellist.cpp | 4 +- kopete/protocols/irc/ui/ircadd.ui | 2 +- kopete/protocols/irc/ui/irceditaccount.ui | 2 +- kopete/protocols/irc/ui/networkconfig.ui | 2 +- kopete/protocols/jabber/jabberaccount.cpp | 8 ++-- kopete/protocols/jabber/jabberaccount.h | 6 +-- kopete/protocols/jabber/jabberchatsession.cpp | 2 +- kopete/protocols/jabber/jabbercontact.cpp | 4 +- kopete/protocols/jabber/jabbertransport.cpp | 12 +++--- kopete/protocols/jabber/jabbertransport.h | 14 +++---- .../jingle/jinglevoicesessiondialogbase.ui | 2 +- .../jabber/jingle/libjingle/talk/base/task.cc | 8 ++-- .../jabber/jingle/libjingle/talk/base/task.h | 6 +-- .../third_party/mediastreamer/msAlawdec.h | 2 +- .../third_party/mediastreamer/msAlawenc.h | 2 +- .../third_party/mediastreamer/msGSMdecoder.h | 2 +- .../third_party/mediastreamer/msGSMencoder.h | 2 +- .../mediastreamer/msLPC10decoder.h | 2 +- .../mediastreamer/msLPC10encoder.h | 2 +- .../third_party/mediastreamer/msMUlawdec.h | 2 +- .../third_party/mediastreamer/msMUlawenc.h | 2 +- .../third_party/mediastreamer/msavdecoder.h | 2 +- .../third_party/mediastreamer/msavencoder.h | 2 +- .../talk/third_party/mediastreamer/mscopy.h | 2 +- .../third_party/mediastreamer/msfdispatcher.c | 18 ++++---- .../third_party/mediastreamer/msfdispatcher.h | 2 +- .../third_party/mediastreamer/msilbcdec.h | 2 +- .../third_party/mediastreamer/msilbcenc.h | 2 +- .../talk/third_party/mediastreamer/msnosync.h | 2 +- .../third_party/mediastreamer/msossread.h | 2 +- .../third_party/mediastreamer/msosswrite.h | 2 +- .../third_party/mediastreamer/msqdispatcher.c | 14 +++---- .../third_party/mediastreamer/msqdispatcher.h | 2 +- .../talk/third_party/mediastreamer/msread.h | 2 +- .../third_party/mediastreamer/msringplayer.h | 2 +- .../third_party/mediastreamer/msrtprecv.h | 2 +- .../third_party/mediastreamer/msrtpsend.h | 2 +- .../talk/third_party/mediastreamer/mssdlout.h | 2 +- .../third_party/mediastreamer/mssoundread.h | 2 +- .../third_party/mediastreamer/mssoundwrite.h | 2 +- .../talk/third_party/mediastreamer/mstimer.h | 2 +- .../mediastreamer/mstruespeechdecoder.h | 2 +- .../mediastreamer/mstruespeechencoder.h | 2 +- .../talk/third_party/mediastreamer/msv4l.h | 2 +- .../third_party/mediastreamer/msvideosource.h | 2 +- .../talk/third_party/mediastreamer/mswrite.h | 2 +- .../talk/third_party/ortp/rtpsession.h | 2 +- .../talk/third_party/ortp/scheduler.c | 2 +- .../talk/third_party/ortp/scheduler.h | 2 +- .../talk/third_party/ortp/sessionset.c | 6 +-- .../talk/third_party/ortp/sessionset.h | 6 +-- .../libiris/cutestuff/network/srvresolver.cpp | 4 +- .../libiris/iris/xmpp-core/connector.cpp | 2 +- .../jabber/libiris/iris/xmpp-core/parser.cpp | 2 +- .../libiris/iris/xmpp-core/xmlprotocol.cpp | 4 +- .../jabber/libiris/iris/xmpp-im/client.cpp | 6 +-- .../libiris/iris/xmpp-im/xmpp_tasks.cpp | 6 +-- kopete/protocols/jabber/ui/dlgaddcontact.ui | 2 +- kopete/protocols/jabber/ui/dlgbrowse.ui | 2 +- .../protocols/jabber/ui/dlgchangepassword.ui | 2 +- kopete/protocols/jabber/ui/dlgchatjoin.ui | 2 +- .../protocols/jabber/ui/dlgchatroomslist.ui | 2 +- .../jabber/ui/dlgjabberchooseserver.ui | 2 +- .../jabber/ui/dlgjabbereditaccountwidget.ui | 2 +- .../jabber/ui/dlgjabberregisteraccount.ui | 4 +- kopete/protocols/jabber/ui/dlgregister.ui | 2 +- kopete/protocols/jabber/ui/dlgsendraw.ui | 2 +- kopete/protocols/jabber/ui/dlgservices.ui | 2 +- kopete/protocols/jabber/ui/dlgvcard.ui | 2 +- .../jabber/ui/jabberaddcontactpage.cpp | 18 ++++---- .../protocols/meanwhile/meanwhileaccount.cpp | 4 +- kopete/protocols/meanwhile/meanwhileaccount.h | 2 +- .../meanwhile/ui/meanwhileaddcontactbase.ui | 2 +- .../meanwhile/ui/meanwhileeditaccountbase.ui | 2 +- kopete/protocols/msn/config/msnprefs.ui | 2 +- kopete/protocols/msn/msnaccount.h | 2 +- kopete/protocols/msn/ui/msnadd.ui | 2 +- .../msn/ui/msndebugrawcommand_base.ui | 2 +- kopete/protocols/msn/ui/msneditaccountui.ui | 2 +- kopete/protocols/msn/ui/msninfo.ui | 2 +- kopete/protocols/oscar/aim/aimaccount.cpp | 4 +- kopete/protocols/oscar/aim/aimaccount.h | 2 +- .../protocols/oscar/aim/ui/aimaddcontactui.ui | 6 +-- .../oscar/aim/ui/aimeditaccountui.ui | 2 +- kopete/protocols/oscar/aim/ui/aiminfobase.ui | 4 +- .../protocols/oscar/aim/ui/aimjoinchatbase.ui | 2 +- kopete/protocols/oscar/icq/icqaccount.cpp | 4 +- kopete/protocols/oscar/icq/icqaccount.h | 2 +- kopete/protocols/oscar/icq/ui/icqadd.ui | 2 +- .../oscar/icq/ui/icqaddcontactpage.cpp | 4 +- .../oscar/icq/ui/icqaddcontactpage.h | 2 +- .../protocols/oscar/icq/ui/icqauthreplyui.ui | 2 +- .../oscar/icq/ui/icqeditaccountui.ui | 2 +- .../protocols/oscar/icq/ui/icqgeneralinfo.ui | 2 +- .../oscar/icq/ui/icqinterestinfowidget.ui | 2 +- .../oscar/icq/ui/icqotherinfowidget.ui | 2 +- .../protocols/oscar/icq/ui/icqsearchbase.ui | 2 +- .../oscar/icq/ui/icqworkinfowidget.ui | 2 +- kopete/protocols/oscar/liboscar/HACKING | 4 +- .../protocols/oscar/liboscar/aimlogintask.cpp | 2 +- kopete/protocols/oscar/oscaraccount.cpp | 14 +++---- kopete/protocols/oscar/oscaraccount.h | 6 +-- .../oscar/oscarencodingselectionbase.ui | 2 +- .../protocols/oscar/oscarlistcontactsbase.ui | 2 +- kopete/protocols/oscar/oscarvisibilitybase.ui | 2 +- kopete/protocols/sms/services/gsmlibprefs.ui | 2 +- .../protocols/sms/services/smsclientprefs.ui | 2 +- kopete/protocols/sms/services/smssendprefs.ui | 2 +- kopete/protocols/sms/smsaccount.cpp | 4 +- kopete/protocols/sms/smsaccount.h | 2 +- kopete/protocols/sms/ui/smsactprefs.ui | 2 +- kopete/protocols/sms/ui/smsadd.ui | 2 +- kopete/protocols/sms/ui/smsuserprefs.ui | 2 +- kopete/protocols/testbed/testbedaccount.cpp | 4 +- kopete/protocols/testbed/testbedaccount.h | 2 +- .../testbed/testbedaccountpreferences.ui | 2 +- kopete/protocols/testbed/testbedaddui.ui | 2 +- .../protocols/winpopup/ui/wpaddcontactbase.ui | 2 +- .../winpopup/ui/wpeditaccountbase.ui | 2 +- .../protocols/winpopup/ui/wpuserinfowidget.ui | 2 +- kopete/protocols/winpopup/wpaccount.cpp | 4 +- kopete/protocols/winpopup/wpaccount.h | 2 +- kopete/protocols/yahoo/libkyahoo/libyahoo.c | 2 +- kopete/protocols/yahoo/ui/yahooadd.ui | 2 +- .../yahoo/ui/yahooeditaccountbase.ui | 2 +- .../yahoo/ui/yahoogeneralinfowidget.ui | 2 +- .../protocols/yahoo/ui/yahooinvitelistbase.ui | 2 +- .../yahoo/ui/yahoootherinfowidget.ui | 2 +- .../protocols/yahoo/ui/yahoostealthsetting.ui | 2 +- .../yahoo/ui/yahooverifyaccountbase.ui | 2 +- .../protocols/yahoo/ui/yahooworkinfowidget.ui | 2 +- kopete/protocols/yahoo/yahooaccount.cpp | 4 +- kopete/protocols/yahoo/yahooaccount.h | 2 +- kppp/edit.cpp | 16 +++---- kppp/edit.h | 2 +- kppp/logview/monthly.cpp | 4 +- kppp/logview/monthly.h | 2 +- kppp/macros.h | 2 +- krdc/hostprofiles.ui | 4 +- krdc/keycapturewidget.ui | 4 +- krdc/maindialogbase.ui | 4 +- krdc/maindialogwidget.cpp | 2 +- krdc/rdp/rdesktop.patch | 2 +- krdc/rdp/rdpprefs.ui | 6 +-- krdc/vnc/vncprefs.ui | 4 +- krfb/kcm_krfb/configurationwidget.ui | 4 +- krfb/krfb/configuration.cc | 6 +-- krfb/krfb/configuration.h | 2 +- krfb/krfb/connectionwidget.ui | 2 +- krfb/krfb/invitewidget.ui | 4 +- krfb/krfb/manageinvitations.ui | 2 +- krfb/krfb/personalinvitewidget.ui | 4 +- krfb/libvncserver/cursor.c | 16 +++---- krfb/libvncserver/rfb.h | 2 +- ksirc/FilterRuleWidget.ui | 2 +- ksirc/KSOpenkSirc/open_ksircData.ui | 2 +- ksirc/KSPrefs/page_autoconnectbase.ui | 2 +- ksirc/KSPrefs/page_colorsbase.ui | 2 +- ksirc/KSPrefs/page_generalbase.ui | 2 +- ksirc/KSPrefs/page_irccolorsbase.ui | 2 +- ksirc/KSPrefs/page_looknfeelbase.ui | 2 +- ksirc/KSPrefs/page_rmbmenubase.ui | 2 +- ksirc/KSPrefs/page_servchanbase.ui | 2 +- ksirc/KSPrefs/page_shortcutsbase.ui | 2 +- ksirc/KSPrefs/page_startupbase.ui | 2 +- ksirc/dccManagerbase.ui | 2 +- ksirc/dccNewbase.ui | 2 +- ksirc/displayMgrMDI.cpp | 4 +- ksirc/kstextview.cpp | 4 +- ksirc/kstextview.h | 2 +- ksirc/puke/HOWTO-PUKE.pod | 4 +- ksirc/puke/controller.cpp | 2 +- ksirc/servercontroller.cpp | 8 ++-- ktalkd/ktalkd/announce.cpp | 2 +- lanbrowsing/lisa/addressvalidator.cpp | 4 +- lanbrowsing/lisa/client.cpp | 10 ++--- lanbrowsing/lisa/client.h | 2 +- lanbrowsing/lisa/netscanner.cpp | 4 +- librss/document.cpp | 12 +++--- wifi/kcmwifi/configadvanced.ui | 2 +- wifi/kcmwifi/configcrypto.ui | 4 +- wifi/kcmwifi/configpower.ui | 4 +- wifi/kcmwifi/ifconfigpagebase.ui | 4 +- wifi/kcmwifi/mainconfig.cpp | 4 +- wifi/kcmwifi/mainconfigbase.ui | 2 +- wifi/kwireless/propertytablebase.ui | 2 +- 336 files changed, 584 insertions(+), 584 deletions(-) diff --git a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui index 260f7001..690688c2 100644 --- a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui @@ -259,5 +259,5 @@ buttonOk buttonCancel - + diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui index e3a8382a..0f8867c8 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui +++ b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui @@ -426,5 +426,5 @@ buttonOk buttonCancel - + diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index e4901630..51f5e10b 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -441,5 +441,5 @@ getAccess() getGroupKind() - + diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index 63101411..2ab91cf5 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -231,7 +231,7 @@ accept() - + kpassdlg.h kpassdlg.h diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index b363a66d..39a21fb3 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -8408,7 +8408,7 @@ This is only available if the SSL libraries have been compiled on your system an mapToGuestCombo_activated( int i ) updateSecurityLevelHelpLbl() - + kurlrequester.h klineedit.h diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 55d6ba5b..4a622f1a 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -1196,7 +1196,7 @@ reject() printersChkToggled( bool ) - + kurlrequester.h klineedit.h diff --git a/filesharing/advanced/kcm_sambaconf/konqinterface.ui b/filesharing/advanced/kcm_sambaconf/konqinterface.ui index 836e5bef..dfccf5c2 100644 --- a/filesharing/advanced/kcm_sambaconf/konqinterface.ui +++ b/filesharing/advanced/kcm_sambaconf/konqinterface.ui @@ -539,5 +539,5 @@ changedSlot() moreOptionsPressed() - + diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index a876c238..bcc0684e 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -3275,7 +3275,7 @@ Only change something if you know what you are doing. storeDosAttributesChk_toggled( bool b ) buttonHelp_clicked() - + kurlrequester.h klineedit.h diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui index 8e7f41ab..b04f8b7b 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui @@ -328,5 +328,5 @@ getBoolValue( const TQString & str, const TQString & name ) getIntValue( const TQString & str, const TQString & name ) - + diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui index 77dd3ebb..1526832a 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui @@ -297,5 +297,5 @@ getSelectedUsers() getAccess() - + diff --git a/filesharing/advanced/kcm_sambaconf/usertab.ui b/filesharing/advanced/kcm_sambaconf/usertab.ui index 953e0f9e..af5b87bf 100644 --- a/filesharing/advanced/kcm_sambaconf/usertab.ui +++ b/filesharing/advanced/kcm_sambaconf/usertab.ui @@ -348,5 +348,5 @@ expertBtnClicked() changedSlot() - + diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index 52a23e14..32b5eb54 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -554,5 +554,5 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap setModified() - + diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui index b3f32cd4..a9295773 100644 --- a/filesharing/advanced/nfs/nfsdialoggui.ui +++ b/filesharing/advanced/nfs/nfsdialoggui.ui @@ -152,5 +152,5 @@ The first column shows the name or address of the host, the second column shows listView_selectionChanged() - + diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index 5373ad7c..3ba4aca5 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui +++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui @@ -474,5 +474,5 @@ hasChanged() - + diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index 2ef0845c..26307437 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -477,7 +477,7 @@ changedSlot() listView_selectionChanged() - + krichtextlabel.h klistview.h diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui index 6a97c046..ed7ffd47 100644 --- a/filesharing/simple/groupconfiggui.ui +++ b/filesharing/simple/groupconfiggui.ui @@ -196,5 +196,5 @@ listBox_selectionChanged( TQListBoxItem * i ) - + diff --git a/kdict/options.cpp b/kdict/options.cpp index f3bf58bb..ab60e86c 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -641,11 +641,11 @@ OptionsDialog::OptionsDialog(TQWidget *tqparent, const char *name) f_List->insertItem(new FontListItem(global->fontName(i), global->font(i))); //************ Layout *************************** - tqlayoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium )); + layoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium )); - TQVBoxLayout *vbox = new TQVBoxLayout(tqlayoutTab, 0, spacingHint()); + TQVBoxLayout *vbox = new TQVBoxLayout(layoutTab, 0, spacingHint()); - TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),tqlayoutTab); + TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),layoutTab); TQVBoxLayout *bvbox = new TQVBoxLayout(bGroup,8,5); bvbox->addSpacing(fontMetrics().lineSpacing()-4); diff --git a/kdict/options.h b/kdict/options.h index a0b1cfe8..1209f565 100644 --- a/kdict/options.h +++ b/kdict/options.h @@ -218,7 +218,7 @@ private: *f_ntDefBtn, *f_ntChngBtn; - TQFrame *tqlayoutTab; + TQFrame *layoutTab; TQRadioButton *w_layout[3]; TQFrame *otherTab; diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index e48397e1..40aac513 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -109,8 +109,8 @@ BrowseData::BrowseData(const TQString &Nhtml, const TQString &NqueryText) //********* DictHTMLPart ****************************************** -DictHTMLPart::DictHTMLPart(TQWidget *tqparentWidget, const char *widgetname) - : KHTMLPart(tqparentWidget,widgetname) +DictHTMLPart::DictHTMLPart(TQWidget *parentWidget, const char *widgetname) + : KHTMLPart(parentWidget,widgetname) {} diff --git a/kdict/queryview.h b/kdict/queryview.h index cb4a0012..f4c441f9 100644 --- a/kdict/queryview.h +++ b/kdict/queryview.h @@ -81,7 +81,7 @@ class DictHTMLPart : public KHTMLPart public: - DictHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0); + DictHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0); ~DictHTMLPart(); signals: diff --git a/kget/dlgadvancedbase.ui b/kget/dlgadvancedbase.ui index d16bb227..9b317d91 100644 --- a/kget/dlgadvancedbase.ui +++ b/kget/dlgadvancedbase.ui @@ -269,6 +269,6 @@ slotChanged() - - + + diff --git a/kget/dlgautomationbase.ui b/kget/dlgautomationbase.ui index 8808d900..abf40f34 100644 --- a/kget/dlgautomationbase.ui +++ b/kget/dlgautomationbase.ui @@ -246,8 +246,8 @@ slotChanged() disconnectToggled(bool b) - - + + kdatetimewidget.h kdatewidget.h diff --git a/kget/dlgconnectionbase.ui b/kget/dlgconnectionbase.ui index 1dfd4831..49eada65 100644 --- a/kget/dlgconnectionbase.ui +++ b/kget/dlgconnectionbase.ui @@ -396,6 +396,6 @@ slotChanged() comboActivated(int) - - + + diff --git a/kget/dlgdirectoriesbase.ui b/kget/dlgdirectoriesbase.ui index 5b1f99e7..6a86b045 100644 --- a/kget/dlgdirectoriesbase.ui +++ b/kget/dlgdirectoriesbase.ui @@ -254,8 +254,8 @@ changeEntry() BarIconSet - - + + klineedit.h kurlrequester.h diff --git a/kget/dlglimitsbase.ui b/kget/dlglimitsbase.ui index 5206e72d..09e0cbce 100644 --- a/kget/dlglimitsbase.ui +++ b/kget/dlglimitsbase.ui @@ -179,8 +179,8 @@ slotChanged() - - + + knuminput.h knuminput.h diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index 006307a3..5d516195 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -161,8 +161,8 @@ slotChanged() - - + + kfontrequester.h diff --git a/kget/docking.cpp b/kget/docking.cpp index 1f4187a6..cc5a8044 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -124,7 +124,7 @@ void DynamicTip::settqStatus( const TQString & _status ) void DynamicTip::maybeTip( const TQPoint & _pos ) { - TQRect r( tqparentWidget()->rect() ); + TQRect r( parentWidget()->rect() ); tip( r, status ); } diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 9f868beb..34024edc 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -421,10 +421,10 @@ void KNewsTickerConfig::slotModifyNewsSource() void KNewsTickerConfig::slotModifyNewsSource(const NewsSourceBase::Data &nsd) { if (m_modifyItem->data().subject != nsd.subject) { - TQListViewItem *tqparentItem = m_modifyItem->tqparentItem(); - tqparentItem->takeItem(m_modifyItem); - if (tqparentItem->childCount() == 0) - delete tqparentItem; + TQListViewItem *parentItem = m_modifyItem->parentItem(); + parentItem->takeItem(m_modifyItem); + if (parentItem->childCount() == 0) + delete parentItem; CategoryItem *catItem = 0L; diff --git a/knewsticker/knewstickerconfig.h b/knewsticker/knewstickerconfig.h index 79b268d2..0af7255e 100644 --- a/knewsticker/knewstickerconfig.h +++ b/knewsticker/knewstickerconfig.h @@ -44,7 +44,7 @@ class NewsSourceItem : public TQCheckListItem void setData(const NewsSourceBase::Data &); void setIcon(const TQPixmap &); - TQListViewItem *tqparentItem() { return TQCheckListItem::tqparent(); } + TQListViewItem *parentItem() { return TQCheckListItem::tqparent(); } private: TQString m_icon; diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui index af476a68..2ad24dd9 100644 --- a/knewsticker/knewstickerconfigwidget.ui +++ b/knewsticker/knewstickerconfigwidget.ui @@ -22,9 +22,9 @@ 0 - + - + @@ -40,9 +40,9 @@ tabScrollerPreferences - + - + @@ -68,9 +68,9 @@ General - + - + @@ -1160,7 +1160,7 @@ Note that the filters are processed from the top to the bottom so that of two fi klistview.h knuminput.h - + knuminput.h knuminput.h diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui index c5e265f6..1b589f5e 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui @@ -14,9 +14,9 @@ 274 - + - + @@ -206,7 +206,7 @@ kurllabel.h kseparator.h - + kurllabel.h kseparator.h diff --git a/knewsticker/newssourcedlg.ui b/knewsticker/newssourcedlg.ui index 29df9791..f6a7c695 100644 --- a/knewsticker/newssourcedlg.ui +++ b/knewsticker/newssourcedlg.ui @@ -28,9 +28,9 @@ image0 - + - + @@ -49,9 +49,9 @@ News Source Properties - + - + @@ -404,5 +404,5 @@ slotSourceFileChanged() slotSuggestClicked() - + diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui index f296f214..9fc65382 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage1.ui @@ -137,7 +137,7 @@ protocolListView - + klistview.h diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui index 63e542a6..67fa86da 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage2.ui @@ -149,7 +149,7 @@ for account: 789ce57d5973ea3ad7e6fdfb2b4e1dddbdd5e58f84904075f50564820009848c74f5856cc90364200364f8aaff7b2f692d19039e0067effd9e2e4a47fb3922c65e7af4ac257959feaf7fff75d7ebfef5effffad7db3b7f0f9cbf1c9fbffef56f317d7cfcfadfffe77ffdf7bffeded9dbfd6bb756faeba05cfe6bf7effff1afbfadc7bf9cbfd86e696fafc2357ed0b8b65722cc08537bffdde07dfc7b4eb84ad825ec10b6152eef84ed4e88f1f892b0f9be0831b67b882b25c2cf061f94351e11ae50fbd8606c77f5f997e1fc2afaf8fc21c4fafb421076103b55c415ba7eb663309ddf5388f1f77c83e97c3e099bf3090cc676764bb846ed1383e9ef5f426c6b7c4c5850fb7b8875bb4dc7dfdf411cbc2abcb7b357dadbd1d7ff4598ae5f5e1176c81e2cc4fa7c383718af5758888d3d9ca1c1d81edc13ae507bd960b2d75188d1de2383e97ae8fc8c3dd8bbc1d4fe1a62b4c72561638fb710633b9d1fd803db4b21d6edecc6e0aa6eb77dc215b2e7bdc1d82e0cae21f6f1787c6f6f4f9faf7742b88a583c198cf6f5f7083bd8ce760d26fb7f8658b7bb75c4606fb4ff6788f1f83d83d1be927edfd85fdc194cfd771062dd2e25e11af5cf34c4badd367f4ff6e7e6ef05f1b56230b63b7e88917fa788f777a83f1f0dc6efcbd710637f74081b3edc8758b73b2d83d1fed63e61c3976b83f1efc5b3c1d47f5f21d6c79374bdfb02b14fd773b08338e006d7f63476095710fb9a6f95dd72a954d2e7778038e403b59bfef566884d7fbaa721c6f1726d30f687f74db842df9f8518bfff6630f5e70b61eacf910831f6d70761eabfd1a3c164af3162d35fd689c1d41f03c246bfba21c6fe730893fd837188d1befb06637fb007c2f4fb2337c4687fcf60fc7ef014626ca7bf37fde5ef1a4cfd43fd61fa2b102176341e11ae51bb1f626c7f272c10fb5aff2adcf4b7b747780fb1ff45b84af831c4556d5fb467a8170e1d2fd45bfabee187d33498f830214cfdef39846ba4176d83f1fbee116181ed72cf606ce7e310633bf24d8d57d4f3bb10ebf6e0c660ea2ffafd7da3e7cc60eaff9310a31eef10267eb0af10637f3e1a8cfdcd2f09131ffca1c1d44ed77760fc5dc5606c1ff11063bbf97e05f188aef780f420f83298f8108418f9b04f5850fb7388b1fdcd608eed0dc4d51d6a9f194ced17842b887d7d7efbbb217fdc106bfef867841dc20c31d04f63e7de60f4f7de98f01e62e18518fbeb9630f92bd6430c7c42fe9409135fc42b62c30ff725c4c83ffabd7de36ff6438c7a32234cfdef5c8458dbdff3091b7fde0931eacb14b1e96ffe6630e9c34788916f5784e9f759c960f2dfe510231fde0dc6feb5ee08937e066d83a9ffc95e211f5a21c6fea6f30ffbffd060eaff2661eaffe03cc4fafb239b708dda6f438ced166141f8cd605b7f7ff489b8b683d8a969cccb4eb9a631fe1e377cf19f0813df3cfafe9eb383fcfa3298fc19da07f46857f3959f1a8c7c728788437da813267bba5706537c4ee7b36ff4283098f8d0451c8ef74fc2c6ff3c194c7c9810367ae28718bf7f48988eefdf1b4c7ad0475c257f327a0831f667c960ea1fba9e2af997119d8fe9bf911762fcfb03c2d47f41d960ecaf80ec67fa6f340db1d0ed7b842bf4fddd10ebf6d18c700db1a37fffa06cf4c07f475c29eda0de5c8418fbff9e7005dbbdb2c1d4dfb6c1783c59456cfa4b4c111f90bfb00d367c681b4cf1e06e88b5fddd5bc2a40fce8dc1143f1c11267fc0bc1063ffd51157491ff87188b1dd3198c6ef35611affa391c1d47f92b0f10774bda1bdc784c9dea30f839d8ac6743e3541ed5f0663bb83d76f97ab656d4fe788308d571bed6187fa5e415c11d85fac6930b6db6788f74dbce011a6f1e53e2036f616a784c9de828e7740facb3f0c267b8b10a3ded2df1b7b3b7b21c6f1563598ec4de75725fd0d060693fe5e1336f391a1c114df55438ce38d1126ff2b74ff56cbe53de4ab731562d4bf57c2646ffe85b852417bfb1ee2fd1db2ef04f1c10ef947df60b2678930e9993498ec252e111bfb04738cf3911bc2a45f6c1662b4cfb1c178fdd2266cf4ecce606ce7747d55ea6f7b6430b6b3d3106bfbf10ee21a5d8f13184cf6f50d26fbe2f9d865d20be7ce60b2f73e6163ffcf10239f6b84ab88bd27c49512f98f6fc4fb3bc85fff8ab0c0fef2e9f70f76f0efc5036133ff7b435c257fe13d1336f3f9ab1023dffb84c99ed6aec1682f41e75325be3b3d83c99e74fc1af1db7b08b1b61fb3099bf590db10637cd13598e61b3b06937f217bd5c89f08dd3fb5bdd0fe8706a3bded2ae13d6a7f3198fac30d31f6c70de12ab6bb32c4badd3d21ec507fbd22de2b617f786784f710bb1f8449bf3cd760d2af4fc4a6bf5999708d8ed73798f8503198e28f63c4861fee2e62d3ffde25e22af90bef2bc4d8df25c2d47fa28bd8f41f3b0fb1ee0fd1206cf4e93bc4e80fa60663ff5864cf1acdc7b817629cef550dc6bfb7fa06e3dfb337c2147f073b06131f6488912f35c47c07b1a3f5b4e698feb6f70957910ff681c1d82ead10a33e4e089bf84f1a4cdf7f0bb1febe6c198cfd278e10ef113fa56730f183ce2fe4cb28c478bc2fc255e24f8fb0f93d3aff4a09dbdd5783915ffc89708df88be3c5d9df217e71c2a48f1ef6bf63f4dca7f6ea0e5eaf4fbf5fa578c7ad194cf3893661817cf5070693fedc1a8cfc73a93f42bdb00913bfc44b88b17f9b848d1e55438cfa6d194cfc1913a6ebf35f0da6bf1f8418f9776e30febdc3428cfa45f6e634ffe3f706e3f7ed5988917f6784cd7ce6d5609a8f687de07b864f7605b1e18b7d6d30b50f081b3d7b3698f48a1b4cf15383b0e1fb95c1f87db14798f4490e0da6fe75101b3ec90961d3ff3dc2a44fbc4958903fda451cea139d8f89c7fc6fc4b51d8a37ce0d463eb99f84cd7a638b30f1c7ab1a4cfd593698fac343cc8dffec1a4cfa766c30e9c97788757f499730e919932146be1c10e6c807bb6430cd676c8369fe42f6e392fa5ff3853ba6ffec3e61d35f970693bf12848d1e3d194c7f8ffde984f39716619aafc863c2a6bf1cc282da0706a37f61743efb145f48c760ba7f42e7bf4feb6fb24998e26f7e1e626cbf3718edc5d0dece418dfa7f8ab866f46948b842f1ce09613a3f798a98937f72ef0dc6fef276091b7d9221c6f5b40f83893f1d83c99f3408738a972606633b7f3718fb9399df97a4171706633b1f21b67769beca428cf3533d3fb2f7c2febc406cfad3ee194ceddf842bd45e3798da1b846bd82e1e119bfe7477080b1aff6d83e97eca3ee203b3de7519621ccf7b88abe4dffd67c49cfacfef10e6148fdc184ce3fbd160b2974f58d2787d3098faefd0608aff8606937d6b888d7d6537c4dabebc4f789faeaf61307edf3a0cb1febe45d76773c4b6d6175b84f63d274cf6751c83a9fd8930cd4fedaec1d8cef0f8c2ccaff8b7c1f4f75f84a97fbd23c2e6f88784496ff98dc1687fd6426ce607f2c8608a37a684c93fcb3162335f9075c2343f967d83e97ee13b62be43e3fbd060d2eb6bc2d4fffe29627b97d623ba0663ff8b196163ff2661b23f1f1a8ceb05e28cb0a4f61383b13db0103bbbb4bea07f1fe4d0d8ff12b1b1bffd6830e9e13361b23f170663bb27099bfeef1a4c7a6d8718fbc71c8f7edfb6438cfe32c4a47f1f880f0c1f3a0663bbbc234cfa289f428cf39923c2f4fbf2d260f2df17884d3c26de119bf9af7b6330cdcf1961d24f796d30cdc7cddf537ce6d2f9193e78fb8425e9fd0b627b9fe2c303c29cd6333961d203f66930f6276b207676e9fed1bec1a4479f06139fda06d37a5410626c2f13dea7e30f43acdb5decbf707cc90ae2038a5f789d30f1c3b93418db99f9bee1c7a3c1e42f2f08131f1cf37db39ef510628cd7a7884d7cce5b21467def188cdfb7e9fcab153afe89c1e84fed63c234ffb4770da6fbf3738cc733bf47fec3ed1b4ceb6d4dc4c69fbb2d83295e32ed86bf658369bd86ceaf66e6c31706137fcf101bff2f0d36fca4ef1b7fecfb88ed5de21ff597cd697e30232c49affa0653bc80e31ff484be7f6b30e9cf8030f1c51911e688472f060be4974b58623bab198cedb68558ec22167a3c8a8ae92f5e266cc6f7a7c1942f7118621ccf55c2c42fdb3198e6ab2e62d33fce2d61b35e5d236cd6233f0da6f5ed53c2c407716130dddfb80e31e69770c4263e730c36f1c15388b13f7dc2d49f9c8e67ef92deb821c67850188cdf77df0893bf1715c2e43f5c0bb1e94fff9230c577eea1c1d85ffe1d618a47f8d460ec2f3e436cfacfaa13de47ecb4432c353f9e0973c41ced2f0dffb9446ce22b7b4298f445f60c26fbbd13267bda8230e9af1c194cfa4dbf67ec297608efa33d9d6fc21cafd73d3618ed257cc2640fb78bd8e82d7b21bc4ff7ff1f0ca6fef10cc6ef7bf4fb0e8d4fd6262c299f686230e9fd38c4c857e48734f6652784c9becebbc1725ff7cf056149ed2583b19de9f10d07377a3f214cf6f41862a32fde21e17dd2f706614efef9c560d2f7b6c1b4ded63298e69f6784cdef750cc6bf77760cc6efcb1a6287e2617b4c98f8eff40913bf050f31f2db264cc7171f06d37809dbb1bf64d88ee343760c46be7b25c46297d6131e0dc6bf779b06933e8e08ef93deb5438cfee5da60ca0fb93298f4e2dc603a1f61308dc72a614efeefc3606c970f21d67c90645fc30f1e188cfcf0881f7297da4b0613bf7a84f711072f21c6efebf98094862fde3b61b2bf87f680f144b84e98becff609139fdc03c482f4cfde3118edcde718fdd53161b2971f10e6b49ee7184cf9575383d15e3e9d9fa0f129a4c1680f7762305ebf7f83589af8bc6330d99b1b8cdfb71961b21ffb08b1febef74298ce875f194cf66f85587fdf6a1096647fade7eebeb11fab8718fd9d242c69fda48218f88ced6f8449dfd81561f3f7aec1c4b757c2743c16184ceb2fd42ee9f8bc6730b55b84e9f7bc73c2a4175e3bc4baffbd538371bc7b8d10ebfef6ccf1687ee50521467d0f8f4ff6168469bc7b8f06937f1b1b4cf63e33d8d5fdc1d11eaeb10f7f216cec8bdf77c3eb3f3498ae9f11a6ebb76a06637bffdd6271c5e2f05f6e6a28764c6dc337928a43b58022a98e2f3614178a5c2a22520bcbcb55e61f3fa63625c82c2328636daf07b8cec7242bcdad654ad46a11eb71b21627ab2cd7a6c8258bc55bce8d2972a1466bc8dcd68afb284b8dc822e3382badf267e9ea633993c21b27526773862f5df53267e4dabc79da8a3386379a3baad6fcc9c99b04cee0ff4be78ce14d3a67e2782397ea2867d2b893fc79a63aca9958eeccf9a35953acdea473a658bd89e3ccd346bc19476a558264fe6cac3771bc594f6f56392372712699378633997ab330c246649f4ccefc32bd59df4f6de7a3bc25cea83a30dc09fdd7cfe84d3667d6d59bcdfc94b15c3a6762b813f2278e333c436bb6e3cca67a93eca30ad29b857a62f4e71feda3d6d29b65aba1fe6ce0a39cb57cd4b67a931d136fc69915bd519c8916c39f141fc56338537c4c2cac6d63e2f57c541c6f5647dc24d49f5f1d136fab37ebf9a974ce048b9c59e6cf1fa537c5f9a88df486ea891969c89f1c7af30f8a89d3f4264d7ffed131714ebd897267ae3f5be94d968f5a7f0efec331719adee8f212d693507ffe61eb366b702658e64cb40ef9f3bbd76d7e0d6732f54671467f5eb0d0fcf43fd547e5e74d8a8f4aac0d7ff2fba83f2dae491a316bf928d29bc9327722fcc9e3a336e14c3e1f953d8f5a7bdd268133b13e6a65e4cd3f2fda3edbfba8fcbc89e3ccfa7a933d8fcae7a3623993c19f227c543ebdc9f651f9f4664b1f15c39bd072da3eff241f954f6f523963bd52fd16f2e71fb76eb3e0a3d6d09be53ac29f7ff43c2aafde28ce58eff33ac29fcde7517fe0bacda67ab364ad77e2cf7faede64f126afde443813ad893f7f928f8ae74e1667b262e26cce442df86e0af1a7889838596f36bb07bead8fda486f748de525963fff1fc4c4697ab35c883f7f4cbecd567a1359b7595b6f229c89d4ef217ffef3d66d8af251b1bc31968bf0e78fc8b749e0ccf67a93e2a39639132dda3e7f50becdc63e6a6acdac0feb730dbd49e44cb426fe6cefa3a2dcd92c26cebc9799c0992fb0ccb755b71ad6a175b4898fa2fa78993b217ffe43ef2dc0e7c43ab59a56cb3a03eb9c596dab43ff3f8e33510ba57246d7c750bf93fefce7c5c4ca325debdcba20cb60e9597d1861ab7af3665d5a03ebcabab66eac5bebcebab78656295e6f12f5e74f5c278e5bb799c0b5ee58bb5679c132a6ec59951885deb70eacaa5563161466d5ac2ae3cc660e58e96d853bef9191769cc99f641ff5ebe7e0ea0a064c3009e369d532ba3097a95f5abce24be6b3802c538bd42336660fc0a564fe94427dfebdeb36d97a73c91ed9137b06156ec55b864a0bacf7b5a8ce6cc25ee6dc59a85fc1466f60a3e3b9de2cab74027ffe989898bd5b15366533abc93e522d43857db2afd067a9f2c1be597d853b919a35d8a11e690bbc81f216f2e78f8c89991a195fec881d6bdf9d69191a6127ec14349afc127b674dd6626731dc89d66deb9a75623d7c69893fd9317151f936297a0357f5ceba309ecec163276a4da2852ed82372078ed2637d76c906ec2a9e3b218794165d136f42eeb09b707ef1c7c4c4ec169466caeed83df8ee352d43236cc84a70a44fb6c3765999ed817d2a6c9fbda673087cda81e6507484cdf9f367f8a80a8ca7aa75ce6a192a9c5e7adce28c73283677b860975c3d99ee267167ce21ee59f78a33863b0bfeeb77c6c49f30121eb90ffea9c9832d2c43858ff8983ff047fe04dc51fcd9e3cf7cc25f12f527d421fe0a3629adf0e737c6c4ca3ff13776c7dff9747bcb60e133fec13ff917ff56dca152e70d7e98c921ce8f903b544a217fb27d54be98789d75e22ff6c58fad737e02bebb10cb5069b1637eca9bc89d90432db0d0593a87789b7762f8b3998fca5eb749d41b5061f04f569f8fd849a1963123accbcfc12222c21f552e6094a5ea10eff1bed6a09229a17db6d59bbcebc49f309e2ed929937cb0950aa759e78a5ff39b2877223a74cbef527d59438db018fdf90531b18e6aaafc9e0f79e9672c43fab3c37757b813165e563be3257188efb3871cfc293abfef931ff0375ee535dbfa49cba862339bdbf62a77e6853fdb8eda9d8a9f2d73c8766dcff69542db81f264ec46dbe7677d14a8b03de2ef9bc4c29b147b6c3f2471078bfd683f71613fdb13fbc596f6abe18efd66bfdbd3397796f85374be0dc4b0d609f7ed9975082afc435ab3629d0ffbd3fe4ae68e2af6137cbeedbaddb00fed23fbd83eb14feda6dd62dff699f2ea863b7690c99f4d7d945661f04f3556cb37ef2e4a99edb6dd49e30e943dbb6b9f83752eec9eddb72fed01942bfbdabeb16fedbb2877ecfb903f9baddbc4c53523ebcb1ad843bb04e3e9e2d75986b467c7de4de70e58e7097853b6f7c03eca3a15b0ccbe7d6057ed9a632167a2232c813f1bcda3742cec3b8c9ff0d9afd19a25eb30873b7606771eed73c781d1d57384e6ceb5231d69571dd7f11c1f3983056c35e7cff67a032aec04d6a13302dffd8bb466b13863e7c1794ce78ed69e73b0ce85239c277be03c3b136d9d17e7d5795be68eb2d2127f36f1514a858fd9051b3aefbfc732589ca9fd09d14d86df02ed51ca7c01d6e93b33bbe27ca8d1e57c3a5fabdc5175447fd69f477d5a53ab032aacc653eff7594615185bdf10f5e4f15bdff69e53771ace73689d43e788bd2f2b3316e2cfda7a035a73c2eeac433e2d6245a280d175ec9c64f8ad4be7546b8ff15ba0ccce04acf302cadc8c7246d54e4bd509fcc99a474dd99373c66ace2f8af87258a76373a79ba93d0dd09e8b88324f94df02ed39c77827ca9b25fee4d59b23e7c2e9f181d32e784562cbe2f49dcbec9859fbad7a44993f803d03e7cab98e7287dd18ee382db24f1ebdf1f8817363edf1198ca7dfa8c271c5fe706e73faadfa82dfda07ebdc39f78ebadb1cc31d65a5087f92f26d3ead236b669df399f39b3c77867598b3e374d3b547fb2d1d333bf5302a3c50dae3ec72e694adcb2867d447d5217f92f5e6d3fa70f6ac323bf9d915896d0a287365d398d9d9770e9ca1530506c47027a23fab3e0a223eab0b51cd1f6c1955d46a46e67c6b296686d125292aac394361818586ca16cbdc59e10f7187ed08e6f4584d47c2bfdd02a9dc19434098bad69316330b877f0ae10c61840dadaf450f6ffb682b6d9fb9dea8f174c387ce1f6f192c420a37db6f25c4cc87c243ee280e5947a83dcb25e48f076370c73ad719127fa00ac7159b093f07774cccfc043173681d116865d6a38b46d89be2cef247d9478cc498cdacf27f0667a8b4acb278108f5931b3f25b919879606266185d4f863bba2e5b5fcbdc11cf649f0928cdefbfe27c45b1fb42bc8857f126deb3fc564acc5c9b73070bfab0b94263adc7d7efbfea9c9c817e6c8a297c66a03d1f196b3da931b3f88c70c77cfc396fc4d79c3f7fc095e7b00c9f8a6f51170de4bad31187ebc6cce2086366712c4e16b983c53a5ae48eb2d01fcf1fb00c3b1113712a9a913b8a2dd14ae74e749d7929663e748ee6aa1cfd5853ab14e58eaaff60fe34b465ce80356dd1598c529da9ddd93c6656ca1cc71fb0d02572475be7f90fe64f8f9d305774445374996b2d65d7897371b145cc7c2e7a4bcc299b621de951f5352f7f1c7f5a3ce03350e1beb8e4b578bfeaf4950532b4e7dcc4cc641db3ce7c0531730c77421ff636e7ce9fc61ff60196698b81b882729d14a5425478933b66de8bc6cce0b75ec4ad8977568bb883115631dc11aa3cff21fc6959753e10435102b5394b5dcb6e899d3563e667a33d30a3d8e59f49dc218dd63e6caed07f007f2e9c118ca7328ca8093bc9fabe52e6cc98f9313e66167bea1d24ab9c59a80fac4bc31d55ff56fef420a63903dffd2daa3967372d51cba13db131b3b424935cdae26e993391ba4c23cc78f9dfc59f16f8a74f311355d14d52e1b8628f378f99c17d0995fd2b652277ee8c0f43eefc1efd016bb4c54cbaa221caa0c76bfcad90cec9a631b3f4a46f33d5333288e14e19b9837538c27e397f603ccdd83d78a72afb5c3bafa32547e9f7475362e61739960f64e5b2e2493c77a23e4c73e897f10794b7c9eed931ccbc73a8705c918ff2493e6f1633cb0928f3391deb42be44f566ce9db094e5eb2fe44fcf1981e79e88013b8619d4a6a3f2cab975ba9be566c837f92e79e4581fc9dcd1057dd8b39c927d7eca322d71cd6bc09763b0cc1a2a1c5784bfce3af362cc2c67f26321da6c8acf44eee8624d6dff67f9c34bca73c378ea8889ce06daea78ce54e6cecd50ca3c5f490565fe22659e1faf25bf13b983458db02fe0cf4fe84f0bc693b68c74ad762177875afaeefa9a3133adc2bfc83af8f5e5637eabbb82f1b30c9aa96a1f26a7c5f2879d404c53569c010e5f17c343d99087f268d398591e8bcaea71f94c9eac72262c07609fa9755fa8fef4ac3270a62c5d5e734685642fb43828baa8ca53d9e4dfb9e6eb4bd601656e2d2af3bcc82069961af161cf85f0075418bc535569308ca742b217808743754431649ff24cad85e58a997b2b31735b76e27f4376395be10d71076b1861cfdbf247af9757e133b49ac5e490e9e85a1d114628734149cfedddbcf9cc601db110337fc98b25658efc8e8e82523448adb66ec19f169f42ff76d575e89ccced4728f010661d5d760cb61e5034d0923ddbde2c66b66f64dfc4cc71455c6affbec099c55af9b00df803ac81a8a60fcad08078af5ec45d45a5c260eb861aa1e27a3ef3b0c7f2326bbe9e18330f44c51927ffa633925749dc51d651770c37593f84c8660231cd80cf8a51618806aae21b78d8e6b3451e4a0e3173f67c3d3e666ec96b185b29bfcd3ec47e3277d087c9d74cfeb4d4cc493f5b125e91552f2887ec424ce48da82aa5d1cfc92db5cb5b79b771cc7c2fb37aaf659dab3bf08b9c41eb989a3da6f1077a53c5320d5112ddd5b3dfaa80ef8611da8719ab9b3442e5b938dc2c66b60fe450fad93dc84ee4c90a77168a95a43f2de682875596b9541f7903d751906580355559125535429373edf995ad9f15d824660665aecb9d1ce7d293bb7afe558ee38eae0f56f9a3c69318805a5e01f72fc3cfa408eb881958e652c5025923d41e3b95ac9839299f593a7131736c2f9ca879463c77b044f9037e4945ac5d79b3601962d076f36f3e030d86880054fd243b4e723ab29cf31ed76accec4996d7a7f240ee257247d7c41fd05c184f2fa00957cb960947d8e786d6e981bf9b8a2b155be78d9340992b1bc7ccfb6a9d39f7b9a9383a813bd694eca362e044cb849feafa3e0b54f8126cd3d1599eb9e324f9982b37233e663e9017eb9c27ab89cf78eee0a853f6c9b40c7eae60469edf3201a830589d4fd7cdf2e457b29795cf9c12338f613eba4e0f063288e38d29da3e79aca346d87dae5f6d011f4fc51462e18b4d7219654d5e6e9a9b211d77cde7a3d907afb92c9e3baace6f1ff894b2ee39800a77455dbcacb3a3d162713ace6dceb59e9598d9e572833527a72df75679230e84253ed9ee3af691375639f657302770084a83bb116e64196d9db1bcdd629df91ee6a36bff26441aa7216f4ca4d893576c575ef1cff5ec2356ef3fb4f4fd893ed8a60cbfb4b165b0b8362873465e5852ccec3a6e7ebfb5d0bb70fe56c89b3bc51b79a5b8a3eab5c6d725d821ca60608d74455b5c16b397867a8a4bd9609398d995721cb3d6a3f216b39faaa95bb3b965f8a7e18eaad7b30f302872471866f243765fccda0f28db85ebf29bcd6366d75b3a660f7ce8199c7533eb2e365cc137444196e14cb45e933f9730532d368b5c6b179f4ad7f5dd20cb6f25c5ccee48ceb9a3f619bd80313370c7ee835428f5f77909e69a65b63be70cd658d6b64fdf1915671de8e16b8806be45d37d749fdce7cd7233a425efdd89b95a98dbd54413bc6835736fa1160fd4bd28b5fee4be28be2c726703fd519f4e015aa3c6e6b5551665b892173e73c6e2c3de5d3766c66700417b5edd37e527606ef709b3c72acc80db199188e698d5d6592455280d71aa78b3c89d8df80351d0967eaac54ea0d7666afdc744034ec77d5f2f3743f92d8c99e59b3b05ce0cc44496c08b4e3277b500ad13d760c90158e6252c7d775688fe5ceaabdad03abc04a353dd9fb864c791fd0d5b10333f65694f52ccec7eb8c01ab04c29c7c8575a37930db00df2665ebe45ddfd5ae4ce86fcb914e50deee4b4b08f813525880616da9ce9e631b36cb9dfb2241b39d6c2416d980bda545de0cdbc5cbaf542f4e7527cf3e93a5a03f14519faec05a283989db56c2676d2f77b4a8e99417b1aee61f639b00f76a27ba7bac29b79e9bb4785e8cfa55a37ce671d359e2006e908b59e3a8bff0ec4ccf9f3992f96d799dde3ec73003fd6d6b689e78d295d8806567cd846f6b9841968960af67416bc5ac3eeeabd8913bee774642fa7df5a8d994f643fd5976a6f2fced45dfc14decccba57b3ae70e5a6843fbf4ad768a0a072a0333cca54bbd027b2c9f368e99076e8aa7e081ce763ccee4cdbc94c43e2f427fd45ad0716c1cade6aa2a37752006a0c2d9ebcc53b7953f665eca67f6dcb324ee2ab501251ee4e4cdbc348d75b6e4cfa5682ce98952e1a6ce8b1ac01c2dd7ce5ae25c2bf3a631f37eecfd5195d3a79e5428e7e4cc426133b75d88fe008364233a7280371d38a789cab9c8ebd7e4a3dbc9e9b7966266959be176978f07beb1aef3f1ab31dce80ab512decde04fd73d573eac00fe5c8941f48e0f9fb2cff5ee00296596cf39d67a626266fbc65d5c858798583dab00233b8e177dd19655f75c2a2b657108a220e40f968deda366f2f1efa0c8574099377f06d0ed45720a1b6ab62e1be15c6a810fe214ac5277cfd51d266d9d2c0deacf67aa5bf147ad050d379fa90ae9f633e75bc9f9cc46df202686592e7aa9451ea868742aea609d29cccb4ab935e845b4c527ff44fe6c181faad1d565f730dfd9346ba1256f73ecf794f00ca07ba9e329506298a7df83ea2d72e005e652a7a2ae59730a566aace9c32ed54c7563fe5cc168eee83be85bac1bca4727c7fdd1f933803a66bec67c6677a0b2bdc535c47df74b737054616d19f74129c0263ecce9b957ca32c8a135ed53d5d9a927dbad21daccbdde34661681ab72499a5a8997e64f62ea8ec1360f42adb8adc79905feb9b74bfce9e7b04c49e58c59f5ed73c678c9bdcbcc294c8c99dd57f71e2289c5981854d81d826da630aefa397c5456b9927b3caa3fd50c1dd6195e05e48cb5f840deb825772747ccdc885d6796eeee625fc3f1cedd32a8f0299ceb375cdbe6bc89c64ad3287f20124fb24e570cf578da3a739707a0a36df09e8feeeabef0396366d09e8abb1f9d6fbb47ee50dd5f02d6bc6cc999c5d2746773fd81d964699535e033cfacba8ef9b61b512d09f31ab88a32a8fa1446d7815b4d7f8e2b69af39f7c4ad191f235edd32447c256077564cbc49f916afea3979bcffce4ec01651ebbcf01a9fe9ec826db566a62276b0fe0c62018a593ccb7ef318bfc8173347f7cdf0b867abe3798e3b26cb14c9996851198077d6d4c2fcf016ccb93163ac2f5d3e60ea7d145b6a0d2f81f705bd942e44d90b19989e608c1fb27dae12bdd688993dd7f3dc23cf81a32aa5c9130b6f54d8b1546f18a979bebae3aced73a673904185f5782a4085617c5645496534affa3b8fdee5c6aebc112fe78d991dd71b83d65c16e29f92e7efc710716a76f092f7a018a4ed83ebb3257da771ab11c54e2062ab8b36af25fb3bef317c67c0abfdc627bc9e2766f69ebce782fcd38b38f5262a965bf8ffea898fb2b601f532bbb03eace29effd259511083549d110fd2eece792f0bef9b5023ed16f3c562f2992966f65edd1a68cff61cb97287de1bf4e0e582bf2b8ba17eba66416f9d9173b398bfba616968153e52b93f9a85191c04fe2cbfb3e4ca7bf7a6f2393966f6f8d67af32da6de0cd4eb546bd79c8755fd245f5c9e5b8b57a5dc8e3ffa4995ba7805ff779d3712f062de25c9cfec377be27dc43f03e87d7a5f5bf1e6d273bc199c675f5b26fcff4a6dd2f416ae8d6dcc9f16073fe27deb5daf7aebe4197a56c2bb930ebdba7d0cbe2b2e66de5477be45dd7bf31cbdc2b1700c760c114796de5eb0bb4df8036a7e0c31c891bedbb7b6a27b8de4f76fd9afdea177b418337bc79198397fd12a0c5a33d5aabed836d4194139ce951dafc51f95c5d486717c22fa10d36c382abdd3d477b8a9e8b1e9b54c3eb37716c6ccb9fd13ccc986708eaf5a85a36d2f62201bd61af9d1ec33277f5a2a02102f6a146f9e9d40fc69a7bfc34d7dbc8e3c525133684f17d8939f33dfee83f70ddebbbd145b57d588d22be46baa48267f74e69b00bb80d6548bd867d33bcf7c0f20fab40bafe7f5bde53825bee09346afde0c228cfe4a7b5574acb656c9b5cf37953f3af34da8fe38d5bbc86d6919656d6fe05db1abf93b93e26bdef3aebd1befd6bbcdc199ae5a1903ad512abc1c5b574599ddf3e9e6ef004ae00f58c6aa4b57f96e882b8b78b785da1bb4ce6b30bbbcf3eebda15762af89dc09bc1d6f379333ca326aa51958a39e6488f94e59cda4b69b65aff24765be89337105962925e55cac57a0f7d4ee6bdf6e5965027b656f0f3e156f9f5dad72871ff2b677e065e65a0898bfcb2a8cf9573d53586e1fa835f222deaab5c01ff5ac695994d5ea76ae8ca3ecd212d70c021875a7450c350f7b5ecdb7bc3ddff299cf7d5b8fb4703ee63bbef065066fd4cac629447c93d8fba1557517b7b8774745f9c33ee0e8d31c799ff98ad22e95655817dd793460339f29eb680bb9bee7fb7e80dcf147fed87f809e4fe64d573f6954f7263093efc7cfbf798d0ff27b1195ff92be5bd3227f22f3d72d0a66ddc0954e656939f7c71bf88f681d2a4ffe337be53d7fe2bff8af29fe49dd4398ba653d838afb4e55edfcc1a7b9cfbf057da6b2a69a2261078a55fe1450d4086db37b350220de88e1a1dcf1dfe6d681ffbefb53efda9ff91f89bcf906d69c026b1c1d0bc7acf5a91d63f4fe16b99faa54f75cd58c552b6cea77ffde7efe3ee79eca326ca87b2c89b93f0dffd3b742ee7c7915ffdbaffb495aa3c6d3a9acba476a3d35610e3660f7e22cb712f7f45e9403600d3e6994f93785f007e6aa308e8ef51818a62ba37f48da730423ebd83ff14ffd660c271a3aa7fe0174e67525160e79a3f677819ec8a7c40dabce3e613c9588d939af6d4bfee03e8f1d7d5fb79a23f7a7e1b7b475ce80396dbfe3c7dd7b5091f0a98ebceac93917d2950dbd2f4a9ef3bcd0f7e9d59a7b69ddb78c6ece1f959baab303fa6245859347a17f0ef6b9f07b7edfbf649fc0f126a86a0d8e33d4b967df2a075e65a4c4c4c273bd9928b5c91513f7f8148eae987da59f345afb3a37e28fcaf5aee9dd6dfa6a656c8d28ace10ffc2bffdabf991f4b2b97ea617d15ea6eaddec5e5cc6aca06c4bf35b5031e7c3aa2a3f6c163f760d53c7bc600b32927a84fccde8805ebf247ed4ba733534ba2c107ebcf6bfc5bff6e71d719b52392ce3650eb34670b4f23b500f5208e0a20a2bf863e99eabb68d9fb6a7c807f9a687def02d3b67a3e6d0dfeb4748ea1cac9ea027b36da0373b1e89c38ba0ea8d7e161e23942e435247d9f14f196d17cfc6127c0723d57068617b25389de1109679965bd9fdbd6c7d44f0b0e74945db60a7bbf5d267f7aa0050dcd1a75ff30fd59bc9c7d0cec1f90cfce99099c517accd56ad855da55ecbb9ed3f8c367e657751e7c01bfa6df64f1ad2d3329666d8007e0fbf01c3b108515fe66a524fe0057d5ea4a55ef295bc4fa4f4fbfc9a2a4229782d8df82c8eb05cf117cda0fbdeb39893f2aea83f154c8af72b54f785f74554c57d0da401d987da5720974a6c9f6c76b6966c7ec7194c49f62de1da7b338ae74943401df5c04fb7b3ad7a40f0a36b4ca45f0108ed1d46b4a03a1fe4f4efe6c5d940aeb5987de99ae9077ecf2a93e62033cf8d9f67b356816ccf45c55451767f1fbc526f167aba2d8df84b982bbceaa43aa6502b552037ddca115e5edcfb10711cba97a0e56ccc0fb25f2b060fef4d8a7ceb41aa88cb1625418e28b3e5c89ce2c2ee65d9a6abf10f7017838d3f7df53bf5b187f54e48a6b3f35f5bed442fab80e766eeba739db3abadefa3c211a3856f99c6acd285fbc5e047fd43e1c6ac549dd85835f2d648556ccf411cbecb3a87d3af55e1c53a5c26bacc26ebdfea3b97a0ebebba1df74befd2e926ae745b5f2d95723b4987d3a81d92f6a2d8972ffd73ac72df873c18e5586adbe3fb9e5130758f4ceae53508609e58816c043506138a28a72371ba11bf147cdc94edda168d0130705ccbb211ab874c730fffdcc9f69955a80d9e029eaa05e9f69fb74e6e18f93f22cf2728138b32b5ed5eab6be8e62f60a2f83ad4fa1a78bb18cda934edd199faa3c9f6dcf51d987e7dbb1a6a572e9dc23b5076631f7c9e018ea6d9dafe0bba74564a35b180d9cc211bb96daedab8073d4fc61d93b50892bef4ddd3de7997bd8e5e6e1b7bad707ec0f8ad971098ea8ee043dc846319699f3c7bf4f7bdadf6a7b8e5bd6efd8dd3a3f1afb18a28f57cf5177590ad12ee4a1ba7f58b5eacb59ba45f0c71fb2b4797a3d3d9f799dc267b2e497203e730b7a0bb67a8ef0ca9b8976e68e48f94b5ddf97bc9ef3c769f93b3fb57e8257a177f93af6dedc3244d7055946ed7beb1e79dfcbef46ddf8787a5f7d770c3c1ccc67bf9a3fbb7e990f7fc83a2d1d0d4c41bdbe8b9973ab8c3ff0dd257f0f22be42d620e1d3e35379a3f2e4f433c791366d9f8abfcf64e16f37c7dd53badec43d5fd8bf7e2bcea868c0fb76c7b26115a185fa1dbd100dbc92c2ae7c47dbe7404efd6a613ba837f4eada8518ca2afc6ab990b51f9d250ab1e314fab85bd0dbd87b6a9f195982119a922747fcd9f587d66141bee402c6d3b77b242ef58ae1d657a2328b614ea69ef06817c343f6a1ded1aba20159cde221f207ecb3efd7b6bc7ba3f7f7121db56381e6eaf67dac76bd55eff669c3cca32015d6637ee63e00b373652b137f0efc0af78335f74e5efc55aba9e73bdf85acefe9bd58d4ce912a9fb9181eea1dadca383bcabf5f6cc89f037f3fc88ea3578aca4dd5ef4c6eeb8ca342661d6a7723b5efadfbc0b7e534f150efb808dec93d8f57e174fe04dc3f08b89c3ac13a3ba8ab5fe5039d4b3715e5cd9fc758e061e08c60967705472c669db901aaeeca8628a9a784d7d89b68993ff829f39c5907309ea6faedb76dbd1359212aac72d0847ece9f7d16c343da9bed34e7fe88a9fc5123ccba0fec2cf6e97790374547e7784d0a89f85a94f9d657996f85bc958fb244715d7fbbbc9005feec060eaba5f5b1d506f677556ed75a3b4426f330d07b85bda87b5039df509d51d43b4e34b3718fbdad79f837ce2f0e34870e200adab392e201f53e1f75efa690f7c499cc37f5ae16765f0c0f693f3f9525bae13b7a178bf23d863f8150ff15cf814c99a9b60a51e1867ec3cf44cf92abebbda13af14a304b54ed19552d261a50b1b5cae954f609dc70841db0d2f20cadc8a29f3f9ce86c857e51d180f6dcea6d59a0c24544a56af60b637e204aea5e9eb68f40fee8e205b9dfeeb35ed1996f65fdb45621ecc7b717eb0ca5925af32d86873a8ffb4565546034f077549f0fd44c959d16338a22e542e7acab5c9d9762545867139575565ba30815c62c51bdcb9b3ac7e69c87217f7c2a813f64c5ad05b59c91fed5aede13a69079b79ae3d1d371c3627868d5294bf44567892eb4cff9830aad46983d2be24ac4b5d237f5abd22d26e7426789ea5c48fdf4faf63c6ce92cd117fd1459c27eb19a3f41c81d5d336fbb7539f601ecc7bd2acbc5bca11aa2d201f5703977ae7e4601152eeb2342bc94cc43e48f1e612333ca8231df34ffa2a53349750626cc2d0b7937aa7e0e563d6d3028e24de9c8431dad63de69c69c4cf327c21d5d3f780f1b446c1752bfe95254d5ce9185f4b1ba6fa3b244076ad7a6225458c71725fd1459275f9628f1c75f2cfc0de619f97f59c5200dfddcb97a4ead889c0bfdd658b5f7a57adbf0ba3917f145e7d25da92c5175273befdffdbdac3f4130825aad05e5ea2fe06a077ef55be5a6e67ca626ab8fd5bbbbe18898f956d09caca6dfb67aac76e35b8f87f1fc0106c53e1db96019a5c27d985956d533b1fa6d16db5e49cf2a03f7750666face33f979a8560cf5b387f84cf3dae788fc519c015d8ed68f696fdbd0796aa76a4f4db55f57019669a83df4e03a546cfd59c8932aa8c24db55bac38db3c4b34863fca3a7ef064f59d44cfac18cb3ed3f23ed7283dd9d0ab4965bd4b6711abf03dabad9e1056cf77e89cce2dd77f96b8438595524658ab98184467bea9a7886bf3fd11b72be25a54dd07954ba7335c0ad93f218c7b46c41d5dfbfbbc90acb904cb84fb2316b3eb2da9f0a968ab5db3741e47113c6cfebda83ff3f20c71f45df208dba298ccb72ebdf17dfb6336988a20ebea39d8edf6a58e587ba6de94256fb47d46cbdc212b8d0b7a9a24d2c7eaad6e6a7f449ded5a446eaacae9ac8bb67abaa9a82c51cdeca97455b6ebdf73fd21de44ca837356d47378fa89a9a9ba6b09aa5e486eaadea7b3a972e9d475143627d3fbd680ef39411e127f903bfe92a71f05d96f1bcb53602ca99deed43e074565608a867b24d47af3493159a22a5b192ca39e87bd8e3ebb14f2e739ae58f7dbadcbe9b7f78ed5fe884559064a984b579065544e671b8ed88d7b5774c89f450f4f16521a1dbc6cf6cba0994d60cd2545204558a62efade89385dd827753bcb5c507e52539f638cb5b57d56b913989a5faeef0f742e9de38e41858bca4dfd60f79ee339d22d883350202a7df5661095a6be455bdb07b9133bc2c4f31a79412dfd14c8147e15b3380a613f68e6a9ce2d2ee6b92f9567389337c12be5d2651c33863fc89d37f8ef73f00ef524cfbbfdf4f34d2fde4456b77b4375f4986ab764e0e1b0a03b923ae34f4c140f61de98f36f883fb1dcc1c2baa9abe02ddce942bd45a0b09db97afaf9a6a9d2cc62eec7eb3d3edac043f5ecea5ab35fe28fe14c409c79d61f55bfc1cc23e5b972f0b42acb708d8ca3f42bd16f2c7c71cb30873a2be68903bd1f5f55ede6af57aed7fcfb4cfebc07cffc327984e9f7f9169281a933df8610430ec520f26ed4ad2ca3ee78602edda6ab30c49ff788de3c2f177f9f0d0bb0406251efb3554f99aafde58b7a0a5cef54d850fb726d979f94c89ff7b0bc810679c5efdc807dac32dfd4fe88b21af76ed4f58bca03d677e4db52ed68b7755e88b6cf82dec49459302e28e7385a22fb2316b3070266898a6fb5dbe8e63b22a5f027ca9977b218d60f4c1668999ed91f917691dbda323aabadadd77c4ff57decc2ce35e44f3c6fc2c29e8af14f2af34dbfef67aa23d702ae80dee5d9573b7f16f43cc6327fde23dc795ee0ce5b588fb7cd2051fb2302fb1bee83bcd1591c5b9fbd8a05f42e4bea2d71c54403f9f8338b29cfec6ee35fd1fb23820a5f415453880aeb4c36958376259a45a870267f96f5e62de2e9c942fc6d932bd3996f2a97ee54bc14b5231268d7503464497c17140de4e14f1c67b0bc51fd60e57893f8bc28f6832e94d56e3405cdc95aea88948159d03a734efe247066b1b0a39c4735fb237e8b2bbd97671179f07581bb7d5d8a41f12a1c5f548ca9ed93cd9d99ae3fb2cf4cb3bfa332f836db1f318e87105b777007aa9f52e195d26335d9b0fa817ebf43843bc99652e5cb3a4f39aada3903f3d44a7a17b902f640d0fb23aabdee4a996f4a2faaa808a4197c07756bc7fab00631fc8972a6111cd2bfb09e24f79fdea7aa2b3a05e55c04e0b9310373f0f32a4cbfa972342f9c9ed515636b600d5897ec93c59b676d29551f89a477aeebfcfa62f28fadb2569a86dec1e8279fab9e9716abf19af5eddc08669db04765192cc49fb7087796398335161505fde499d6c173eb772cb1fb6276e6ca2e103d35f97d700ce3e9046c0356094ed03aaacee44f231c69ba4ecd5ad8e62c4ba0eb3a9f59baebbe297de3d26243f8b56736152c389d73265a883ff19c59e4ce2c684269153a53d567a9f7e92ce19b117f910aeb1ddfacbe73e35c581f518b18eeb02ff8f738853fb355eea09777f60abb8296de99ab0f9fb27e1b7861bb8aa49696b5679d0767560754f8248e332bfc49e38ce18d2987419b0f0a39cbb27ab31bee8ff88b54f88cb94c3a3df6a454389933ec8b754dbdc09f460267162dd709ba5b9d6543ef58705ae4fe88d9c55131d933cc007616fd532efec471a79950cec192cec6731fb5a7ec25cc2cf5fe88853c9b9ce73787a2ca66309e18faa765bd41aeac7227d49f65ceac72e782ac73a1718f8fd63f53710dfe692abed5eef2bf4a85c53593ec8e4dad9d79c4b75ef9dbe84f92de206716ebc3f5d682d88718ba0fb83fa2cea5fb059651d13c3b776eac8eb2cb2a6792f426567f92f5a619e1cebc3c07fddcbb9994c595da1f91de20ff0b2ca33247ac73501a6599b5b466c98a635542fe6471e61cec644a33e8d8d9abadb43f22bd41fe575806a24cd90d2e61fec496b5261a13a7e98daa559ba9ff8eea4fbcdec4a9f4733048f53b6dbd974343bdbbbba03dc6b24acb1939bde05359863d6ea63551de2cf0278d3b51decccb2cb882282bf96cdb949bfa8b6261760c4ab303fd7d1267993c9c89e34e447fd2f566d97217dacba7ed10504cee4f7669f113eb14bc135b55e1ed78b3c29f34bdc1d25ca80f83eb9fbc6f905d40d3be3d3fb889b7cc3a3e6a9933f33ae44f1a679a21672ec25a8fb0c267aab9b586d7824feb438fa69588af18de2cf0275b6f9a2bf56df0ec3dfc7aeb886beb34b8e307a957bca68f4ae24ef0181c117f92f526ca99c5a218f453bb02c670063ee7ee55706f4653713e6ab5b0afc00b5ac08121e94f5ece44cb79500a767e8d65c419ff10776abd3c8d3345e88db64c1bae6f089f5db24f928f4ae68e2a30c2d8e98fdea5534f51d5d979702725c6c13fe3a342ce8c83a3a01394c1327b689d608ff427993368893967a2f579a09eb3fa21cb381079079ff225596b368d896338330e2ac17e704056a986f5de127fb23883d63205e61981b24fd19cb9604369f3b19418ef6dc79974de04637f08ac698eac3967a275843fd97a33af4d698c5881777b5b4ec96907df3240cb64f9a8edf4465966c4218e3b58e28caaf7147754aded7391536fcc488bd61d8882b6b78c7a32ecda3a74f6e48b359dcf9f7e466f3467bca037b2b50aef2d73265a883f51ee247126ca9df9a7e3ef6cf9ec558f9db021b746ce4858959fe7cca27f5ad69b903b5876893fe97ab3cc19532b4bcd4632e59e6a96e7be7046ec42c5c230a27e94339a371e28cdb356e1610c6756b8a3ac15ea4f3667167913619073b6c9be9bacc64fd89d6010d764de65d9d6478d5c509aaf9117cb9905bd897227f45fe93e6a9533643518bfca3e87237fad7baa2d3e1b05fcdeea089827e0fce9e76262edb9d13f0de993ce19e28d29da3ee93e2a8937e16734caf986089d6b6a1d320191f0347b66b99dde90653a6a96b0648114bd59ae97f813cf9965eb2d7f9ef5dec8192aacde9c6d7d8f1c81b3cb939fd31badc295a0472a9ce9a36278135a2ec29fbc7a839cf1e85f07eaaf462c6d5740a7cd4ff83baa705ece6ca637649936cd12e239335ce24c1c777647632cc49f75f426ce5a0f811d67199571c46bc119a970b85ef31331b19e59827f1a7911adc9f6514b7ab3a4d4467f726b8de10e9cc32df491a95b815cba47d102461d5adf5657cad163be55accdd789f51c617ff444b1f09a3e2a5a1bde2cf0278533b17a13f7b9e2a10f1b3df393d124188831c5c285f9a855de0463e5b96196701b72269fdea470666ebdd138c29f4ccee8cf9c33a83d652a1d18612dab377a09582083aba00de73dcec799cd7c94f14f344b58b640b28f4ad59b58fe24f8a864bdd1add64299f9557b367a1d49f01bcffa1bcd605c14679679a3c7530b7ee16081353963e214ceeca2d5c83a7b217fd23f07099c090bb496c12aed603f3857ffd6f8363882be2e3eaea980653ae15acd0f70665e46667d3e878f4ae0cdb252df8ede420b3de719616b688d074af3acfb6853cec473678933510b25f127c64725f026a5dc065e313e0ae64fef416bf434b246d31c71cd9a3e2a863733c51d552bfb14c0190bad35e70e95aff811b6b67f6ac6f8a7ade29aa88f5ae64c127fa23171b6dea496375d0f83437fb8a9de68ff049e3bc13fad398fcaab3751ee8c3eb2f4398e37c97a13530e5647583eff04acd1fe69f4b9665c93eda3163993c21d65a9d03e0705e88de60c7067a8b953d6ff6ea93192ce9da5b8a6429ebb1c6b8135e751ebea8de24ca44ee04fb6dee4b0148eb0a61a61f9783372613c7516e64f05eb4d3667426bcd22fc498a89f372a66c38b3c41d5d431494a937face5c0bf4ef202316fe111fb5c49db1aea92cf26785376f397c54fc289b974e304ee54d25c63f153e8fcae24e9433cbfc89d79bbc3e2a8e332177cabaad12af3778672e585ddffbe198384d6f42ee7c6141fe6ce5a3e279131d71df268e8ec435153db33cd0568ce7cd363e2ab7de24f1465b2ca23f9be94d126716af1a74651c896b3ced9fca7094698205d6f351ebeb4d126722bc89e74f5c4cbc266f96b9a3cb88d3bd04b55e7ea0db16e39a9fd39bf5798316c3fa6bce9fa2f426f6d3d2eb11079199e5fa7a53584cbcc29918deacf2672b1f15c319b2da10b9b215673658b7599b3773cea8baaead3333fcc9b4c45a7ab3fcd13ab37c67ae807b0b5beb4d026756f953808fb2563913ad1378b3ddba4d413e6a9933510bfdfd7fffe7bffe1f92e4fedb - + kcolorbutton.h diff --git a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui index d8941dfa..a3688a6c 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui +++ b/kopete/kopete/addaccountwizard/addaccountwizardpage3.ui @@ -149,5 +149,5 @@ for account: 789ce57d5973ea3ad7e6fdfb2b4e1dddbdd5e58f84904075f50564820009848c74f5856cc90364200364f8aaff7b2f692d19039e0067effd9e2e4a47fb3922c65e7af4ac257959feaf7fff75d7ebfef5effffad7db3b7f0f9cbf1c9fbffef56f317d7cfcfadfffe77ffdf7bffeded9dbfd6bb756faeba05cfe6bf7effff1afbfadc7bf9cbfd86e696fafc2357ed0b8b65722cc08537bffdde07dfc7b4eb84ad825ec10b6152eef84ed4e88f1f892b0f9be0831b67b882b25c2cf061f94351e11ae50fbd8606c77f5f997e1fc2afaf8fc21c4fafb421076103b55c415ba7eb663309ddf5388f1f77c83e97c3e099bf3090cc676764bb846ed1383e9ef5f426c6b7c4c5850fb7b8875bb4dc7dfdf411cbc2abcb7b357dadbd1d7ff4598ae5f5e1176c81e2cc4fa7c383718af5758888d3d9ca1c1d81edc13ae507bd960b2d75188d1de2383e97ae8fc8c3dd8bbc1d4fe1a62b4c72561638fb710633b9d1fd803db4b21d6edecc6e0aa6eb77dc215b2e7bdc1d82e0cae21f6f1787c6f6f4f9faf7742b88a583c198cf6f5f7083bd8ce760d26fb7f8658b7bb75c4606fb4ff6788f1f83d83d1be927edfd85fdc194cfd771062dd2e25e11af5cf34c4badd367f4ff6e7e6ef05f1b56230b63b7e88917fa788f777a83f1f0dc6efcbd710637f74081b3edc8758b73b2d83d1fed63e61c3976b83f1efc5b3c1d47f5f21d6c79374bdfb02b14fd773b08338e006d7f63476095710fb9a6f95dd72a954d2e7778038e403b59bfef566884d7fbaa721c6f1726d30f687f74db842df9f8518bfff6630f5e70b61eacf910831f6d70761eabfd1a3c164af3162d35fd689c1d41f03c246bfba21c6fe730893fd837188d1befb06637fb007c2f4fb2337c4687fcf60fc7ef014626ca7bf37fde5ef1a4cfd43fd61fa2b102176341e11ae51bb1f626c7f272c10fb5aff2adcf4b7b747780fb1ff45b84af831c4556d5fb467a8170e1d2fd45bfabee187d33498f830214cfdef39846ba4176d83f1fbee116181ed72cf606ce7e310633bf24d8d57d4f3bb10ebf6e0c660ea2ffafd7da3e7cc60eaff9310a31eef10267eb0af10637f3e1a8cfdcd2f09131ffca1c1d44ed77760fc5dc5606c1ff11063bbf97e05f188aef780f420f83298f8108418f9b04f5850fb7388b1fdcd608eed0dc4d51d6a9f194ced17842b887d7d7efbbb217fdc106bfef867841dc20c31d04f63e7de60f4f7de98f01e62e18518fbeb9630f92bd6430c7c42fe9409135fc42b62c30ff725c4c83ffabd7de36ff6438c7a32234cfdef5c8458dbdff3091b7fde0931eacb14b1e96ffe6630e9c34788916f5784e9f759c960f2dfe510231fde0dc6feb5ee08937e066d83a9ffc95e211f5a21c6fea6f30ffbffd060eaff2661eaffe03cc4fafb239b708dda6f438ced166141f8cd605b7f7ff489b8b683d8a969cccb4eb9a631fe1e377cf19f0813df3cfafe9eb383fcfa3298fc19da07f46857f3959f1a8c7c728788437da813267bba5706537c4ee7b36ff4283098f8d0451c8ef74fc2c6ff3c194c7c9810367ae28718bf7f48988eefdf1b4c7ad0475c257f327a0831f667c960ea1fba9e2af997119d8fe9bf911762fcfb03c2d47f41d960ecaf80ec67fa6f340db1d0ed7b842bf4fddd10ebf6d18c700db1a37fffa06cf4c07f475c29eda0de5c8418fbff9e7005dbbdb2c1d4dfb6c1783c59456cfa4b4c111f90bfb00d367c681b4cf1e06e88b5fddd5bc2a40fce8dc1143f1c11267fc0bc1063ffd51157491ff87188b1dd3198c6ef35611affa391c1d47f92b0f10774bda1bdc784c9dea30f839d8ac6743e3541ed5f0663bb83d76f97ab656d4fe788308d571bed6187fa5e415c11d85fac6930b6db6788f74dbce011a6f1e53e2036f616a784c9de828e7740facb3f0c267b8b10a3ded2df1b7b3b7b21c6f1563598ec4de75725fd0d060693fe5e1336f391a1c114df55438ce38d1126ff2b74ff56cbe53de4ab731562d4bf57c2646ffe85b852417bfb1ee2fd1db2ef04f1c10ef947df60b2678930e9993498ec252e111bfb04738cf3911bc2a45f6c1662b4cfb1c178fdd2266cf4ecce606ce7747d55ea6f7b6430b6b3d3106bfbf10ee21a5d8f13184cf6f50d26fbe2f9d865d20be7ce60b2f73e6163ffcf10239f6b84ab88bd27c49512f98f6fc4fb3bc85fff8ab0c0fef2e9f70f76f0efc5036133ff7b435c257fe13d1336f3f9ab1023dffb84c99ed6aec1682f41e75325be3b3d83c99e74fc1af1db7b08b1b61fb3099bf590db10637cd13598e61b3b06937f217bd5c89f08dd3fb5bdd0fe8706a3bded2ae13d6a7f3198fac30d31f6c70de12ab6bb32c4badd3d21ec507fbd22de2b617f786784f710bb1f8449bf3cd760d2af4fc4a6bf5999708d8ed73798f8503198e28f63c4861fee2e62d3ffde25e22af90bef2bc4d8df25c2d47fa28bd8f41f3b0fb1ee0fd1206cf4e93bc4e80fa60663ff5864cf1acdc7b817629cef550dc6bfb7fa06e3dfb337c2147f073b06131f6488912f35c47c07b1a3f5b4e698feb6f70957910ff681c1d82ead10a33e4e089bf84f1a4cdf7f0bb1febe6c198cfd278e10ef113fa56730f183ce2fe4cb28c478bc2fc255e24f8fb0f93d3aff4a09dbdd5783915ffc89708df88be3c5d9df217e71c2a48f1ef6bf63f4dca7f6ea0e5eaf4fbf5fa578c7ad194cf3893661817cf5070693fedc1a8cfc73a93f42bdb00913bfc44b88b17f9b848d1e55438cfa6d194cfc1913a6ebf35f0da6bf1f8418f9776e30febdc3428cfa45f6e634ffe3f706e3f7ed5988917f6784cd7ce6d5609a8f687de07b864f7605b1e18b7d6d30b50f081b3d7b3698f48a1b4cf15383b0e1fb95c1f87db14798f4490e0da6fe75101b3ec90961d3ff3dc2a44fbc4958903fda451cea139d8f89c7fc6fc4b51d8a37ce0d463eb99f84cd7a638b30f1c7ab1a4cfd593698fac343cc8dffec1a4cfa766c30e9c97788757f499730e919932146be1c10e6c807bb6430cd676c8369fe42f6e392fa5ff3853ba6ffec3e61d35f970693bf12848d1e3d194c7f8ffde984f39716619aafc863c2a6bf1cc282da0706a37f61743efb145f48c760ba7f42e7bf4feb6fb24998e26f7e1e626cbf3718edc5d0dece418dfa7f8ab866f46948b842f1ce09613a3f798a98937f72ef0dc6fef276091b7d9221c6f5b40f83893f1d83c99f3408738a972606633b7f3718fb9399df97a4171706633b1f21b67769beca428cf3533d3fb2f7c2febc406cfad3ee194ceddf842bd45e3798da1b846bd82e1e119bfe7477080b1aff6d83e97eca3ee203b3de7519621ccf7b88abe4dffd67c49cfacfef10e6148fdc184ce3fbd160b2974f58d2787d3098faefd0608aff8606937d6b888d7d6537c4dabebc4f789faeaf61307edf3a0cb1febe45d76773c4b6d6175b84f63d274cf6751c83a9fd8930cd4fedaec1d8cef0f8c2ccaff8b7c1f4f75f84a97fbd23c2e6f88784496ff98dc1687fd6426ce607f2c8608a37a684c93fcb3162335f9075c2343f967d83e97ee13b62be43e3fbd060d2eb6bc2d4fffe29627b97d623ba0663ff8b196163ff2661b23f1f1a8ceb05e28cb0a4f61383b13db0103bbbb4bea07f1fe4d0d8ff12b1b1bffd6830e9e13361b23f170663bb27099bfeef1a4c7a6d8718fbc71c8f7edfb6438cfe32c4a47f1f880f0c1f3a0663bbbc234cfa289f428cf39923c2f4fbf2d260f2df17884d3c26de119bf9af7b6330cdcf1961d24f796d30cdc7cddf537ce6d2f9193e78fb8425e9fd0b627b9fe2c303c29cd6333961d203f66930f6276b207676e9fed1bec1a4479f06139fda06d37a5410626c2f13dea7e30f43acdb5decbf707cc90ae2038a5f789d30f1c3b93418db99f9bee1c7a3c1e42f2f08131f1cf37db39ef510628cd7a7884d7cce5b21467def188cdfb7e9fcab153afe89c1e84fed63c234ffb4770da6fbf3738cc733bf47fec3ed1b4ceb6d4dc4c69fbb2d83295e32ed86bf658369bd86ceaf66e6c31706137fcf101bff2f0d36fca4ef1b7fecfb88ed5de21ff597cd697e30232c49affa0653bc80e31ff484be7f6b30e9cf8030f1c51911e688472f060be4974b58623bab198cedb68558ec22167a3c8a8ae92f5e266cc6f7a7c1942f7118621ccf55c2c42fdb3198e6ab2e62d33fce2d61b35e5d236cd6233f0da6f5ed53c2c407716130dddfb80e31e69770c4263e730c36f1c15388b13f7dc2d49f9c8e67ef92deb821c67850188cdf77df0893bf1715c2e43f5c0bb1e94fff9230c577eea1c1d85ffe1d618a47f8d460ec2f3e436cfacfaa13de47ecb4432c353f9e0973c41ced2f0dffb9446ce22b7b4298f445f60c26fbbd13267bda8230e9af1c194cfa4dbf67ec297608efa33d9d6fc21cafd73d3618ed257cc2640fb78bd8e82d7b21bc4ff7ff1f0ca6fef10cc6ef7bf4fb0e8d4fd6262c299f686230e9fd38c4c857e48734f6652784c9becebbc1725ff7cf056149ed2583b19de9f10d07377a3f214cf6f41862a32fde21e17dd2f706614efef9c560d2f7b6c1b4ded63298e69f6784cdef750cc6bf77760cc6efcb1a6287e2617b4c98f8eff40913bf050f31f2db264cc7171f06d37809dbb1bf64d88ee343760c46be7b25c46297d6131e0dc6bf779b06933e8e08ef93deb5438cfee5da60ca0fb93298f4e2dc603a1f61308dc72a614efeefc3606c970f21d67c90645fc30f1e188cfcf0881f7297da4b0613bf7a84f711072f21c6efebf98094862fde3b61b2bf87f680f144b84e98becff609139fdc03c482f4cfde3118edcde718fdd53161b2971f10e6b49ee7184cf9575383d15e3e9d9fa0f129a4c1680f7762305ebf7f83589af8bc6330d99b1b8cdfb71961b21ffb08b1febef74298ce875f194cf66f85587fdf6a1096647fade7eebeb11fab8718fd9d242c69fda48218f88ced6f8449dfd81561f3f7aec1c4b757c2743c16184ceb2fd42ee9f8bc6730b55b84e9f7bc73c2a4175e3bc4baffbd538371bc7b8d10ebfef6ccf1687ee50521467d0f8f4ff6168469bc7b8f06937f1b1b4cf63e33d8d5fdc1d11eaeb10f7f216cec8bdf77c3eb3f3498ae9f11a6ebb76a06637bffdd6271c5e2f05f6e6a28764c6dc337928a43b58022a98e2f3614178a5c2a22520bcbcb55e61f3fa63625c82c2328636daf07b8cec7242bcdad654ad46a11eb71b21627ab2cd7a6c8258bc55bce8d2972a1466bc8dcd68afb284b8dc822e3382badf267e9ea633993c21b27526773862f5df53267e4dabc79da8a3386379a3baad6fcc9c99b04cee0ff4be78ce14d3a67e2782397ea2867d2b893fc79a63aca9958eeccf9a35953acdea473a658bd89e3ccd346bc19476a558264fe6cac3771bc594f6f56392372712699378633997ab330c246649f4ccefc32bd59df4f6de7a3bc25cea83a30dc09fdd7cfe84d3667d6d59bcdfc94b15c3a6762b813f2278e333c436bb6e3cca67a93eca30ad29b857a62f4e71feda3d6d29b65aba1fe6ce0a39cb57cd4b67a931d136fc69915bd519c8916c39f141fc56338537c4c2cac6d63e2f57c541c6f5647dc24d49f5f1d136fab37ebf9a974ce048b9c59e6cf1fa537c5f9a88df486ea891969c89f1c7af30f8a89d3f4264d7ffed131714ebd897267ae3f5be94d968f5a7f0efec331719adee8f212d693507ffe61eb366b702658e64cb40ef9f3bbd76d7e0d6732f54671467f5eb0d0fcf43fd547e5e74d8a8f4aac0d7ff2fba83f2dae491a316bf928d29bc9327722fcc9e3a336e14c3e1f953d8f5a7bdd268133b13e6a65e4cd3f2fda3edbfba8fcbc89e3ccfa7a933d8fcae7a3623993c19f227c543ebdc9f651f9f4664b1f15c39bd072da3eff241f954f6f523963bd52fd16f2e71fb76eb3e0a3d6d09be53ac29f7ff43c2aafde28ce58eff33ac29fcde7517fe0bacda67ab364ad77e2cf7faede64f126afde443813ad893f7f928f8ae74e1667b262e26cce442df86e0af1a7889838596f36bb07bead8fda486f748de525963fff1fc4c4697ab35c883f7f4cbecd567a1359b7595b6f229c89d4ef217ffef3d66d8af251b1bc31968bf0e78fc8b749e0ccf67a93e2a39639132dda3e7f50becdc63e6a6acdac0feb730dbd49e44cb426fe6cefa3a2dcd92c26cebc9799c0992fb0ccb755b71ad6a175b4898fa2fa78993b217ffe43ef2dc0e7c43ab59a56cb3a03eb9c596dab43ff3f8e33510ba57246d7c750bf93fefce7c5c4ca325debdcba20cb60e9597d1861ab7af3665d5a03ebcabab66eac5bebcebab78656295e6f12f5e74f5c278e5bb799c0b5ee58bb5679c132a6ec59951885deb70eacaa5563161466d5ac2ae3cc660e58e96d853bef9191769cc99f641ff5ebe7e0ea0a064c3009e369d532ba3097a95f5abce24be6b3802c538bd42336660fc0a564fe94427dfebdeb36d97a73c91ed9137b06156ec55b864a0bacf7b5a8ce6cc25ee6dc59a85fc1466f60a3e3b9de2cab74027ffe989898bd5b15366533abc93e522d43857db2afd067a9f2c1be597d853b919a35d8a11e690bbc81f216f2e78f8c89991a195fec881d6bdf9d69191a6127ec14349afc127b674dd6626731dc89d66deb9a75623d7c69893fd9317151f936297a0357f5ceba309ecec163276a4da2852ed82372078ed2637d76c906ec2a9e3b218794165d136f42eeb09b707ef1c7c4c4ec169466caeed83df8ee352d43236cc84a70a44fb6c3765999ed817d2a6c9fbda673087cda81e6507484cdf9f367f8a80a8ca7aa75ce6a192a9c5e7adce28c73283677b860975c3d99ee267167ce21ee59f78a33863b0bfeeb77c6c49f30121eb90ffea9c9832d2c43858ff8983ff047fe04dc51fcd9e3cf7cc25f12f527d421fe0a3629adf0e737c6c4ca3ff13776c7dff9747bcb60e133fec13ff917ff56dca152e70d7e98c921ce8f903b544a217fb27d54be98789d75e22ff6c58fad737e02bebb10cb5069b1637eca9bc89d90432db0d0593a87789b7762f8b3998fca5eb749d41b5061f04f569f8fd849a1963123accbcfc12222c21f552e6094a5ea10eff1bed6a09229a17db6d59bbcebc49f309e2ed929937cb0950aa759e78a5ff39b2877223a74cbef527d59438db018fdf90531b18e6aaafc9e0f79e9672c43fab3c37757b813165e563be3257188efb3871cfc293abfef931ff0375ee535dbfa49cba862339bdbf62a77e6853fdb8eda9d8a9f2d73c8766dcff69542db81f264ec46dbe7677d14a8b03de2ef9bc4c29b147b6c3f2471078bfd683f71613fdb13fbc596f6abe18efd66bfdbd3397796f85374be0dc4b0d609f7ed9975082afc435ab3629d0ffbd3fe4ae68e2af6137cbeedbaddb00fed23fbd83eb14feda6dd62dff699f2ea863b7690c99f4d7d945661f04f3556cb37ef2e4a99edb6dd49e30e943dbb6b9f83752eec9eddb72fed01942bfbdabeb16fedbb2877ecfb903f9baddbc4c53523ebcb1ad843bb04e3e9e2d75986b467c7de4de70e58e7097853b6f7c03eca3a15b0ccbe7d6057ed9a632167a2232c813f1bcda3742cec3b8c9ff0d9afd19a25eb30873b7606771eed73c781d1d57384e6ceb5231d69571dd7f11c1f3983056c35e7cff67a032aec04d6a13302dffd8bb466b13863e7c1794ce78ed69e73b0ce85239c277be03c3b136d9d17e7d5795be68eb2d2127f36f1514a858fd9051b3aefbfc732589ca9fd09d14d86df02ed51ca7c01d6e93b33bbe27ca8d1e57c3a5fabdc5175447fd69f477d5a53ab032aacc653eff7594615185bdf10f5e4f15bdff69e53771ace73689d43e788bd2f2b3316e2cfda7a035a73c2eeac433e2d6245a280d175ec9c64f8ad4be7546b8ff15ba0ccce04acf302cadc8c7246d54e4bd509fcc99a474dd99373c66ace2f8af87258a76373a79ba93d0dd09e8b88324f94df02ed39c77827ca9b25fee4d59b23e7c2e9f181d32e784562cbe2f49dcbec9859fbad7a44993f803d03e7cab98e7287dd18ee382db24f1ebdf1f8817363edf1198ca7dfa8c271c5fe706e73faadfa82dfda07ebdc39f78ebadb1cc31d65a5087f92f26d3ead236b669df399f39b3c77867598b3e374d3b547fb2d1d333bf5302a3c50dae3ec72e694adcb2867d447d5217f92f5e6d3fa70f6ac323bf9d915896d0a287365d398d9d9770e9ca1530506c47027a23fab3e0a223eab0b51cd1f6c1955d46a46e67c6b296686d125292aac394361818586ca16cbdc59e10f7187ed08e6f4584d47c2bfdd02a9dc19434098bad69316330b877f0ae10c61840dadaf450f6ffb682b6d9fb9dea8f174c387ce1f6f192c420a37db6f25c4cc87c243ee280e5947a83dcb25e48f076370c73ad719127fa00ac7159b093f07774cccfc043173681d116865d6a38b46d89be2cef247d9478cc498cdacf27f0667a8b4acb278108f5931b3f25b919879606266185d4f863bba2e5b5fcbdc11cf649f0928cdefbfe27c45b1fb42bc8857f126deb3fc564acc5c9b73070bfab0b94263adc7d7efbfea9c9c817e6c8a297c66a03d1f196b3da931b3f88c70c77cfc396fc4d79c3f7fc095e7b00c9f8a6f51170de4bad31187ebc6cce2086366712c4e16b983c53a5ae48eb2d01fcf1fb00c3b1113712a9a913b8a2dd14ae74e749d7929663e748ee6aa1cfd5853ab14e58eaaff60fe34b465ce80356dd1598c529da9ddd93c6656ca1cc71fb0d02572475be7f90fe64f8f9d305774445374996b2d65d7897371b145cc7c2e7a4bcc299b621de951f5352f7f1c7f5a3ce03350e1beb8e4b578bfeaf4950532b4e7dcc4cc641db3ce7c0531730c77421ff636e7ce9fc61ff60196698b81b882729d14a5425478933b66de8bc6cce0b75ec4ad8977568bb883115631dc11aa3cff21fc6959753e10435102b5394b5dcb6e899d3563e667a33d30a3d8e59f49dc218dd63e6caed07f007f2e9c118ca7328ca8093bc9fabe52e6cc98f9313e66167bea1d24ab9c59a80fac4bc31d55ff56fef420a63903dffd2daa3967372d51cba13db131b3b424935cdae26e993391ba4c23cc78f9dfc59f16f8a74f311355d14d52e1b8628f378f99c17d0995fd2b652277ee8c0f43eefc1efd016bb4c54cbaa221caa0c76bfcad90cec9a631b3f4a46f33d5333288e14e19b9837538c27e397f603ccdd83d78a72afb5c3bafa32547e9f7475362e61739960f64e5b2e2493c77a23e4c73e897f10794b7c9eed931ccbc73a8705c918ff2493e6f1633cb0928f3391deb42be44f566ce9db094e5eb2fe44fcf1981e79e88013b8619d4a6a3f2cab975ba9be566c837f92e79e4581fc9dcd1057dd8b39c927d7eca322d71cd6bc09763b0cc1a2a1c5784bfce3af362cc2c67f26321da6c8acf44eee8624d6dff67f9c34bca73c378ea8889ce06daea78ce54e6cecd50ca3c5f490565fe22659e1faf25bf13b983458db02fe0cf4fe84f0bc693b68c74ad762177875afaeefa9a3133adc2bfc83af8f5e5637eabbb82f1b30c9aa96a1f26a7c5f2879d404c53569c010e5f17c343d99087f268d398591e8bcaea71f94c9eac72262c07609fa9755fa8fef4ac3270a62c5d5e734685642fb43828baa8ca53d9e4dfb9e6eb4bd601656e2d2af3bcc82069961af161cf85f0075418bc535569308ca742b217808743754431649ff24cad85e58a997b2b31735b76e27f4376395be10d71076b1861cfdbf247af9757e133b49ac5e490e9e85a1d114628734149cfedddbcf9cc601db110337fc98b25658efc8e8e82523448adb66ec19f169f42ff76d575e89ccced4728f010661d5d760cb61e5034d0923ddbde2c66b66f64dfc4cc71455c6affbec099c55af9b00df803ac81a8a60fcad08078af5ec45d45a5c260eb861aa1e27a3ef3b0c7f2326bbe9e18330f44c51927ffa633925749dc51d651770c37593f84c8660231cd80cf8a51618806aae21b78d8e6b3451e4a0e3173f67c3d3e666ec96b185b29bfcd3ec47e3277d087c9d74cfeb4d4cc493f5b125e91552f2887ec424ce48da82aa5d1cfc92db5cb5b79b771cc7c2fb37aaf659dab3bf08b9c41eb989a3da6f1077a53c5320d5112ddd5b3dfaa80ef8611da8719ab9b3442e5b938dc2c66b60fe450fad93dc84ee4c90a77168a95a43f2de682875596b9541f7903d751906580355559125535429373edf995ad9f15d824660665aecb9d1ce7d293bb7afe558ee38eae0f56f9a3c69318805a5e01f72fc3cfa408eb881958e652c5025923d41e3b95ac9839299f593a7131736c2f9ca879463c77b044f9037e4945ac5d79b3601962d076f36f3e030d86880054fd243b4e723ab29cf31ed76accec4996d7a7f240ee257247d7c41fd05c184f2fa00957cb960947d8e786d6e981bf9b8a2b155be78d9340992b1bc7ccfb6a9d39f7b9a9383a813bd694eca362e044cb849feafa3e0b54f8126cd3d1599eb9e324f9982b37233e663e9017eb9c27ab89cf78eee0a853f6c9b40c7eae60469edf3201a830589d4fd7cdf2e457b29795cf9c12338f613eba4e0f063288e38d29da3e79aca346d87dae5f6d011f4fc51462e18b4d7219654d5e6e9a9b211d77cde7a3d907afb92c9e3baace6f1ff894b2ee39800a77455dbcacb3a3d162713ace6dceb59e9598d9e572833527a72df75679230e84253ed9ee3af691375639f657302770084a83bb116e64196d9db1bcdd629df91ee6a36bff26441aa7216f4ca4d893576c575ef1cff5ec2356ef3fb4f4fd893ed8a60cbfb4b165b0b8362873465e5852ccec3a6e7ebfb5d0bb70fe56c89b3bc51b79a5b8a3eab5c6d725d821ca60608d74455b5c16b397867a8a4bd9609398d995721cb3d6a3f216b39faaa95bb3b965f8a7e18eaad7b30f302872471866f243765fccda0f28db85ebf29bcd6366d75b3a660f7ce8199c7533eb2e365cc137444196e14cb45e933f9730532d368b5c6b179f4ad7f5dd20cb6f25c5ccee48ceb9a3f619bd80313370c7ee835428f5f77909e69a65b63be70cd658d6b64fdf1915671de8e16b8806be45d37d749fdce7cd7233a425efdd89b95a98dbd54413bc6835736fa1160fd4bd28b5fee4be28be2c726703fd519f4e015aa3c6e6b5551665b892173e73c6e2c3de5d3766c66700417b5edd37e527606ef709b3c72acc80db199188e698d5d6592455280d71aa78b3c89d8df80351d0967eaac54ea0d7666afdc744034ec77d5f2f3743f92d8c99e59b3b05ce0cc44496c08b4e3277b500ad13d760c90158e6252c7d775688fe5ceaabdad03abc04a353dd9fb864c791fd0d5b10333f65694f52ccec7eb8c01ab04c29c7c8575a37930db00df2665ebe45ddfd5ae4ce86fcb914e50deee4b4b08f813525880616da9ce9e631b36cb9dfb2241b39d6c2416d980bda545de0cdbc5cbaf542f4e7527cf3e93a5a03f14519faec05a283989db56c2676d2f77b4a8e99417b1aee61f639b00f76a27ba7bac29b79e9bb4785e8cfa55a37ce671d359e2006e908b59e3a8bff0ec4ccf9f3992f96d799dde3ec73003fd6d6b689e78d295d8806567cd846f6b9841968960af67416bc5ac3eeeabd8913bee774642fa7df5a8d994f643fd5976a6f2fced45dfc14decccba57b3ae70e5a6843fbf4ad768a0a072a0333cca54bbd027b2c9f368e99076e8aa7e081ce763ccee4cdbc94c43e2f427fd45ad0716c1cade6aa2a37752006a0c2d9ebcc53b7953f665eca67f6dcb324ee2ab501251ee4e4cdbc348d75b6e4cfa5682ce98952e1a6ce8b1ac01c2dd7ce5ae25c2bf3a631f37eecfd5195d3a79e5428e7e4cc426133b75d88fe008364233a7280371d38a789cab9c8ebd7e4a3dbc9e9b7966266959be176978f07beb1aef3f1ab31dce80ab512decde04fd73d573eac00fe5c8941f48e0f9fb2cff5ee00296596cf39d67a626266fbc65d5c858798583dab00233b8e177dd19655f75c2a2b657108a220e40f968deda366f2f1efa0c8574099377f06d0ed45720a1b6ab62e1be15c6a810fe214ac5277cfd51d266d9d2c0deacf67aa5bf147ad050d379fa90ae9f633e75bc9f9cc46df202686592e7aa9451ea868742aea609d29cccb4ab935e845b4c527ff44fe6c181faad1d565f730dfd9346ba1256f73ecf794f00ca07ba9e329506298a7df83ea2d72e005e652a7a2ae59730a566aace9c32ed54c7563fe5cc168eee83be85bac1bca4727c7fdd1f933803a66bec67c6677a0b2bdc535c47df74b737054616d19f74129c0263ecce9b957ca32c8a135ed53d5d9a927dbad21daccbdde34661681ab72499a5a8997e64f62ea8ec1360f42adb8adc79905feb9b74bfce9e7b04c49e58c59f5ed73c678c9bdcbcc294c8c99dd57f71e2289c5981854d81d826da630aefa397c5456b9927b3caa3fd50c1dd6195e05e48cb5f840deb825772747ccdc885d6796eeee625fc3f1cedd32a8f0299ceb375cdbe6bc89c64ad3287f20124fb24e570cf578da3a739707a0a36df09e8feeeabef0396366d09e8abb1f9d6fbb47ee50dd5f02d6bc6cc999c5d2746773fd81d964699535e033cfacba8ef9b61b512d09f31ab88a32a8fa1446d7815b4d7f8e2b69af39f7c4ad191f235edd32447c256077564cbc49f916afea3979bcffce4ec01651ebbcf01a9fe9ec826db566a62276b0fe0c62018a593ccb7ef318bfc8173347f7cdf0b867abe3798e3b26cb14c9996851198077d6d4c2fcf016ccb93163ac2f5d3e60ea7d145b6a0d2f81f705bd942e44d90b19989e608c1fb27dae12bdd688993dd7f3dc23cf81a32aa5c9130b6f54d8b1546f18a979bebae3aced73a673904185f5782a4085617c5645496534affa3b8fdee5c6aebc112fe78d991dd71b83d65c16e29f92e7efc710716a76f092f7a018a4ed83ebb3257da771ab11c54e2062ab8b36af25fb3bef317c67c0abfdc627bc9e2766f69ebce782fcd38b38f5262a965bf8ffea898fb2b601f532bbb03eace29effd259511083549d110fd2eece792f0bef9b5023ed16f3c562f2992966f65edd1a68cff61cb97287de1bf4e0e582bf2b8ba17eba66416f9d9173b398bfba616968153e52b93f9a85191c04fe2cbfb3e4ca7bf7a6f2393966f6f8d67af32da6de0cd4eb546bd79c8755fd245f5c9e5b8b57a5dc8e3ffa4995ba7805ff779d3712f062de25c9cfec377be27dc43f03e87d7a5f5bf1e6d273bc199c675f5b26fcff4a6dd2f416ae8d6dcc9f16073fe27deb5daf7aebe4197a56c2bb930ebdba7d0cbe2b2e66de5477be45dd7bf31cbdc2b1700c760c114796de5eb0bb4df8036a7e0c31c891bedbb7b6a27b8de4f76fd9afdea177b418337bc79198397fd12a0c5a33d5aabed836d4194139ce951dafc51f95c5d486717c22fa10d36c382abdd3d477b8a9e8b1e9b54c3eb37716c6ccb9fd13ccc986708eaf5a85a36d2f62201bd61af9d1ec33277f5a2a02102f6a146f9e9d40fc69a7bfc34d7dbc8e3c525133684f17d8939f33dfee83f70ddebbbd145b57d588d22be46baa48267f74e69b00bb80d6548bd867d33bcf7c0f20fab40bafe7f5bde53825bee09346afde0c228cfe4a7b5574acb656c9b5cf37953f3af34da8fe38d5bbc86d6919656d6fe05db1abf93b93e26bdef3aebd1befd6bbcdc199ae5a1903ad512abc1c5b574599ddf3e9e6ef004ae00f58c6aa4b57f96e882b8b78b785da1bb4ce6b30bbbcf3eebda15762af89dc09bc1d6f379333ca326aa51958a39e6488f94e59cda4b69b65aff24765be89337105962925e55cac57a0f7d4ee6bdf6e5965027b656f0f3e156f9f5dad72871ff2b677e065e65a0898bfcb2a8cf9573d53586e1fa835f222deaab5c01ff5ac695994d5ea76ae8ca3ecd212d70c021875a7450c350f7b5ecdb7bc3ddff299cf7d5b8fb4703ee63bbef065066fd4cac629447c93d8fba1557517b7b8774745f9c33ee0e8d31c799ff98ad22e95655817dd793460339f29eb680bb9bee7fb7e80dcf147fed87f809e4fe64d573f6954f7263093efc7cfbf798d0ff27b1195ff92be5bd3227f22f3d72d0a66ddc0954e656939f7c71bf88f681d2a4ffe337be53d7fe2bff8af29fe49dd4398ba653d838afb4e55edfcc1a7b9cfbf057da6b2a69a2261078a55fe1450d4086db37b350220de88e1a1dcf1dfe6d681ffbefb53efda9ff91f89bcf906d69c026b1c1d0bc7acf5a91d63f4fe16b99faa54f75cd58c552b6cea77ffde7efe3ee79eca326ca87b2c89b93f0dffd3b742ee7c7915ffdbaffb495aa3c6d3a9acba476a3d35610e3660f7e22cb712f7f45e9403600d3e6994f93785f007e6aa308e8ef51818a62ba37f48da730423ebd83ff14ffd660c271a3aa7fe0174e67525160e79a3f677819ec8a7c40dabce3e613c9588d939af6d4bfee03e8f1d7d5fb79a23f7a7e1b7b475ce80396dbfe3c7dd7b5091f0a98ebceac93917d2950dbd2f4a9ef3bcd0f7e9d59a7b69ddb78c6ece1f959baab303fa6245859347a17f0ef6b9f07b7edfbf649fc0f126a86a0d8e33d4b967df2a075e65a4c4c4c273bd9928b5c91513f7f8148eae987da59f345afb3a37e28fcaf5aee9dd6dfa6a656c8d28ace10ffc2bffdabf991f4b2b97ea617d15ea6eaddec5e5cc6aca06c4bf35b5031e7c3aa2a3f6c163f760d53c7bc600b32927a84fccde8805ebf247ed4ba733534ba2c107ebcf6bfc5bff6e71d719b52392ce3650eb34670b4f23b500f5208e0a20a2bf863e99eabb68d9fb6a7c807f9a687def02d3b67a3e6d0dfeb4748ea1cac9ea027b36da0373b1e89c38ba0ea8d7e161e23942e435247d9f14f196d17cfc6127c0723d57068617b25389de1109679965bd9fdbd6c7d44f0b0e74945db60a7bbf5d267f7aa0050dcd1a75ff30fd59bc9c7d0cec1f90cfce99099c517accd56ad855da55ecbb9ed3f8c367e657751e7c01bfa6df64f1ad2d3329666d8007e0fbf01c3b108515fe66a524fe0057d5ea4a55ef295bc4fa4f4fbfc9a2a4229782d8df82c8eb05cf117cda0fbdeb39893f2aea83f154c8af72b54f785f74554c57d0da401d987da5720974a6c9f6c76b6966c7ec7194c49f62de1da7b338ae74943401df5c04fb7b3ad7a40f0a36b4ca45f0108ed1d46b4a03a1fe4f4efe6c5d940aeb5987de99ae9077ecf2a93e62033cf8d9f67b356816ccf45c55451767f1fbc526f167aba2d8df84b982bbceaa43aa6502b552037ddca115e5edcfb10711cba97a0e56ccc0fb25f2b060fef4d8a7ceb41aa88cb1625418e28b3e5c89ce2c2ee65d9a6abf10f7017838d3f7df53bf5b187f54e48a6b3f35f5bed442fab80e766eeba739db3abadefa3c211a3856f99c6acd285fbc5e047fd43e1c6ac549dd85835f2d648556ccf411cbecb3a87d3af55e1c53a5c26bacc26ebdfea3b97a0ebebba1df74befd2e926ae745b5f2d95723b4987d3a81d92f6a2d8972ffd73ac72df873c18e5586adbe3fb9e5130758f4ceae53508609e58816c043506138a28a72371ba11bf147cdc94edda168d0130705ccbb211ab874c730fffdcc9f69955a80d9e029eaa05e9f69fb74e6e18f93f22cf2728138b32b5ed5eab6be8e62f60a2f83ad4fa1a78bb18cda934edd199faa3c9f6dcf51d987e7dbb1a6a572e9dc23b5076631f7c9e018ea6d9dafe0bba74564a35b180d9cc211bb96daedab8073d4fc61d93b50892bef4ddd3de7997bd8e5e6e1b7bad707ec0f8ad971098ea8ee043dc846319699f3c7bf4f7bdadf6a7b8e5bd6efd8dd3a3f1afb18a28f57cf5177590ad12ee4a1ba7f58b5eacb59ba45f0c71fb2b4797a3d3d9f799dc267b2e497203e730b7a0bb67a8ef0ca9b8976e68e48f94b5ddf97bc9ef3c769f93b3fb57e8257a177f93af6dedc3244d7055946ed7beb1e79dfcbef46ddf8787a5f7d770c3c1ccc67bf9a3fbb7e990f7fc83a2d1d0d4c41bdbe8b9973ab8c3ff0dd257f0f22be42d620e1d3e35379a3f2e4f433c791366d9f8abfcf64e16f37c7dd53badec43d5fd8bf7e2bcea868c0fb76c7b26115a185fa1dbd100dbc92c2ae7c47dbe7404efd6a613ba837f4eada8518ca2afc6ab990b51f9d250ab1e314fab85bd0dbd87b6a9f195982119a922747fcd9f587d66141bee402c6d3b77b242ef58ae1d657a2328b614ea69ef06817c343f6a1ded1aba20159cde221f207ecb3efd7b6bc7ba3f7f7121db56381e6eaf67dac76bd55eff669c3cca32015d6637ee63e00b373652b137f0efc0af78335f74e5efc55aba9e73bdf85acefe9bd58d4ce912a9fb9181eea1dadca383bcabf5f6cc89f037f3fc88ea3578aca4dd5ef4c6eeb8ca342661d6a7723b5efadfbc0b7e534f150efb808dec93d8f57e174fe04dc3f08b89c3ac13a3ba8ab5fe5039d4b3715e5cd9fc758e061e08c60967705472c669db901aaeeca8628a9a784d7d89b68993ff829f39c5907309ea6faedb76dbd1359212aac72d0847ece9f7d16c343da9bed34e7fe88a9fc5123ccba0fec2cf6e97790374547e7784d0a89f85a94f9d657996f85bc958fb244715d7fbbbc9005feec060eaba5f5b1d506f677556ed75a3b4426f330d07b85bda87b5039df509d51d43b4e34b3718fbdad79f837ce2f0e34870e200adab392e201f53e1f75efa690f7c499cc37f5ae16765f0c0f693f3f9525bae13b7a178bf23d863f8150ff15cf814c99a9b60a51e1867ec3cf44cf92abebbda13af14a304b54ed19552d261a50b1b5cae954f609dc70841db0d2f20cadc8a29f3f9ce86c857e51d180f6dcea6d59a0c24544a56af60b637e204aea5e9eb68f40fee8e205b9dfeeb35ed1996f65fdb45621ecc7b717eb0ca5925af32d86873a8ffb4565546034f077549f0fd44c959d16338a22e542e7acab5c9d9762545867139575565ba30815c62c51bdcb9b3ac7e69c87217f7c2a813f64c5ad05b59c91fed5aede13a69079b79ae3d1d371c3627868d5294bf44567892eb4cff9830aad46983d2be24ac4b5d237f5abd22d26e7426789ea5c48fdf4faf63c6ce92cd117fd1459c27eb19a3f41c81d5d336fbb7539f601ecc7bd2acbc5bca11aa2d201f5703977ae7e4601152eeb2342bc94cc43e48f1e612333ca8231df34ffa2a53349750626cc2d0b7937aa7e0e563d6d3028e24de9c8431dad63de69c69c4cf327c21d5d3f780f1b446c1752bfe95254d5ce9185f4b1ba6fa3b244076ad7a6225458c71725fd1459275f9628f1c75f2cfc0de619f97f59c5200dfddcb97a4ead889c0bfdd658b5f7a57adbf0ba3917f145e7d25da92c5175273befdffdbdac3f4130825aad05e5ea2fe06a077ef55be5a6e67ca626ab8fd5bbbbe18898f956d09caca6dfb67aac76e35b8f87f1fc0106c53e1db96019a5c27d985956d533b1fa6d16db5e49cf2a03f7750666face33f979a8560cf5b387f84cf3dae788fc519c015d8ed68f696fdbd0796aa76a4f4db55f57019669a83df4e03a546cfd59c8932aa8c24db55bac38db3c4b34863fca3a7ef064f59d44cfac18cb3ed3f23ed7283dd9d0ab4965bd4b6711abf03dabad9e1056cf77e89cce2dd77f96b8438595524658ab98184467bea9a7886bf3fd11b72be25a54dd07954ba7335c0ad93f218c7b46c41d5dfbfbbc90acb904cb84fb2316b3eb2da9f0a968ab5db3741e47113c6cfebda83ff3f20c71f45df208dba298ccb72ebdf17dfb6336988a20ebea39d8edf6a58e587ba6de94256fb47d46cbdc212b8d0b7a9a24d2c7eaad6e6a7f449ded5a446eaacae9ac8bb67abaa9a82c51cdeca97455b6ebdf73fd21de44ca837356d47378fa89a9a9ba6b09aa5e486eaadea7b3a972e9d475143627d3fbd680ef39411e127f903bfe92a71f05d96f1bcb53602ca99deed43e074565608a867b24d47af3493159a22a5b192ca39e87bd8e3ebb14f2e739ae58f7dbadcbe9b7f78ed5fe884559064a984b579065544e671b8ed88d7b5774c89f450f4f16521a1dbc6cf6cba0994d60cd2545204558a62efade89385dd827753bcb5c507e52539f638cb5b57d56b913989a5faeef0f742e9de38e41858bca4dfd60f79ee339d22d883350202a7df5661095a6be455bdb07b9133bc2c4f31a79412dfd14c8147e15b3380a613f68e6a9ce2d2ee6b92f9567389337c12be5d2651c33863fc89d37f8ef73f00ef524cfbbfdf4f34d2fde4456b77b4375f4986ab764e0e1b0a03b923ae34f4c140f61de98f36f883fb1dcc1c2baa9abe02ddce942bd45a0b09db97afaf9a6a9d2cc62eec7eb3d3edac043f5ecea5ab35fe28fe14c409c79d61f55bfc1cc23e5b972f0b42acb708d8ca3f42bd16f2c7c71cb30873a2be68903bd1f5f55ede6af57aed7fcfb4cfebc07cffc327984e9f7f9169281a933df8610430ec520f26ed4ad2ca3ee78602edda6ab30c49ff788de3c2f177f9f0d0bb0406251efb3554f99aafde58b7a0a5cef54d850fb726d979f94c89ff7b0bc810679c5efdc807dac32dfd4fe88b21af76ed4f58bca03d677e4db52ed68b7755e88b6cf82dec49459302e28e7385a22fb2316b3070266898a6fb5dbe8e63b22a5f027ca9977b218d60f4c1668999ed91f917691dbda323aabadadd77c4ff57decc2ce35e44f3c6fc2c29e8af14f2af34dbfef67aa23d702ae80dee5d9573b7f16f43cc6327fde23dc795ee0ce5b588fb7cd2051fb2302fb1bee83bcd1591c5b9fbd8a05f42e4bea2d71c54403f9f8338b29cfec6ee35fd1fb23820a5f415453880aeb4c36958376259a45a870267f96f5e62de2e9c942fc6d932bd3996f2a97ee54bc14b5231268d7503464497c17140de4e14f1c67b0bc51fd60e57893f8bc28f6832e94d56e3405cdc95aea88948159d03a734efe247066b1b0a39c4735fb237e8b2bbd97671179f07581bb7d5d8a41f12a1c5f548ca9ed93cd9d99ae3fb2cf4cb3bfa332f836db1f318e87105b777007aa9f52e195d26335d9b0fa817ebf43843bc99652e5cb3a4f39aada3903f3d44a7a17b902f640d0fb23aabdee4a996f4a2faaa808a4197c07756bc7fab00631fc8972a6111cd2bfb09e24f79fdea7aa2b3a05e55c04e0b9310373f0f32a4cbfa972342f9c9ed515636b600d5897ec93c59b676d29551f89a477aeebfcfa62f28fadb2569a86dec1e8279fab9e9716abf19af5eddc08669db04765192cc49fb7087796398335161505fde499d6c173eb772cb1fb6276e6ca2e103d35f97d700ce3e9046c0356094ed03aaacee44f231c69ba4ecd5ad8e62c4ba0eb3a9f59baebbe297de3d26243f8b56736152c389d73265a883ff19c59e4ce2c684269153a53d567a9f7e92ce19b117f910aeb1ddfacbe73e35c581f518b18eeb02ff8f738853fb355eea09777f60abb8296de99ab0f9fb27e1b7861bb8aa49696b5679d0767560754f8248e332bfc49e38ce18d2987419b0f0a39cbb27ab31bee8ff88b54f88cb94c3a3df6a454389933ec8b754dbdc09f460267162dd709ba5b9d6543ef58705ae4fe88d9c55131d933cc007616fd532efec471a79950cec192cec6731fb5a7ec25cc2cf5fe88853c9b9ce73787a2ca66309e18faa765bd41aeac7227d49f65ceac72e782ac73a1718f8fd63f53710dfe692abed5eef2bf4a85c53593ec8e4dad9d79c4b75ef9dbe84f92de206716ebc3f5d682d88718ba0fb83fa2cea5fb059651d13c3b776eac8eb2cb2a6792f426567f92f5a619e1cebc3c07fddcbb9994c595da1f91de20ff0b2ca33247ac73501a6599b5b466c98a635542fe6471e61cec644a33e8d8d9abadb43f22bd41fe575806a24cd90d2e61fec496b5261a13a7e98daa559ba9ff8eea4fbcdec4a9f4733048f53b6dbd974343bdbbbba03dc6b24acb1939bde05359863d6ea63551de2cf0278d3b51decccb2cb882282bf96cdb949bfa8b6261760c4ab303fd7d1267993c9c89e34e447fd2f566d97217dacba7ed10504cee4f7669f113eb14bc135b55e1ed78b3c29f34bdc1d25ca80f83eb9fbc6f905d40d3be3d3fb889b7cc3a3e6a9933f33ae44f1a679a21672ec25a8fb0c267aab9b586d7824feb438fa69588af18de2cf0275b6f9a2bf56df0ec3dfc7aeb886beb34b8e307a957bca68f4ae24ef0181c117f92f526ca99c5a218f453bb02c670063ee7ee55706f4653713e6ab5b0afc00b5ac08121e94f5ece44cb79500a767e8d65c419ff10776abd3c8d3345e88db64c1bae6f089f5db24f928f4ae68e2a30c2d8e98fdea5534f51d5d979702725c6c13fe3a342ce8c83a3a01394c1327b689d608ff427993368893967a2f579a09eb3fa21cb381079079ff225596b368d896338330e2ac17e704056a986f5de127fb23883d63205e61981b24fd19cb9604369f3b19418ef6dc79974de04637f08ac698eac3967a275843fd97a33af4d698c5881777b5b4ec96907df3240cb64f9a8edf4465966c4218e3b58e28caaf7147754aded7391536fcc488bd61d8882b6b78c7a32ecda3a74f6e48b359dcf9f7e466f3467bca037b2b50aef2d73265a883f51ee247126ca9df9a7e3ef6cf9ec558f9db021b746ce4858959fe7cca27f5ad69b903b5876893fe97ab3cc19532b4bcd4632e59e6a96e7be7046ec42c5c230a27e94339a371e28cdb356e1610c6756b8a3ac15ea4f3667167913619073b6c9be9bacc64fd89d6010d764de65d9d6478d5c509aaf9117cb9905bd897227f45fe93e6a9533643518bfca3e87237fad7baa2d3e1b05fcdeea089827e0fce9e76262edb9d13f0de993ce19e28d29da3ee93e2a8937e16734caf986089d6b6a1d320191f0347b66b99dde90653a6a96b0648114bd59ae97f813cf9965eb2d7f9ef5dec8192aacde9c6d7d8f1c81b3cb939fd31badc295a0472a9ce9a36278135a2ec29fbc7a839cf1e85f07eaaf462c6d5740a7cd4ff83baa705ece6ca637649936cd12e239335ce24c1c777647632cc49f75f426ce5a0f811d67199571c46bc119a970b85ef31331b19e59827f1a7911adc9f6514b7ab3a4d4467f726b8de10e9cc32df491a95b815cba47d102461d5adf5657cad163be55accdd789f51c617ff444b1f09a3e2a5a1bde2cf0278533b17a13f7b9e2a10f1b3df393d124188831c5c285f9a855de0463e5b96196701b72269fdea470666ebdd138c29f4ccee8cf9c33a83d652a1d18612dab377a09582083aba00de73dcec799cd7c94f14f344b58b640b28f4ad59b58fe24f8a864bdd1add64299f9557b367a1d49f01bcffa1bcd605c14679679a3c7530b7ee16081353963e214ceeca2d5c83a7b217fd23f07099c090bb496c12aed603f3857ffd6f8363882be2e3eaea980653ae15acd0f70665e46667d3e878f4ae0cdb252df8ede420b3de719616b688d074af3acfb6853cec473678933510b25f127c64725f026a5dc065e313e0ae64fef416bf434b246d31c71cd9a3e2a863733c51d552bfb14c0190bad35e70e95aff811b6b67f6ac6f8a7ade29aa88f5ae64c127fa23171b6dea496375d0f83437fb8a9de68ff049e3bc13fad398fcaab3751ee8c3eb2f4398e37c97a13530e5647583eff04acd1fe69f4b9665c93eda3163993c21d65a9d03e0705e88de60c7067a8b953d6ff6ea93192ce9da5b8a6429ebb1c6b8135e751ebea8de24ca44ee04fb6dee4b0148eb0a61a61f9783372613c7516e64f05eb4d3667426bcd22fc498a89f372a66c38b3c41d5d431494a937face5c0bf4ef202316fe111fb5c49db1aea92cf26785376f397c54fc289b974e304ee54d25c63f153e8fcae24e9433cbfc89d79bbc3e2a8e332177cabaad12af3778672e585ddffbe198384d6f42ee7c6141fe6ce5a3e279131d71df268e8ec435153db33cd0568ce7cd363e2ab7de24f1465b2ca23f9be94d126716af1a74651c896b3ced9fca7094698205d6f351ebeb4d126722bc89e74f5c4cbc266f96b9a3cb88d3bd04b55e7ea0db16e39a9fd39bf5798316c3fa6bce9fa2f426f6d3d2eb11079199e5fa7a53584cbcc29918deacf2672b1f15c319b2da10b9b215673658b7599b3773cea8baaead3333fcc9b4c45a7ab3fcd13ab37c67ae807b0b5beb4d026756f953808fb2563913ad1378b3ddba4d413e6a9933510bfdfd7fffe7bffe1f92e4fedb - + diff --git a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui index 432255d8..550e285f 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/addcontactwizard_base.ui @@ -478,7 +478,7 @@ addGroupButton protocolListView - + klistview.h kpushbutton.h diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui index 6456863d..d5545eaf 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard_base.ui @@ -212,7 +212,7 @@ 789cedbd596f233997ae7bdfbfa2d0ba6b1ca8352b021be74292e7799e0ece45ccf3282914a18dfddf3783ef222dd9966c67655665ba5d0b1ff03da918c897e45a1cc3fffd5f7f3d5c9cfef55ffffd1fd39936f38cbf0c57cbfffa2f731e45d5fff7ffffbffffb3ffeb3dd6bfdd5517b7fb55545fdabf39fffcf7ffca7e1ff65fcd568f1ff6a9e0e24b7f9ef23e236d8b425f3fb47b8bf2deeaf0cc9fc7a3b22a6fb67f792f9fd7648dc69756b5e1e72eec8f45c117770bd277eefb67a3507d792fb354767c43df068c1b92b9e373b21a6e7a5f7c45dbc3fb920eeb506356731711f5c159c7be279d13931ddef2c897b48dfac4d3c680d797af0febecc5f97b88ff4ce9e889596c67f879e83da6a2e7ac44a4bad59ef12ab2d9d97d7856483a71f7a0cc5fd79977888f72596649e3e734cacb54c9e5fa45711e975c7c4cc6ab64a62bd65f1f2bc2336c0d989649bdf3f12dc46fe0f894d7081f4a9e2f9339758457efd8098ae0fe7c4561bf50b7a69e2fa45446ce2f7e98cd86af3f29fa5c436382e25f3f21c3738ebb2bc8e8835944f1e12ebd03f154cf767a76056e1797d30a09fc16a3ce7794c2cee8f880d94df0c7a9982239dd844f9cc89db9d362fdfe444322fcf0af5c512e99f3f11ebb8df3b22b6505ec52e675bf0bc416ca3fce65370bbd786befbc4fd36d76336271e800d8f78d8e6e91ff1f6d37ef637636213f5d3be27a6f7a5376071bfd193ccd367d2f56d053ced736ed70e8697cf1d711be59f259c3bb5f1fc78c46a9bbfcfba21d63afc7ea792ccef9ff3fad8eed6c6df7749ac77f8f35c85d8e8c09fe1f9d25fc4785e4fdcef2bc46687d7874823b63abc7dfa2ae73efb17f893063133aeff0db189f7cdc692f9eff390989e377388ed0eaf1f53e467209ee70c8807a84fb329315d9f9860e63e713f2f6f561a74fd628f7888fa9742ff21931bed197a29e2f7ac4fcc8ca717e5a3b0eb79fd9af1f6c14a877ecf6fc19d6e87d787e494b8d7e1f57989f46842ef04efd3d813f8f3529487d6e977787d59407f9d31bf7fb6473cc0ef21eaabd1d6dbbc7d4eaf890dd4c7b90dee285dc4cb25b1da4579203fa6b8deb4c01dbdcbf5b60cc95c3f17e56db13b787af231b185fa6d04e04e07e99d3f10eb5d5e3fa6bcfdb7ed968afa9d77c0e2fe29da8bdd31ba5c7f3b2036bb5cdf8afb5f167e299e2d8660f604de3e66c4b5f1fad227b6ba5cdf25f7279de7fe800e16f7a70f6071ffb447dc46fb2a63621bcf9b9d4ae6fec43b90cccb23b802b3e684f2e0f963ea88e7df10d3f317d7c41db4d788c74b569b04e37d5df63cc42f9fb8035e70ffc86a1b5d3f3589bb687fc939b8dbedf1f797787e5ffcee87c43db4f72c0277fb3df4af78fbec0cda3af5575a6071fdcc23ee53fb1e80bb3dbc6fde241ef478fa2e67e05ea7cff56c3624733d9b1a71175cf0fad2198ae73b23e24107fd8f1de221da7f13e53b14f7370dc9bc7c9a26710f3c47fe1479bf0516bf376dc9bc3c9b747daf0f5e223faaa85f05d2af8ae72536b142fe06f543edaa3d9efef49a58efa1ffd421367a789f0b16ef6b7a92797b6bfac403e24032af1f4bee9f3ad2ff4c8fc1323d3ab10aff565e82bb5a8fa7df3827367b783eea8b269edf8c8887c4b164b44fd4075d3c3fb821d63ae8af44c4cc787d43f9ea5dbbc7ef6f26e09e82e73553c1039e9f6646ac822d94afc13c0e671be9313a149f674b627aff5c23a6f7cf8e890df8f329fc8bc1d2c3d95a807b2c40f1f7e7c4f4fee654327e9f116bc473c918afa07d9bb27ce08f4c999e1931a527837f3259771e7a14c4f4bce682581fc0dfc33f58e27e77426cc25f4f47c416e24b81fa60b1e7c33f77883bc8af7d2b19fe4523ee829b2531bdbfb994ccfd45b32236c029cac716e9c9ef89293d33f82b9b3d1ff91b11d3fdcdb164ee1f9a136293784732c61bbc7fc8865b26957f442cde1710db1daeeff4115c1bd76f0966ed0fcfdf25a6e737f7882de27dc9f02f07c43678ccdb73f7393ecdc1223e460658a467a681457aa605711bf17ef60066e9e3faf83ef1a08ff71f12d3fb9b4792b93f681e83d9f092f308f997e3df2c05cbf73bc4f47ebd0766ed9fb7f77046ac903f3e018be7374f25231e9c11b789cf25a33f8ffc74c5fbbc636216d0b87e2698bd9feb1f2f8855f2e71760f1bce6257187f84a32bf7ec9fb3f5dd95fcedb60f1be7849dca5fe15dedf63efc3f3aec1e279cd1be22ef1ad64f81b3caf2f9e974f887bd49fb289fbe8afa5a8affd9e41fef70e2c9ed7bc27ee0de0bf9f24e3fa07e23e7889f40d447e4be83f10fec3c6f503999e0531a52717bf0fd07fcc90be016b1ff08fa84f03f1be664b32fc599b78009ea3fe0ca57f447b1976a9ff113489e9fdc91531bdbf407b1c327d90ff0e583cbfd9153c44fa7ac443708af42ae279f91ef110fdd5661f2cae6f0e24c3df0f8915624532af3f19ae57c5f3a625b182feef0ce955597d853f5589e9fe469358256e48c67c01da8b8cff21ca4b13cf7786c42afab7860b66e5c1eb6f4323a6e73574628dd890cccba36112ebe008ed4b17cf4fae8935f49f67d04f67f591e77f1649e6d7376c627a5ec392cccbbbe1101bc4ae645e5e11d263b03762bc84f41be2f9d327e23efcd1ac920c3dbac443b4a786474ccf6ff8c4e690a7df437998e27df908dc57707f722c99d747f38e58457b6804c4f4bc462899a7af11115be005ea8f25cad38f880d8c3f1a31585cdf482443df94d826ce24f3f209511f6df1bca0416c7679fa2d94a7cdca1fe32fba9e950fea634e4ccf6b4cc18316f14c32d7ab31276e83475c8f9e9c9fc913304b0fcf8fbb436c613ce48c89ed2e6fdf451fccf4457f674a4ce94d7d624aefac496ca0bd360ab0484f632119fa96c41df088c7af9e8ce7d11558a4677a0b66ef437f62486c52fdaec0e2798da5649efec688b84b3c91ccf33fc1fd325e3b0ab89e00e6fefb91b88df19d8ff77798fea8cf63627a5e6387b847bc2b99e767c4db4f4fce674716583cdf99107730fe9b213d5d56ff30be6d80999ea89f7bc4f4fcc63e719ff840b0c2df37e2edb127e373b52016f389787e4fbcbf710816f7378e8807c4c79279fa7770bf9c1f4f91dfbe785e5811b380c8f3ab12b3ff787e3330d317f1c920ee527d3a211e2a48dfa964f8d73362053ce1f1b227e3b38bf21888f735cec1e2fac68564fc7e49ac8227dcbff7647c4dd1be86e279ce0e71bf87f93ae83564e5c1eb677a2b99ebad9f112bd0af71454cef6b5c4b86bfbe21d6c019d2af88f7b94de201c6cb81463cc4f834d1c14c2fbcef965853509fef8875e27bc9fcfe09ef6ff4e4f87d81fcaae27dde0931bdcfdd23567af0bf317830801e46452cf2fb404cef6b3c121bc44f92319f88e769e2f9be6015f303a90b66f9e3cf374d629df46c119b785ea32d19febd436c8177a0af5c4fc8507ff55e0ff1da6d10d3fbe7a8bf3acb1fc6db3ab1785f97d852e0df7bc436715f32afff63949721df0f7f6488f779a7c45a8fdf9f65c47a0fed670016cfd3517f8c618bde37948cf938e4cf14eb7f2efc8b299e3783bf37999e582f3926b6903fdb970c3de1cf4cf1fc862a99b707ad49dc064fd01ee4fa479e82bb3ae6077db43f4ba427a3ebeb1c733d34c9fc7d0ef4b5d8f3396b0dc9dc5f6b74fdb043ac4be6fe34447cb1c5f3bc33629aef710f882dcc0778d0cb66f7237f067117cfd34cc12acf8f6611f7c0152fcfbe8ce7ae0666efe3efcf1f89e97dda3d58a67f4732de6713d3f33547322f5fcd25ee83f5b664ccbff0f2edcb781ddc82657e75629a8f0a47e07a8194b7ff0330d39bd7375d2316f9f788e97d9a4f3c200e24a3bfcefb437d19bf03bcbf23dee79d13d3fcd31ccfeb30fd79794427c494dfe48c78004eaf24e3fda164fe7e2d221e12c792110f78bc61c35113fd2df7102cd2a36560e68fb93fd212b0b85f1b132bc4a964f8ff9058c5ef13bc4fc6771fd7b3f134e6833c8398e69f74a49ff5eee1efb53b6213e5339b80993efc79fa0931bd5f13bfab2abf5f6f4ae6fe5a6f106be010f9e98bf70706710ff32f85091ef6507f931d620def8b9a92f1be5032de574ae6fe47af8875b0c7e37b7f20dea7a960a63f673d2056116ff427b0683fb6414ce5e1d0f384feeeb5649ede704aac53fa4e25237d2dc9183f39c406788cf621fb1b25ca6b28d6a30294d750e4c7cf8869be4ddb2556d15fd546c416fa5316d23364f9c17e0eba9ea59f978f51121b2ad683cf884de2b664febc05da8b22e6af2df807a54bf3cb19daabc24a803fdf3325a33c97c43afab7c12598bd9fb3d121a6f79906b1455c49e6fa8c79ffa32ffb2b15f454c5fab19683fb6d8c27039398d2138f8887980f34505e6cf489f8e10fc02c7dfc77df233691ded9a364f40752620b6c5e49c6fae235b10db69a92317ea4fb951678cec77f7d395f91a3fcb5ae82f53f0ffa6922fd7e4eacf479fab20b6215f38f560166f511fdd77d624aaf45cf17efb74e2473fdac21719b5891ccdb4fc5fb337dd97fd250de7add83e0e54fbfb3f2e0d747d7c4943e0fe5a90b7ddd01b105fddd4a32bfde86ffd0c5fb1d87b843ec0ad6103fa0271b2d53ff3624a6f99810fece10e9c9778835cc5f9a682f061b40607d78406c23de04c8af21d217f7886db42707f1ca10e971e9fd4a57e3f16284dfe5fa8789f231457af39c58457f4d83ff31d98808eb9da7c403cc8f690f92e1ff746205f3f1da2db181f91d0ff5d514f90dee8975cc17e72d6203eb6f26fcabc9f4e0cff7ba60965fcc6f414f93d51fac0f27c494df592919f12b25ee81fd13c9e80fa0bdc8fe62754c4cfb7d52f43facae067df405b86761bec9b3c0758de3cf9f12537ea6e27713f3a301ea9b25deef9f12f7c1a12999e73f7c201e80c7a8efb648af8dfcdaacfcb0ff614eac5379e27d76af85f96b83eeaf47f49cf17e9bf540509f2d624a6f720466f59fe7277c24a6f44423c9bcfec60ef110bce4ed6520fba3de35982982fd16f7e0611bfd85f0092cde373b23267d92a564fefe989e2fde173f48c6fea811b1423c96ccdbbfc6fdc3a0dd1d52fc9b112bf0e7d913b105ff9876c17589f3f2a3eb9962dc3f98485f9bf90f8c2775627a5f7a42ac129f4ae6fe69c2fde140f64fb512dca5f5b9620216e39770072cde9fd960169ff9f373a4a7a3b4e11fe23e710ffe367789499ffc4a32e6cb15624a6fe648463cd827d6880f24637f08ef3f0fe4fc957e0cae572478fd457eba6cc48af5ea5db0c84f80fc74eb0d913cfd63e236d67be37be20ee6272ca4bfcbea0f7f5e42cf53fa945f8f98d29753fa149d38908cf45c131b1ad77bc2fdf340f697b539b85e71e6ed6901ae571078fe2a6293fa33487fafd7a6fdabc85f6fd081bf4d35e23efcdf14fad6fd63febc694aaca17e4dcf884dc4571bf5ada774a9fd5c131b949f1bc998afcf24c35fe5c4267882fa21e7e734dcdfef68983fd014621a5fea3eb18df19d9580bb16f93fb4977ac0c1cb2b34884df853f708dc3768fe14faf6853e31da5f5f19201ea7743f6befd84f44ef63e947fe0e24237fe792315f7d416c81c7285f39ffa7a13c5983c27c9589f7d71580a7c78c88a93c33f89301eb01717d32e83310e90f7789bb88a731eae380a51feb6f77c4949e694b32f60bb4896d625532fc0fca7f28f47750bf86f50a13d7bf24a6f89bc0df0c7bb4bf7a8afa57f7ff797d4b91ff61ddc2f8fd8e64a47f42dc437f20cb89fbd81fb00cc1a27d2d4f8929fd334b32d6df29bd6a8b3814ac737d2668ef727fb256803b2dccff07f0ff8a787f8af6a1307f85f563f84b453c6f9613b7891792d19f3827ee80753e5e67837d0dfd3bfd112cde6fd8c41ddadf7549dca3f9eb33629a6f8ae9fa2ef58f32d42fb547fece47fe54961fc43f4732fcc70df100fdafa40166f9c57a00eabf2ad23f3b948cdfe97eb54b7c2b19fd3df81fadddc77ab40fffad89f69e237f9a68df09da8fd6a3fde7e603b141eba3681f9a486fe0120fb13e1939c40ad60b2bb44f8df52f305f48d7b3fac4d353c2df6b32fd779251de5de21e714f32bf7f097de5f8c285ffd7dbb4fe9622bfbac8ef14e9d7bb347e9e26c4b41f628ef8aa8bfe5f8efe832ef263a3bdeb8a06ff3543fbd5457ae6a664ecf7b388fb601dfece68d9d84f3347fa0db1dfd93a26a6f574af434cf9c9a1afd111f3ef287f83f528b03e9112537a83476215fdf98aee67fd715e7f6da4d760f114fd67f8174394c73c20a6f4cf33c9d02b271e103f4ac6fc07fa6f668bf66b698fc4b49f29417c35dbb43e9b138bf6664ec1bd21ce17c41ab18afa19a1be9b227f8147aca13f12ef10eb186f5a48af29f26b35887570a8121b545f0f894df4afaaa164cccfdf1393bf9fd3ef22ff738578082e0cc9e82fa2bce5f845bb26a6f914f78a98f63745e80f5a6ddaff12a13d59227fc113b181786ca27e58227f7187d8427fbb807fb05405e9290692715e202156c13aeaabdda2fd2546484cfb4f33c42fbb67e2fc43ae11d3f98d12f5c716f3a74bd4379b8d07f8ef637a3ef37fd89f0efd6df1fec591645ebe8b5b628d58958cf9059e9f7a3a0deb07da9098f617eb1e31ed0fce2c62ca4fde030f68fe3f710543df709fd8c4fa7972436c617e29ccc12c3ee27c530516fa964d624a6f9912ebc4d79231bfc5dbe350cec71b4f82b15f5b3b108cfc2e26c4e2bc481b2cf6e7678fe09e0dff13ef8245fa238fd8c6fcccf21e2ce63fc70698f5d7f9f5a30e58f8ebca22a6f45736b1415c49c67900de5e8672fca41f11b791bfa20116fb9bad2eb847e3fb1cf9673f63bf509a1153fa8316b83e40c5d31f81597bc7fc91466ca1fd4f4692d19f46f97484bfdb3188a9fd4c048bfc9e1353fe2aca9f6a12ab92b1bf8cfb83a11c6f1913e21ece17987b60168fe1cfcfc0fd3ee2ef2804b30885f91fe8db95f9457ded2a2df8ffc9297117f12cb800b30e12c6d7683ff5060e9c5fe913d3f933ed4a30ca638ef4f7c47eb3f91d58ac9fc53ab8dfc6fd11fd2ed2171e10b7b1bf643c148cf5c4b443dcc1fe88c903711feb072394af1cef2cd15efa62bfa7d92336e83c24f2db67e18ce77f82fa5eef47c0fa8a42dcc37e9cc51db185f593f888d8c67c48e48345fad29cb88bfd6013d4d7bee84fdbf0177da637fc273d4fed61bc37c6ef723ca35f10d37eede509b83b407f752e98f6cb8da1f7a047e305ab476cd1f9d09cd8867f98ccc07deabf86d7c41d94970d7fc30658787f02bd06227fd994b807fd4697c40afcbd8ffa537798797bd9417b7b5eef3823a6f39ec609b18af78de7e0ae8ef5ffc91e31ed3f9fa2bd0cfb3aea6b047f3514e9090f89fbd86f3281be4351ff1de4675877e8b95eaa645ede23bcff79fc72486ca27f33823f579803c278f48e98cefb4cae892df477e6687f8ad89f36bf25a6f9e700f5491958585f8d915f45a43fbb241e60bdc7477c52d43eea4f85f27c5e0f1910d3fe1f3d2136e05f76505f54713e7154122bf87d227ed7113f271d621beddf44fb55597dc1f9c87de201cef765c8bf3aeca03d066de23eea4f1410537ed229f110fbfd6ce8c5a20fea8f7f46dc072fa1b75c1f29c6c4b49f61722219fddb1e319dff5d2e24737dc721319d079e2c89a93f3a6a13d3f9567321197a415f8dbd9ee76f4ebf8bfdeb73a45f13fb3de737c4b43f728178a3b106cd7f1f45c4e47f22f83f4de8e3217e6bea00e53f87bf795e7f41fbd5db5df427e7884fbad8bf38bf26a6f14682fceb431a2f8547c4f4bee49658c17cc3645f30da7bda2656319f52e279723fcb1cf5cb10e7cd62dc6f88eb23ba9ee590e7c785ff30d421f2171d13ab88cf23a44fae97cce12f4db1ffb140fd34fb038c0f52b40f533c3ff18975ac973a282f5355f0be05da9becaf1b280fd6bbc5faec7497b84be75fe9fa1ed59f10e56bf535d49fbc416ca3bf96c37f58f50c1cbf1ef9b386b43f337a24a6f4b9d08ff5cf311e092d628df4803f90eb0d73a4c716fb1d97a83f763de3ccf38ff6638be7c707c426f6afd9482feb7f430ffb4432ea2b6fbfcaf379e118ccc239ce935d81c5fec7c91cccea33fc750416ef4be9779663c43b5e3f15d9ff35f1fc765fc379db7c0a1e74e19f12a4a72dee8f9e886dec978cdb60d63f4379f2f187d261fe0ee38721b14a3c27d631fed12ec19d16da6bd4010f69bd3db927a6f715bc3fa9c8fe9dbf0feed379eaf8102cae5ff2fe9bd2eb2b18df4d7c302b2fac0fe8c43db49f087af4ea03ba9cc760d546fe96d047f68f4c05dc3670fe3b6a81950efa8fa9e02ef67b8db9bf54647fc4b0c0cc9f613ef908dc1962ff67f20016f73b5db04af38573e825e3bf3d00f76dfabec32398b558e407e5356439e4fadbbcffa2287d8bbe0f81f263ff80fa54e1f932fe8d915fb53fc47cc198b75745c68b39f4d6c479f46513dc33d1bf8b911e8d3968ccf7f078a0e862fec6bc05b3df319e6a11d3fc507a494cf32913eecf94677f88fa6188fd0a09f2630c34c40ffb18acd1fc5885f27cf677286f53dc9f36c01d1aefe926b185f3390efd3ea0f9631bf935351abfcd797f4ab1c4f9f7f90e319d6f9f1f1153bc0befc01d15e7c5c707e01ecda7d948af35e8a17cc30cac0da0c798fb2be5d95fa17c6c71de3dbf0077a8bf52417f5b9cbf7334f06048f9d903b3e7a3bf714e3cc4f86dc2d3ab4a7f35df038bf3f125ef6fa8d2dfccf7c1e2f718f7b73b1638db25b6e12fb40b7057c7fe972801b3168dfde797604d81deee8d64a4ff4832be2fd02356c1f14032fa8f5c6fb523ceeb5b1a98ddcfcbdb9a4ae6ef1bf1f6a94a7f343f048bf981890aeed1fa83e582eb1516ce6760f67ed4cf67e6e90b4692d13fe9116bd03fd9938cf9bd27c9fc7d13e45faed78d63b0387fe9ed80c5f3c296643ccf27d6f1bcd4918cf86f121bf83df324f3faba407aa5bf2c513efdee10fbbf5dfa9d3d0fe59149863fe4ed55adcf6be3fb2b13f080f66b9821b185781514c436f62f6473b062603fcf88f757d4e7fde82598fd8ef42cc02cfd585f4f894de8919e135b288f11f7c7aa22ceb34f1e892dac6f2cb83f51a5ffb4513f54cdc4f8b5e4fe43d53a26c69b4b1e2f55d9dff451beacff88fc58282f83e50ff5117a1b2c43a86f285fe9cf26a84f66b74bfd371e6f54d9ff1a2dc11d0de3ab25eafff3fe8a3e7848dfeb59f0f2d0eae93e9e1eff1cac77687d98e74793ed3d2fc13d11effb6071fe293904eb7dc4b382fb4f4dce5f4dc6e0ce10e74175e2de80f6a3e1fd1d118f46787f577cafc31e82d90813f35d73b0dec67af292d7674db60f5303f754c4a331ef2f69b2fe1678de407c7f6592111b98ffb42a703d22e7f5a50766cd19e309debe3459ff623c9fc5633c2fb4c13aadefc609f110f349156fcf9a1c3f2fcfc0cc9f623d02fa283d8bc68b1d707f80f48db9ffd2647d9c707fa1c9fa3631c12c5e61fd097acaf8ba8c88e9fb43d31d705fc3f71eb413f080ceb36513b062e13ced88fb434dd6cf1cf935fb341e3671bd39a4f5325707b3888cfda407605dc17ef93025d6a9fef178a0c9fa3d7e20a6ef3399481feb2d438f92f76f3559df43bccfee2b74fd0cacd0f75122a4cfd675ec4f1bf1faabcbf8575d12d3f7acac18dc57f13c9daeef8befa33c81d90883b78f058f77ba6c3fe305318d7f2c3cbfad6bd86f1b9c11d37ec711afcfba6c3f954b4cfd93498f98c6e70beedf7519bfc626317d9f2c6c82eb1e0bd77f1fac1b180f24f4bb6e637da4e0fe4497eda9cc89c5fcc1ad64ac178cc0aa46dff3e0fd535db6b7ca23a6fbcb2931cd6f8dbbc4f4fd9691424cfe6abc434cebb1a30362fafe546680d501fc4bf6406c623f8b97818d16f6fb2ec003f1bee29098e63f165d62f1fe2b627aff62444cdffb1ae7c41ae6a39703624adf127a0fea2f44f1fa82fa311874b03ee4d3fb0c9adf9df0f6a90fc5febd49494cdfd32a5ac4f43dadc93931ad6f8c517f86a2ff3eba27a6ef098da07fbda080f512d4bf217350b89ffb1b5d11cf1fa3be2a22fd930931f5f7973631f54fc7e277ea1f8ee877b15ee1227f8a6e637ce6a460a38df299404f55f4af2787c4d41fab04d3f78dc6284f557c2f6704bd55f1fd81d802b3fe1acec3a0bda8468be6a3f1bb26fa8be30b620de3c1d1102cf6772faf88e97b1023a457ab4f10f3e7d3f3060acadf477968068dffe29898f6fb8fd15e74513ee347627aff644a4cf34315daab5e7f2188bf1fefd3bb36fa071aea072b408cbf4dc1169e37467d31c4f779c663625abf58223f8638cf3eb68987e0d11d31cd972dfbe01eed1f19ed11b7e10f7494af31a4f93613e565a81d3c2f5a100f29ffa8ef66fd4529ee2f505ea6f81ecd08fecd14f327a38c98ce5b2e7bc45d7080fa6c6a5dcc2f8fa19725eacb648798f6232ca08f557fe183ff7e414cf393e39498e62747bb6071be7379494cebf7a38164ac07d0fdf50950ae0f5d3f3029de209e586c44cbdb93790a565bc8bf8d7860193d9c27f426c4033a3f86fa618bef318cd1be6d919ff18858417fb56a13d3fce012e567f706385f39ba958cfa71414cfbc934a4cf56e83c6754805503f575c4db8bd112df679a3860f17d8ee52eb83eb1c9afdf918cf2368855b0f5085628de7a365835d1ff1af1f665b4457d19b7c0f5173878f97ac4627de89498f6434d0a626a4fcb0c2cce1b8e1262da3fb8b48875c49bd18d647cdf12e96d3387cbaf779a6036a2c3fbf8f8c7e888f6345e8245fda872622a8fc90131bd7fd427a6f72d5362da9fb5348969ffcfb22b19fb690ec11a7d9fc6a5df0d3a6fb444fabba23e151558d497c9022ccee3562d620bcfaf0e88693f9f4dd7b3fce37c06fdae52ff2aa3fb35fafe558cfc770d03fda325f4e909ff3e3e018bf6560a16f945fde9f5e97b48d513711bf30fcb4432ea23ef2f1b7d515f26015896c73eb84ff32da36bc9e88faac4b4df39467dea1b74be69c1fd913110d7578fc43dcc8f8c2692f1be3d625abfad3262da7fac3f8087d41f9922fd0385fa43156fefc650d6f763b0288f52018be7951e31ed07ab7625637cdb2156c0ba0b5687a82f25f717f5f10db4a731f450447d5ca0fc14717f3924a6fdc6e53131cdb7947c3c67a8a27d2c4e882daccf140a31b5d7c2960c7f87f25645792cdac4f4fcc519318def0a71bd81f5e2f408ac74315e1d833599be01315d5f1e49467a5d6293be07a713d37e439fae1f5a680f31fc87a629f09763b44f5dd497894d4ccfab52627a5e29aea7f5f8a204b30e2dd677f17e5d35e17f52ba5eb3108fd30bb06161bdc54904633daa407d35c4f3aa84b88df5f2b24fdcc1fe761fed9d6508f1369f81590f18f313683f8641df3389511f0c93ce538cf17c53d48f02cf33c5f38b0762dadf5bc5c43dec3735104f4ca58bfe7b521293ff9d46c4627f19fc9fa9f750bf4ade9f606ad0f3463a31ed672d0ac938cf794f3cc0fe561bf5dd627ae33c820f66fd3ff8878898cee354605bdcbf6c130fc1655732be5f342756b0ffa5e4f5cd6c092eee8855da8ffa40ac81cb8e64c4139e5fb32dce2b2c7788e9f762464ce71d162d6283d8918cf52205ac28e8cf580158a3f149c5f5323be2fa71454ce7e3ca03c9883f5362aa9fc63158d1e8fbd0485f47efa23e2f787b36bbe2fa854d6c83ab3bc9f0876d70bd838df3be64f467b83f357b033a2f56e4e0219ddf2b6e05633fcfa222a6f349654b32f6bb1e811503fd196b0facb5909fb041ac613cb5e4fed0acf7d3a0fe6792117f1ce21eb8b8918cf524e4a76f0eb0be58429f0173ef882f3bc40370914ae6e9314cb0e87f4548ffc05411df4648df7040f5793901d73b4ef8f3ae25633c312656c0e5a364cc8fd0ef2c05c81ff451ea1d11fc798964f8872b628dbe7f644986bf7e20d6c14b94872ab8dc958c7810131b184f1597c426d8c6fb556d80f2720a307b03da2f1f4f989ad07f6112d3fd8b5232daff84d802973b92515f6f896db081f4696a9fe69351ff353600427be1fec4d4d9f518df18e07a4599f34232d65b9f88db600be9d7cd3ef5df2c62fa9ea72d7ea7ef572d911eb97fa1447e0c367cc7fc5248dc21be908cefddeac45d1a4fa0fdb0f121f2e75e122be01cf931588f0bf10dedc130e9fc7709ffc2fc3ffc6d392626ff5b0492d17fb489fbf47d0fd46793f510b1be41d79b438c07538b58857fae50ff2c513e05f4b1143a0fb52888e97c68752319fe7d444cdf4730e66095f6776af0cf96d1a6fd953c9e98b6d0ab3822a6fc14e2f721f6cb1467c40a78a149e6ed693127a6ef0198a8dfb6de43ffcd41f9da269df708e977ab85f35a0bee0fad96c85fb9245631df5b85c41ab8f02423be9c12ebe0c5a3648c8fe97e8dea434c6caae89f876d620dfde992b707ab2dd2b36810d3f3966362035c5692d1de5d62135c5a9231fe8ec12aed27b4f6c19a46ebf70a988df0907feeffac8eb8bf3821a6f3f58b9964f8e79298ce532f479279fbab90feaee0c201ab2de263c9bc7d2c9ac46de2a960f4b7cc21b85ec1e1f17b424cdfc34dfa6083c6ff156f0f564fdc5f2e883bc4267117df1731e97a5dc1f8304079f7ac36dacb82fb67abcfae47fb54897be0b2908cef79d0ef1a9d073607c47d625732e2eb21f180fe5ec883647c8fe14a32f687df83cd0ee261c9fd8d3550fbd8ff5dde110fc08b7bc9989f3f251e82cbb964ec1744fd1eb0fa8cfa63112bc411b1582fed4bc67af38858437b704cc9383f722e98f64ff4c07a1ff34d3abd8f75d0d1dfe1fe9775f6e9fcad658335da2f6c39c426f18164ec6f3d94ccf36718c4349f6776c0fa00eb7be6ae60c4abcc2456b01ee5d0f516edffb3e04f148dce331b578231ff638d8869ff8cb92318e30f0bed45d15ba80fc69160cc875a77c4f4f72eac7bc958cf5f48c6f72c0ac1c88fb3473cc0efb642ac60fe399812dbb45f847e678ae3fb12a88faadea1fe725f32e6677cc9182fdd4ac6fdbbc434def122c9484f4a4c7f2fc6ce24a3bc3bc47ddaefdc928cf937f1fe3ee6e7cd8660cce7a5c8bf6ad8f0bf3e3dcfea207e5a789e269fd726a6f6663f33be3fa149e6f98b4dc1183fd81de221e5af2b19e7996782311eb005d3fa9e3d978cf9f233c198bf303dc9f8de85489f8af945f39098e627747abed9c5fe0a1bf543d7e9efdd388664ac471c48c6fec65230d6579c7d620dd7bb9e64ec47542563fdf95630dd7f484c7fefc639958cf9f863620be9378f24637e10fe4337c4f94ffc6e88fb9d6362fafb38ce0931fdfd1ad7908cfe9b4b4ce7a15c5332f6cb3625a37fbb2b98be6fd626b6e9efd30c04239e184dc9d8af86fa6918e2ef55401f83d5479ede688f7888fe880b7f688ae7bbb6647c6f10fecf345ac4c792e1cfe782313fe89e10b7b1be64a682319f63fa92b1ffe994b883f52ef74c32be9f6210ab88c70efc9f69b5b0ffdeeb130f307e75517e96b8dfbd20ee82bd5032d64b1dc9789e4bdc23f624a3ff732b19dfd3f489fbc481647cbf23211e60fec683bfb58d01d60bbc7be221f6037b0f92717d4b32be8ff248ac103f4986ff6f0ac678dd502563feb92456e93c9f2218f323c65032fcd109b181f9550df5d1362d13f35b681f36eb1162fe8bd75fbb259eef5792b19f6d4732ce2f2c8935e29164a4772c19fbff27c43a380824e3fc444e6c108792f13d9b4c32d6d3457a4cfadef3bd608c5f7d1b6cf5d11e031e5fecb661627d208825a37f974ac6f7a612625a3f0dba9279f9270bc1d037e811db882f415f32d6f70660d6fd407fe04e307d6ff35632fcc38d64d4c76b621aef06bcbced0e7b3ef64b2a60f67cb02a19f333a792b1ffee8ab88df9f6f04c322f9f28958cfa744edc21be908cf1d5a5647c6f6841dca3f330c7c4b4fe92207d5db30b7f1e6592115f72e21ee6cba3a964cc7fce88fb58bf8de692b1dfa32d19e3e12be201e243d4938cf5cd7bc1188fe416f110eb33c6a160b417e38098becf66ec4b46fc417deb5a7d3a1f3e265631ff18a17ef44c5a2f8b9bc4345e89069271fe6e2819e5a3102b585f8b54c9384f7d2919eb7b7b82d1ff8f4f88553aef772119dfc310e9d1305f1ca3fef44d8dcaf34c30e2537c2e19fbf9a792f1f7bc42c1b41f2f22d6b15e94e492513f62c9980fcf88697f6506ffd367e33194f70d31ed37773bc426e61712b4e701bb1fe72752c9484f8fd8c47c41f2446c61fd22e94ac6799b9664ec4f6a13db988f4e3a92515fa682b1bfcec825c37f237f03ab85fd9a462a19e39f03e20eed3f2e884dcc4fe5bc7f620fad16e6fbd34a32f6b32f89db882fe9ae649cbf1d49c6fed31dc9587f191377882792e18f1bc45dcc57e7489fc298eb93f625e3fb494de21e381d08c67c71aa4ac6fef821319d3f4b15c9f81e4a453cc07c6a7e2619e7e1af8987988f3274c9f0b79a64f8db06311b01f1e7233faa35c4f82e2b2523ff0b6205fe3b3f25a6ef0be773c9980f5425a37c6c62da9fa63b60e63130de447cd02c9aefcaee2423bf0ab18ef999fc84d8c0fc892eaeb74cbcbf4f6ce33cbf2e9e6f9b98afb8910cff88fac086ab26f6f7a33c74cb843fc98f25f3fa350d88e9fb7ff98098be9fa8a3beebcc63f2f4f9f03f8665d3f756503f0d9bce17ebfbc4030be723f6888716ca775732e211f4b32c9bfc29eeb7ec3ee6a7749bd8b0b1ffbb4b6cda48df9498fd0be75c32c627c89f6d69187f3b21b18efeb575416ca07f1ced0846ffd0b926a6bf4f683bc4d4bf7063c1e84fd8b664cc9fdc48463cef10dba83f6e2219cf47fcb3ed16e28d732b19e3e74bc9189f5e48863f3c908cf4dd11d3fe04df928cfe645b32e63bbb92f1fee7fb71de20978cf1c25c32bedfe01277e07f9d5c32c67733c1f0bfce5432f4be978c78a64ac6782b25eec2ff853dc9d87fde928cf3768a648c8f1f24e3bcc35432d227f4a0f5afd023a6f516e751324f8fd3928cf5a58964fcbd9327c9f81ee2a564c4ffb9649c37ec4be6e9f34d62fa7b04b1482ffd3d81e04432caf34932e6b36792118f32c988bf73c9f8fee7bd648ce746c403cc57bbb9648cd70692f1fdee9964f4c77724a33e8af40f309feb5f4946fa0dc9f02fa23ed3fca6fb2019f5712619e39747c9e86f1d4ac679d7b664a47f2919f31d223ff4fd31573c4fa1ef670e2543cf9664b49f5832e6f7762523fd4f9231feba968cef2bcf25a3bee892513f9edf8ff1d131b18af956af920c7f2df452715e31f42563fc5b48869e8a64a4a724a6efa9047b92a1df4232eaab2619e76d03c106eaeb11b16e40af4832c6aff79231de0925a33eaa92d1de1bc48681f1d6be608c9ffda6643cff4632beb7752819e521fc9d69a2fe1e48869ec21f5b16cea3913fafffabf972f66d6fd9b7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3d9beb5d96cdfda6cb66f6d36dbb7369bed5b9bcdf6adcd66fbd666b37d6bb3c99a8d6f6d5e5b5363a637f56f6d9e4d6842667c6b53b79e754d9899ccacffc9da6cd084a9c2cc6efe8ffceef5564db82a4da7b6ff49dabcd044dfa40933b7e935bdff09da704db48f6bc2ccafed6b6bf3614d9c554db805cde06b6af3f7346986cda8b6afa5cda668fc8626ee664d98c5b57d0d6dde8bc69b3c8ad4245cd5845bd24cfe6c6d3e1a8d3fa709b3b4b63f539bcf46e3cf69c22d6be67f96363f1a8d4993571ee56d4d9a53d89fa2cdcf893c5b35c98426dc66cdf9efaecdbfa009538559d12c7e576dde8dc62f5bcf8f6892bfad09d9e277d3e6d744e3154dd2f735212b7f176d7e6d347e4393e9464d982adcaa7f5b9b7f261a7f4e1361ff9636ff6c345ed1e4cdd6c36df9ac4a73d41c37c7ffbc36ff4634fe9c26cd09ec9fd3e6df8cc6ef6a52ad6ac26da7b9fbebb5f91da2f1164d46af3569eec17e9d36bf28f2fc48345e7c4e1366fbb5fd7c6d7ec768fc394d9a07cc0e9b873f4f9b9f168d3f1b797e54939d4d9a303baaedef6bf32744e38d9aecbda549f398dbc9dfd1e68f8a3c3b1b5acfaa2650e5a4790afb116dfe284d367994d79a1c0b4d989dd5f6196d3e1d8d5f7a947f2d1a7f4e93e679f3a2b68f68f38f47e3f7bceccfd2e4e46d4d985d32bbdaa6cdd789c62fbdec764d84bda5cddf8c3cbf6134dea8c9f95b9a34af99dd346f57b5f903a3f1cb9af2239a5cbed44418b4f9a322cf0f446352e57c43eb79a109b3bbe67df3bed6e60fd1e427449e7735b9ad3511c6b5f9f2d1f8739a707b683e726dbe7c345ed1e4fa8526772f34796a3e0ae3dafc7ed1f8c723cf9bd1f8739a306b316b736dbe7c34deaac9c34b4d98756ae3da7cf968fc394d987599f5b8365f3e1a6fd4e4f12d4dc8fa5c9b2f1f8d45e4f99026bde680db906bf33b46e38f479e1fd1a4bd4d13615c9b9fe1657f4493837f2a1abff228eb9af4d735692a4db5a9369a5c9bdf33f26c8ec6ef7994ed9a745f683258d7a456851b3f23f4414d5eb69e3f281abff4b2af34515635a1ff34aecdaf8dc62f3dcaaf8dc65b23cfc73469e8dcf819a17f35f2fc23d178ab26cd979a08e3da7cf968fcd2cb6ed78499d9b01afcfcd46f138d5f469e9f168ddfd4a4b14913615c9b3f3d1abf6c3d3fa289bdaa4ac369b80d8fb4f9e2d178adf5bcab8930aecd978fc6af6aca564d98f9b5496dbe74345eb1d79ab82f356116d4c6b5f9f2d1f89526d60b4dbc554d98858da8c1cf4f7dfd68fc394dc8f8f9a9af1f8d377994b7356924ccd2063f23f4f5a3f1268ff2b626c2b836ff44e4f957a3f13b9ac4eb9a34b246de9836f819a12f178d37461e661fd04418d7e6cb47e37735c9563569cc98cd1bfc8cd0d78fc61b3cca064d84716dbe7c347e4393fc8526b3674d1a0b6efc8cd09788c61f8a3c2f3dcadb9a30ab982db9363f698df4378ac6ef78d917ade785266423aecdcf8ac6ef79947f2d1a7f4e13b23169f3c5a3f1e73411c6b5f9bd23cf4f88c66f6a52bdd0642255d961b6dbd85dd1e677d3e4274663a949f9114d98edd5c6b5f9b7a3f10f8c033f178ddf6c3d1b3569ec333b681cac68f385a3f1164d765e6b42c6cf08fdbd71e09f108d5f68f2b2a6bcd0a471d438ae4d6af3a5a3f196d6b3aac9213411c6b5f9f2d1f8739a303ba98d6bf3ef47e3e8d746e38d9a1cbda58930aecdef168d5f469ebf1d8dd73439784f93c669e38cd93969f3c5a3f1e73411c6b5f9f2d1f8739a342e1a97b591365f3c1a6fd0e4846b72f652136657ccaeb9365f3e1abf53535e68c2eca6b65a9b7f2c1aff78e4f9559a5cbcd08454e1c6cf4f7dfd68bc5593ab979a70bb6bdc716dfeac68fce35ef66253eb59d784db7de35e6af3a5a3f1e73461f6c08c9f11fa42d1f8e46768c2eda9f124b5f9d2d1788b26cfaa484dc85a5c9b2f1f8d5754f98026ccdab5496dbe74347eb3f56cd4848c9f2dfbfad1f85d4d5655e930ebd6c6b5f91991e7b78ec62b5ef6039a90f173771f8e3c7f6c347eaff5ac69d26df4990d1a03aecdc7a2f16723cf6f148d3fa1095705c6b5f9b5d1f8a547f917a2f13b9af4d635690c61a4cdef188d5f469ebf118d3fa709338599cab5f9f2d1f8a597ddae89d68491369b34f9f159d9df2a1a7f4e13327e26f18f8fc62f6bcae734515e6aa2d17fa4cd178fc61faa295213fe9faef1bfe9f6f5a3f13b9a34d6356166d4c6b5f9f2d1f8039a68cf9a703335936bf3e5a3f1e734e16669fc6fba7d22f2fca1d1789347795b13664e6d5c9baf168d37469e8f69c2cdd55caecdbf1d797e79347e57137b5513665e6d5c9b2f1f8d573431a426d6264db8f91a3faff90f44e3bb7f371a7f4e132de016726d5e7bd92f168d3fa8095409b9451a3faff92f47e31f8f3c1f8ec62fbdec764db41826b5f9d2d1786beb09a52aa4899670e36712bf7e34fea02650251546dafcfa68fcd2a3fcea689c69b936d566da5c2bb485566a95b6d4464c99cd9a8c9f55e1c6ffe6c96f3d0efc6c34ded176b53d6d5f3bd00eb523ed583bd14eb533ed5cbbd02eb52bed5abbd16eb5bbed9a08236dbe4634bed71eb447a6ca93d6d2da5ae79575b59ed6d706da50533475b326b5e94d1d735b5f201ab30b75ddd00e7453b774fb0d5da4e98eee6a03ddd37d3d785b1366616d5c9bb722cf1f158df5488f992e899eead99b7ae46b36d567fa9c5d5fe88b1555a426dc4a9dff6dae3f3d1aeb4b7dc4723ad627fa8ebebb667b6bb6bf6207faa17ec4ee3ad64f5e6ac2ed54e77fbbe24f8dc6fa997eae05ac2d79fa857ea95fe9d74c9bda6ed6ec76cdeea4ddeb0f7ac2d479d49fb826a5d08459ab36aecdaf8ac6c39f3f36163d14bdad77f4aeded3fbfa401fea8aae1acdd5ad79ccd6429aa1af1a5391996118a661690786cdb45951c570605c9b7f27f2fcd0d818bd36c3353cc3671618a11119b1ae326d122325cbd62c5fb3e98acdd85d73a360ea2c5053842a46591bd7e6f78bc61bc7c64c97ca581a23ae8c6f8c8d89b1532bc372b96becadd9fe8a1dacd921d911bfefd83861ea9c3e6bc2ecac36aecd6f158db78f038d73e38274815d421996c72be39ad9cd9addaed9dd9add1b0f74e7a3f1c4ea5f4b6862b4b9616fd26f148ddf1cf3d0d8d8e81abd355d6aeb0b6d581e07c6904c593175d5cca6b4c6f39da6a61d983aa9d2313aa6511bd7e6b789c69bc781a6695aa6fd4a19df745672e89a9ee9330bccd08cccd84ccc74c5323337a7e6cc9c732b9eefabbd8eb9d00766094d9855b5716d7e381a9bcb9f1779b68d8dcd91397ead0ba93359cda5b963ee9a7be63eb703f3d03c328fb99dd0bfed9ba7e69979be7a0fbfef82d59c4b68625e99d7b5716d7e301a9b37e6edafd5a41ef39877e6fd265db8360f6b797c349fa40afb66cb6c73eb985df96f3db36f0e5e69333415a68e5a6b62d19fab206d7e20f2588dda95b27cffad68fc7ab66d756c6ce996f1564b5a35cb14f9b32ccbb61ccb7dd6c6f22c9f5bb0a2d7be15b2aba297ea586cd46125a44b6a6556c6b5f9012f6be5d6d49a5973abf8f168bc591352666195db7521752a56ee03a6cbd21a59636bb2a2c28eb5cb6d6f4d9b7d76d5c83ab00ed7b4612308ebb8d6c43a8191365b34b14e5f7b14f3c63ab3cead0bebd2bafad168bc7d0ec5bab66e3ea20bd7e6d67ce4aadc59f7d683f5b8a2c293d5b2dacc3a966c53568f69d567d7ddb13bacb576c55a953520658696c2b5d91a792cd56eda0d9671dda676639bd6996dd9b6edd8aeedfd4834de3eaf64fb7660871f55c68eecd84e585efb766a674c85b69d43057b6acfecb95d309bdb0bbbe4ff56d94ba655cbead829d3e8c11e3d6b638fb5037b62299662efd4c6b5d91a8ded5d7bcfdeb70fec43fbc83eb64fec53fbcc3eb72fec4bfbcabeb66f7e74a67ad3cc927d6bdf7d5417a6ccbdfd603fda4f7666b7ecb6ddb1bb4c879eddb707f6d0566cf5d99ca6d36009d51d836935635792428ef4570e1b5b393674711c87aff9bed743713cc777022774222776122775322777a6cecc993b85b3f8d199eab766db9cd2a93eae8bb37446ced899383bceaeb3c7f25b38fbce0153e1d039728e999dbcb0fadf8e9c5376c581b32f15ea48bff3c0b439735c6ee70e3fe7fb5e0fc5b9702e9d2be7dab9716e9d3be7de79701e9d27a7e5b49d8ed3fd7834de3e03e9f49cfec75b125366e00c1dc551dda6dba827feb82ab52627aee1b26ea06bb9acc9bb8e349bfd0b0b62aecb553ab255d7e30a755d9fb461fec60d6a559c733774f9bcdffbe3404b7523377613e7ce4d9d969bb9b93b7567eedc2ddc855bbad5fbd178b32698537297eee8e3bab86377e2ee381377d7dd73f7dd03f7d0852a2e57c4718fdd13f7d43d73cf995d703b6774cafef584fd56ab640a856a7dd0aedc4ba6cd55ad0a8c6bf3ee38d0bd766fdc5bb7ae332df7de7d701fdd27b7e5b6993e1db7ebf6dcbe3bf8b42672b6cd1dbaca273c4ce4aa5ed351bc465d63ea292ecff04ccff2ea5a526b72e65e788ee77a9ee77bc18af95efd9fe3854ca75376a5c314aaeb10d3c7e3bd1d2f86365ec22cf5f8fad4477a2896ea655eee4dddcc9b7973aff0165ee955ded21b392d6fec4dbc1d6fd7db7b4f93d7b3b2debe77e01d7e5c19efc83b7677ec4777d73bf14ebd33efdcbbf02ebd2befdabb714fbd906972cb74b8f3eebd07efd17b5ab147afc5feed8e540a9986275e9beb736cabb5cf314cedc0ebd4aac0b8361f181b7b5dafe7f59d476fe00d3dc553fda6dfa8a7df58724d37655d4fdb77bc9eeffadec734c1acaceffbc1677caf1ffa9133f61ace8e1ffb89a7fba99ff9b93ff567fedc2ffc0557e5c17bf24bbff297fec81ffb136963c63bfe2e53a9c5940b98868ebfe7effb0775fbf299363eebfdf9c7b52afe09333e5ffc91b1b17fe69ffb17fea57fe55fb37fb8f16ffd3bffde7ff01ffd27bfe5b7fd8edff57b7edf1f6cf228a4899c95f587fe275a92e1fb6ad00c1af6a3a3061a6b4b67811e1881e95d055660074ee0b266e37b8f4c95a53f0e82200ca220669690a5ecff474116e44ca5915f31851e8269300be641c1daa11d2c58ab62fe262883ca3f85716ddeeda104cb60148c9d6930097682dd602fd80f0e82c3e02838761f8293e034380bce838be0f25d4d302bdbd2ece02ab8fe8cef0d6ebc66ed7d9d9ddafb06b7ee6170e7e7c17d5d638287e031780a5a413be8305532a64237e805fd60100c032550b90d19f5d9bf76994a5110b25ab413369932f3b0c1dad749a8e96aa86b072c50325542b336aecdbb3d94d00aedd061aedb73efbd65e8874118869157847198846998857938fd802634531dcec2f9677c6f58848bb07494b0aabd6fb80c47e13830c34960853be16eb81778e17e78101e8647e17178c2f23f08d4f0343c0bcfc38bf092ec82d15978159e3295fa4ca19865e19a2973c3da97ef39e12dd3e68e6973cf5479081f6be3dabc33360e9fc256d80e3b6137ec857d771a0ec261e87b15534609ce43356a7e4413cc54478d48fb4c4b8af4c8884c7727b29ee375ed7d837bef3ab28387c889dcc88bfc2888c2288ae228094fa334bc8cb2288fa6d12c9a4b9b31ce984ae7e115ab47fda8a86b4db4f04be6a182a88c2afd285ad69a442318d7e69db171348e26d18e73635f846eb41bed45fbd14174e8cdfcabe8283a7edbcbbed484eb72129d46679fd0e53cba882efd28baaae3b51f8b781d5dfbd370c79f4737d16db81fdd45f7d143f4183d45ada81d75a22e53651ef5a27e3488869112a9cc146683b8c9fe75ce15ba881bb116cc633d3658ebdaf55ab119b311436cd79ac4acfb1fb3ee1cd7666baf2df6629f39b5308ee2384ee234cee23c9ec633ff299ec74570f1be2698bb8f17f187661c84c555bc8cccdafbaec6eb7854c7eb781c4f0237de8977233fde8bf7e383f890e9d262fa3cc647f131d3448d4fe2d3f88cd939b7334617f165a4c4cdf82a9ac5d775ad896f58eb8a9877aee2db98b5a8f8bed6247e80716db6f6dae2c7f8296ec56ddf8d3b7137eec5fd78100f63c56fc56ad24c1a2b9a9cb0dbf5979ad4b3f78991989fd125b1123bba643d3c8ad7eefe7abc4e9ce031718356e2450f899f04bcc6c4ac4d85ac6df949c874384fa2244e9224254b922cc99329d3e824529359c294498af02c18260b76cb3829b583a44a96b526c9881bff9ee8b6b171384d26c9ceba974d7693bd64df6f2707c9617224ea49729c9cb05cadaef3f0158de42c394f2e3eae8b1d2597c955721d34c468693d5e87bb75bc4e6ec283782fb94dee92fbe481d97df4c87cf121f3c9fbecd747a6c653d24ada4987accda89bf4984251d24f064c9961a2242ad4499b69433b48356892ea30aecd07c73ccf5e36355233b55236c047db49ddd413794b7d5ae5e12b1a69907e62fcc8ee8ed2385c205ea7c9cb785d7bdf340d9ed22ccdd3693a4be7519c1651ccba2fb3749a782c8e3fb178fe902ed232add2653a4ac7e984d938dd4977d38a69d44af7d2fd609e1ea487cc23cda04eca7a7de9b1d084d90933f46f3eacc9b34749cfd2f3f422bd64ba5ca5d7abbdfef486d51bbeca93dea69f98896177dea70fe96372cdfabe4afa84d1521daf3d19afa31bc4ebe83e3c8a1e93fbb4953cc487c95dda8ef7d24ec27e6575ca617d412beda6bdb49f0ed261aa301ba66ad6cc1ae938d332bdf63499119f321fcdd4092f33d328322bb38526b08caf876fd564a397cdd8d02a6e1b65f62a8f59601a59984559fc1965b2244bc3451dafe17db3cc3b5b8dd759be1eafe17d5997d78f1eb269d0626de93171d8d861c67c52ee67d92c9b6745b6202bb32a5b66a36ccc9599b03617317594a897ed64bbda41b6f7ac09b3fdec203b78d6667d6cfc91c8931d6647c65976fcd29b6427f1223bfd942e67ce28b9aae375ed7db3738c96ea789d5dacc7eb6c5ac76b78dff890c5a7fdec92a9e5c53b2c6e4de2311b735eb1b1e7058b6967d955769ddd64b7d91dfbdf7df6903d725d9eb2166b5d2da6ce34bec8da598729d35dd54458adcd673591ebc6676655b79eecf54aec27cc8eb27ebccc06cff13a1bd6def775bc4e3b75bc4eee582b7a603586795fa6d33dbc6f7493294cc36974cd5ae098e9cac65c6e93e9ace6cdbc916bb52ab5e57a6e64cd749c9bcc3367b995dbda41eee4eeaa2ab99733f796f3bfb1f4794dd6d78da3e6e76ac9aae5611ed53546c4ebfc55bcae474b88d7b5f76535267e8ed7cc2367c153e4b0feb1ed5db3b67719dcb987acefbccfbcf8ae337177bc669ee4699e3155f27c9acff27956a64a5ea4bb49275fe42c72e755be94aa704d84716d5eed58929a38db3411ebc6e655fe8939bb674beff3713ec906abf13a5c067a3d5aca77d6e3753d5a7a8ed7c91de235bc6fb89bef325f3d6163ac31f3ddcbbac638aaa3048de43adfcb27f97e7e901fe647f9717e92dde5a7f959aaa693fc3cbf60ca5ce6572f3561769ddfe4fc1b763fac498575e37a2530bffd748db9cbeff387f5789d3fd6f1baf6be88d7f913e235ab21b37ab4f456bcaebd6fde6299bbf35316eff7f3d8a9c7eb63561387c955dece3b769477f35edecf07f9305772352ba7cd69c35c64d6547b4b13615c9bd7ade7c39a8835d2a9fe195da6c6d4cc27225e3fcf6e225e4fdf8cd7d15abc8e7785f70d2cd62734bd0be6a1ce98a73a7154fb316844663698da5367eaca777a537f1ae427d3701a4d63dd9b26d37445959b559b6653d6006b6ddef028a48954a55add61b0a249136ba4d3e974f60965e6d362ba98966fc5ebdafbaec6ebec32de7f8ed7b5f7cda6d3aa8ed7d18d3fafbdaf9f7ba69f321f95f87176ce7cd6988d4e59cf7aba9c8ea2b5129b8ea793e9ce7497e9b237dddfac09b383dab836eb9ab43769b2a6cacaba717a3bfdf08ceff428b1a7cbd7f19ae5ceacbd2fe275f018ee4fabf578cd14a278cd5473987ab688d74cd533a6ee89bbcb94de89cc69395d78c7d3e3c47ae3fd27d3d3e9d9cbd6c334c99e35999e73bbe0dabc6e3d9b35499f35c1bab1164d2f3fa8cbd5f49ad5725bc46b477d8ed7182dadc7ebb4bd1aaf59cb92f13adc0d7758cb9bacc76b47f1a3e43a7d64fe3d9dde4caf364480707abb4113a872c1ed6ecabf0bf956e4795f13ac1bb3f6b47577ccb3d9f7d387bc9d5c39c33a5ed7b39b75bc0e6e990765a325e64d5766379fe375ed7da38879628ad7cc3bb378edcf44bc66de9bc5eb3441bc0e17397bc7f431d95e5aa3e9d3364da62d6efc3b6d3fa289b069e74335a63bedb17033c9f7d6e3f5f3ec66befbd1785d8f96588467358645fbb5789d0df2c9d47127d3fed6b40ca6c3a9f24a938b674dc8f8f76fde8e3caf3419ae6a52afa53beeacf99131d3ac91c6ac3417225e3fcf6eaec66bd683a3784db39bedd578cd7a7f14af315aaabd2fe275ed7dbd66ed7de3e54c9be933635b5a82eb99c9dad2564d661637fe5d81579a64ef692256d367cebbbab8338fb5fee5a6785d7bdf4c798ed7dcfbca781defafc7ebdafbb291848cd7b5f715f17ac61adad47496db52a377596bdaa4495b6842c6d77c5f479ef734c15afa2c7a57997816b0825ed4def7edd548e17d45bc16b39b225e47776c84792be27576e1996c04fa46bc9e69693c4becad299aa5b36cc5a36cd4848cf76fb67b94754da00a6c36dd961267195dccb4d578fdd66a643dbbc9624fab8ed7627613f1ba9edd5c8dd7b5f77d1dafc3451daf5909cc7cf59d729acf8a4dad675d136e8bd9826bf3494deab5f45939dbba53260f67cb992f464bdb5623939bd5789dbe19af038ad7e108f13a7d5a8dd7f93df332ef8ce866e3d9e41d4d769e5581716d94375bcf2b4d6a5566a55849df363b3e75678188d7efad46aec7eb745e7b5fc4eb3415f1ba1e2db17b6fd7e3753d5a9a3ece76fd70bad5ff3265f666fb1fd76476c0ec70c6ff56cee734c15afaec688b32d775bcaebdefc756236bef2be275721befadc7eb7ab4c4ea1af3beafe335ab31c7796776f28e32a7b3b3373cca6b4dcea189b05a9bd75e769326b52a584b9f6d5c39982588d7db572383a7c85b8bd734bb29e2f5eaec26e2b5ff2a5ebb93e066f66e9f7c7635bbfe9c26b39bd9edec6ec6fbc56f6982dd39af358185e6f3bac24b65ea78fdd9d548cc6ec67b91ff3a5ed7b39b2cb6adc6eb451daf672c2cd9eff4c967f7b30716873eaec94dad89b05a9bcf68c2ed61f6387bdaa0cc627576f3e3ab91f5ece67abcae6737eb78ed697e5c8f96a2ab3a5ea78f88d779346bcddc779469cf3aeb91e7639accbab35e6dd00691e77d4db0bf207c9cbdd92bafd7dc7e7c35f2ad782d663759dba4789db7eb1a331bcc86db7b79866f9533e50d4d0e5e6872fb5a93990aabb559d7a4deb1b44913ec2f889d79f3755ae68df5d1d2e75723c33d11af576737c38af9f3f2395ecfb5c44e2eb7f7f2586af4b9f13af2bcf428d2d634999b73ab36a14dadc9ab9af24a13da61f0307f75fe22b1ec874df17ad36a24e2f5faece67abcae6737d7e375703377e6efb425a68cc71ef5694d982a96b460cee7d2df683d6b9ac85d170fc2e62fd671ed6816fc8cd5c8d5781d6898dd44bc664d329a1d4f8ffd70feeee8769e30d1b76bd2dda849ad4a36cf6babb5f9b826d86190eaf3e97c365ffdaf982fe6e5bc9a2fe7a3f9783e99efcc77e77bf3fdf9c1fc707e343f9e9fcc4fe767f3f3f9c5fc727ec5fe7731bf9edfcc6fe7772f5723c5ec26e2f5f368a98ed7acc6dcbfd7cb63ca3cb0decc764d5eb51ea909a9c28defdb7a6e3def69226cfe346fcddb1fb6cebcbbc17af3fecbd54811af6beffb1caf67ba330a8bf4dd79b4f9607ab039f27c48937c3e64a6ccf93998579ab8eb9a3cefbac05aba97ced54f28d32e9a1bb5e9168df578bd3ebb395d66691daf0b6de6cd1aefe962f885cee2d2dfd60456f0b3ac1fd544aca5176661b11cdb8553b88557f84550844554c44552a44556e4c5b49815f3a22816455954ecca6531daa8cdb898bcb51ab91aaf8b9da959ecbea78b7758ec7d5093e085268feb9a70db2ff66b6d3eaa095f4bdfcf0e8a0396dfc3e2a8382e4e8ad3e2ac382f2e983697c555715ddc14b75c9bbbe2be78281e8ba782b53ea6e5e69ad37e7b3552c4eba2933e14dd776b4cafe86f8ec69fd384dba0e0df92dfa0c9c94b4d841543965ba55017cde264d15868c5f9425f180b7361419b85bd7084360b77e1cddb0b7f116c566711be5e8d9c6988d76c8c7dfd5e2fcff017d122de168d3fa10957a5182c9245526bb3a289be4d13ac1b2f5296d76c91336d98a364dacc1705d366b128a1cda27aa1cd723162778cb7683359ecacae468a78ed8c16bb8bbdf77a794c99fdc5c1468ff2039a303b5c1c2d8e6a6dded0e4c54e94dc7b5e1d5d1cb39c9e2c4eeb7ac3b5d1b836c6466dce16e7ec8e8bc5e51675aed66737f368eecc5a8bebfc03fbbe1637fee0bd68fcd2cbbe6c3deb9a70bb5df0bfe9f67ac7d25b9a903277a8358bfbc5036f538f759b2a2e16467129dbd4d3a2b5a24d7bd15974d95dbd2ddaf41703ac468a783d3517c3fc033b0517caecece391e7b526a4cab3265c95855a364b7e3efc4d4ddedc7591df948d79bbd44abd344ab3704aab8e53a5fd1ca74a07beb874599c7a28ca5a9bd22b7d765750869bd52923785fc4ebe8828de8dfede5197e1997c94fd5e4b6d6848c9f11fa8826a44c56e6e5b49c95f39265bb2ccbaa5c96a3725c4eca9d72b7dcab6378b95f1e88185e1e9647e531d3e6a49c32754eb76873569ecf76eb785d5e4c6fb2fea615db35652ecbabcf459e154d0ed735414d8126ccae6b8336ef6922d68dcb1b96c35b566bee58ad39468b629d98fbda13970fe563f954b6ca76795076ca6ed92bfb4c9b41392c9552ad9af376d5d8accdbc5bf1781d5d54fafb6349c3af8ccafc559a541637be76b75913b9eb82af90564ee5565ee52fee0bb50aea5a53852b3dbfabd5085e45555c2555ca3cf1b2ca983679c5627935dda2cdac9a4f6ff24ef4819d3c55512daaf21391e7539a30e3ff496db66822d68dab25cbdd68715fb7a76acc7ccd69ed87eb5a534d588b7aac76d65b14bc4db55bed55fbd54175c8ee3eda5a738ec3c2ddf8bd9215654e2ad63aabb317aa6c89c69fd384ff775ef133d0ef6902ab2eaa4b566bae0ab55c144e75cddad3bcbaa97d4d75cbfd308fdfd55d755f3dacb528af7aac9eaa56c5c756d5e67167adcebbfd5fa64cafeaf36b07d5f0435ef62d4d565579a549a5546a6d429bf51d4b6fada52f99c75836160f759d61ca346a65d09eea9e4ded6b961a6a0d8b513c7e2f75dea2f64a75692ccda5b5b4d9139c6dda2cdff5344b6fe9cbab83cf469e5735e54d4d84d5da6cd46465dd78192ea3ca5bc68b6659b211e629297351f7f9eaf684e80d5fb3526b8eeb5ab34caa8365bacc96793dee5c6ef1392cbf5bf7c62de7cb62e5dac5b2fc159aac69237771bddc9df3bc46ba64e3e9e572392a4e96e3c25b684299dad314c97252dc94adeaae3c58ee705f237ac4dc0f2f8daac56acdee726fb9cf9e72b0559b62b9717fdcf26879fce2ea934f7ad9754dcedfd6644d9b2d9a603d7079ba3c63b93ae7bacc596c3aaffd4cdd9a6a656a4fc362f74a7baa2394f035b2d65c2c2f9757bce65c6f5567c3b75d96b7d5ecd5b577cbfb9fafc99a361b3511ab81cb07a6cc23745914758d593e3165cc65abdc439d29f73133b16ca33dd5116ad9215fd3a55ad35bf69703f6a4e1566d94ea8d35dca5faf6d5a3e66722cfa6d6b3459bb7355959231db191c2482b476ce4142cf4bac6549322ae3d30eb09af285376473ac56ed69e789f8f45a8653a32ea5a333247d688f9e3913372b7a9337ab1663af2475b663846e1cfd6645d9b4d9a60ed6b14b1fcc44550de1717b52ee54e112f5b755baa7b34ac13d6e67d1aa10c8f4f2bedc91c25cbdd513aca96fd513e9ad6917cf4aa75ace5763e2a5694592c6f47f32d5797a3eabd68fc63566bf37ac7d2fa7ae088f5f946a3e513f3bcb7757da97dcc685cd798a556dcd61e18ad4928533cd5ca8c26d53e62f76867b937da1ded8df6470798411e1d8eb6f60247c7529993d1e9e86c74bef5ea8b9fabc99a361b34c11ae9e8b2588eaeca9d4559abb2b0a04bf95464c56ddd96160e1b3db95554f6ead62494a9f646d7757c1add8c8cd12d6b4f77a3fbd5f9f5d1c3b6dc32af33470f78f4c894391b3d8d5a5bb4698f3a3f5393356d765e68b2b61e38eab29cf4ca875a15e65fea7674c35bd2fee249b4a5a2a862f2c0676bcaf46b4f331a8c8623657ded61b4c1b70a1b370d7fdc98cfb832ccc6dad6abf59fa9c99a365bd68dc7c6d81c5baca65cf3bac254295b757d812e65a79857116b4b2c6abf5606917b6c8f9db75666c65bfd31cbaf37f685325c9d2dfe781c8ea35fa6cd86dd39b3bb71cc7291d49ab0110157a5ba2ba6d57dad4be9d635a67828fb4559f76716ed3a36b1d1d33e9419a7e36c9c6f5ab51a4fdfd12658558669b3d57f8fe7bf489b8debc6e362bc189745cefa755c93f2605c1533d6f7bd2be6cb76dd926aef2b6a0c1b71674b63bc1c8fc6e3f164bcf3de9ade78f71d75f6d6d5591d2fbcb4623cdeff45da6c58371eb3b8323eac1561e3a4196f434c15565beeeb7654f6c747e3e3f1c9f8747c363e1f5f8c2fc7579f59ef1c5fbfa3cdcdc85bab39b7cbbb2d57dffd126d36ac918eefc70fe347aec71d1b0b304daaa82846faf869dc1ab7c79d71f7334abca9ce96f9759edffe8b7635d87af5f09768f3e61ae998c596b1cac647f7ccab1465af8ac74793e6b8f3771579b6c9d659d27a2e70a2ad6a33d15e8fa99e6da24f8c9faecd9b6ba45539312716f327ccca7e954cec89531cfe3c5d6adbb6524ef9755ff89cadd16de2fd746dde5c239df8ac5c83f2b03cacd22a9d8493e8e7ea423527deaecdf26e7cbba68e37bed9a24d32497fae366faf1b4fb249ce468ccc4a6532fd15bad4b67da59cab53acd79cf996b1155367f693b579638d743267655a2c3bd5ee6431297f95325c9d2d2be5b0d1f19acfa95ece70ad69b39c8c7eaa366fac1b4fc69309ebc53d4e76eab5935faacdc5f671e7eb5ee0646bbf68b2f793b579b1463ad967116a343998fc64dffbb64dded186a9a3bd50675bcd39999cfe446d5ead7d4dce26e7938b7a6fc83fa2cde5b69572deaa5a6c24beaacdd5d69a73fdf3b479b9ca33b999dcbe3d3efc65ea6ce9ef52cd69bea839f75bd579f869dabc580f9c3cfe93ba706d9eded366349fb4d6b4696fed05763e3a5ffeae366bebc693eea4f74f6bc3d4e9bfa7ce64f0a2e66c9d919ffc8459ae5a9bf5b5afc9a7f6c7fe34db32af075bdeedacb5ab9dc6ce96f9ae1d7de76f8f1ffef3fffcaffff8bf491de25c - + klistview.h diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index 53e318bf..e91c49fe 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -700,7 +700,7 @@ Kopete::Contact *ChatMessagePart::contactFromNode( const DOM::Node &n ) const void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) { - // look through tqparents until we find an Element + // look through parents until we find an Element DOM::Node activeNode = nodeUnderMouse(); while ( !activeNode.isNull() && activeNode.nodeType() != DOM::Node::ELEMENT_NODE ) activeNode = activeNode.parentNode(); diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index 015f2f5c..7d446e6f 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -108,10 +108,10 @@ void EmoticonSelector::emoticonClicked(const TQString &str) // kdDebug(14000) << "selected emoticon '" << str << "'" << endl; // KDE4/TQt TODO: use qobject_cast instead. emit ItemSelected ( str ); - if ( isVisible() && tqparentWidget() && - tqparentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) + if ( isVisible() && parentWidget() && + parentWidget()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) ) { - tqparentWidget()->close(); + parentWidget()->close(); } } diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 6649f6b3..53f6ec71 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -96,7 +96,7 @@ FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *n } -bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ) +bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ) { return true; } diff --git a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui index 04a67f16..112d01f5 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui +++ b/kopete/kopete/config/accounts/kopeteaccountconfigbase.ui @@ -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 73a3ef79..650e6da8 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 *tqparentWidget = 0) - : KNewStuff( type, tqparentWidget) + KopeteStyleNewStuff(const TQString &type, TQWidget *parentWidget = 0) + : KNewStuff( type, parentWidget) {} bool createUploadFile(const TQString &) @@ -149,29 +149,29 @@ public: { case ChatWindowStyleManager::StyleInstallOk: { - KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") ); + KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Information, i18n("The Chat Window style was successfully installed."), i18n("Install successful") ); return true; } case ChatWindowStyleManager::StyleCannotOpen: { - 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") ); + 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") ); break; } case ChatWindowStyleManager::StyleNoDirectoryValid: { - 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") ); + 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") ); break; } case ChatWindowStyleManager::StyleNotValid: { - KMessageBox::queuedMessageBox( this->tqparentWidget(), KMessageBox::Error, i18n("The specified archive does not contain a valid Chat Window style."), i18n("Invalid Style") ); + KMessageBox::queuedMessageBox( this->parentWidget(), 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->tqparentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") ); + KMessageBox::queuedMessageBox( this->parentWidget(), KMessageBox::Error, i18n("An unknow error occurred while trying to install the Chat Window style."), i18n("Unknow error") ); break; } } @@ -727,7 +727,7 @@ public: FakeAccount(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name){} ~FakeAccount() {} -bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*tqparentContact*/ ){return true;} +bool createContact( const TQString &/*contactId*/, Kopete::MetaContact */*parentContact*/ ){return true;} void connect( const Kopete::OnlineStatus& /*initialtqStatus*/){} void disconnect(){} void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/*reason*/){} diff --git a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui index 23cf85bf..35fa6489 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_chatwindow.ui @@ -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 29f1b544..880f2a38 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -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 ecf668f1..d15d2d71 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -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 bf2678d1..49c4cd47 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_emoticons.ui @@ -228,7 +228,7 @@ setEnabled(bool) - + klistbox.h ktextedit.h diff --git a/kopete/kopete/config/appearance/emoticonseditwidget.ui b/kopete/kopete/config/appearance/emoticonseditwidget.ui index b3e8f0d5..0babcc4e 100644 --- a/kopete/kopete/config/appearance/emoticonseditwidget.ui +++ b/kopete/kopete/config/appearance/emoticonseditwidget.ui @@ -77,7 +77,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kopete/kopete/config/appearance/tooltipeditwidget.ui b/kopete/kopete/config/appearance/tooltipeditwidget.ui index f08bfe5c..c08cfc2c 100644 --- a/kopete/kopete/config/appearance/tooltipeditwidget.ui +++ b/kopete/kopete/config/appearance/tooltipeditwidget.ui @@ -207,7 +207,7 @@ - + klistview.h klistview.h diff --git a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui index 58f9b7f3..5e4a7b1f 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui +++ b/kopete/kopete/config/avdevice/avdeviceconfig_videoconfig.ui @@ -615,7 +615,7 @@ mHueSlider_sliderPressed() mHueSlider_destroyed(QObject*) - + kcombobox.h kcombobox.h diff --git a/kopete/kopete/config/behavior/behaviorconfig_chat.ui b/kopete/kopete/config/behavior/behaviorconfig_chat.ui index 32f2a1f1..f5601731 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_chat.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_chat.ui @@ -248,7 +248,7 @@ mChatViewBufferSize - Limit the maximum number of lines visible in a chat window to improve speed for complex tqlayouts. + Limit the maximum number of lines visible in a chat window to improve speed for complex layouts. @@ -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 9d5343a4..3d1c8926 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_events.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_events.ui @@ -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 1595f4b3..13e7cc5d 100644 --- a/kopete/kopete/config/behavior/behaviorconfig_general.ui +++ b/kopete/kopete/config/behavior/behaviorconfig_general.ui @@ -207,5 +207,5 @@ mUseQueueChk mAutoConnect - + diff --git a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui index f9dcb01e..d2a1860a 100644 --- a/kopete/kopete/config/behavior/kopeteawayconfigbase.ui +++ b/kopete/kopete/config/behavior/kopeteawayconfigbase.ui @@ -349,7 +349,7 @@ mAutoAwayTimeout mGoAvailable - + klineedit.h diff --git a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui index 7602a2ae..cebc838c 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfigbase.ui +++ b/kopete/kopete/config/identity/kopeteidentityconfigbase.ui @@ -525,7 +525,7 @@ current user contact. setEnabled(bool) - + kcombobox.h kpushbutton.h diff --git a/kopete/kopete/contactlist/customnotifications.ui b/kopete/kopete/contactlist/customnotifications.ui index 4f33add2..b3b578d8 100644 --- a/kopete/kopete/contactlist/customnotifications.ui +++ b/kopete/kopete/contactlist/customnotifications.ui @@ -229,7 +229,7 @@ chkChatSS chkSuppressCommon - + kurlrequester.h klineedit.h diff --git a/kopete/kopete/contactlist/kabcexport_base.ui b/kopete/kopete/contactlist/kabcexport_base.ui index 367a474b..c9b8f883 100644 --- a/kopete/kopete/contactlist/kabcexport_base.ui +++ b/kopete/kopete/contactlist/kabcexport_base.ui @@ -179,5 +179,5 @@ - + diff --git a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui index b0728e8d..8afccb19 100644 --- a/kopete/kopete/contactlist/kopeteaddrbookexportui.ui +++ b/kopete/kopete/contactlist/kopeteaddrbookexportui.ui @@ -145,5 +145,5 @@ - + diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index af5abcc2..15ae230c 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -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()->tqparentGroup() == dest_groupLVI->group() ) + if(source_groupLVI->group()->parentGroup() == dest_groupLVI->group() ) return false; - Kopete::Group *g=dest_groupLVI->group()->tqparentGroup(); + Kopete::Group *g=dest_groupLVI->group()->parentGroup(); while(g && g != Kopete::Group::toplevel) { if(g==source_groupLVI->group()) return false; - g=g->tqparentGroup(); + g=g->parentGroup(); } 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()->tqparentGroup() == Kopete::Group::toplevel) + if(source_groupLVI->group()->parentGroup() == Kopete::Group::toplevel) return false; return true; }*/ diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui index 23621b37..f336b240 100644 --- a/kopete/kopete/contactlist/kopetegvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui @@ -148,7 +148,7 @@ icnbOpen icnbClosed - + kicondialog.h kicondialog.h diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.h b/kopete/kopete/contactlist/kopetemetacontactlvi.h index e9629df4..bda1660c 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.h +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.h @@ -75,12 +75,12 @@ public: /** * tqparent when top-level */ - TQListView *tqparentView() const { return m_parentView; }; + TQListView *parentView() const { return m_parentView; }; /** * tqparent when not top-level */ - KopeteGroupViewItem *tqparentGroup() const { return m_parentGroup; }; + KopeteGroupViewItem *parentGroup() const { return m_parentGroup; }; /** * call this when the item has been moved to a different group diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui index 6c28f40a..da5b2d99 100644 --- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui +++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui @@ -570,7 +570,7 @@
addressbooklinkwidget.h
- + addressbooklinkwidget.h klineedit.h diff --git a/kopete/kopete/groupkabcselectorwidget.ui b/kopete/kopete/groupkabcselectorwidget.ui index 26cfb9b2..46d6c5e3 100644 --- a/kopete/kopete/groupkabcselectorwidget.ui +++ b/kopete/kopete/groupkabcselectorwidget.ui @@ -77,7 +77,7 @@ - + Kopete::UI::AddressBookLinkWidget diff --git a/kopete/kopete/kopeteiface.h b/kopete/kopete/kopeteiface.h index a5ce3855..68124007 100644 --- a/kopete/kopete/kopeteiface.h +++ b/kopete/kopete/kopeteiface.h @@ -45,7 +45,7 @@ k_dcop: const TQString &altFileName = TQString(), uint fileSize = 0);*/ // FIXME: Do we *need* this one? Sounds error prone to me, because - // nicknames can contain tqparentheses too. + // nicknames can contain parentheses too. // Better add a contacttqStatus( const TQString id ) I'd say - Martijn TQStringList contactstqStatus(); diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index ddda9bd7..68ef32fa 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -284,7 +284,7 @@ void KNotification::raiseWidget(TQWidget *w) } else { - TQWidget *pw=w->tqparentWidget(); + TQWidget *pw=w->parentWidget(); raiseWidget(pw); if( TQTabWidget *tab_widget=dynamic_cast(pw)) diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index 11f668d8..0477ccd3 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -278,42 +278,42 @@ Kopete::MetaContact* Account::addContact( const TQString &contactId, const TQStr } else { - // should we here add the contact to the tqparentContact if any? + // should we here add the contact to the parentContact if any? kdDebug( 14010 ) << k_funcinfo << "Contact already exists" << endl; } return c->metaContact(); } - MetaContact *tqparentContact = new MetaContact(); + MetaContact *parentContact = new MetaContact(); if(!displayName.isEmpty()) - tqparentContact->setDisplayName( displayName ); + parentContact->setDisplayName( displayName ); //Set it as a temporary contact if requested if ( isTemporary ) - tqparentContact->setTemporary( true ); + parentContact->setTemporary( true ); else - tqparentContact->addToGroup( group ); + parentContact->addToGroup( group ); if ( c ) { - c->setMetaContact( tqparentContact ); + c->setMetaContact( parentContact ); if ( mode == ChangeKABC ) { kdDebug( 14010 ) << k_funcinfo << " changing KABC" << endl; - KABCPersistence::self()->write( tqparentContact ); + KABCPersistence::self()->write( parentContact ); } } else { - if ( !createContact( contactId, tqparentContact ) ) + if ( !createContact( contactId, parentContact ) ) { - delete tqparentContact; + delete parentContact; return 0L; } } - ContactList::self()->addMetaContact( tqparentContact ); - return tqparentContact; + ContactList::self()->addMetaContact( parentContact ); + return parentContact; } bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddMode mode ) @@ -341,7 +341,7 @@ bool Account::addContact(const TQString &contactId , MetaContact *tqparent, AddM } else { - // should we here add the contact to the tqparentContact if any? + // should we here add the contact to the parentContact if any? kdDebug( 14010 ) << "Account::addContact: Contact already exists" << endl; } return false; //(the contact is not in the correct metacontact, so false) diff --git a/kopete/libkopete/kopeteaccount.h b/kopete/libkopete/kopeteaccount.h index 44f12eb1..205b795f 100644 --- a/kopete/libkopete/kopeteaccount.h +++ b/kopete/libkopete/kopeteaccount.h @@ -364,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 tqparentContact as the tqparent. + * new custom @ref Contact, using @p parentContact 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 tqparentContact the metacontact to add this contact to + * @param parentContact 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 *tqparentContact ) =0; + virtual bool createContact( const TQString &contactId, MetaContact *parentContact ) =0; /** diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index a0b27ded..2357da53 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -346,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 tqparentheses too. - Martijn + * nicknames can contain parentheses too. - Martijn */ TQStringList contactStatuses() const; diff --git a/kopete/libkopete/kopetemimesourcefactory.cpp b/kopete/libkopete/kopetemimesourcefactory.cpp index ca50d514..962bc8ff 100644 --- a/kopete/libkopete/kopetemimesourcefactory.cpp +++ b/kopete/libkopete/kopetemimesourcefactory.cpp @@ -146,7 +146,7 @@ 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 tqinvalidated in the meantime, we'll just + * Note that if the cache has been invalidated in the meantime, we'll just * get an empty pixmap back. */ Account *account = AccountManager::self()->accounts().getFirst(); diff --git a/kopete/libkopete/kopeteonlinestatus.h b/kopete/libkopete/kopeteonlinestatus.h index a1296f17..34f0bc9c 100644 --- a/kopete/libkopete/kopeteonlinestatus.h +++ b/kopete/libkopete/kopeteonlinestatus.h @@ -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 tqinvalidated due to a change of icon sets between + * if the cache has been invalidated 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. */ diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index d11e413b..06176178 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -465,7 +465,7 @@ 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 tqinvalidates the config file, the contact list, and most likely + // as it invalidates 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 diff --git a/kopete/libkopete/networkstatuscommon.cpp b/kopete/libkopete/networkstatuscommon.cpp index acf53f96..ef6d488e 100644 --- a/kopete/libkopete/networkstatuscommon.cpp +++ b/kopete/libkopete/networkstatuscommon.cpp @@ -8,7 +8,7 @@ TQDataStream & operator<< ( TQDataStream & s, const NetworktqStatus::Properties s << (int)p.onDemandPolicy; s << p.service; s << ( p.internet ? 1 : 0 ); - s << p.nettqmasks; + s << p.netmasks; return s; } @@ -26,7 +26,7 @@ TQDataStream & operator>> ( TQDataStream & s, NetworktqStatus::Properties &p ) p.internet = true; else p.internet = false; - s >> p.nettqmasks; + s >> p.netmasks; 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 81ac8350..1d36b5c0 100644 --- a/kopete/libkopete/networkstatuscommon.h +++ b/kopete/libkopete/networkstatuscommon.h @@ -19,8 +19,8 @@ namespace NetworktqStatus TQCString service; // indicate that the connection is to 'the internet' - similar to default gateway in routing bool internet; - // list of nettqmasks that the network connects to - overridden by above internet - TQStringList nettqmasks; + // list of netmasks that the network connects to - overridden by above internet + TQStringList netmasks; // for future expansion consider // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged // EnumLinktqStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 1edede5d..9c41d44d 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -218,7 +218,7 @@ TQValueList Emoticons::tokenize( const TQString& message, uint // Search for where it ends if( htmlEnd == -1 ) { - // Aptqparently this HTML entity isn't ended, something is wrong, try skip the '&' + // Apparently 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; diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp index 35dde6b8..f542d153 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp @@ -36,7 +36,7 @@ Account::~Account() } -bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) +bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) { return true; } diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h index 93b1acdf..0f297a06 100644 --- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h +++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h @@ -39,7 +39,7 @@ public: Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L); ~Account(); // pure virtual functions implementation - virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact ); + virtual bool createContact( const TQString &contactId, MetaContact *parentContact ); virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() ); virtual void disconnect(); virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() ); diff --git a/kopete/libkopete/ui/addressbooklinkwidget_base.ui b/kopete/libkopete/ui/addressbooklinkwidget_base.ui index 652e292a..8fc4c46f 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget_base.ui +++ b/kopete/libkopete/ui/addressbooklinkwidget_base.ui @@ -70,7 +70,7 @@ - + klineedit.h kpushbutton.h diff --git a/kopete/libkopete/ui/addressbookselectorwidget_base.ui b/kopete/libkopete/ui/addressbookselectorwidget_base.ui index f67300df..276620be 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget_base.ui +++ b/kopete/libkopete/ui/addressbookselectorwidget_base.ui @@ -165,8 +165,8 @@ klistviewsearchline.h - - + + kactivelabel.h klistview.h diff --git a/kopete/libkopete/ui/contactaddednotifywidget.ui b/kopete/libkopete/ui/contactaddednotifywidget.ui index 6517c1e0..100e6eca 100644 --- a/kopete/libkopete/ui/contactaddednotifywidget.ui +++ b/kopete/libkopete/ui/contactaddednotifywidget.ui @@ -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 412ea20e..cd91863d 100644 --- a/kopete/libkopete/ui/fileconfirmbase.ui +++ b/kopete/libkopete/ui/fileconfirmbase.ui @@ -140,7 +140,7 @@ - + klineedit.h kpushbutton.h diff --git a/kopete/libkopete/ui/kopeteawaydialogbase.ui b/kopete/libkopete/ui/kopeteawaydialogbase.ui index 26eb3590..be81b276 100644 --- a/kopete/libkopete/ui/kopeteawaydialogbase.ui +++ b/kopete/libkopete/ui/kopeteawaydialogbase.ui @@ -81,5 +81,5 @@ - + diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index eb755f29..91b251a9 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -68,7 +68,7 @@ ToolTip::~ToolTip() void ToolTip::maybeTip( const TQPoint &pos ) { - if( !tqparentWidget() || !m_listView ) + if( !parentWidget() || !m_listView ) return; if( Item *item = dynamic_cast( m_listView->itemAt( pos ) ) ) @@ -122,7 +122,7 @@ ListView::ListView( TQWidget *tqparent, const char *name ) // 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. tqmasking them out of the viewport does. + // that doesn't do the job. masking them out of the viewport does. // class MyWidget : public TQWidget { public: using TQWidget::clearWFlags; }; // static_cast( viewport() )->clearWFlags( WStaticContents ); // static_cast( viewport() )->setWFlags( WNoAutoErase ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index 6e6aad72..1f23da15 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1227,17 +1227,17 @@ class Item::Private { public: Private( Item *item ) - : tqlayoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } - TQTimer tqlayoutTimer; + TQTimer layoutTimer; - //TQTimer tqlayoutAnimateTimer; - SharedTimerRef tqlayoutAnimateTimer; + //TQTimer layoutAnimateTimer; + SharedTimerRef layoutAnimateTimer; SharedTimer &theLayoutAnimateTimer() { static SharedTimer timer( 10 ); @@ -1245,8 +1245,8 @@ public: } bool animateLayout; - int tqlayoutAnimateSteps; - static const int tqlayoutAnimateStepsTotal = 10; + int layoutAnimateSteps; + static const int layoutAnimateStepsTotal = 10; float opacity; @@ -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->tqlayoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->tqlayoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); + connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); + //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); @@ -1323,13 +1323,13 @@ void Item::slotColumnResized() void Item::scheduleLayout() { // perform a delayed tqlayout in order to speed it all up - if ( ! d->tqlayoutTimer.isActive() ) - d->tqlayoutTimer.start( 30, true ); + if ( ! d->layoutTimer.isActive() ) + d->layoutTimer.start( 30, true ); } void Item::slotLayoutItems() { - d->tqlayoutTimer.stop(); + d->layoutTimer.stop(); for ( uint n = 0; n < components(); ++n ) { @@ -1347,14 +1347,14 @@ void Item::slotLayoutItems() if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() ) { - d->tqlayoutAnimateTimer.start(); - //if ( !d->tqlayoutAnimateTimer.isActive() ) - // d->tqlayoutAnimateTimer.start( 10 ); - d->tqlayoutAnimateSteps = 0; + d->layoutAnimateTimer.start(); + //if ( !d->layoutAnimateTimer.isActive() ) + // d->layoutAnimateTimer.start( 10 ); + d->layoutAnimateSteps = 0; } else { - d->tqlayoutAnimateSteps = Private::tqlayoutAnimateStepsTotal; + d->layoutAnimateSteps = Private::layoutAnimateStepsTotal; d->animateLayout = true; } slotLayoutAnimateItems(); @@ -1362,11 +1362,11 @@ void Item::slotLayoutItems() void Item::slotLayoutAnimateItems() { - if ( ++d->tqlayoutAnimateSteps >= Private::tqlayoutAnimateStepsTotal ) - d->tqlayoutAnimateTimer.stop(); + if ( ++d->layoutAnimateSteps >= Private::layoutAnimateStepsTotal ) + d->layoutAnimateTimer.stop(); - const int s = Private::tqlayoutAnimateStepsTotal; - const int p = TQMIN( d->tqlayoutAnimateSteps, s ); + const int s = Private::layoutAnimateStepsTotal; + const int p = TQMIN( d->layoutAnimateSteps, s ); updateAnimationPosition( p, s ); setHeight(0); @@ -1457,7 +1457,7 @@ void Item::slotUpdateVisibility() void Item::tqrepaint() { // if we're about to retqlayout, don't bother painting yet. - if ( d->tqlayoutTimer.isActive() ) + if ( d->layoutTimer.isActive() ) return; listView()->repaintItem( this ); } diff --git a/kopete/libkopete/ui/kopetepassworddialog.ui b/kopete/libkopete/ui/kopetepassworddialog.ui index 40a94ca8..6007a139 100644 --- a/kopete/libkopete/ui/kopetepassworddialog.ui +++ b/kopete/libkopete/ui/kopetepassworddialog.ui @@ -105,5 +105,5 @@ m_password m_save_passwd - + diff --git a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui index ecdfda7a..468efd56 100644 --- a/kopete/libkopete/ui/kopetepasswordwidgetbase.ui +++ b/kopete/libkopete/ui/kopetepasswordwidgetbase.ui @@ -91,7 +91,7 @@ mRemembered - + kpassdlg.h diff --git a/kopete/libkopete/ui/metacontactselectorwidget_base.ui b/kopete/libkopete/ui/metacontactselectorwidget_base.ui index 1fd35317..52d946b9 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget_base.ui +++ b/kopete/libkopete/ui/metacontactselectorwidget_base.ui @@ -97,8 +97,8 @@ kopetelistview.h tqheader.h - - + + kactivelabel.h kopetelistviewsearchline.h diff --git a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui index 20102dc5..f7b00f60 100644 --- a/kopete/plugins/addbookmarks/addbookmarksprefsui.ui +++ b/kopete/plugins/addbookmarks/addbookmarksprefsui.ui @@ -100,5 +100,5 @@ - + diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui index b6a7a895..61043084 100644 --- a/kopete/plugins/alias/aliasdialog.ui +++ b/kopete/plugins/alias/aliasdialog.ui @@ -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 01e15f9e..1121c24d 100644 --- a/kopete/plugins/alias/aliasdialogbase.ui +++ b/kopete/plugins/alias/aliasdialogbase.ui @@ -97,7 +97,7 @@ - + klistview.h kpushbutton.h diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui index f7cb8c55..ca558f4b 100644 --- a/kopete/plugins/autoreplace/autoreplaceprefs.ui +++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui @@ -215,5 +215,5 @@ - + diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui index 6cd3caca..00a7b4c0 100644 --- a/kopete/plugins/cryptography/cryptographyprefsbase.ui +++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui @@ -189,7 +189,7 @@ m_selectOwnKey_toggled(bool) m_selectOwnKey_stateChanged(int) - + klineedit.h diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui index ff766de4..fb71e0a1 100644 --- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui +++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui @@ -75,5 +75,5 @@ - + diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index 43787d47..661fd717 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -165,16 +165,16 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqpare "box enables you to use any key, even if it has not be signed.")); if (filemode) { - TQWidget *tqparentBox=new TQWidget(boutonboxoptions); - TQHBoxLayout *shredBox=new TQHBoxLayout(tqparentBox,0); + TQWidget *parentBox=new TQWidget(boutonboxoptions); + TQHBoxLayout *shredBox=new TQHBoxLayout(parentBox,0); //shredBox->setFrameStyle(TQFrame::NoFrame); //shredBox->setMargin(0); - CBshred=new TQCheckBox(i18n("Shred source file"),tqparentBox); + CBshred=new TQCheckBox(i18n("Shred source file"),parentBox); 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").tqarg(shredWhatsThis),tqparentBox ); + KActiveLabel *warn= new KActiveLabel( i18n("Read this before using shredding").tqarg(shredWhatsThis),parentBox ); shredBox->addWidget(CBshred); shredBox->addWidget(warn); } diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index 2d853f0e..360af41e 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -452,7 +452,7 @@ m_soundFN m_raise - + klistview.h klineedit.h diff --git a/kopete/plugins/history/historyprefsui.ui b/kopete/plugins/history/historyprefsui.ui index 8bcea1ae..36f3dee2 100644 --- a/kopete/plugins/history/historyprefsui.ui +++ b/kopete/plugins/history/historyprefsui.ui @@ -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 cdf49bbe..af9f1bce 100644 --- a/kopete/plugins/history/historyviewer.ui +++ b/kopete/plugins/history/historyviewer.ui @@ -336,7 +336,7 @@ - + kprogress.h klineedit.h diff --git a/kopete/plugins/latex/latexprefsbase.ui b/kopete/plugins/latex/latexprefsbase.ui index fc2a865a..bad68932 100644 --- a/kopete/plugins/latex/latexprefsbase.ui +++ b/kopete/plugins/latex/latexprefsbase.ui @@ -158,7 +158,7 @@ - + knuminput.h knuminput.h diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui index e43ae524..cf90dc57 100644 --- a/kopete/plugins/motionautoaway/motionawayprefs.ui +++ b/kopete/plugins/motionautoaway/motionawayprefs.ui @@ -288,7 +288,7 @@ - + klineedit.h knuminput.h diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui index f9ab61be..5725a2ae 100644 --- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui +++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui @@ -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/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index 0d782a39..ca9c9316 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -306,8 +306,8 @@ void NowListeningPlugin::slotAdvertCurrentMusic() { if( NowListeningConfig::self()->appendStatusAdvertising() ) { - // Check for the now listening message in tqparenthesis, - // include the header to not override other messages in tqparenthesis. + // Check for the now listening message in parenthesis, + // include the header to not override other messages in parenthesis. TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) ); // HACK: Don't keep appending the now listened song. Replace it in the status message. diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui index dc418729..21d2f0e9 100644 --- a/kopete/plugins/nowlistening/nowlisteningprefs.ui +++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui @@ -369,7 +369,7 @@ in place of your status message. setEnabled(bool) - + klistbox.h diff --git a/kopete/plugins/smpppdcs/smpppdcsprefs.ui b/kopete/plugins/smpppdcs/smpppdcsprefs.ui index 80e8e6ed..1bbb6664 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefs.ui +++ b/kopete/plugins/smpppdcs/smpppdcsprefs.ui @@ -275,7 +275,7 @@ useSmpppd accountList - + kpushbutton.h smpppdlocationwidget.h diff --git a/kopete/plugins/smpppdcs/smpppdlocationui.ui b/kopete/plugins/smpppdcs/smpppdlocationui.ui index 9452893f..6b22e3f9 100644 --- a/kopete/plugins/smpppdcs/smpppdlocationui.ui +++ b/kopete/plugins/smpppdcs/smpppdlocationui.ui @@ -139,7 +139,7 @@ - + klineedit.h knuminput.h diff --git a/kopete/plugins/statistics/statisticswidget.ui b/kopete/plugins/statistics/statisticswidget.ui index 0a128691..87dd1b4d 100644 --- a/kopete/plugins/statistics/statisticswidget.ui +++ b/kopete/plugins/statistics/statisticswidget.ui @@ -236,7 +236,7 @@ - + kdatepicker.h klineedit.h diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui index 919e2f54..79b1cbde 100644 --- a/kopete/plugins/texteffect/texteffectprefs.ui +++ b/kopete/plugins/texteffect/texteffectprefs.ui @@ -224,7 +224,7 @@ knuminput.h - + klistbox.h diff --git a/kopete/plugins/translator/translatorprefsbase.ui b/kopete/plugins/translator/translatorprefsbase.ui index f6c063a2..7a8d2c5a 100644 --- a/kopete/plugins/translator/translatorprefsbase.ui +++ b/kopete/plugins/translator/translatorprefsbase.ui @@ -187,5 +187,5 @@ - + diff --git a/kopete/plugins/webpresence/webpresenceprefs.ui b/kopete/plugins/webpresence/webpresenceprefs.ui index 7f872fb7..41518bb4 100644 --- a/kopete/plugins/webpresence/webpresenceprefs.ui +++ b/kopete/plugins/webpresence/webpresenceprefs.ui @@ -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 985111a4..767c7b1a 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -375,12 +375,12 @@ GaduAccount::userlistChanged() } bool -GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) +GaduAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) { kdDebug(14100) << "createContact " << contactId << endl; uin_t uinNumber = contactId.toUInt(); - GaduContact* newContact = new GaduContact( uinNumber, tqparentContact->displayName(),this, tqparentContact ); + GaduContact* newContact = new GaduContact( uinNumber, parentContact->displayName(),this, parentContact ); newContact->setParentIdentity( accountId() ); addNotify( uinNumber ); diff --git a/kopete/protocols/gadu/gaduaccount.h b/kopete/protocols/gadu/gaduaccount.h index ad7b4edf..0363d181 100644 --- a/kopete/protocols/gadu/gaduaccount.h +++ b/kopete/protocols/gadu/gaduaccount.h @@ -128,7 +128,7 @@ signals: protected: //{ bool createContact( const TQString& contactId, - Kopete::MetaContact* tqparentContact ); + Kopete::MetaContact* parentContact ); //} private slots: diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 2ee61e97..0b581a42 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -74,13 +74,13 @@ GaduContact::GaduContact( uin_t uin, const TQString& name, Kopete::Account* acco TQString GaduContact::identityId() const { - return tqparentIdentity_; + return parentIdentity_; } void GaduContact::setParentIdentity( const TQString& id) { - tqparentIdentity_ = id; + parentIdentity_ = id; } uin_t diff --git a/kopete/protocols/gadu/gaducontact.h b/kopete/protocols/gadu/gaducontact.h index ee244a96..15eaf288 100644 --- a/kopete/protocols/gadu/gaducontact.h +++ b/kopete/protocols/gadu/gaducontact.h @@ -96,7 +96,7 @@ private: Kopete::ChatSession* msgManager_; TQString description_; - TQString tqparentIdentity_; + TQString parentIdentity_; GaduAccount* account_; KAction* actionSendMessage_; diff --git a/kopete/protocols/gadu/ui/gaduadd.ui b/kopete/protocols/gadu/ui/gaduadd.ui index afc259b1..7fa193d6 100644 --- a/kopete/protocols/gadu/ui/gaduadd.ui +++ b/kopete/protocols/gadu/ui/gaduadd.ui @@ -353,7 +353,7 @@ - + krestrictedline.h diff --git a/kopete/protocols/gadu/ui/gaduawayui.ui b/kopete/protocols/gadu/ui/gaduawayui.ui index fbc9411c..de6b1b81 100644 --- a/kopete/protocols/gadu/ui/gaduawayui.ui +++ b/kopete/protocols/gadu/ui/gaduawayui.ui @@ -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 1542a76f..ff165d35 100644 --- a/kopete/protocols/gadu/ui/gadueditaccountui.ui +++ b/kopete/protocols/gadu/ui/gadueditaccountui.ui @@ -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 9490ffb6..9397854c 100644 --- a/kopete/protocols/gadu/ui/gaduregisteraccountui.ui +++ b/kopete/protocols/gadu/ui/gaduregisteraccountui.ui @@ -267,7 +267,7 @@ - tqlayoutImageCenter + layoutImageCenter @@ -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 2aef2334..d9c39029 100644 --- a/kopete/protocols/gadu/ui/gadusearch.ui +++ b/kopete/protocols/gadu/ui/gadusearch.ui @@ -684,7 +684,7 @@ onlyOnline listFound - + krestrictedline.h klistview.h diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index ff5b53b4..ddcf1918 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -855,11 +855,11 @@ void GroupWiseAccount::receiveFolder( const FolderItem & folder ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << folder.id << " sequence: " << folder.sequence - << " tqparentId: " << folder.tqparentId + << " parentId: " << folder.parentId << " displayName: " << folder.name << endl; - if ( folder.tqparentId != 0 ) + if ( folder.parentId != 0 ) { - 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; + 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; return; } @@ -910,13 +910,13 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " objectId: " << contact.id << ", sequence: " << contact.sequence - << ", tqparentId: " << contact.tqparentId + << ", parentId: " << contact.parentId << ", dn: " << contact.dn << ", displayName: " << contact.displayName << endl; //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "\n dotted notation is '" << protocol()->dnToDotted( contact.dn ) << "'\n" <addContactInstance( contact.id, contact.tqparentId, contact.sequence, contact.displayName, contact.dn ); + GWContactInstance * gwInst = m_serverListModel->addContactInstance( contact.id, contact.parentId, 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.tqparentId, contact.sequence ); + c = new GroupWiseContact( this, contact.dn, metaContact, contact.id, contact.parentId, contact.sequence ); Kopete::ContactList::self()->addMetaContact( metaContact ); } // add the metacontact to the ContactItem's group, if not there aleady - if ( contact.tqparentId == 0 ) + if ( contact.parentId == 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.tqparentId ); + GWFolder * folder = m_serverListModel->findFolderById( contact.parentId ); 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.tqparentId, contact.id ); + dit->item( contact.parentId, contact.id ); // TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); return; @@ -1092,7 +1092,7 @@ void GroupWiseAccount::sendMessage( const GroupWise::ConferenceGuid &guid, const } } -bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* tqparentContact ) +bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaContact* parentContact ) { 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 = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->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.tqparentId = ::tqqt_cast( fld->tqparent() )->id; + fi.parentId = ::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.tqparentId = 0; + fi.parentId = 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, tqparentContact, 0, 0, 0 ); + GroupWiseContact * gc = new GroupWiseContact( this, contactId, parentContact, 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, tqparentContact->displayName(), highestFreeSequence, folders, topLevel ); + cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel ); TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); cct->go( true ); return true; @@ -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, tqparentid + // 1) Seek matches between CLIs and MCGs and remove from the lists without taking any action. match on objectid, parentid // 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 @@ -1531,7 +1531,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) // create contactItem parameter ContactItem instance; instance.id = ( *instIt )->id; - instance.tqparentId = sourceFolder->id; + instance.parentId = 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 tqparentId = destinationFolder->id; - ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), tqparentId ); + int parentId = destinationFolder->id; + ccit->contactFromUserId( contact->dn(), contact->metaContact()->displayName(), parentId ); } else { @@ -1628,7 +1628,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) TQValueList< ContactItem > instancesToChange; ContactItem instance; instance.id = (*it)->id; - instance.tqparentId = ::tqqt_cast( (*it)->tqparent() )->id; + instance.parentId = ::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 314769f0..fbb66697 100644 --- a/kopete/protocols/groupwise/gwaccount.h +++ b/kopete/protocols/groupwise/gwaccount.h @@ -74,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* tqparentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); /** * Delete a contact on the server */ diff --git a/kopete/protocols/groupwise/gwaddui.ui b/kopete/protocols/groupwise/gwaddui.ui index 4de7649d..6302f869 100644 --- a/kopete/protocols/groupwise/gwaddui.ui +++ b/kopete/protocols/groupwise/gwaddui.ui @@ -109,5 +109,5 @@ - + diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index dd74fc67..0dd78a71 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -48,8 +48,8 @@ using namespace GroupWise; GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn, 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 ), + const int objectId, const int parentId, const int sequence ) +: Kopete::Contact( account, GroupWiseProtocol::dnToDotted( dn ), tqparent ), m_objectId( objectId ), m_parentId( parentId ), m_sequence( sequence ), m_actionBlock( 0 ), m_archiving( false ), m_deleting( false ), m_messageReceivedOffline( false ) { if ( dn.tqfind( '=' ) != -1 ) diff --git a/kopete/protocols/groupwise/gwcontact.h b/kopete/protocols/groupwise/gwcontact.h index 183df1a4..d3c98a6b 100644 --- a/kopete/protocols/groupwise/gwcontact.h +++ b/kopete/protocols/groupwise/gwcontact.h @@ -61,12 +61,12 @@ public: * @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 tqparent The Kopete::MetaContact this contact is part of. * @param objectId The contact's numeric object ID. - * @param tqparentId The ID of this contact's tqparent (folder). + * @param parentId 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 *tqparent, - const int objectId, const int tqparentId, const int sequence ); + const int objectId, const int parentId, const int sequence ); ~GroupWiseContact(); @@ -132,11 +132,11 @@ public: */ void setDeleting( bool deleting ); /** - * Marks this contact as having sent a message whilst aptqparently offline + * Marks this contact as having sent a message whilst apparently offline */ void setMessageReceivedOffline( bool on ); /** - * Has this contact sent a message whilst aptqparently offline? + * Has this contact sent a message whilst apparently offline? */ bool messageReceivedOffline() const; diff --git a/kopete/protocols/groupwise/gwprotocol.cpp b/kopete/protocols/groupwise/gwprotocol.cpp index 176a4b92..4abdab9f 100644 --- a/kopete/protocols/groupwise/gwprotocol.cpp +++ b/kopete/protocols/groupwise/gwprotocol.cpp @@ -94,7 +94,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( TQString accountId = serializedData[ "accountId" ]; TQString displayName = serializedData[ "displayName" ]; int objectId = serializedData[ "objectId" ].toInt(); - int tqparentId = serializedData[ "tqparentId" ].toInt(); + int parentId = serializedData[ "parentId" ].toInt(); int sequence = serializedData[ "sequenceNumber" ].toInt(); TQDict accounts = Kopete::AccountManager::self()->accounts( this ); @@ -107,7 +107,7 @@ Kopete::Contact *GroupWiseProtocol::deserializeContact( } // FIXME: creating a contact with a userId here - return new GroupWiseContact(account, dn, metaContact, objectId, tqparentId, sequence ); + return new GroupWiseContact(account, dn, metaContact, objectId, parentId, sequence ); } AddContactPage * GroupWiseProtocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account * account ) diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index e48bf368..7b071f35 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -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 aptqparently arbitrary order + // NM Protocol 1 writes them in an apparently arbitrary order // tag //dout.writeRawBytes( GW_URLVAR_TAG, sizeof( GW_URLVAR_TAG ) ); //dout << field->tag(); diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h index 50ac0f65..ea3a2626 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.h +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.h @@ -109,7 +109,7 @@ class Transfer; * ascii text, * latin1 as hexadecimal, * escaped tqunicode code points (encoded/escaped as \uUNICODEVALUE?, with or without a space between the end of the tqunicode value and the ? ) - * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is aptqparently ignored by the server + * Outgoing messages may contain rich text, and additionally the plain text encoded as UTF8, but this plain payload is apparently ignored by the server * */ class CoreProtocol : public TQObject diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.h b/kopete/protocols/groupwise/libgroupwise/gwerror.h index a6afa5c8..f5de53ce 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.h +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.h @@ -123,14 +123,14 @@ namespace GroupWise { uint id; uint sequence; - uint tqparentId; + uint parentId; TQString name; }; struct ContactItem { uint id; - uint tqparentId; + uint parentId; uint sequence; TQString dn; TQString displayName; diff --git a/kopete/protocols/groupwise/libgroupwise/gwfield.h b/kopete/protocols/groupwise/libgroupwise/gwfield.h index 1f8deea2..6d3cb5a9 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 aptqparently only used in _field_to_string for debug */ +/* Comments: ^1 not used ^2 ignored ^3 apparently only used in _field_to_string for debug */ /* Otherwise: widely used */ #define NMFIELD_TYPE_INVALID 0 /* ^1 */ diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index ae1a6984..6f410dcb 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -31,9 +31,9 @@ CreateContactInstanceTask::~CreateContactInstanceTask() { } -void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ) +void CreateContactInstanceTask::contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ) { - contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, tqparentFolder ); + contact( new Field::SingleField( NM_A_SZ_USERID, 0, NMFIELD_TYPE_UTF8, userId ), displayName, parentFolder ); } 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 tqparentFolder ) +void CreateContactInstanceTask::contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ) { - contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, tqparentFolder ); + contact( new Field::SingleField( NM_A_SZ_DN, 0, NMFIELD_TYPE_UTF8, dn ), displayName, parentFolder ); } 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 tqparentFolder ) +void CreateContactInstanceTask::contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ) { Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); // 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 84347964..19e41f2e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.h @@ -38,13 +38,13 @@ public: /** * Sets up the request message. */ - void contactFromUserId( const TQString & userId, const TQString & displayName, const int tqparentFolder ); - void contactFromDN( const TQString & dn, const TQString & displayName, const int tqparentFolder ); + void contactFromUserId( const TQString & userId, const TQString & displayName, const int parentFolder ); + void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); 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 tqparentFolder ); + void contact( Field::SingleField * id, const TQString & displayName, const int parentFolder ); 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 4e9d3e8a..bf0873ab 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -113,7 +113,7 @@ void CreateContactTask::slotContactAdded( const ContactItem & addedContact ) return; } client()->debug( TQString( "CreateContactTask::slotContactAdded() - Contact Instance %1 was created on the server, with objectId %2 in folder %3" ).tqarg - ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.tqparentId ) ); + ( addedContact.displayName ).tqarg( addedContact.id ).tqarg( addedContact.parentId ) ); 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.tqparentId == 0 ) + if ( addedContact.parentId == 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 8b973361..1ca6f141 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.h @@ -65,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 tqparentFolder ); + //void contactFromDN( const TQString & dn, const TQString & displayName, const int parentFolder ); /** * 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 363882d8..a165cdc2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.cpp @@ -29,10 +29,10 @@ CreateFolderTask::~CreateFolderTask() { } -void CreateFolderTask::folder( const int tqparentId, const int sequence, const TQString & displayName ) +void CreateFolderTask::folder( const int parentId, 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( tqparentId ) ) ); + 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_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 4befdf40..448e17a2 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createfoldertask.h @@ -35,7 +35,7 @@ Q_OBJECT public: CreateFolderTask(Task* tqparent); ~CreateFolderTask(); - void folder( const int tqparentId, const int sequence, const TQString & displayName ); + void folder( const int parentId, 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 4559c1f7..ad67cb4c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.cpp @@ -29,7 +29,7 @@ DeleteItemTask::~DeleteItemTask() { } -void DeleteItemTask::item( const int tqparentFolder, const int objectId ) +void DeleteItemTask::item( const int parentFolder, const int objectId ) { if ( objectId == 0 ) { @@ -37,7 +37,7 @@ void DeleteItemTask::item( const int tqparentFolder, const int objectId ) return; } Field::FieldList lst; - lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( tqparentFolder ) ) ); + lst.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, TQString::number( parentFolder ) ) ); // 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 15ea9702..2e2ed64c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h +++ b/kopete/protocols/groupwise/libgroupwise/tasks/deleteitemtask.h @@ -33,7 +33,7 @@ Q_OBJECT public: DeleteItemTask(Task* tqparent); ~DeleteItemTask(); - void item( const int tqparentFolder, const int objectId ); + void item( const int parentFolder, const int objectId ); }; #endif diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp index a09af45a..2474aaaa 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/logintask.cpp @@ -121,9 +121,9 @@ void LoginTask::extractFolder( Field::MultiField * folderContainer ) folder.name = current->value().toString(); // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.tqparentId = current->value().toInt(); + folder.parentId = current->value().toInt(); - client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.tqparentId ).tqarg( folder.sequence ) ); + client()->debug( TQString( "Got folder: %1, obj: %2, tqparent: %3, seq: %3." ).tqarg( folder.name ).tqarg( folder.id ).tqarg( folder.parentId ).tqarg( folder.sequence ) ); // tell the world about it emit gotFolder( folder ); } @@ -139,7 +139,7 @@ void LoginTask::extractContact( Field::MultiField * contactContainer ) current = fl.findSingleField( NM_A_SZ_OBJECT_ID ); contact.id = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - contact.tqparentId = current->value().toInt(); + contact.parentId = 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 tqparentName = propList->tag(); + TQString parentName = 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() == tqparentName */) + if ( propField /*&& propField->tag() == parentName */) { TQString propValue = propField->value().toString(); TQString contents = propMap[ propField->tag() ]; diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp index 703c0582..be04efad 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp @@ -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.tqparentId = current->value().toInt(); + contact.parentId = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_SEQUENCE_NUMBER ); contact.sequence = current->value().toInt(); current = fl.findSingleField( NM_A_SZ_DISPLAY_NAME ); @@ -127,7 +127,7 @@ void ModifyContactListTask::processFolderChange( Field::MultiField * container ) folder.name = current->value().toString(); // tqparent current = fl.findSingleField( NM_A_SZ_PARENT_ID ); - folder.tqparentId = current->value().toInt(); + folder.parentId = 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/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 044a4e24..c9d6aac9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -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.tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, contact.parentId ) ); 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/pollsearchresultstask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp index ae0f9456..1cc33e75 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp @@ -155,7 +155,7 @@ GroupWise::ContactDetails PollSearchResultsTask::extractUserDetails( Field::Fiel Field::MultiField * propList = dynamic_cast( *it ); if ( propList ) { - TQString tqparentName = propList->tag(); + TQString parentName = 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/updatecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp index e1a863a7..a1e539d9 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp @@ -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).tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); 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).tqparentId ) ); + contactFields.append( new Field::SingleField( NM_A_SZ_PARENT_ID, 0, NMFIELD_TYPE_UTF8, (*it).parentId ) ); 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/ui/gwaccountpreferences.ui b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui index 6b3d89f7..21f774b5 100644 --- a/kopete/protocols/groupwise/ui/gwaccountpreferences.ui +++ b/kopete/protocols/groupwise/ui/gwaccountpreferences.ui @@ -316,5 +316,5 @@ 89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000032949444154388db59531681b6714c77f32373c8186ef0305eea005093258900eca26d30e3174a8a807d1c9ee940e5d4a276f09a414e22974ee609a4c75a0857a70a20c199ce93424e43414aee0c26910dc8105f7410df706413a7c915551db049a3e38b87bf7bedffddfc7ff7d578be398456c6c6cbce13d441cc7b5da02fcf4e8e99bde7a8f899b501515d959f64e10e71cd949c6e8d508e6cb7cb050fae49727444d87ed08a566dc0cea545a621b96725e62c522f312c4929ff9e7725e6203439282ec0bc72f74150c30c927d89690163f539619a044564973a1980ae54c01c136a1db518a0024808942780dead16a27e7e0ca55949a81668023b242fcd2901c394663072cd408ad75e18b6d43a7076143710aa1b9049ccd326e064a5979e8f0191cfc5878544368af1b24807caa4cfe507ef8aea0bf6dd8b92de7f00bc1562c95e64416e297f216aadcfa3ca43f10da1f8243112286871507fb05c3c7059d568bde96c5885b01af2d6e4a2db10dc8ff128e0fdd39f4cbaf8576dbe170702afcf6b86467bbce57df8680f0d3230767e0e62bdc55c5e53c476742fabbc318437f209886c3cd41d4b0f74049c78ef21476ef5846cf7ded2831848d55f0aa62816caade11adb7ed2fa0f71ce9d8619ac2e627824a45a72b00e413c5a95c0cf63e052bbe2014bfa738c3de3d251dfb0f8a80fda04e6480600113cc558a11a0e10b93a9225886cff04a8d10868662eab87f37271e59f2136f85a855bfda15f9594eb7a3b4ae0b933f95e161c5ceed88f254e97f2ad49b75eedf8562e2d8fb264355314da1dbada866abe47fedb106d01f78b71fec170c8f7276ef58da3de8f64a76bf6f634283730e9d2b9b8390ce0dae565c6a8e04b0710b746678f8a8e0e18382d173a1d7151c909fe4e84ccf57be3e76245b115143584ee73f27afc8e80b4c667e4c37b7054c8be1afde0de978a9c63485fea0457cec70aa089015ab9297e0938c240573cdb7651a4a7f20f43feb304a72aac2e73bd723da1fe5746ec0682bc26070f38c345905d7e238f6077c00dd8f85280211fcd91af84b02ef94a50c004502c1394813252f14575ca09839242f9484cb42df31e763edd237ff31d6c0ffa3fe17f0fb86c7715cfb1ba8bd86cc8d2decd30000000049454e44ae426082 - + diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5f48d727..ad0c75be 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -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* tqparentContact ) +bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaContact* parentContact ) { if ( validateData() ) { @@ -91,7 +91,7 @@ bool GroupWiseAddContactPage::apply( Kopete::Account* account, Kopete::MetaConta else return false; - return ( account->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ); + return ( account->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ); } else return false; diff --git a/kopete/protocols/groupwise/ui/gwaddui.ui b/kopete/protocols/groupwise/ui/gwaddui.ui index 6c360392..4f036f8b 100644 --- a/kopete/protocols/groupwise/ui/gwaddui.ui +++ b/kopete/protocols/groupwise/ui/gwaddui.ui @@ -133,5 +133,5 @@ setEnabled(bool) - + diff --git a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui index 651a3b17..726376a5 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatpropswidget.ui @@ -384,7 +384,7 @@ - + klistbox.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui index c239ce86..63ffca38 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui +++ b/kopete/protocols/groupwise/ui/gwchatsearchwidget.ui @@ -108,7 +108,7 @@ - + klistview.h kpushbutton.h diff --git a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui index 12e0deb2..b403abec 100644 --- a/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcontactpropswidget.ui @@ -204,7 +204,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gwcontactsearch.ui b/kopete/protocols/groupwise/ui/gwcontactsearch.ui index 8c215959..508f4015 100644 --- a/kopete/protocols/groupwise/ui/gwcontactsearch.ui +++ b/kopete/protocols/groupwise/ui/gwcontactsearch.ui @@ -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 366cb717..9ef4caad 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatusedit.ui @@ -88,5 +88,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui index df25aaef..821c6030 100644 --- a/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui +++ b/kopete/protocols/groupwise/ui/gwcustomstatuswidget.ui @@ -105,7 +105,7 @@ - + klistview.h diff --git a/kopete/protocols/groupwise/ui/gwprivacy.ui b/kopete/protocols/groupwise/ui/gwprivacy.ui index 13070437..1f4b6bcb 100644 --- a/kopete/protocols/groupwise/ui/gwprivacy.ui +++ b/kopete/protocols/groupwise/ui/gwprivacy.ui @@ -189,5 +189,5 @@ - + diff --git a/kopete/protocols/groupwise/ui/gwshowinvitation.ui b/kopete/protocols/groupwise/ui/gwshowinvitation.ui index 08253705..48c061a9 100644 --- a/kopete/protocols/groupwise/ui/gwshowinvitation.ui +++ b/kopete/protocols/groupwise/ui/gwshowinvitation.ui @@ -131,5 +131,5 @@ - + diff --git a/kopete/protocols/irc/ircaccount.h b/kopete/protocols/irc/ircaccount.h index a20ccc93..3e5bf304 100644 --- a/kopete/protocols/irc/ircaccount.h +++ b/kopete/protocols/irc/ircaccount.h @@ -191,7 +191,7 @@ public slots: void appendMessage( const TQString &message, MessageType type = Default ); protected: - virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ) ; + virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ) ; private slots: void engineStatusChanged(KIRC::Engine::tqStatus newtqStatus); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 67916d4d..e4e574bc 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -46,11 +46,11 @@ class ChannelListItem : public KListViewItem virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); private: - KListView *tqparentList; + KListView *parentList; }; ChannelListItem::ChannelListItem( KListView *tqparent, TQString arg1, TQString arg2, TQString arg3 ) : - KListViewItem( tqparent, tqparent->lastItem() ), tqparentList( tqparent ) + KListViewItem( tqparent, tqparent->lastItem() ), parentList( tqparent ) { setText(0, arg1); setText(1, arg2); diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui index ae2c0740..c899eca8 100644 --- a/kopete/protocols/irc/ui/ircadd.ui +++ b/kopete/protocols/irc/ui/ircadd.ui @@ -159,5 +159,5 @@ addID tabWidget3 - + diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index c5827342..e2e33f69 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -1015,7 +1015,7 @@ commandEdit addButton - + klistview.h diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networkconfig.ui index 2a00f1bb..0f15dee5 100644 --- a/kopete/protocols/irc/ui/networkconfig.ui +++ b/kopete/protocols/irc/ui/networkconfig.ui @@ -378,5 +378,5 @@ accept() reject() - + diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index f3583f0e..4f22a622 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -1184,11 +1184,11 @@ void JabberAccount::slotContactAddedNotifyDialogClosed( const TQString & contact if(dialog->added()) { - Kopete::MetaContact *tqparentContact=dialog->addContact(); - if(tqparentContact) + Kopete::MetaContact *parentContact=dialog->addContact(); + if(parentContact) { TQStringList groupNames; - Kopete::GroupList groupList = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->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 ( tqparentContact->displayName() ); + item.setName ( parentContact->displayName() ); item.setGroups ( groupNames ); // add the new contact to our roster. diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 3d174639..04b79770 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -168,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, tqparenting to meta contact, etc.) is being taken care of. + * (updating the GUI, parenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param tqparentContact The metacontact to add this contact to + * @param parentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 38ea726f..60c109ae 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -117,7 +117,7 @@ void JabberChatSession::slotUpdateDisplayName () if ( !mResource.isEmpty () ) jid.setResource ( mResource ); - TQString statusText = i18n("a contact's online status in tqparenthesis.", " (%1)") + TQString statusText = i18n("a contact's online status in parenthesis.", " (%1)") .tqarg( chatMembers.first()->onlinetqStatus().description() ); if ( jid.resource().isEmpty () ) setDisplayName ( chatMembers.first()->metaContact()->displayName () + statusText ); diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 119a6f6e..f873387f 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -1298,7 +1298,7 @@ void JabberContact::slotDiscoFinished( ) XMPP::RosterItem ri = rosterItem(); Kopete::MetaContact *mc=metaContact(); - JabberAccount *tqparentAccount=account(); + JabberAccount *parentAccount=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( tqparentAccount , ri , tr_type ); + JabberTransport *transport = new JabberTransport( parentAccount , 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/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index a081a8db..8bd9a915 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -38,11 +38,11 @@ #include "xmpp_tasks.h" -JabberTransport::JabberTransport (JabberAccount * tqparentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) - : Kopete::Account ( tqparentAccount->protocol(), tqparentAccount->accountId()+"/"+ item.jid().bare() ) +JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem & item, const TQString& gateway_type) + : Kopete::Account ( parentAccount->protocol(), parentAccount->accountId()+"/"+ item.jid().bare() ) { m_status=Creating; - m_account = tqparentAccount; + m_account = parentAccount; 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 * tqparentAccount, const XMPP::R m_status=Normal; } -JabberTransport::JabberTransport( JabberAccount * tqparentAccount, const TQString & _accountId ) - : Kopete::Account ( tqparentAccount->protocol(), _accountId ) +JabberTransport::JabberTransport( JabberAccount * parentAccount, const TQString & _accountId ) + : Kopete::Account ( parentAccount->protocol(), _accountId ) { m_status=Creating; - m_account = tqparentAccount; + m_account = parentAccount; const TQString contactJID_s = configGroup()->readEntry("GatewayJID"); diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index e03be173..3f14fcc5 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -45,18 +45,18 @@ class JabberTransport : public Kopete::Account public: /** * constructor called when the transport is created by info from server (i.e not when loading kopete) - * @param tqparentAccount is the tqparent jabber account. + * @param parentAccount 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 * tqparentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); + JabberTransport (JabberAccount * parentAccount, const XMPP::RosterItem &item, const TQString& gateway_type=TQString()); /** * constructor called when the transport is loaded from config - * @param tqparentAccount is the tqparent jabber account. + * @param parentAccount is the tqparent jabber account. * @param accountId is the accountId */ - JabberTransport (JabberAccount * tqparentAccount, const TQString &accountId ); + JabberTransport (JabberAccount * parentAccount, const TQString &accountId ); ~JabberTransport (); @@ -123,12 +123,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, tqparenting to meta contact, etc.) is being taken care of. + * (updating the GUI, parenting to meta contact, etc.) is being taken care of. * * @param contactId The unique ID for this protocol - * @param tqparentContact The metacontact to add this contact to + * @param parentContact The metacontact to add this contact to */ - virtual bool createContact (const TQString & contactID, Kopete::MetaContact * tqparentContact); + virtual bool createContact (const TQString & contactID, Kopete::MetaContact * parentContact); private: JabberAccount *m_account; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui index c6349007..72e3827c 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui @@ -360,7 +360,7 @@ - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc index 41ae9068..09655472 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc @@ -34,7 +34,7 @@ namespace buzz { Task::Task(Task * tqparent) : state_(STATE_INIT), - tqparent_(tqparent), + parent_(tqparent), blocked_(false), done_(false), aborted_(false), @@ -43,8 +43,8 @@ Task::Task(Task * tqparent) : child_error_(false), start_time_(0) { runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner()); - if (tqparent_ != NULL) { - tqparent_->AddChild(this); + if (parent_ != NULL) { + parent_->AddChild(this); } } @@ -224,7 +224,7 @@ Task::AbortAllChildren() { void Task::Stop() { AbortAllChildren(); // No need to wake because we're either awake or in abort - tqparent_->OnChildStopped(this); + parent_->OnChildStopped(this); } void diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h index 553d04fb..c583bda8 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h @@ -115,9 +115,9 @@ public: unsigned long long ElapsedTime(); virtual void Poll() {} - Task * GetParent() { return tqparent_; } + Task * GetParent() { return parent_; } TaskRunner * GetRunner() { return runner_; } - virtual Task * GetParent(int code) { return tqparent_->GetParent(code); } + virtual Task * GetParent(int code) { return parent_->GetParent(code); } // Called from outside to stop task without any more callbacks void Abort(bool nowake = false); @@ -162,7 +162,7 @@ private: void OnChildStopped(Task * child); int state_; - Task * tqparent_; + Task * parent_; TaskRunner * runner_; bool blocked_; bool done_; 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 9e13459e..c10d76fd 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 tqparent_class; + MSFilterClass parent_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 d76f2f62..66e9fa63 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 tqparent_class; + MSFilterClass parent_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 dd8d330c..8fbce4a0 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 tqparent_class; + MSFilterClass parent_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 3fad63e3..e2130625 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 tqparent_class; + MSFilterClass parent_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 af1ecc7c..8f61778b 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 tqparent_class; + MSFilterClass parent_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 af900445..e72539ec 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 tqparent_class; + MSFilterClass parent_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 6e516db5..6e038368 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 tqparent_class; + MSFilterClass parent_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 0192984e..b302b339 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 tqparent_class; + MSFilterClass parent_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 71a04d3a..55008939 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 tqparent_class; + MSFilterClass parent_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 23da59f6..b703a396 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 tqparent_class; + MSFilterClass parent_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 2e03e525..9b7c438b 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 tqparent_class; + MSFilterClass parent_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 84859fda..623a3682 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 *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; + 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; } 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 a50c5637..4aea7e95 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 tqparent_class; + MSFilterClass parent_class; } MSFdispatcherClass; /* PUBLIC */ 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 035a80fd..a3d0a326 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 tqparent_class; + MSFilterClass parent_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 6995022c..b072e430 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 tqparent_class; + MSFilterClass parent_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 7af095f8..a6c9e9e8 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 tqparent_class; + MSSyncClass parent_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 78fa91ad..e359f271 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 tqparent_class; + MSSoundReadClass parent_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 21abb2a1..024eebb4 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 tqparent_class; + MSSoundWriteClass parent_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 20051b62..568411c6 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 @@ -51,14 +51,14 @@ void ms_qdispatcher_init(MSQdispatcher *obj) void ms_qdispatcher_class_init(MSQdispatcherClass *klass) { - 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; + 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_TQDISPATCHER_MAX_INPUTS; + parent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS; - tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; - tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; + parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy; + parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process; } 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 66e80902..6f28abf9 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 @@ -43,7 +43,7 @@ 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 tqparent_class; + MSFilterClass parent_class; } MSQdispatcherClass; /* PUBLIC */ 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 a40f4fa0..b695f7da 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 tqparent_class; + MSFilterClass parent_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 715cdf3c..a090afbf 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 tqparent_class; + MSFilterClass parent_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 e9fd7937..0f36c379 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 tqparent_class; + MSFilterClass parent_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 56728f16..96889964 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 tqparent_class; + MSFilterClass parent_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 b19c7e74..9c7d5ab3 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 @@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut; struct _MSSdlOutClass { - MSFilterClass tqparent_class; + MSFilterClass parent_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 31349250..9c5512b0 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 tqparent_class; + MSFilterClass parent_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 e8fae0d8..8c1bab2d 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 tqparent_class; + MSFilterClass parent_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/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h index b245ab86..3fe11350 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 tqparent_class; + MSSyncClass parent_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 105e2603..a61719ea 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 tqparent_class; + MSFilterClass parent_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 2637d3ac..78024946 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 tqparent_class; + MSFilterClass parent_class; Win32CodecDriver* driver; } MSTrueSpeechEncoderClass; 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 e289ccc8..950187b8 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 @@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l; struct _MSV4lClass { - MSVideoSourceClass tqparent_class; + MSVideoSourceClass parent_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 2189a6df..897b239e 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 tqparent_class; + MSFilterClass parent_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 55081793..8492a09d 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 tqparent_class; + MSFilterClass parent_class; } MSWriteClass; /* PUBLIC */ 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 81554a06..7518e075 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 tqmask_pos; /* the position in the scheduler tqmask of RtpSession */ + gint mask_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 2ea733ac..bee787a2 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 @@ -177,7 +177,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session) /* find a free pos in the session tqmask*/ for (i=0;imax_sessions;i++){ if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){ - session->tqmask_pos=i; + session->mask_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) 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 106f1fcd..4dcd9afb 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 @@ -37,7 +37,7 @@ struct _RtpScheduler { gint w_max; SessionSet e_sessions; /* tqmask of session that have error event */ gint e_max; - gint max_sessions; /* the number of position in the tqmasks */ + gint max_sessions; /* the number of position in the masks */ /* 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 bea1a7c9..36856a99 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 @@ -67,7 +67,7 @@ gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, Ses tqmask2=(guint32*)&user_set->rtpset; tqmask3=(guint32*)&result_set->rtpset; while(ir_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 b4a0b904..8d166222 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 @@ -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)->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_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_copy(dest,src) memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set)) diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 0bd0ca45..68f260ca 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -205,7 +205,7 @@ void SrvResolver::qdns_done() if(!d->qdns) return; - // aptqparently we sometimes get this signal even though the results aren't ready + // apparently 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; - // aptqparently we sometimes get this signal even though the results aren't ready + // apparently 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/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index a8ad7bd9..ab2a5d5c 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -409,7 +409,7 @@ void AdvancedConnector::dns_done() //if(!d->qdns) // return; - // aptqparently we sometimes get this signal even though the results aren' t ready + // apparently 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/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp index ba14f404..80ce5366 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp @@ -465,7 +465,7 @@ namespace XMPP current = TQDomElement(); } else - current = current.tqparentNode().toElement(); + current = current.parentNode().toElement(); } if(in->lastRead() == '/') diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp index 0f8b17a7..5f682371 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp @@ -33,9 +33,9 @@ using namespace XMPP; static TQDomElement stripExtraNS(const TQDomElement &e) { // find closest tqparent with a namespace - TQDomNode par = e.tqparentNode(); + TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.tqparentNode(); + par = par.parentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 9d56467c..86a01e60 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -470,9 +470,9 @@ void Client::streamCloseFinished() static TQDomElement oldStyleNS(const TQDomElement &e) { // find closest tqparent with a namespace - TQDomNode par = e.tqparentNode(); + TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.tqparentNode(); + par = par.parentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -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.tqparentNode(); + n = n.parentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; 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 2d13db79..bab5665b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -654,9 +654,9 @@ bool JT_PushPresence::take(const TQDomElement &e) static TQDomElement oldStyleNS(const TQDomElement &e) { // find closest tqparent with a namespace - TQDomNode par = e.tqparentNode(); + TQDomNode par = e.parentNode(); while(!par.isNull() && par.namespaceURI().isNull()) - par = par.tqparentNode(); + par = par.parentNode(); bool noShowNS = false; if(!par.isNull() && par.namespaceURI() == e.namespaceURI()) noShowNS = true; @@ -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.tqparentNode(); + n = n.parentNode(); TQString ns; if(n.isNull() || !n.toElement().hasAttribute("xmlns")) ns = "jabber:client"; diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui index f39e81ef..c0b3d1cc 100644 --- a/kopete/protocols/jabber/ui/dlgaddcontact.ui +++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui @@ -98,7 +98,7 @@ - + klineedit.h diff --git a/kopete/protocols/jabber/ui/dlgbrowse.ui b/kopete/protocols/jabber/ui/dlgbrowse.ui index 1b73dd95..cb0f1cc2 100644 --- a/kopete/protocols/jabber/ui/dlgbrowse.ui +++ b/kopete/protocols/jabber/ui/dlgbrowse.ui @@ -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 18c0b439..29ae6d33 100644 --- a/kopete/protocols/jabber/ui/dlgchangepassword.ui +++ b/kopete/protocols/jabber/ui/dlgchangepassword.ui @@ -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 db1bbfcb..aa124cc2 100644 --- a/kopete/protocols/jabber/ui/dlgchatjoin.ui +++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui @@ -126,5 +126,5 @@ slotBowse() slotJoin() - + diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui index 0c5e07be..5feefbb7 100644 --- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui +++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui @@ -178,7 +178,7 @@ 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/dlgjabberchooseserver.ui b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui index 51943ee4..a1b732db 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui +++ b/kopete/protocols/jabber/ui/dlgjabberchooseserver.ui @@ -100,7 +100,7 @@ 789c75d54953dd381007f03b9fe255fa969aea585ea59a9a039084256c0f0810a6e6204b32fbfe58a7e6bb8fddff3609c90ce6f27b6acbea764bfef07e72b0b53e79ff61ee6ee6672761128efdede47dbcbfb878fef3af3ffe9e7b67eac9f05fb849feeeb7b977d3d9244c36ae2ed300ef7b50664cac337127b626cf9db885f3a22e075325762694324edfc4de74954c4e6b705ed595dc4fe2ceb842c6fdd16093e5be6e24be1e9ce7856f647e7f227685ad647db4230e65d178194fe26eb8c43cb8903f89df1e5d4a3c1d8a7d9559acff40dccf57c1e5e0d20c97b811fb2ad928f31f8b43e59b56c6dde0aa1d2ef1ba3895b194f5901d5cd7755307b93f8add70c9f87470636a5be2fe7d71d5b416f905b1b399433db706dbcc3695d4930ab1192ef1e660d7b8429fbf216e6dd2f9b3c1a18d59443df7c4a9772dcec5dd70897707f7a355c2f33f8a8bc66678fe17b5cb50bf4f62eb7223fd430fe2d0a40cf7afc2ce1658cff9e0646c9521fe515cfad2209f457555607ee99f543bafcf3f1337aecbe4fdd005eccb4ceacd976217cacccaf8bdd8b719fa830fd57926f5e62b38984ceac12fea5ac7a5bf53eb23c689e156f3e5353834fafc67b5c3faf862b491fcf949dd66526f967aa61082ce77a04e46eac7f23e536c8b1ce3ab70e80cf291fe4ba96f70a91fefc33137c8675edcb555867807c7d220bf95d139eedf53d746fa95b3d1fafc85c15dd666b9bc0fb670b4c88fbcba3f2164fcebab518f1bb1f10eef9f23dc6abf7003c760a45f7977748efbafc579db68fc231cfb05cbf34fd429c7fb3f1d5da0decba3b15fb85677c89fe4bceb8a7e39c8bf529b1cfd78acce612e5f8d7c315eb699e697d441dfcf0e9c8c9e4f97ea02f5a4237595cbf9c84be2fe80a9b17fa3ba413da8535bac97d2abf17ee53ce9ea100af8014ed6211f1d4faec27e9c8d463d19eb69fa7a231f525b7501275fa3bfcd683d9feed46d055fa9638e7c3e8fd6f3fbf6d518bf51a702cf43beb61dfbe71c4efd8692f8157572a8dff6abd10fd7ea0ef3d1c2e806cf43bfdace75a817d6e3a2b7e8974db8df7118bf57772df617fadf875062ff213fdf7738ce8f2775897a30fab58d49e7cfe1ae6ad11ff3eadae23c5d52fb12df4fa3ee2fb91ffd1b626cb05fb6e0ae8ea8d799ba89e8d799daeaf7e159ed1accff32da62bfcbf7a08b7dc658ffa2da27d47baa6e615a56077d1fe887d4cf88f59caa6327ef87e57bd20d7fb2fee90c17137b6e3970e4c41d1f8dbf7f8fe1633ee1533ee373bee04bbee26b3e7e1bc3377ccb773ce37b7ee0477ee2677ee179be7913b3c08bfc913ff1675ee2655ee155fec26bbcfe26668337798ba7bccd3bbccb5f798ff7f980bfbd8939e48c0de75c70c915d7dcb06547fc630c11796a2950a4441d1dd1319dd0299dbd8939a70bbaecc7afe89a6ee896ee6846f774fe36777aa0c73ee2899ee985e6698116e9e1e7faf4511fe9137da6255aa6155aa52fbfd6b08f59a375daa04ddaa2296d8fbffe14b343bbf495f6689f0ee8dbffc41c524686722aa8a4ea7f626a6ac892f3ecc9fbff8e99ce7ceb838f3ef9eefb6fbfc4787fe48ffdc98fb3f431fffc3ef72fd6519eaa - + kactivelabel.h diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index 085f0b91..e3599536 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -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/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui index 96c91ec1..32749c18 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui +++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui @@ -55,7 +55,7 @@ - tqlayoutServerEntry + layoutServerEntry @@ -309,7 +309,7 @@ lePassword lePasswordVerify - + kpushbutton.h knuminput.h diff --git a/kopete/protocols/jabber/ui/dlgregister.ui b/kopete/protocols/jabber/ui/dlgregister.ui index 76c8cc84..8a883b65 100644 --- a/kopete/protocols/jabber/ui/dlgregister.ui +++ b/kopete/protocols/jabber/ui/dlgregister.ui @@ -158,5 +158,5 @@ reject() - + diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui index 20c01e7c..9d56f7bc 100644 --- a/kopete/protocols/jabber/ui/dlgsendraw.ui +++ b/kopete/protocols/jabber/ui/dlgsendraw.ui @@ -155,5 +155,5 @@ - + diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui index 03022c61..fda7bf4a 100644 --- a/kopete/protocols/jabber/ui/dlgservices.ui +++ b/kopete/protocols/jabber/ui/dlgservices.ui @@ -195,5 +195,5 @@ close() - + diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui index 857a2890..8a4aa790 100644 --- a/kopete/protocols/jabber/ui/dlgvcard.ui +++ b/kopete/protocols/jabber/ui/dlgvcard.ui @@ -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 90f4f1e0..0f86a79b 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -76,7 +76,7 @@ bool JabberAddContactPage::validateData () } -bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *tqparentContact ) +bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact *parentContact ) { 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 , tqparentContact , gatewayTask ); + new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; } - TQString displayName = tqparentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, parentContact, 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* tqparentContact=metacontact; + Kopete::MetaContact* parentContact=metacontact; JabberAccount *jaccount=transport->account();; /*\ * this is a copy of the end of JabberAddContactPage::apply \*/ - TQString displayName = tqparentContact->displayName (); + TQString displayName = parentContact->displayName (); /* if ( displayName.isEmpty () ) displayName = contactId; */ // collect all group names TQStringList groupNames; - Kopete::GroupList groupList = tqparentContact->groups(); + Kopete::GroupList groupList = parentContact->groups(); for(Kopete::Group *group = groupList.first(); group; group = groupList.next()) groupNames += group->displayName(); - if ( jaccount->addContact ( contactId, tqparentContact, Kopete::Account::ChangeKABC ) ) + if ( jaccount->addContact ( contactId, parentContact, Kopete::Account::ChangeKABC ) ) { XMPP::RosterItem item; XMPP::Jid jid ( contactId ); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 91ad1a0f..f96b10f8 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -63,10 +63,10 @@ void MeanwhileAccount::setPlugin(MeanwhilePlugin *plugin) bool MeanwhileAccount::createContact( const TQString & contactId , - Kopete::MetaContact * tqparentContact) + Kopete::MetaContact * parentContact) { MeanwhileContact* newContact = new MeanwhileContact(contactId, - tqparentContact->displayName(), this, tqparentContact); + parentContact->displayName(), this, parentContact); MeanwhileProtocol *p = static_cast(protocol()); diff --git a/kopete/protocols/meanwhile/meanwhileaccount.h b/kopete/protocols/meanwhile/meanwhileaccount.h index daa5ca0c..2b59e1ca 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.h +++ b/kopete/protocols/meanwhile/meanwhileaccount.h @@ -44,7 +44,7 @@ public: ~MeanwhileAccount(); virtual bool createContact(const TQString &contactId, - Kopete::MetaContact *tqparentContact); + Kopete::MetaContact *parentContact); virtual void connectWithPassword(const TQString &password); diff --git a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui index d323bbe9..6920d7e3 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileaddcontactbase.ui @@ -107,5 +107,5 @@ - + diff --git a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui index 39bde950..5f85cac2 100644 --- a/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui +++ b/kopete/protocols/meanwhile/ui/meanwhileeditaccountbase.ui @@ -430,7 +430,7 @@ mScreenName - + kopetepasswordwidget.h diff --git a/kopete/protocols/msn/config/msnprefs.ui b/kopete/protocols/msn/config/msnprefs.ui index e6d95217..701d564d 100644 --- a/kopete/protocols/msn/config/msnprefs.ui +++ b/kopete/protocols/msn/config/msnprefs.ui @@ -209,7 +209,7 @@ knuminput.h - + knuminput.h knuminput.h diff --git a/kopete/protocols/msn/msnaccount.h b/kopete/protocols/msn/msnaccount.h index d62998cf..f7c9b4e3 100644 --- a/kopete/protocols/msn/msnaccount.h +++ b/kopete/protocols/msn/msnaccount.h @@ -126,7 +126,7 @@ public slots: void slotErrorMessageReceived( int type, const TQString &msg ); protected: - virtual bool createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact ); + virtual bool createContact( const TQString &contactId, Kopete::MetaContact *parentContact ); private slots: diff --git a/kopete/protocols/msn/ui/msnadd.ui b/kopete/protocols/msn/ui/msnadd.ui index 6373ccf3..283ea56f 100644 --- a/kopete/protocols/msn/ui/msnadd.ui +++ b/kopete/protocols/msn/ui/msnadd.ui @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui index 27c1050f..b5699dd0 100644 --- a/kopete/protocols/msn/ui/msndebugrawcommand_base.ui +++ b/kopete/protocols/msn/ui/msndebugrawcommand_base.ui @@ -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 b4bfe186..674248a1 100644 --- a/kopete/protocols/msn/ui/msneditaccountui.ui +++ b/kopete/protocols/msn/ui/msneditaccountui.ui @@ -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/msninfo.ui b/kopete/protocols/msn/ui/msninfo.ui index f983af30..42a0f0b6 100644 --- a/kopete/protocols/msn/ui/msninfo.ui +++ b/kopete/protocols/msn/ui/msninfo.ui @@ -217,5 +217,5 @@ If not, the user has not added you to their list, or has removed you. - + diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 1f0269c8..201d7d01 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -235,9 +235,9 @@ AIMAccount::~AIMAccount() { } -OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) +OscarContact *AIMAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) { - AIMContact* contact = new AIMContact( this, contactId, tqparentContact, TQString(), ssiItem ); + AIMContact* contact = new AIMContact( this, contactId, parentContact, TQString(), ssiItem ); if ( !ssiItem.alias().isEmpty() ) contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); diff --git a/kopete/protocols/oscar/aim/aimaccount.h b/kopete/protocols/oscar/aim/aimaccount.h index 35c7adb5..fc3d57ff 100644 --- a/kopete/protocols/oscar/aim/aimaccount.h +++ b/kopete/protocols/oscar/aim/aimaccount.h @@ -133,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 *tqparentContact, const SSI& ssiItem ); + OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); TQString sanitizedMessage( const TQString& message ); diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui index 97484a6d..663d2fc5 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactui.ui @@ -26,9 +26,9 @@ Contact Information - + - + @@ -60,5 +60,5 @@ addSN - + diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index a1b8dbfd..5221130e 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -533,7 +533,7 @@ rbBlockAIM rbBlockDenyList - + kopetepasswordwidget.h diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 5743d7e7..9457068e 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -18,7 +18,7 @@ 400 - + @@ -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 4b3b12aa..fdfe2a53 100644 --- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui +++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui @@ -120,5 +120,5 @@ - + diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index e9772233..b65f7e4e 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -375,9 +375,9 @@ void ICQAccount::setOnlineStatus( const Kopete::OnlineStatus& status, const TQSt } -OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) +OscarContact *ICQAccount::createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) { - ICQContact* contact = new ICQContact( this, contactId, tqparentContact, TQString(), ssiItem ); + ICQContact* contact = new ICQContact( this, contactId, parentContact, TQString(), ssiItem ); if ( !ssiItem.alias().isEmpty() ) contact->setProperty( Kopete::Global::Properties::self()->nickName(), ssiItem.alias() ); diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h index 256c54dd..e6a86819 100644 --- a/kopete/protocols/oscar/icq/icqaccount.h +++ b/kopete/protocols/oscar/icq/icqaccount.h @@ -69,7 +69,7 @@ public: void setUserProfile( const TQString &profile ); protected: - virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ); + virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ); virtual TQString sanitizedMessage( const TQString& message ); diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index c42adfe2..5ac8d973 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -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 6280644b..05d9eb70 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -66,13 +66,13 @@ void ICQAddContactPage::showEvent(TQShowEvent *e) AddContactPage::showEvent(e); } -bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *tqparentContact ) +bool ICQAddContactPage::apply(Kopete::Account* , Kopete::MetaContact *parentContact ) { kdDebug(14153) << k_funcinfo << "called; adding contact..." << endl; TQString contactId = addUI->uinEdit->text(); kdDebug(14153) << k_funcinfo << "uin=" << contactId << endl; - return mAccount->addContact(contactId, tqparentContact, Kopete::Account::ChangeKABC ); + return mAccount->addContact(contactId, parentContact, Kopete::Account::ChangeKABC ); } diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h index 23c514f6..ba658f94 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.h @@ -39,7 +39,7 @@ public: ~ICQAddContactPage(); virtual bool validateData(); - virtual bool apply(Kopete::Account* , Kopete::MetaContact *tqparentContact); + virtual bool apply(Kopete::Account* , Kopete::MetaContact *parentContact); void setUINFromSearch( const TQString& ); diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index a73b95a2..61fc84cb 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -192,5 +192,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index 074e4424..8c8776e0 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -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/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui index 52288b38..c48e8ff9 100644 --- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui +++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui @@ -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 a8107e44..009780f0 100644 --- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui @@ -112,5 +112,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui index 2e1079a2..d5d77c09 100644 --- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui @@ -64,5 +64,5 @@ - + diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui index 5e2b3bf6..140f17fa 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui +++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui @@ -479,7 +479,7 @@ closeButton searchResults - + kpushbutton.h kpushbutton.h diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui index bd6b714a..4707dbe8 100644 --- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui +++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui @@ -245,5 +245,5 @@ - + diff --git a/kopete/protocols/oscar/liboscar/HACKING b/kopete/protocols/oscar/liboscar/HACKING index 36a6edf5..0259505d 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 tqparenthesis. However +conditional statement. They should also not be used after parenthesis. However the should be to mark of mathematical or comparative operators. if ( foo == bar ) @@ -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 -tqparenthesis. Please mail me so I can send it to you. +parenthesis. 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 05a63198..56fa497f 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -158,7 +158,7 @@ void AimLoginTask::sendLoginRequest() outbuf->addTLV(0x0001, client()->userId().length(), client()->userId().latin1()); - TQByteArray digest( 17 ); //aptqparently MD5 digests are 16 bytes long + TQByteArray digest( 17 ); //apparently MD5 digests are 16 bytes long encodePassword( digest ); digest[16] = '\0'; //do this so that addTLV sees a NULL-terminator diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 4ff71b1c..38d01121 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -555,7 +555,7 @@ Connection* OscarAccount::setupConnection( const TQString& server, uint port ) bool OscarAccount::createContact(const TQString &contactId, - Kopete::MetaContact *tqparentContact) + Kopete::MetaContact *parentContact) { /* 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 ( tqparentContact->isTemporary() ) + if ( parentContact->isTemporary() ) { SSI tempItem( contactId, 0, 0, 0xFFFF, dummyList, 0 ); - return createNewContact( contactId, tqparentContact, tempItem ); + return createNewContact( contactId, parentContact, 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, tqparentContact, ssiItem ); + return createNewContact( contactId, parentContact, 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 = tqparentContact->groups(); //get the group list + Kopete::GroupList kopeteGroups = parentContact->groups(); //get the group list if ( kopeteGroups.isEmpty() || kopeteGroups.first() == Kopete::Group::topLevel() ) { @@ -617,7 +617,7 @@ bool OscarAccount::createContact(const TQString &contactId, } else { - //aptqparently kopeteGroups.first() can be invalid. Attempt to prevent + //apparently 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 )] = tqparentContact; + d->addContactMap[Oscar::normalize( contactId )] = parentContact; addContactToSSI( Oscar::normalize( contactId ), groupName, true ); return true; } diff --git a/kopete/protocols/oscar/oscaraccount.h b/kopete/protocols/oscar/oscaraccount.h index bccaa9a1..2371a640 100644 --- a/kopete/protocols/oscar/oscaraccount.h +++ b/kopete/protocols/oscar/oscaraccount.h @@ -134,16 +134,16 @@ protected: * Adds a contact to a meta contact */ virtual bool createContact(const TQString &contactId, - Kopete::MetaContact *tqparentContact ); + Kopete::MetaContact *parentContact ); /** * 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 tqparentContact the tqparent metacontact + * @param parentContact the tqparent metacontact * @return whether the creation succeeded or not */ - virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *tqparentContact, const SSI& ssiItem ) = 0; + virtual OscarContact *createNewContact( const TQString &contactId, Kopete::MetaContact *parentContact, const SSI& ssiItem ) = 0; virtual TQString sanitizedMessage( const TQString& message ) = 0; diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui index bf10a6ca..97ef3f74 100644 --- a/kopete/protocols/oscar/oscarencodingselectionbase.ui +++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui @@ -54,5 +54,5 @@ - + diff --git a/kopete/protocols/oscar/oscarlistcontactsbase.ui b/kopete/protocols/oscar/oscarlistcontactsbase.ui index a5415391..4f318e78 100644 --- a/kopete/protocols/oscar/oscarlistcontactsbase.ui +++ b/kopete/protocols/oscar/oscarlistcontactsbase.ui @@ -45,5 +45,5 @@ - + diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui index fe70ffe1..4a3bb1a1 100644 --- a/kopete/protocols/oscar/oscarvisibilitybase.ui +++ b/kopete/protocols/oscar/oscarvisibilitybase.ui @@ -166,5 +166,5 @@ visibleContacts invisibleContacts - + diff --git a/kopete/protocols/sms/services/gsmlibprefs.ui b/kopete/protocols/sms/services/gsmlibprefs.ui index 49545bc5..b0bcd890 100644 --- a/kopete/protocols/sms/services/gsmlibprefs.ui +++ b/kopete/protocols/sms/services/gsmlibprefs.ui @@ -91,7 +91,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smsclientprefs.ui b/kopete/protocols/sms/services/smsclientprefs.ui index 40dffc4e..1b10799a 100644 --- a/kopete/protocols/sms/services/smsclientprefs.ui +++ b/kopete/protocols/sms/services/smsclientprefs.ui @@ -123,7 +123,7 @@ - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/services/smssendprefs.ui b/kopete/protocols/sms/services/smssendprefs.ui index b9b1b06a..cdd2220d 100644 --- a/kopete/protocols/sms/services/smssendprefs.ui +++ b/kopete/protocols/sms/services/smssendprefs.ui @@ -179,7 +179,7 @@ program provider - + kurlrequester.h klineedit.h diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index f4cf21f5..bc95a458 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -170,9 +170,9 @@ void SMSAccount::slotSendingFailure(const Kopete::Message &msg, const TQString & } bool SMSAccount::createContact( const TQString &contactId, - Kopete::MetaContact * tqparentContact ) + Kopete::MetaContact * parentContact ) { - if (new SMSContact(this, contactId, tqparentContact->displayName(), tqparentContact)) + if (new SMSContact(this, contactId, parentContact->displayName(), parentContact)) return true; else return false; diff --git a/kopete/protocols/sms/smsaccount.h b/kopete/protocols/sms/smsaccount.h index 7ab7dbd4..05caa989 100644 --- a/kopete/protocols/sms/smsaccount.h +++ b/kopete/protocols/sms/smsaccount.h @@ -68,7 +68,7 @@ protected slots: protected: - bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); + bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); private: bool theSubEnable; diff --git a/kopete/protocols/sms/ui/smsactprefs.ui b/kopete/protocols/sms/ui/smsactprefs.ui index 5f8eb9f4..d04814ef 100644 --- a/kopete/protocols/sms/ui/smsactprefs.ui +++ b/kopete/protocols/sms/ui/smsactprefs.ui @@ -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 4b05727b..29e75542 100644 --- a/kopete/protocols/sms/ui/smsadd.ui +++ b/kopete/protocols/sms/ui/smsadd.ui @@ -139,5 +139,5 @@ addNr addName - + diff --git a/kopete/protocols/sms/ui/smsuserprefs.ui b/kopete/protocols/sms/ui/smsuserprefs.ui index a21c5037..777b16b7 100644 --- a/kopete/protocols/sms/ui/smsuserprefs.ui +++ b/kopete/protocols/sms/ui/smsuserprefs.ui @@ -111,7 +111,7 @@ - + klineedit.h diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index e722bed2..e78391ae 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -58,9 +58,9 @@ KActionMenu* TestbedAccount::actionMenu() return mActionMenu; } -bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* tqparentContact) +bool TestbedAccount::createContact(const TQString& contactId, Kopete::MetaContact* parentContact) { - TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, tqparentContact->displayName(), tqparentContact ); + TestbedContact* newContact = new TestbedContact( this, contactId, TestbedContact::Echo, parentContact->displayName(), parentContact ); return newContact != 0L; } diff --git a/kopete/protocols/testbed/testbedaccount.h b/kopete/protocols/testbed/testbedaccount.h index 76e2790a..71840ff9 100644 --- a/kopete/protocols/testbed/testbedaccount.h +++ b/kopete/protocols/testbed/testbedaccount.h @@ -48,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* tqparentContact); + virtual bool createContact(const TQString& contactId, Kopete::MetaContact* parentContact); /** * Called when Kopete is set globally away */ diff --git a/kopete/protocols/testbed/testbedaccountpreferences.ui b/kopete/protocols/testbed/testbedaccountpreferences.ui index 7437db6a..4edf08ca 100644 --- a/kopete/protocols/testbed/testbedaccountpreferences.ui +++ b/kopete/protocols/testbed/testbedaccountpreferences.ui @@ -156,5 +156,5 @@ - + diff --git a/kopete/protocols/testbed/testbedaddui.ui b/kopete/protocols/testbed/testbedaddui.ui index 429b20b1..aa0410dd 100644 --- a/kopete/protocols/testbed/testbedaddui.ui +++ b/kopete/protocols/testbed/testbedaddui.ui @@ -103,5 +103,5 @@ - + diff --git a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui index c9f63825..8049dab1 100644 --- a/kopete/protocols/winpopup/ui/wpaddcontactbase.ui +++ b/kopete/protocols/winpopup/ui/wpaddcontactbase.ui @@ -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 b12e9c2c..32c8ead5 100644 --- a/kopete/protocols/winpopup/ui/wpeditaccountbase.ui +++ b/kopete/protocols/winpopup/ui/wpeditaccountbase.ui @@ -347,7 +347,7 @@ However, the recommended way is to ask your administrator to create this directo installSamba() - + kpushbutton.h knuminput.h diff --git a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui index d717c9c4..aaec0dbe 100644 --- a/kopete/protocols/winpopup/ui/wpuserinfowidget.ui +++ b/kopete/protocols/winpopup/ui/wpuserinfowidget.ui @@ -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 addb88bb..9366d31f 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -75,12 +75,12 @@ bool WPAccount::checkHost(const TQString &Name) } } -bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) +bool WPAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) { // kdDebug(14170) << "[WPAccount::createContact] contactId: " << contactId << endl; if (!contacts()[contactId]) { - WPContact *newContact = new WPContact(this, contactId, tqparentContact->displayName(), tqparentContact); + WPContact *newContact = new WPContact(this, contactId, parentContact->displayName(), parentContact); return newContact != 0; } else { kdDebug(14170) << "[WPAccount::addContact] Contact already exists" << endl; diff --git a/kopete/protocols/winpopup/wpaccount.h b/kopete/protocols/winpopup/wpaccount.h index eb343541..19209a65 100644 --- a/kopete/protocols/winpopup/wpaccount.h +++ b/kopete/protocols/winpopup/wpaccount.h @@ -92,7 +92,7 @@ public slots: void setOnlineStatus( const Kopete::OnlineStatus &status , const TQString &reason = TQString()); protected: - virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); private slots: // void updateAccountId(); diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c index 56b5f968..32e6f2bd 100644 --- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c +++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c @@ -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 tqparentheses. */ + /* Ignore parentheses. */ if (*magic_ptr == '(' || *magic_ptr == ')') { magic_ptr++; diff --git a/kopete/protocols/yahoo/ui/yahooadd.ui b/kopete/protocols/yahoo/ui/yahooadd.ui index 7aa1bd78..f497da37 100644 --- a/kopete/protocols/yahoo/ui/yahooadd.ui +++ b/kopete/protocols/yahoo/ui/yahooadd.ui @@ -93,5 +93,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui index a9102967..002c740b 100644 --- a/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooeditaccountbase.ui @@ -463,5 +463,5 @@ slotSelectPicture() - + diff --git a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui index a9b93dcf..16af6016 100644 --- a/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoogeneralinfowidget.ui @@ -643,5 +643,5 @@ homepageEdit yahooIdEdit - + diff --git a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui index 6c83ac64..c1d88464 100644 --- a/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui +++ b/kopete/protocols/yahoo/ui/yahooinvitelistbase.ui @@ -333,5 +333,5 @@ btnCancel_clicked() btnInvite_clicked() - + diff --git a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui index 98d754d6..197de528 100644 --- a/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahoootherinfowidget.ui @@ -115,5 +115,5 @@ - + diff --git a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui index f83b2050..d0254985 100644 --- a/kopete/protocols/yahoo/ui/yahoostealthsetting.ui +++ b/kopete/protocols/yahoo/ui/yahoostealthsetting.ui @@ -92,5 +92,5 @@ radioOnline - + diff --git a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui index 10eccd2e..5a18d662 100644 --- a/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui +++ b/kopete/protocols/yahoo/ui/yahooverifyaccountbase.ui @@ -155,5 +155,5 @@ 789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8 - + diff --git a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui index 5a61311a..c501d6b5 100644 --- a/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui +++ b/kopete/protocols/yahoo/ui/yahooworkinfowidget.ui @@ -229,5 +229,5 @@ stateEdit countryEdit - + diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index fb2c3447..315b4d45 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -663,7 +663,7 @@ YahooContact *YahooAccount::contact( const TQString &id ) return static_cast(contacts()[id]); } -bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact ) +bool YahooAccount::createContact(const TQString &contactId, Kopete::MetaContact *parentContact ) { // 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, - tqparentContact->displayName(), tqparentContact ); + parentContact->displayName(), parentContact ); return newContact != 0; } else diff --git a/kopete/protocols/yahoo/yahooaccount.h b/kopete/protocols/yahoo/yahooaccount.h index 4269a6cd..5a093872 100644 --- a/kopete/protocols/yahoo/yahooaccount.h +++ b/kopete/protocols/yahoo/yahooaccount.h @@ -153,7 +153,7 @@ protected: /** * Adds our Yahoo contact to a metacontact */ - virtual bool createContact(const TQString &contactId, Kopete::MetaContact *tqparentContact); + virtual bool createContact(const TQString &contactId, Kopete::MetaContact *parentContact); virtual bool createChatContact( const TQString &nick ); diff --git a/kppp/edit.cpp b/kppp/edit.cpp index e330db7f..e9f049ab 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -487,12 +487,12 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) "If unsure, contact your Internet Service Provider"); ipLayout->addWidget(sub_label, 1, 0); - subnettqmask_l = new IPLineEdit(ipWidget); - sub_label->setBuddy(subnettqmask_l); - ipLayout->addWidget(subnettqmask_l, 1, 1); + subnetmask_l = new IPLineEdit(ipWidget); + sub_label->setBuddy(subnetmask_l); + ipLayout->addWidget(subnetmask_l, 1, 1); TQWhatsThis::add(sub_label,tmp); - TQWhatsThis::add(subnettqmask_l,tmp); + TQWhatsThis::add(subnetmask_l,tmp); autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), tqparent); autoname->setChecked(gpppdata.autoname()); @@ -523,7 +523,7 @@ IPWidget::IPWidget( TQWidget *tqparent, bool isnewaccount, const char *name ) } else { ipaddress_l->setText(gpppdata.ipaddr()); - subnettqmask_l->setText(gpppdata.subnettqmask()); + subnetmask_l->setText(gpppdata.subnettqmask()); staticadd_rb->setChecked(true); autoname->setChecked(false); } @@ -560,7 +560,7 @@ void IPWidget::save() { gpppdata.setSubnettqmask("0.0.0.0"); } else { gpppdata.setIpaddr(ipaddress_l->text()); - gpppdata.setSubnettqmask(subnettqmask_l->text()); + gpppdata.setSubnettqmask(subnetmask_l->text()); } gpppdata.setAutoname(autoname->isChecked()); } @@ -571,13 +571,13 @@ void IPWidget::hitIPSelect( int i ) { ipaddress_label->setEnabled(false); sub_label->setEnabled(false); ipaddress_l->setEnabled(false); - subnettqmask_l->setEnabled(false); + subnetmask_l->setEnabled(false); } else { ipaddress_label->setEnabled(true); sub_label->setEnabled(true); ipaddress_l->setEnabled(true); - subnettqmask_l->setEnabled(true); + subnetmask_l->setEnabled(true); } } diff --git a/kppp/edit.h b/kppp/edit.h index 6b20df1a..3bf7fdb1 100644 --- a/kppp/edit.h +++ b/kppp/edit.h @@ -139,7 +139,7 @@ private: TQRadioButton *staticadd_rb; IPLineEdit *ipaddress_l; - IPLineEdit *subnettqmask_l; + IPLineEdit *subnetmask_l; TQCheckBox *autoname; }; diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 8d949db1..8ac58c16 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -249,10 +249,10 @@ MonthlyWidget::MonthlyWidget(TQWidget *tqparent) : bbox->tqlayout(); currentMonth(); - tqlayoutWidget(); + layoutWidget(); } -void MonthlyWidget::tqlayoutWidget() { +void MonthlyWidget::layoutWidget() { if(tl) delete tl; diff --git a/kppp/logview/monthly.h b/kppp/logview/monthly.h index 9f9fd24a..516310a4 100644 --- a/kppp/logview/monthly.h +++ b/kppp/logview/monthly.h @@ -51,7 +51,7 @@ private slots: void slotSelectionChanged(); private: - void tqlayoutWidget(); + void layoutWidget(); void plotMonth(); /** diff --git a/kppp/macros.h b/kppp/macros.h index 8b96469f..b631516a 100644 --- a/kppp/macros.h +++ b/kppp/macros.h @@ -1,4 +1,4 @@ -// helper macros for tqlayouting +// helper macros for layouting #ifndef __MACROS__H__ #define __MACROS__H__ diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index aca1c6d6..34d7d939 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -160,8 +160,8 @@ load() save() - - + + klistview.h diff --git a/krdc/keycapturewidget.ui b/krdc/keycapturewidget.ui index b9c9c375..e90411b1 100644 --- a/krdc/keycapturewidget.ui +++ b/krdc/keycapturewidget.ui @@ -100,6 +100,6 @@ kdialogbase.h - - + + diff --git a/krdc/maindialogbase.ui b/krdc/maindialogbase.ui index 7072bb46..083e0c37 100644 --- a/krdc/maindialogbase.ui +++ b/krdc/maindialogbase.ui @@ -343,8 +343,8 @@ Remote Desktop Connection only supports systems that use VNC. enableBrowsingArea( bool enable ) - - + + kcombobox.h diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index c45f87e9..2ce61c2e 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -179,7 +179,7 @@ void MainDialogWidget::enableBrowsingArea( bool enable ) setMinimumSize(tqminimumSize().width(), (h > 0) ? h : 0); resize(width(), height()-hOffset); - TQTimer::singleShot( 0, tqparentWidget(), TQT_SLOT( adjustSize() ) ); + TQTimer::singleShot( 0, parentWidget(), TQT_SLOT( adjustSize() ) ); } if (enable) diff --git a/krdc/rdp/rdesktop.patch b/krdc/rdp/rdesktop.patch index ddee1c86..954d5fc2 100644 --- a/krdc/rdp/rdesktop.patch +++ b/krdc/rdp/rdesktop.patch @@ -68,7 +68,7 @@ + if ( g_embed_wnd ) + { -+ XRetqparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0); ++ XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0); + } + input_tqmask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | diff --git a/krdc/rdp/rdpprefs.ui b/krdc/rdp/rdpprefs.ui index 6c05ee60..0d37422a 100644 --- a/krdc/rdp/rdpprefs.ui +++ b/krdc/rdp/rdpprefs.ui @@ -343,7 +343,7 @@ - tqlayoutLabel + layoutLabel @@ -509,6 +509,6 @@ setUseKWallet( bool b ) useKWallet() - - + + diff --git a/krdc/vnc/vncprefs.ui b/krdc/vnc/vncprefs.ui index 0522d324..f569bb3f 100644 --- a/krdc/vnc/vncprefs.ui +++ b/krdc/vnc/vncprefs.ui @@ -160,6 +160,6 @@ setUseKWallet( bool b ) useKWallet() - - + + diff --git a/krfb/kcm_krfb/configurationwidget.ui b/krfb/kcm_krfb/configurationwidget.ui index c49101fa..7eaf2d96 100644 --- a/krfb/kcm_krfb/configurationwidget.ui +++ b/krfb/kcm_krfb/configurationwidget.ui @@ -188,7 +188,7 @@ Plain - + @@ -495,7 +495,7 @@ Most VNC clients use a display number instead of the actual port. This display n passwordInput portInput - + knuminput.h knuminput.h diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cc index 1547141d..2076c4ed 100644 --- a/krfb/krfb/configuration.cc +++ b/krfb/krfb/configuration.cc @@ -181,7 +181,7 @@ void Configuration::loadFromKConfig() { for (int i = 0; i < num; i++) invitationList.push_back(Invitation(&c, i)); - tqinvalidateOldInvitations(); + invalidateOldInvitations(); if (invNum != invitationList.size()) emit invitationNumChanged(invitationList.size()); @@ -212,7 +212,7 @@ void Configuration::saveToKConfig() { } void Configuration::saveToDialogs() { - tqinvalidateOldInvitations(); + invalidateOldInvitations(); TQValueList::iterator it = invitationList.begin(); while (it != invitationList.end()) { Invitation &inv = *(it++); @@ -241,7 +241,7 @@ Invitation Configuration::createInvitation() { return inv; } -void Configuration::tqinvalidateOldInvitations() { +void Configuration::invalidateOldInvitations() { TQValueList::iterator it = invitationList.begin(); while (it != invitationList.end()) { if (!(*it).isValid()) diff --git a/krfb/krfb/configuration.h b/krfb/krfb/configuration.h index dd8f5fb7..fb9a1b31 100644 --- a/krfb/krfb/configuration.h +++ b/krfb/krfb/configuration.h @@ -97,7 +97,7 @@ private: void saveToDialogs(); Invitation createInvitation(); void closeInvDlg(); - void tqinvalidateOldInvitations(); + void invalidateOldInvitations(); void setKInetdEnabled(const TQDateTime &date); void setKInetdEnabled(bool enabled); void setKInetdServiceRegistrationEnabled(bool enabled); diff --git a/krfb/krfb/connectionwidget.ui b/krfb/krfb/connectionwidget.ui index 93cb3a4e..a4a27b02 100644 --- a/krfb/krfb/connectionwidget.ui +++ b/krfb/krfb/connectionwidget.ui @@ -204,5 +204,5 @@ - + diff --git a/krfb/krfb/invitewidget.ui b/krfb/krfb/invitewidget.ui index 9a137d31..46f39fec 100644 --- a/krfb/krfb/invitewidget.ui +++ b/krfb/krfb/invitewidget.ui @@ -192,6 +192,6 @@ emailInviteClicked() manageInviteClicked() - - + + diff --git a/krfb/krfb/manageinvitations.ui b/krfb/krfb/manageinvitations.ui index a9338792..807ce195 100644 --- a/krfb/krfb/manageinvitations.ui +++ b/krfb/krfb/manageinvitations.ui @@ -209,7 +209,7 @@ listSizeChanged( int i ) listSelectionChanged() - + klistview.h diff --git a/krfb/krfb/personalinvitewidget.ui b/krfb/krfb/personalinvitewidget.ui index 04e970b5..da8ce9d9 100644 --- a/krfb/krfb/personalinvitewidget.ui +++ b/krfb/krfb/personalinvitewidget.ui @@ -236,6 +236,6 @@ Give the information below to the person that you want to invite (<a href="wh - - + + diff --git a/krfb/libvncserver/cursor.c b/krfb/libvncserver/cursor.c index d943dc37..633cc0fe 100644 --- a/krfb/libvncserver/cursor.c +++ b/krfb/libvncserver/cursor.c @@ -36,7 +36,7 @@ rfbSendtqCursorShape(cl) rfbFramebufferUpdateRectHeader rect; rfbXCursorColors colors; int saved_ublen; - int bitmapRowBytes, tqmaskBytes, dataBytes; + int bitmapRowBytes, maskBytes, dataBytes; int i, j; CARD8 *bitmapData; CARD8 bitmapByte; @@ -85,21 +85,21 @@ rfbSendtqCursorShape(cl) /* Calculate data sizes. */ bitmapRowBytes = (pCursor->width + 7) / 8; - tqmaskBytes = bitmapRowBytes * pCursor->height; + maskBytes = bitmapRowBytes * pCursor->height; dataBytes = (cl->useRichCursorEncoding) ? (pCursor->width * pCursor->height * - (cl->format.bitsPerPixel / 8)) : tqmaskBytes; + (cl->format.bitsPerPixel / 8)) : maskBytes; /* Send buffer contents if needed. */ if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { if (!rfbSendUpdateBuf(cl)) return FALSE; } if ( cl->ublen + sz_rfbFramebufferUpdateRectHeader + - sz_rfbXCursorColors + tqmaskBytes + dataBytes > UPDATE_BUF_SIZE ) { + sz_rfbXCursorColors + maskBytes + dataBytes > UPDATE_BUF_SIZE ) { return FALSE; /* FIXME. */ } @@ -347,7 +347,7 @@ void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap) /* Cursor creation. You "paint" a cursor and let these routines do the work */ -rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString) +rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString) { int i,j,w=(width+7)/8; rfbCursorPtr cursor = (rfbCursorPtr)calloc(1,sizeof(rfbCursor)); @@ -364,9 +364,9 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmask for(i=0,bit=0x80;i>1,cp++) if(*cp!=' ') cursor->source[j*w+i/8]|=bit; - if(tqmaskString) { + if(maskString) { cursor->tqmask = (unsigned char*)calloc(w,height); - for(j=0,cp=tqmaskString;j>1,cp++) if(*cp!=' ') cursor->tqmask[j*w+i/8]|=bit; } else diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index aba56cfa..55051819 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -744,7 +744,7 @@ extern Bool rfbSendtqCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); extern Bool rfbSendSoftCursor(rfbClientPtr cl, Bool cursorWasChanged); extern unsigned char rfbReverseByte[0x100]; extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap); -extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* tqmaskString); +extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString); extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString); extern void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor); diff --git a/ksirc/FilterRuleWidget.ui b/ksirc/FilterRuleWidget.ui index ab845cdd..e24b283c 100644 --- a/ksirc/FilterRuleWidget.ui +++ b/ksirc/FilterRuleWidget.ui @@ -235,5 +235,5 @@ - + diff --git a/ksirc/KSOpenkSirc/open_ksircData.ui b/ksirc/KSOpenkSirc/open_ksircData.ui index df4ae7c6..0bc3374d 100644 --- a/ksirc/KSOpenkSirc/open_ksircData.ui +++ b/ksirc/KSOpenkSirc/open_ksircData.ui @@ -333,5 +333,5 @@ passwordChanged(const QString &) - + diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui index 815598ba..0287b3c5 100644 --- a/ksirc/KSPrefs/page_autoconnectbase.ui +++ b/ksirc/KSPrefs/page_autoconnectbase.ui @@ -382,7 +382,7 @@ kcl_clicked(TQListViewItem *) kvl_clicked(TQListViewItem*) - + klistview.h knuminput.h diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui index cffcc4cc..9c14536f 100644 --- a/ksirc/KSPrefs/page_colorsbase.ui +++ b/ksirc/KSPrefs/page_colorsbase.ui @@ -1059,5 +1059,5 @@ coloursSetEnable() changed() - + diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui index d4dec93b..e5811a1a 100644 --- a/ksirc/KSPrefs/page_generalbase.ui +++ b/ksirc/KSPrefs/page_generalbase.ui @@ -536,5 +536,5 @@ showWallpaperPixmap(const QString &) changed() - + diff --git a/ksirc/KSPrefs/page_irccolorsbase.ui b/ksirc/KSPrefs/page_irccolorsbase.ui index 7b7e31b9..b83b9b05 100644 --- a/ksirc/KSPrefs/page_irccolorsbase.ui +++ b/ksirc/KSPrefs/page_irccolorsbase.ui @@ -1253,7 +1253,7 @@ chanaged() changed() - + kcolorbutton.h kcolorbutton.h diff --git a/ksirc/KSPrefs/page_looknfeelbase.ui b/ksirc/KSPrefs/page_looknfeelbase.ui index ba4ea3f4..49688ab9 100644 --- a/ksirc/KSPrefs/page_looknfeelbase.ui +++ b/ksirc/KSPrefs/page_looknfeelbase.ui @@ -314,7 +314,7 @@ showWallpaperPixmap(const QString &) changed() - + kurlrequester.h klineedit.h diff --git a/ksirc/KSPrefs/page_rmbmenubase.ui b/ksirc/KSPrefs/page_rmbmenubase.ui index abeb6169..09fbef0d 100644 --- a/ksirc/KSPrefs/page_rmbmenubase.ui +++ b/ksirc/KSPrefs/page_rmbmenubase.ui @@ -248,5 +248,5 @@ kseparator.h - + diff --git a/ksirc/KSPrefs/page_servchanbase.ui b/ksirc/KSPrefs/page_servchanbase.ui index 59ad646f..c677949a 100644 --- a/ksirc/KSPrefs/page_servchanbase.ui +++ b/ksirc/KSPrefs/page_servchanbase.ui @@ -168,5 +168,5 @@ - + diff --git a/ksirc/KSPrefs/page_shortcutsbase.ui b/ksirc/KSPrefs/page_shortcutsbase.ui index c570f73f..1c40bdca 100644 --- a/ksirc/KSPrefs/page_shortcutsbase.ui +++ b/ksirc/KSPrefs/page_shortcutsbase.ui @@ -53,5 +53,5 @@ showWallpaperPixmap(const QString &) changed() - + diff --git a/ksirc/KSPrefs/page_startupbase.ui b/ksirc/KSPrefs/page_startupbase.ui index 125b0934..42dfefeb 100644 --- a/ksirc/KSPrefs/page_startupbase.ui +++ b/ksirc/KSPrefs/page_startupbase.ui @@ -187,7 +187,7 @@ changed() server_changed() - + keditlistbox.h klineedit.h diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui index bd1939ce..b3b070b4 100644 --- a/ksirc/dccManagerbase.ui +++ b/ksirc/dccManagerbase.ui @@ -190,7 +190,7 @@ kpbAbort_clicked() kpbNew_clicked() - + klistview.h kpushbutton.h diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui index 06e90b46..661ed5f5 100644 --- a/ksirc/dccNewbase.ui +++ b/ksirc/dccNewbase.ui @@ -227,7 +227,7 @@ sendClicked() fileClicked() - + alistbox.h kcombobox.h diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index ba169e4f..4e6020e9 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -196,9 +196,9 @@ void DisplayMgrMDI::reparentReq() s = o; - while(s->tqparentWidget()){ + while(s->parentWidget()){ kdDebug(5008) << "Got a: " << s->className() << endl; - s = s->tqparentWidget(); + s = s->parentWidget(); if(s->inherits("KMainWindow")) break; diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 8b2e5e45..b12f8864 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1114,12 +1114,12 @@ void TextLine::clearSelection() i->setSelectiontqStatus( Item::NoSelection ); } -void TextLine::appendItem( Item *i, int tqlayoutUpdatePolicy ) +void TextLine::appendItem( Item *i, int layoutUpdatePolicy ) { m_items.append( i ); i->setLine(this); - if ( tqlayoutUpdatePolicy == UpdateMaxHeight ) + if ( layoutUpdatePolicy == UpdateMaxHeight ) m_maxHeight = kMax( m_maxHeight, i->height() ); } diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h index f8bf755f..b523d274 100644 --- a/ksirc/kstextview.h +++ b/ksirc/kstextview.h @@ -323,7 +323,7 @@ public: void clearSelection(); // transfers ownership - void appendItem( Item *i, int tqlayoutUpdatePolicy = NoUpdate ); + void appendItem( Item *i, int layoutUpdatePolicy = NoUpdate ); bool isEmpty() const { return m_items.isEmpty(); } diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod index 9a09acd4..2a6bc799 100644 --- a/ksirc/puke/HOWTO-PUKE.pod +++ b/ksirc/puke/HOWTO-PUKE.pod @@ -188,7 +188,7 @@ Both these functions should be overriden and return your widget type, and set your widget. For setWidget you should connect required Q_SIGNALS and eventFilters you are using. -Make sure to call the tqparents setWidget in setWidget so it can connect +Make sure to call the parents setWidget in setWidget so it can connect filters etc. BEWARE: You might get the widget into setWidget being null (from the @@ -222,7 +222,7 @@ Call the destructor as such: delete widget(); setWidget(0); -This will clear the widget from now and all tqparents and delete it. +This will clear the widget from now and all parents and delete it. you never want it deleted twice. (deleting 0 won't hurt) =head2 2.2 The Perl code diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index faa5cf23..a4e13f3c 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -711,7 +711,7 @@ void PukeController::closefd(int fd) PObject *po = 0x0; while(it.current()){ /* - * Delete all the tqlayouts first + * Delete all the layouts first * */ if(it.current()->type == POBJECT_LAYOUT){ diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 7fc945db..c525ec65 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -762,14 +762,14 @@ void servercontroller::WindowSelected(TQListViewItem *item) if ( !item ) return; - TQListViewItem *tqparent_server = item->tqparent(); - if(!tqparent_server) + TQListViewItem *parent_server = item->tqparent(); + if(!parent_server) return; - TQString txt = TQString(tqparent_server->text(0)) + "_" + item->text(0) + "_toplevel"; + TQString txt = TQString(parent_server->text(0)) + "_" + item->text(0) + "_toplevel"; TQWidget *obj = dynamic_cast( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); if(obj == 0x0){ - txt =TQString(tqparent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; + txt =TQString(parent_server->text(0)) + "_!" + item->text(0) + "_toplevel"; obj = dynamic_cast( objFinder::tqfind(txt.utf8(), "KSircTopLevel")); } diff --git a/ktalkd/ktalkd/announce.cpp b/ktalkd/ktalkd/announce.cpp index 51f878e0..1970b92d 100644 --- a/ktalkd/ktalkd/announce.cpp +++ b/ktalkd/ktalkd/announce.cpp @@ -93,7 +93,7 @@ int announce(NEW_CTL_MSG *request, const char *remote_machine, char *disp, int request->r_name); } else if (strstr(request->l_name,"\033")) { syslog(LOG_WARNING, - "blocked VT100 FLASH BOMB to user: %s (aptqparently from: %s)", + "blocked VT100 FLASH BOMB to user: %s (apparently from: %s)", request->r_name, remote_machine); } else { if ((pid = fork())) { diff --git a/lanbrowsing/lisa/addressvalidator.cpp b/lanbrowsing/lisa/addressvalidator.cpp index f4dab083..3ac8ccf0 100644 --- a/lanbrowsing/lisa/addressvalidator.cpp +++ b/lanbrowsing/lisa/addressvalidator.cpp @@ -114,8 +114,8 @@ void AddressValidator::setValidAddresses(MyString addressSpecs) { pos=nextPart.find('/'); MyString netStr=nextPart.left(pos); - MyString tqmaskStr=nextPart.mid(pos+1); - int tqmask=inet_addr(tqmaskStr.data()); + MyString maskStr=nextPart.mid(pos+1); + int tqmask=inet_addr(maskStr.data()); int net= (inet_addr(netStr.data()) & tqmask); dcerr<<"setValidAddresses: net/tqmask: " <isInformed()) return 0; + if (!parentServer->isInformed()) return 0; //we fork now, so that writing to the client can't block the server process /* int pid=fork(); if (pid==-1) @@ -91,7 +91,7 @@ int Client::tryToGetInfo() //child //this one does it all :-) dcerr<<"tryToGetInfo: sending data to client"<writeDataToFD(fd(),0); + parentServer->writeDataToFD(fd(),0); close(); //exit(0); return 1; diff --git a/lanbrowsing/lisa/client.h b/lanbrowsing/lisa/client.h index a82289c4..b6311235 100644 --- a/lanbrowsing/lisa/client.h +++ b/lanbrowsing/lisa/client.h @@ -34,7 +34,7 @@ class Client void close(); time_t age() {return time(0)-m_creationTime;}; private: - NetManager *tqparentServer; + NetManager *parentServer; int m_fd; //if something goes wrong close the connection after a timeout time_t m_creationTime; diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp index ac8f512d..fd6a86bf 100644 --- a/lanbrowsing/lisa/netscanner.cpp +++ b/lanbrowsing/lisa/netscanner.cpp @@ -191,8 +191,8 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) { //mdcerr<<"net/tqmask combination detected"<, and than RSS 0.91-0.94 and RSS 2.0. */ - TQDomNode tqparentNode; + TQDomNode parentNode; if (d->version == v0_90 || d->version == v1_0) - tqparentNode = rootNode; + parentNode = rootNode; else - tqparentNode = channelNode; + parentNode = channelNode; - TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image")); + TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image")); if (!n.isNull()) d->image = new Image(n); - n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput")); + n = parentNode.namedItem(TQString::tqfromLatin1("textinput")); if (!n.isNull()) d->textInput = new TextInput(n); // Our (hopefully faster) version of elementsByTagName() - for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { + for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) { const TQDomElement e = n.toElement(); if (e.tagName() == TQString::tqfromLatin1("item")) d->articles.append(Article(e)); diff --git a/wifi/kcmwifi/configadvanced.ui b/wifi/kcmwifi/configadvanced.ui index 536fa9a5..3eda59d7 100644 --- a/wifi/kcmwifi/configadvanced.ui +++ b/wifi/kcmwifi/configadvanced.ui @@ -141,5 +141,5 @@ - + diff --git a/wifi/kcmwifi/configcrypto.ui b/wifi/kcmwifi/configcrypto.ui index 4dc4e408..76736675 100644 --- a/wifi/kcmwifi/configcrypto.ui +++ b/wifi/kcmwifi/configcrypto.ui @@ -354,8 +354,8 @@ load( const IfConfig & ifconfig ) save( IfConfig & ifconfig ) - - + + klineedit.h klineedit.h diff --git a/wifi/kcmwifi/configpower.ui b/wifi/kcmwifi/configpower.ui index c1ec4fd7..b319cdac 100644 --- a/wifi/kcmwifi/configpower.ui +++ b/wifi/kcmwifi/configpower.ui @@ -149,8 +149,8 @@ load( const IfConfig & ifconfig ) save( IfConfig & ifconfig ) - - + + knuminput.h knuminput.h diff --git a/wifi/kcmwifi/ifconfigpagebase.ui b/wifi/kcmwifi/ifconfigpagebase.ui index 51e48c22..089284aa 100644 --- a/wifi/kcmwifi/ifconfigpagebase.ui +++ b/wifi/kcmwifi/ifconfigpagebase.ui @@ -489,8 +489,8 @@ kdialog.h - - + + klineedit.h kurlrequester.h diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index 6989316a..22a25a34 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -78,12 +78,12 @@ void MainConfig::slotChangeNumConfigs( int newnumber ) if ( config->m_numConfigs < newnumber ) // number of configs raised { int diff = newnumber - config->m_numConfigs; - ( (KCMWifi*)tqparentWidget() )->addConfigTab( diff, false ); + ( (KCMWifi*)parentWidget() )->addConfigTab( diff, false ); } else // number of configs lowered { int diff = config->m_numConfigs - newnumber; - ( (KCMWifi*)tqparentWidget() )->delConfigTab( diff ); + ( (KCMWifi*)parentWidget() )->delConfigTab( diff ); } } diff --git a/wifi/kcmwifi/mainconfigbase.ui b/wifi/kcmwifi/mainconfigbase.ui index b47161ee..77e168c1 100644 --- a/wifi/kcmwifi/mainconfigbase.ui +++ b/wifi/kcmwifi/mainconfigbase.ui @@ -156,7 +156,7 @@ - + kpushbutton.h kcombobox.h diff --git a/wifi/kwireless/propertytablebase.ui b/wifi/kwireless/propertytablebase.ui index 19e97b2a..1ee5b482 100644 --- a/wifi/kwireless/propertytablebase.ui +++ b/wifi/kwireless/propertytablebase.ui @@ -64,5 +64,5 @@ - +